gentoo resync : 24.12.2018

4 files changed, 2 insertions, 184 deletions

diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 21d6ca075cfd..3d3e72a591e8 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -5,13 +5,7 @@ AUX mdadm.rc 465 BLAKE2B fef5cc1cc68d7d5e11250b6196cfd1fa45bd39e14d90c723d44d7b6
 AUX mdadm.weekly 187 BLAKE2B 50048d84cd57b384b98fcdb6b2a4a18380aab6e76877ee9edd460e65ef9f35981c05b12f32e96dc0b6a8247e628ff162b0a1171fe00fa55aa3f4dfb47e2fc91a SHA512 3bc7bf8c9593f06e42ae657e2bce416758090d1f999a447986df17b97e1494b261f02155b83932295f2f3bbab7d8933cf647c834bfb1d7def879cbedfaa6d7c2
 AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9a6069060b11bf90387830f516b69d266fef061112ba41f903b9371fff91c94c9332b12e436145 SHA512 37fe70f5df0fb2b68be01ee774e3a943cfb280322f2db0c5d6892e701fb58be26a225b78448814294bf68f154cca697278fcf9572a47b6201920d95ad05189d6
 AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021
-DIST mdadm-3.4.tar.xz 422704 BLAKE2B 0e8251fefb2db853a921215a07f1f7e70dfcd6650c20493cb487d4ce32cb609fe8191297046161e62f802c75150e6628b52192bb466d72c4cabfb1bcfae09839 SHA512 5de06f3a2b83333e5346a1e858b15e76f75a13a1d5c5f2032fecc6eb167454b282e12ee111ac2abec778e058ec9554708ac317a476778328546603618e6f70f7
-DIST mdadm-4.0.tar.xz 430780 BLAKE2B f08a67452398c864d73c78e2a7258d89c5c81b83dd136d4cd7e31e46b22d75ff67ecf553dc22f55dca418409daded51a399728dfdbd36039e828cad3233774e6 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
-DIST mdadm_3.3.4-1.1.debian.tar.xz 86312 BLAKE2B 367a9ed4b16b73a63b613e8029934ee8fbb056e33ca621e92964408ac9a3b3d107af03b657dbfe572f63150e5438879f6dd29a7e7cca1599b213ba135249e78d SHA512 ea9b34a9952e1ff836cb931c7eef0ae0c44e3f4d46162c7a7eca24936d6f7168e99d67749b3100bc68ebadc8f256e4833d42da48c531cf71e6e8f3100911828f
-DIST mdadm_3.4-4.debian.tar.xz 81200 BLAKE2B 393bac2310139788935ced77b736d60d11f58e86349990034367af5460483e97239eef5a6622405b68a7aa6f65059bc5692518172e422c3596ab879527619952 SHA512 86a9edb8f29931fdfa40037d535ca80f0bf59539fe1ef16f2639e666a5ac1bd90ec617ec1635080ae62a02f7986a6e10c97dce5389555ab7d417885f216c0f93
 DIST mdadm_4.1~rc1-4.debian.tar.xz 104716 BLAKE2B d3f5def44de4e83ba302c25438b0f4b2cba0ea1d65964482d6ad1fe1c9e7847e04ef5068859fbefba7125b0931a6473746eef18f1152d02ca604a6fe01e39c99 SHA512 25f60d6bb789ecc8db64dd1fdc750f0cf875f52e28fe82b10bf870e39f751b7e819d45e85c13252ce1b4b728e957216fb28ccd41d04dc8d7386cbd8cdd113fac
