gentoo resync : 25.11.2020

4 files changed, 17 insertions, 38 deletions

diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest
index db4708c50241..2086c9aaac7b 100644
--- a/sys-fs/zerofree/Manifest
+++ b/sys-fs/zerofree/Manifest
@@ -1,5 +1,4 @@
-DIST zerofree-1.0.4.tgz 8509 BLAKE2B d2d5872ad22e7c5f08e00083b0dadb5411023df9d129ec3bd08637e8a74f77f13a535e6f2c1a7cd4d390ed7a0d0b6e2433dacfa89336bb16ffb64c0d1c409929 SHA512 8172c8c43794eab1f751a700f847098343659ceabaf6ab78c3c902b34cf9b0db0dda75308b6bc80d22afccd11be25f35070ca6d715c3282c5c7c7106f598b42b
+AUX zerofree-include-sys_types.patch 284 BLAKE2B 45b375568b6bfc767a65d5d1082f44db4030ae687edb4d528f0000d1fc8dc78c10f98cd6bf57eaa9b9dd2d0ce96aee408ecddc1126ddd59faa737f7dcd236d7d SHA512 0cf3833271195c2f1da591af625928d8207d6bb39702cdc9f8ade0e7e773096e4f55860438863f06639f205283c0cccbaaf8b4d9ee98e3850a5075e38d06a187
 DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c
-EBUILD zerofree-1.0.4.ebuild 834 BLAKE2B 798366afa40e3a98e4ebc5b49e1158a459c2dc8c6542e8db42d2c028850fd548609b4c44c1641793997290b4c9a9cd60cfba3722834dee7b590aa31e0532ab87 SHA512 ebe03d80d9fd66c3c1003292ad24fc43c28bb4f4286382a3f986d06fe813173f0c811ce23015ba114c337e0f040092039c938d49893e4d19b479851b03a79d9d
-EBUILD zerofree-1.1.1.ebuild 834 BLAKE2B 798366afa40e3a98e4ebc5b49e1158a459c2dc8c6542e8db42d2c028850fd548609b4c44c1641793997290b4c9a9cd60cfba3722834dee7b590aa31e0532ab87 SHA512 ebe03d80d9fd66c3c1003292ad24fc43c28bb4f4286382a3f986d06fe813173f0c811ce23015ba114c337e0f040092039c938d49893e4d19b479851b03a79d9d
+EBUILD zerofree-1.1.1.ebuild 947 BLAKE2B f2d5575eda702b83c454889bfa54e816405c3037a983705a3ad1cc260a74b9cef35c9a3ba78af281d246853a23c3306bf76f7030ad032807fefd4a22a807bfa9 SHA512 f7750e84509daba6bb0242bc6f59744678c94c298384bffa54d03631d3aa267a1c0deeb3fb38e2300e20905d0e68cf0cbfea7de02bcd98129d88b68c7615c3af
 MISC metadata.xml 433 BLAKE2B aa623f9df641917cb34f2a028d4db98e33b241e89b94ac424045fb053bbe16b124f62329394d30cb6163689f8716a1eef4697115648f06f9834ee41c2914ae26 SHA512 c454915a2972c289341df97d9d8cb9bf26ea2f4c00ba4555a2d14e69e8f48f7bc8fc33c404ad19c175ff7e96900f3cead4dbaf32b0c36981c8a4926212a017e8
diff --git a/sys-fs/zerofree/files/zerofree-include-sys_types.patch b/sys-fs/zerofree/files/zerofree-include-sys_types.patch
new file mode 100644
index 000000000000..fecdbd49b0ac
--- /dev/null
+++ b/sys-fs/zerofree/files/zerofree-include-sys_types.patch
@@ -0,0 +1,10 @@
+--- zerofree-1.1.1/zerofree.c.orig	2019-05-05 19:22:49.000000000 -0500
++++ zerofree-1.1.1/zerofree.c	2019-05-05 19:21:50.000000000 -0500
+@@ -17,6 +17,7 @@
+  *             Jan Krämer.
+  */
+ 
++#include <sys/types.h>
+ #include <ext2fs/ext2fs.h>
+ #include <stdio.h>
+ #include <unistd.h>
diff --git a/sys-fs/zerofree/zerofree-1.0.4.ebuild b/sys-fs/zerofree/zerofree-1.0.4.ebuild
deleted file mode 100644
index 6e360c833a18..000000000000
--- a/sys-fs/zerofree/zerofree-1.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Zeroes out all free space on a filesystem"
-HOMEPAGE="http://frippery.org/uml/index.html"
-SRC_URI="http://frippery.org/uml/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE=""
-
-DEPEND="sys-libs/e2fsprogs-libs"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Honor system CFLAGS.
-	# Use pipes for the sed delimiter to resolve #710818.
-	sed -i \
-		-e "s|CC=gcc|CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}|g" \
-		-e "s|-o zerofree|\$(CFLAGS) \$(LDFLAGS) -o zerofree|g" \
-		-e "/-lext2fs/{ s|-lext2fs||g; s|$| -lext2fs|g; }" \
-		Makefile || die "Failed to sed the Makefile"
-
-	eapply_user
-}
-
-src_install() {
-	# Install into /sbin
-	into /
-	dosbin zerofree
-}
diff --git a/sys-fs/zerofree/zerofree-1.1.1.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild
index 6e360c833a18..d234d5d2144f 100644
--- a/sys-fs/zerofree/zerofree-1.1.1.ebuild
+++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild
@@ -17,6 +17,11 @@ DEPEND="sys-libs/e2fsprogs-libs"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
+	# Bug #712582, fix compile in musl environments.
+	eapply "${FILESDIR}/${PN}-include-sys_types.patch"
+
 	# Honor system CFLAGS.
 	# Use pipes for the sed delimiter to resolve #710818.
 	sed -i \