commit:     5c4070ac92b48441ef0ea14e7c144f3e726db4f4
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 12:06:54 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 12:07:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4070ac

sys-fs/libeatmydata: refresh to EAPI=7

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch       |  2 --
 ...{libeatmydata-105-r1.ebuild => libeatmydata-105-r2.ebuild} | 11 +++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch 
b/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
index 3ffd698c7dd..41362d1c253 100644
--- a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
+++ b/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
@@ -1,8 +1,6 @@
 Don't rely on debian's way to multilib/multiarch.
 
 https://bugs.gentoo.org/550344
-diff --git a/eatmydata.in b/eatmydata.in
-index 40468db..aa143f0 100644
 --- a/eatmydata.in
 +++ b/eatmydata.in
 @@ -17,5 +17,4 @@

diff --git a/sys-fs/libeatmydata/libeatmydata-105-r1.ebuild 
b/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
similarity index 83%
rename from sys-fs/libeatmydata/libeatmydata-105-r1.ebuild
rename to sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
index 4065bab2afd..2b6e0ab0a18 100644
--- a/sys-fs/libeatmydata/libeatmydata-105-r1.ebuild
+++ b/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-multilib eutils
+EAPI=7
+
+inherit multilib-minimal
 
 DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
 HOMEPAGE="https://launchpad.net/libeatmydata/";
@@ -14,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # sandbox fools LD_PRELOAD and libeatmydata does not get control
-# bug/feature in sandbox?
+# feature of sandbox
 #DEPEND="test? ( dev-util/strace )"
 RESTRICT=test
 
@@ -25,8 +26,10 @@ PATCHES=(
        "${FILESDIR}"/${PN}-105-undpkg.patch
 )
 
+ECONF_SOURCE=${S}
+
 multilib_src_install_all() {
-       prune_libtool_files --all
+       find "${D}" -name '*.la' -type f -delete || die
 
        dodoc AUTHORS README
 }

Reply via email to