-EBUILD mdadm-3.4.ebuild 2312 BLAKE2B 41ef408ace17b030f2df95ccadccf30e27d9e8f352407882dee3d2b9716f0c9102fa59d61d1242cb7b6f6cb729400f3734df4826f4747180949e32da6b0d9bad SHA512 a9db6b4547e842873cda2a6ab5adf9d3c9cc3a32fcb6f119479f3ad3b204a61ec7f70008fd90facfbb4b0acfc34d39c39b123aef6feceebee62fc4a37671e507
-EBUILD mdadm-4.0.ebuild 2317 BLAKE2B f0b6868f68dac70629cd334394edf4bfa354fc8c9d954b0abd1c79cc01db4d56d901c5fed0e4cd03a9b99f066c502b11ca5bd24f282fb39ee35e3cf0f78b695c SHA512 44784eab4666f253615afc8fa362e7d445639bb2d8e9922526fa01dd76143886b5a6dd69baac7a1534df22fa1dcb0d95c4c1ab9589c22641c80ff1faaaffbd9a
-EBUILD mdadm-4.1.ebuild 2291 BLAKE2B 2672eba9227ba577838f17e3c63eec81be869c88166df1324ff94328b4f1cf41addfa35e8baf72bafa4587782f992b3094893c5f32f635a2d1e9c4a413c689df SHA512 7ee57f202f9b9210014640d8fd8b7b295ffca8dcfadb2e030de330d01567108336aa455f282fa8b512c5ec980db7d4a52fa1935e6b60b18c169aa66bd2bd9184
+EBUILD mdadm-4.1.ebuild 2289 BLAKE2B 40a056e951eeea1f82888f77a30dd6135cac8ef2ed540978e2aba7e033de9d39531f1a66b3a814db2c1daec7c0b139c1599039e9ab648fd5c6d7076172bb08e4 SHA512 6ca0581a0ff88ce66e5fee54fffd727c96e1a732ebfa53b3ab43435c987831b6540d1936a8c12f3b500adb1a356f1137f215aa020444c5943c0c06920993487a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mdadm/mdadm-3.4.ebuild b/sys-fs/mdadm/mdadm-3.4.ebuild
deleted file mode 100644
index 14b87d2989a2..000000000000
--- a/sys-fs/mdadm/mdadm-3.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
-
-DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
-DEB_PR=1.1
-SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
-		mirror://debian/pool/main/m/mdadm/${PN}_3.3.4-${DEB_PR}.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="static"
-
-DEPEND="virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND=">=sys-apps/util-linux-2.16"
-
-# The tests edit values in /proc and run tests on software raid devices.
-# Thus, they shouldn't be run on systems with active software RAID devices.
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
-}
-
-mdadm_emake() {
-	# We should probably make corosync & libdlm into USE flags. #573782
-	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CC="$(tc-getCC)" \
-		CWFLAGS="-Wall" \
-		CXFLAGS="${CFLAGS}" \
-		UDEVDIR="$(get_udevdir)" \
-		SYSTEMD_DIR="$(systemd_get_unitdir)" \
-		COROSYNC="-DNO_COROSYNC" \
-		DLM="-DNO_DLM" \
-		"$@"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	mdadm_emake all mdassemble
-}
-
-src_test() {
-	mdadm_emake test
-
-	sh ./test || die
-}
-
-src_install() {
-	mdadm_emake DESTDIR="${D}" install install-systemd
-	into /
-	dosbin mdassemble
-	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
-
-	insinto /etc
-	newins mdadm.conf-example mdadm.conf
-	newinitd "${FILESDIR}"/mdadm.rc mdadm
-	newconfd "${FILESDIR}"/mdadm.confd mdadm
-	newinitd "${FILESDIR}"/mdraid.rc mdraid
-	newconfd "${FILESDIR}"/mdraid.confd mdraid
-
-	# From the Debian patchset
-	into /usr
-	dodoc "${WORKDIR}"/debian/README.checkarray
-	dosbin "${WORKDIR}"/debian/checkarray
-	insinto /etc/default
-	newins "${FILESDIR}"/etc-default-mdadm mdadm
-
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/mdadm.weekly mdadm
-}
-
-pkg_postinst() {
-	if ! systemd_is_booted; then
-		if [[ -z ${REPLACING_VERSIONS} ]] ; then
-			# Only inform people the first time they install.
-			elog "If you're not relying on kernel auto-detect of your RAID"
-			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
-			elog "	rc-update add mdraid boot"
-		fi
-	fi
-}
diff --git a/sys-fs/mdadm/mdadm-4.0.ebuild b/sys-fs/mdadm/mdadm-4.0.ebuild
deleted file mode 100644
index 4532b9e2202a..000000000000
--- a/sys-fs/mdadm/mdadm-4.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
-
-DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
-DEB_PR=4
-SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
-		mirror://debian/pool/main/m/mdadm/${PN}_3.4-${DEB_PR}.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static"
-
-DEPEND="virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND=">=sys-apps/util-linux-2.16"
-
-# The tests edit values in /proc and run tests on software raid devices.
-# Thus, they shouldn't be run on systems with active software RAID devices.
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
-}
-
-mdadm_emake() {
-	# We should probably make corosync & libdlm into USE flags. #573782
-	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CC="$(tc-getCC)" \
-		CWFLAGS="-Wall" \
-		CXFLAGS="${CFLAGS}" \
-		UDEVDIR="$(get_udevdir)" \
-		SYSTEMD_DIR="$(systemd_get_unitdir)" \
-		COROSYNC="-DNO_COROSYNC" \
-		DLM="-DNO_DLM" \
-		"$@"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	mdadm_emake all mdassemble
-}
-
-src_test() {
-	mdadm_emake test
-
-	sh ./test || die
-}
-
-src_install() {
-	mdadm_emake DESTDIR="${D}" install install-systemd
-	into /
-	dosbin mdassemble
-	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
-
-	insinto /etc
-	newins mdadm.conf-example mdadm.conf
-	newinitd "${FILESDIR}"/mdadm.rc mdadm
-	newconfd "${FILESDIR}"/mdadm.confd mdadm
-	newinitd "${FILESDIR}"/mdraid.rc mdraid
-	newconfd "${FILESDIR}"/mdraid.confd mdraid
-
-	# From the Debian patchset
-	into /usr
-	dodoc "${WORKDIR}"/debian/README.checkarray
-	dosbin "${WORKDIR}"/debian/checkarray
-	insinto /etc/default
-	newins "${FILESDIR}"/etc-default-mdadm mdadm
-
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/mdadm.weekly mdadm
-}
-
-pkg_postinst() {
-	if ! systemd_is_booted; then
-		if [[ -z ${REPLACING_VERSIONS} ]] ; then
-			# Only inform people the first time they install.
-			elog "If you're not relying on kernel auto-detect of your RAID"
-			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
-			elog "	rc-update add mdraid boot"
-		fi
-	fi
-}
diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
index e3943f1d3d3d..2247f704d965 100644
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static"
 
 DEPEND="virtual/pkgconfig