gentoo resync : 12.03.2021

6 files changed, 46 insertions, 214 deletions

diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 7e1598dd2a57..adbbf6cf19a5 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -1,10 +1,9 @@
 AUX dmraid-1.0.0_rc16-fix-missing-PATH-MOUNTED.patch 328 BLAKE2B 0e2460c01d71892c1171b8b79867229531fb09e0ebfe42c6c240a4cab5cf756ede7ce903849e6661d5830c608d2642ca365a5a053959b91f0c040ab0836976db SHA512 9de3430dba561c0f30fbed787bc2e0da39a0b0d83fbb39c1d8e824b02557e9fec08f96faa2720165364435ee01b1cb83e7a786b17f28338862a3c9e2b60bb2ba
+AUX dmraid-1.0.0_rc16-musl.patch 591 BLAKE2B 5627ffa58fef18eb0be07e9a52f2a6b034e96f01e0e2983e2080f721a0e8767aa7ad373560e118a6ba9926c884563f0b29d8f9e2d72d95a65ad46d0597193dd1 SHA512 603d16b12436bc6c0c93609150a44e51c469fb56fe5d5ac34925139a22c3be49606f0f73483e9f284aeb6bc67e7043f3c846fb9d251ac869ca65bf9f48c97c8f
 AUX dmraid-1.0.0_rc16-parallel-make.patch 594 BLAKE2B 6dd17b5a8601f9de8cddbfffaaba3f3ed8c03c4f6b7271afe6d3a55b8f7cf633a72a868362c0241aa656cc460ad28c277bbfd6e723d462896c2c3c64af354874 SHA512 deb57258ab2aacd8e9b17e8430ba6f7453930280ac2990fe33e5f6cf0ef572591c30385ec3f0a23b335ae004c87b09d5fb2f1fe821f67acd79fde7e0a4d32c7c
 AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 BLAKE2B 5278f1df08db2a63519b6d311a34d825533672fd9f28bb692238b904c63fb9583c82d8d1a91a1ac3c4221c97773a0d97130734cebb74f70608bc89381882d9f3 SHA512 28da140287f7ed8625fc6a7131948b76898df8fbbdce9be278852ddc8f466a8e6352c7d4e1e96aa51a3737895e12c0607501bc657a43f1ab54d879d5510c310e
 AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 BLAKE2B 713e255890dfbfd7ded83cc914a136cf88a40943ac310f10e574f6ee3683e4cd61b1e369a38ddfb6ad767c904b95b2a04c04b1a38833998485aa4b1e29006870 SHA512 ff2aaebec2be1ace40377a4bcd91c802c190ac4047643478d6f99e3023cf69b4a5e8230519ce2f3febe5d6419a54557184739bcbeaa08047354ca93f27e4ec67
 AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93d44a02a450a03b1e338f3120473512fe60d7a5f60d4bb2ae25ed019e0c58b89c5e67fd81426ae0fd5e06220976640b84d29d67 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
