gentoo resync : 15.06.2021

4 files changed, 38 insertions, 46 deletions

diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index acf91c6e096f..ec502aa8b4da 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,4 +1,3 @@
-AUX libeatmydata-105-undpkg.patch 308 BLAKE2B a6ad730f191ae342217dd7f881bab503ae662d3fcc9d8f782e23765e9b2385ab5d8f30a3ffdb0180d2ef22f22f327b7c6b3189674d65ac1aaacf68a4466e8620 SHA512 1f90cd5637babf47139c30f0b3a1c96e4dfaceaba7617108b76ef68f69a47287e509284e318cbbe1c0c62fc4f2fb5792b0d0ad0dd977388fd90f3ed54ba35e28
-DIST libeatmydata-105.tar.gz 419427 BLAKE2B 251fc4226ddddce16abc16c8a0717cd69621e8c166cf7a7dec1c8782c2a25edcf26e34f1a09bd2b6153a46eb99a6cf4b1adc334db188201b12a27b4a1562ed03 SHA512 fb2ac1400d5e3c44bfc952c72f29a4c7234edf5b756a9602ad822c57fbc9813c35d2da9492e2982abf81e0826d278da2d31ee1865e806754e0b387ad699367d4
-EBUILD libeatmydata-105-r2.ebuild 706 BLAKE2B 14ee75e1d57bb91db40cdc3061941e6dffea7500056eb8dd65ac6865ad2e437f692e719c02e2741e8962fac26c3a52d27b41c7f89258997097ae3eabd6e6c1b9 SHA512 5dbf29d6f85a32561cbf005074fe53c2f928f82edbdfcfa0057434d73f4d15273b7b855e81b179ed692926b7da1b953e6935a51c114af6421be946a40d2b3a4f
+DIST libeatmydata-129.tar.gz 358437 BLAKE2B 448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2 SHA512 dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1
+EBUILD libeatmydata-129-r1.ebuild 845 BLAKE2B f053a4f83e42ebab36ab199a86365317f31d83096a7b82b6b672e6c9d644157aefcef9aae5c3e35cff407eefc8d9a781875fe5a1c58f2a6f7ba46717cb71d6d4 SHA512 d81b90984fa1072628a77c20ee7595bfd8bf1b9c1418bf155f866fe80cbc85a760e79015b943e2d1610c37076fd9bc424410ada70d7b08cced7615e881d8b33c
 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
deleted file mode 100644
index 41362d1c2531..000000000000
--- a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Don't rely on debian's way to multilib/multiarch.
-
-https://bugs.gentoo.org/550344
---- a/eatmydata.in
-+++ b/eatmydata.in
-@@ -17,5 +17,4 @@
- 
--export `dpkg-architecture|grep DEB_BUILD_MULTIARCH`
-+shlib="@libexecdir@/eatmydata.sh"
- 
--shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh"
- if [ -f "$shlib" ]; then
diff --git a/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild b/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
deleted file mode 100644
index 0d1428d550b4..000000000000
--- a/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-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"
-
-# sandbox fools LD_PRELOAD and libeatmydata does not get control
-# feature of sandbox
-#DEPEND="test? ( dev-util/strace )"
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-105-undpkg.patch
-)
-
-ECONF_SOURCE="${S}"
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -type f -delete || die
-
-	dodoc AUTHORS README
-}
diff --git a/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild
new file mode 100644
index 000000000000..71b725cd15a6
--- /dev/null
+++ b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
+HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/"
+SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-util/strace )"
+
+ECONF_SOURCE="${S}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --disable-static
+}
+
+multilib_src_test() {
+	# sandbox fools LD_PRELOAD and libeatmydata does not get control
+	# feature of sandbox
+	SANDBOX_ON=0 LD_PRELOAD= emake -k check
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -type f -delete || die
+
+	dodoc AUTHORS README.md
+}