gentoo Easter resync : 12.04.2020

4 files changed, 120 insertions, 2 deletions

diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 27c05eca8cb9..8d67bafa0ae9 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -1,8 +1,10 @@
+AUX dmraid-1.0.0_rc16-fix-missing-PATH-MOUNTED.patch 328 BLAKE2B 0e2460c01d71892c1171b8b79867229531fb09e0ebfe42c6c240a4cab5cf756ede7ce903849e6661d5830c608d2642ca365a5a053959b91f0c040ab0836976db SHA512 9de3430dba561c0f30fbed787bc2e0da39a0b0d83fbb39c1d8e824b02557e9fec08f96faa2720165364435ee01b1cb83e7a786b17f28338862a3c9e2b60bb2ba
 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 3265 BLAKE2B a91285e39f5a8b06be879981eb696c5056b6be73a6021d674bfd200488aae9150e17b4c722e3bd2516622352ae0a3292b41ada8f3067738093aaeaa6bc18656c SHA512 b5947a0d4ad5254ee5e2898a651cc01e9f8c33563926b6c4c98b397db4ba324f00c636f2ef5e25d252d74d6aefcb10d87e0a6d154d8f33a47786102e57b8e093
+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 3295 BLAKE2B 56f9cd517355efbfe9534b5dbeb9374b7f432090edfd62a5bd654aae0e03dbaf824674e73a6966a7bb5d29aac31e2667e3b57d018aebf0ee912fb03f211d0bca SHA512 4a0674eb7eafbcb82e9f5aaaf65b926c4190ea44e5852fa7dfedebc7e238c98e543b1e005f9a154bf817e2a77e2bad934a0301777ae29a3d352afb0aa07993fb
 MISC metadata.xml 769 BLAKE2B 58eaf54f32d2bdfa2bdcdb149d97a5e23cfaa91edcf261041953b46ca79291dc8f687da56d9fc2c821697fe69cdc54f78515581566c2ab4a5afc125273e4c3a4 SHA512 e716dad80405dae942af5ded092214854432f43a5c622e8ce41f36af3f514c9425de401da278e2b0a2abc96103e4894896ff539f5665e5c48ec2640e57d11e26
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
index f54f09eec68a..448e03528698 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
 IUSE="dietlibc intel_led klibc led mini static"
 REQUIRED_USE="klibc? ( !dietlibc )"
 
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
new file mode 100644
index 000000000000..a4b58735f59a
--- /dev/null
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic
+
+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}
+	static? ( sys-fs/lvm2[static-libs] )
+"
+BDEPEND="virtual/pkgconfig
+	app-arch/tar"
+
+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() {
+	eapply -p2 "${FILESDIR}"/${P}-undo-p-rename.patch \
+		"${FILESDIR}"/${P}-return-all-sets.patch
+	eapply -p0 "${FILESDIR}"/${P}-static-build-fixes.patch
+	eapply -p3 "${FILESDIR}"/${P}-parallel-make.patch
+	eapply "${FILESDIR}"/${P}-fix-missing-PATH-MOUNTED.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
+	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/files/dmraid-1.0.0_rc16-fix-missing-PATH-MOUNTED.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-fix-missing-PATH-MOUNTED.patch
new file mode 100644
index 000000000000..3d773b5e15ed
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-fix-missing-PATH-MOUNTED.patch
@@ -0,0 +1,14 @@
+--- a/lib/device/scan.c	2010-10-27 07:31:47.000000000 -0400
++++ b/lib/device/scan.c	2020-04-04 22:13:26.905977068 -0400
+@@ -32,6 +32,11 @@
+ #define	_PATH_MOUNTS	"/proc/mounts"
+ #endif
+ 
++/* Find mtab */
++#ifndef _PATH_MOUNTED
++#define _PATH_MOUNTED	"/etc/mtab"
++#endif
++
+ static char *
+ find_sysfs_mp(struct lib_context *lc)
+ {