-EBUILD dmraid-1.0.0_rc16-r3.ebuild 3266 BLAKE2B cae1fe9893033caa1ef9c166e5d76582520e0d672b2d2124183a1ea88268d21c90205bc49515cca08d6104024d46490840cba2391f1ee77b13e14da61cf767eb SHA512 509e0ebed35e1a7b6832dea0d69d10dd5ae96cf48605117ba228d5c12a8dbe7c52d91a48bf73bde8ac0efabd1b30743671e9d1f4effc5d8489826e765940d690
-EBUILD dmraid-1.0.0_rc16-r4.ebuild 3199 BLAKE2B df8cc50e363a354ebbcfa4adbb98b3fac4d4ee23a102950819a4337576a69bc7d8501f73f9fa62f908c8d37220135546b15f1b8329d7179cd6270972ba27e94b SHA512 db1ac9ee6140aae30d3124895d4b8cffb414663449c53f5559a6d76f17d19433057419516c8978fc9b8afea0462f9071695d7042e766c427b08d86bf0432b9f4
-EBUILD dmraid-1.0.0_rc16-r5.ebuild 3302 BLAKE2B 80754d66d259660813df47f4378cff9541fc34cee3e7bc1314bea542c71cfc7635e18c11c1ea871dbf60af4b572df5bd2c6b8b08786fae3ced93357ca9c652d0 SHA512 306fa1221f44860fcf29fda84f481df1d87c04c975504ab2cb762e07e33c426981386f283f4d01d9d9dcd3e0f9cb1b91abe5cbec8cf42a88270245b40347f42d
-MISC metadata.xml 690 BLAKE2B 610874b7f4687e1298a8b264dc5bfea0a1b0d801cc06e8366868f0e20007bbc3e1c78372eb6646b50c13194ecdf29e650580f1842977b40ea4938af03e00f759 SHA512 0df41bb9107110e39d6bbb8f89017e39b72fffe8875e85996ea62df6d1566064f3a103b41ba22ffb82cfc1d6d98e31cd4003cf7c546b6574bd0dfaa75d92b365
+EBUILD dmraid-1.0.0_rc16-r5.ebuild 3386 BLAKE2B 451c7548c24f60ca32d2b99c0ae56a5109c6a1401489f939c4c69dbe5613a97ab5aa0eaeb2b859705ee598ef4b89e9ec02851fbfdb9613fa8d2a54688ae67981 SHA512 de1d6a4489dc5f16fbd1d3fa25b0d5d12a121e33b5f825bd93016f9f8c4ce8a0597a3304b83dca51ac7a7d75916760128dd8920447e136832040e614606b5358
+MISC metadata.xml 544 BLAKE2B 8a100ed92851488b9a8c722769ea1d5a443ebf1220698b8de3de05f2b6cb282d4cf1d9849d5f86ceabfc6f70fab0d610853b084f8adaf938c48625be5db87191 SHA512 002f647c3c87349f1d56a1180e90e5746c5e94dc1b2e118aa2737b5d5b1dd72b4c3dbe808cdb56c2db6d47a6eb224784542ae7b005f100818979177c7e1d1898
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
deleted file mode 100644
index 448e03528698..000000000000
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools linux-info flag-o-matic eutils
-
-MY_PV=${PV/_/.}-3
-
-DESCRIPTION="Device-mapper RAID tool and library"
-HOMEPAGE="https://people.redhat.com/~heinzm/sw/dmraid/"
-SRC_URI="https://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
-IUSE="dietlibc intel_led klibc led mini static"
-REQUIRED_USE="klibc? ( !dietlibc )"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	klibc? ( dev-libs/klibc )
-	dietlibc? ( dev-libs/dietlibc )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( sys-fs/lvm2[static-libs] )"
-
-S=${WORKDIR}/${PN}/${MY_PV}/${PN}
-
-pkg_setup() {
-	if kernel_is lt 2 6 ; then
-		ewarn "You are using a kernel < 2.6"
-		ewarn "DMraid uses recently introduced Device-Mapper features."
-		ewarn "These might be unavailable in the kernel you are running now."
-	fi
-}
-
-src_prepare() {
-	epatch	"${FILESDIR}"/${P}-undo-p-rename.patch \
-		"${FILESDIR}"/${P}-return-all-sets.patch \
-		"${FILESDIR}"/${P}-static-build-fixes.patch \
-		"${FILESDIR}"/${P}-parallel-make.patch
-	# pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it
-	einfo "Appending pkg.m4 from system to aclocal.m4"
-	cat "${ROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4"
-	epatch_user
-	eautoreconf
-
-	einfo "Creating prepatched source archive for use with Genkernel"
-	# archive the patched source for use with genkernel
-	cd "${WORKDIR}" || die
-	mkdir -p "tmp/${PN}" || die
-	cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" || die
-	mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" || die
-	cd tmp || die
-	tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die
-	mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. || die
-}
-
-src_configure() {
-	econf --with-usrlibdir='${prefix}'/$(get_libdir) \
-		$(use_enable static static_link) \
-		$(use_enable mini) \
-		$(use_enable led) \
-		$(use_enable intel_led) \
-		$(use_enable klibc) \
-		$(use_enable dietlibc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGELOG README TODO KNOWN_BUGS doc/*
-	insinto /usr/share/${PN}
-	doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "For booting Gentoo from Device-Mapper RAID you can use a Genkernel initramfs."
-		elog
-		elog "Genkernel will generate the kernel and the initramfs with a statically "
-		elog "linked dmraid binary (its own version which may not be the same as this version):"
-		elog "\t emerge -av sys-kernel/genkernel"
-		elog "\t genkernel --dmraid all"
-	fi
-	# skip this message if this revision has already been emerged
-	if [[ " ${REPLACING_VERSIONS} " != *\ ${PVR}\ * ]]; then
-		elog
-		elog "A pre-patched distfile of this version of DMRAID has been installed at"
-		elog "/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2 , to support using it within a"
-		elog "Genkernel initramfs."
-		elog
-	fi
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you would rather use this version of DMRAID with Genkernel, update the following"
-		elog "in /etc/genkernel.conf:"
-		elog "\t DMRAID_VER=\"${MY_PV}\""
-		elog "\t DMRAID_SRCTAR=\"/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2\""
-		elog
-	fi
-}
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r4.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r4.ebuild
deleted file mode 100644
index 153fa71d352a..000000000000
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools linux-info flag-o-matic eutils
-
-MY_PV=${PV/_/.}-3
-
-DESCRIPTION="Device-mapper RAID tool and library"
-HOMEPAGE="https://people.redhat.com/~heinzm/sw/dmraid/"
-SRC_URI="https://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="intel_led led mini static"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( sys-fs/lvm2[static-libs] )
-"
-
-S="${WORKDIR}/${PN}/${MY_PV}/${PN}"
-
-pkg_setup() {
-	if kernel_is lt 2 6 ; then
-		ewarn "You are using a kernel < 2.6"
-		ewarn "DMraid uses recently introduced Device-Mapper features."
-		ewarn "These might be unavailable in the kernel you are running now."
-	fi
-}
-
-src_prepare() {
-	epatch	"${FILESDIR}"/${P}-undo-p-rename.patch \
-		"${FILESDIR}"/${P}-return-all-sets.patch \
-		"${FILESDIR}"/${P}-static-build-fixes.patch \
-		"${FILESDIR}"/${P}-parallel-make.patch
-	# pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it
-	einfo "Appending pkg.m4 from system to aclocal.m4"
-	cat "${ROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4"
-	epatch_user
-	eautoreconf
-
-	einfo "Creating prepatched source archive for use with Genkernel"
-	# archive the patched source for use with genkernel
-	cd "${WORKDIR}" || die
-	mkdir -p "tmp/${PN}" || die
-	cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" || die
-	mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" || die
-	cd tmp || die
-	tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die
-	mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. || die
-}
-
-src_configure() {
-	# disable klibc and dietlibc, bug #653392
-	econf --with-usrlibdir='${prefix}'/$(get_libdir) \
-		--disable-klibc \
-		--disable-dietlibc \
-		$(use_enable static static_link) \
-		$(use_enable mini) \
-		$(use_enable led) \
-		$(use_enable intel_led)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGELOG README TODO KNOWN_BUGS doc/*
-	insinto /usr/share/${PN}
-	doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "For booting Gentoo from Device-Mapper RAID you can use a Genkernel initramfs."
-		elog
-		elog "Genkernel will generate the kernel and the initramfs with a statically "
-		elog "linked dmraid binary (its own version which may not be the same as this version):"
-		elog "\t emerge -av sys-kernel/genkernel"
-		elog "\t genkernel --dmraid all"
-	fi
-	# skip this message if this revision has already been emerged
-	if [[ " ${REPLACING_VERSIONS} " != *\ ${PVR}\ * ]]; then
-		elog
-		elog "A pre-patched distfile of this version of DMRAID has been installed at"
-		elog "/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2 , to support using it within a"
-		elog "Genkernel initramfs."
-		elog
-	fi
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you would rather use this version of DMRAID with Genkernel, update the following"
-		elog "in /etc/genkernel.conf:"
-		elog "\t DMRAID_VER=\"${MY_PV}\""
-		elog "\t DMRAID_SRCTAR=\"/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2\""
-		elog
-	fi
-}
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
index 7d42581d1fd8..0d180f48c84a 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,20 +10,22 @@ MY_PV=${PV/_/.}-3
 DESCRIPTION="Device-mapper RAID tool and library"
 HOMEPAGE="https://people.redhat.com/~heinzm/sw/dmraid/"
 SRC_URI="https://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}/${MY_PV}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="intel_led led mini static"
 
 RDEPEND=">=sys-fs/lvm2-2.02.45"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	static? ( sys-fs/lvm2[static-libs] )
 "
-BDEPEND="virtual/pkgconfig
-	app-arch/tar"
-
-S="${WORKDIR}/${PN}/${MY_PV}/${PN}"
+BDEPEND="
+	app-arch/tar
+	virtual/pkgconfig
+"
 
 pkg_setup() {
 	if kernel_is lt 2 6 ; then
@@ -39,19 +41,26 @@ src_prepare() {
 	eapply -p0 "${FILESDIR}"/${P}-static-build-fixes.patch
 	eapply -p3 "${FILESDIR}"/${P}-parallel-make.patch
 	eapply "${FILESDIR}"/${P}-fix-missing-PATH-MOUNTED.patch
+	eapply "${FILESDIR}"/${PN}-1.0.0_rc16-musl.patch
 
 	# pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it
 	einfo "Appending pkg.m4 from system to aclocal.m4"
 	cat "${BROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4"
-	eapply_user
+
+	mv configure.{in,ac} || die
+
+	default
+
 	eautoreconf
 
 	einfo "Creating prepatched source archive for use with Genkernel"
 	# archive the patched source for use with genkernel
 	cd "${WORKDIR}" || die
 	mkdir -p "tmp/${PN}" || die
+
 	cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" || die
 	mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" || die
+
 	cd tmp || die
 	tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die
 	mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. || die
@@ -59,7 +68,8 @@ src_prepare() {
 
 src_configure() {
 	# disable klibc and dietlibc, bug #653392
-	econf --with-usrlibdir='${prefix}'/$(get_libdir) \
+	econf \
+		--with-usrlibdir='${prefix}'/$(get_libdir) \
 		--disable-klibc \
 		--disable-dietlibc \
 		$(use_enable static static_link) \
@@ -70,7 +80,9 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
+
 	dodoc CHANGELOG README TODO KNOWN_BUGS doc/*
+
 	insinto /usr/share/${PN}
 	doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2
 }
diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch
new file mode 100644
index 000000000000..d43ed6354718
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/717430
+https://git.alpinelinux.org/aports/plain/main/dmraid/006-musl-libc.patch
+--- a/include/dmraid/misc.h
++++ b/include/dmraid/misc.h
+@@ -10,6 +10,7 @@
+ 
+ #ifndef _MISC_H_
+ #define _MISC_H_
++#include <fcntl.h>
+ 
+ #define DM_ASSERT(__cond) do { if (!(__cond)) { printf("ASSERT file:%s line:%d fuction:%s cond: %s\n", __FILE__, __LINE__, __FUNCTION__, #__cond); } } while(0);
+ 
+--- a/lib/device/scan.c
++++ b/lib/device/scan.c
+@@ -10,6 +10,7 @@
+ # include <dirent.h>
+ # include <paths.h>
+ #else
++# include <paths.h>
+ # include <dirent.h>
+ # include <mntent.h>
+ #endif
diff --git a/sys-fs/dmraid/metadata.xml b/sys-fs/dmraid/metadata.xml
index 5088afcac953..580f0fd5c680 100644
--- a/sys-fs/dmraid/metadata.xml
+++ b/sys-fs/dmraid/metadata.xml
@@ -2,9 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>
-		<flag name="dietlibc">Compile against <pkg>dev-libs/dietlibc</pkg></flag>
 		<flag name="intel_led">Enable Intel LED support</flag>
-		<flag name="klibc">Compile against <pkg>dev-libs/klibc</pkg></flag>
 		<flag name="led">Enable LED support</flag>
 		<flag name="mini">Create a minimal binary suitable for early boot environments</flag>
 	</use>