6 files changed, 9 insertions, 97 deletions
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index 9374a844a8d9..561b3e5fc935 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,9 +1,4 @@
-AUX libeatmydata-105-undpkg.patch 379 BLAKE2B 8e53fff0b78507413051bdf8ca42e5ee6a131ff9fb9a76154a1d029fb4292e668755696253f1a6fe111e6f8564fca10c089f6a54e3cfd527beddf8b5769d4608 SHA512 b6b56e90305937eebe6a043f40c904a1facbf480d9f63a3c59d8bd96150c810bb2cb4aaffafc3d02f4c01179eeec5cce2f5b285d0db6fb7664ea5b2fa64f2ec5
+AUX libeatmydata-105-undpkg.patch 308 BLAKE2B a6ad730f191ae342217dd7f881bab503ae662d3fcc9d8f782e23765e9b2385ab5d8f30a3ffdb0180d2ef22f22f327b7c6b3189674d65ac1aaacf68a4466e8620 SHA512 1f90cd5637babf47139c30f0b3a1c96e4dfaceaba7617108b76ef68f69a47287e509284e318cbbe1c0c62fc4f2fb5792b0d0ad0dd977388fd90f3ed54ba35e28
 DIST libeatmydata-105.tar.gz 419427 BLAKE2B 251fc4226ddddce16abc16c8a0717cd69621e8c166cf7a7dec1c8782c2a25edcf26e34f1a09bd2b6153a46eb99a6cf4b1adc334db188201b12a27b4a1562ed03 SHA512 fb2ac1400d5e3c44bfc952c72f29a4c7234edf5b756a9602ad822c57fbc9813c35d2da9492e2982abf81e0826d278da2d31ee1865e806754e0b387ad699367d4
-DIST libeatmydata-65.tar.gz 408813 BLAKE2B 21b125ee28fde610ce91f342c2579ad302c43aac4c8fcbb4663ed1d1a55355f8ef2c61bdffd4734e04032e7ccacabc7c17ba708f07e468f44a9bdecbe14428c9 SHA512 b2e3ed9c67b6ae9b0e5918b114bf0fb6e59dda3bff9b9331a8c280243822d4c77f35e9b08138ea65a74c893cc2bd67677bbf28b03bc61f011b24dd39d171adc2
-DIST libeatmydata-82.tar.gz 407977 BLAKE2B 1a0c024e8199302f30df170e6668719bc19b38cff08b05a62f8d085f3b1531dc22690811f4ba1459b0b2d59c5329ee3b3e377f37838d9e607d69171399d85ba6 SHA512 882b2464c26d99ea0b01a2f1171dddb637ac0b3509c18416da4e0199f515ff23c43a7bb5eb641bc3447a2c6be06c261260713565c3e4c4b988995d09f52d623c
-EBUILD libeatmydata-105-r1.ebuild 718 BLAKE2B d20c366834274acfb7ce0e60f8c3cdeb84ee30f4fcf225c086b5df0c582a94e0945fb06a4c68e1239fe0ddf523c6b3ba7b235a05bbe6095d4e84d1276c61ee2f SHA512 41f08297579e704008856a13fed9c6df70b41931c0be4ce89c76a1cbada7dca9a6cada20f2085744dd0b6efa8face844c7af60c156b4a3bbe1780c89ba0db725
-EBUILD libeatmydata-65.ebuild 646 BLAKE2B f675ee8134252580fb4361284022591663715d4ff7e6c1bc55900a215cc14d1cc50601ec1cabe51b7c3855289e9482e1eeadff3ed39f4237d89f18d2d8e11928 SHA512 2575255da69e9001574b4ba288188ca0a08a1f85c25f3b0148f906c4ed2c973cc410ead085a122f2ba33dc32be065d5442d509ee5e65e6116c95b55c285c988e
-EBUILD libeatmydata-82-r1.ebuild 630 BLAKE2B 9c6f95259969fe6e61ff22733eb1cf429a31b38fa397e5ad7b769469e70fb22b8c7dc9b5a1c589b7d0322adc9cc86200f4560053ce2e76117a51e06cf139f623 SHA512 c646bc4930c299b6ae1b7b7b0beff1fb2150e5713d04c9d4604d45e192d27e6bf1210bc7b1af0ef1985b61bf93c069999625d648b01803de39bf1dd631379b31
-EBUILD libeatmydata-82.ebuild 635 BLAKE2B 6a4c9f777b73451dbab0ba3a602c3b18d2ed6b7ff9859e563bf2703f6a698e9ab7190c9a77405fb223c7bc3a15079207069b0febbcc7cf57c578bd2bb15f06e6 SHA512 41a6bbee82152a245bbf939f912d9f0d1aee15abe072bfd233ceb3e2a736e30ecdd459a7f1d01114e68e283fcbf032c4a41f9b947cb355138118f30b127c2d54
+EBUILD libeatmydata-105-r2.ebuild 746 BLAKE2B 1a57dc157792ca1f25de7a1225fb762e88be60845dbf48f21fef3782b1950559399ebe048426452fd834910046cea379021849045ccf727e3dd4885bfd538acb SHA512 cd390db0b4e89e365de7ebb72784f87a139fafceee744d92200f1baf08e49d24a1b3308d41b67393ad32d6524fab0f4fe15461d436e15bbec3d565d646f5ab96
 MISC metadata.xml 512 BLAKE2B 549d76a933090ccaf7100a6ae03b8a1f0c1c68454764018360184bcdce4e6628a38ac499bd8a568fc43240fa13596a6f0b4e108fff1c742d4e229aad59049b10 SHA512 4b436b230dfafd7554ffe9ef222fda5aa4e4132768f945c34cde4fed9359f2782e0f371617ecf52b55339f278fbd51f28fe58bf50ec600bef8644c82f594d363
diff --git a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch b/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
index 3ffd698c7ddd..41362d1c2531 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
index 4065bab2afd0..2b6e0ab0a184 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
 }
diff --git a/sys-fs/libeatmydata/libeatmydata-65.ebuild b/sys-fs/libeatmydata/libeatmydata-65.ebuild
deleted file mode 100644
index 716221b794a4..000000000000
--- a/sys-fs/libeatmydata/libeatmydata-65.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
-HOMEPAGE="https://launchpad.net/libeatmydata/"
-SRC_URI="https://launchpad.net/${PN}/trunk/release-${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# sandbox fools LD_PRELOAD and libeatmydata does not get control
-# bug/feature in sandbox?
-#DEPEND="test? ( dev-util/strace )"
-RESTRICT=test
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-	dodoc AUTHORS README
-}
diff --git a/sys-fs/libeatmydata/libeatmydata-82-r1.ebuild b/sys-fs/libeatmydata/libeatmydata-82-r1.ebuild
deleted file mode 100644
index 67a35edabb68..000000000000
--- a/sys-fs/libeatmydata/libeatmydata-82-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib eutils
-
-DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
-HOMEPAGE="https://launchpad.net/libeatmydata/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# sandbox fools LD_PRELOAD and libeatmydata does not get control
-# bug/feature in sandbox?
-#DEPEND="test? ( dev-util/strace )"
-RESTRICT=test
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-multilib_src_install_all() {
-	dodoc AUTHORS README
-}
diff --git a/sys-fs/libeatmydata/libeatmydata-82.ebuild b/sys-fs/libeatmydata/libeatmydata-82.ebuild
deleted file mode 100644
index 1649666771ac..000000000000
--- a/sys-fs/libeatmydata/libeatmydata-82.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
-HOMEPAGE="https://launchpad.net/libeatmydata/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# sandbox fools LD_PRELOAD and libeatmydata does not get control
-# bug/feature in sandbox?
-#DEPEND="test? ( dev-util/strace )"
-RESTRICT=test
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-	dodoc AUTHORS README
-}