gentoo resync : 08.06.2019

4 files changed, 9 insertions, 73 deletions

diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index 3200671df9bf..d43447e7abc2 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -5,15 +5,12 @@ AUX iprinit-r1 350 BLAKE2B 6f8bc65a7daf0969c7b98cb3f8aa522a3b5e0f2a5db45ff4965da
 AUX iprupdate 193 BLAKE2B 9fb60ebf6a62bac469c693b0d5d2386b7364d8afebfeae6f6f8c21005a9aaa4e84f23415ddd7945ca78be5430a932524df76936797a4c2eb5ebad909cc0e2fcc SHA512 1b793065cf39cccdf8937546ee4becdc9e202733786ca77768955cc7936fdd41f73622e2019b5a81ec500d97dff019470585030f145955f37e012b2cee20181b
 AUX iprupdate-r1 197 BLAKE2B 4989e933a4d182583640fbd4977a7a43402de66437355d2b889745758ac04c1e8afaff299ac21fbceca2e8cbf7a2c88f4ac69eef3c92667c8064f6b87004e07e SHA512 2398ff3b8c4331f959f3740f003cb119b95357ffa15b9c4c9bb44ab191d2e863ef0b00e90d54ea012a66f309d2e3dc7fbd87c9e8817606523d0805a02153f29c
 AUX iprutils-2.4.11.1-basename.patch 172 BLAKE2B 8075c38277fe0290b47e1a107ba721d02d9d453e9bdb60197e815b0967cc5db4530754c037dc0873483057f93b3b30de0faa4fdd41906ee3c92b0be6a70ee7b7 SHA512 3c0d027d720970028588a241a2399ed5cd658b69b0d4f6ff1645b0ce3eb58eb1af7e485cb674972f11033261f4d9ec9a0c42f583f319123cbab48ce6481caa7d
-AUX iprutils-2.4.11.1-migrate_cand.patch 271 BLAKE2B 9f5c55b9bb470892865f57b2bfcab8e6978c3f1e1cd4bae0674f60cc2e4349971c25d72a5833c08728bb705ff30a78a9ce7ac2f77e2dee359115e41c26ef86fb SHA512 064b3c89cca536054cf05804c462997124d006cedad6db5a16c7e1a0b46a32a5ce3c2aa57080f5a6b3d7076eb54d14609223a0bcf69e06c882595eacf706df4e
 AUX iprutils-2.4.7-tinfo.patch 569 BLAKE2B 8188fe255a04685e1240b6e99c8ae63e1993e9942bd25cd526d40f6f7dab568f27816a22360fad60d10418b4455a764fa1484b71a284276019a260adf64b42f1 SHA512 2d489b2a5107fe16c0cbdbcaeb589249d27b7bf40633d9c830d7384053e0659690d2db974a2447a3383bf5af04cc94d64d0fcadc5b18432f57dbc69e338aa0fc
 AUX iprutils-2.4.8-tinfo.patch 551 BLAKE2B 8638750e930e7fe265e75fead2a9c111f0a7304676c4f48c8789be1cf42a76b5ac4a21e0b9fc3ad5536771ce543541c1f032c64f6f264929e6197ba09f76e31d SHA512 c03595b85e17edee22191c49bf8a3361b0c81a9f4dc50bf6d2393dc2be5a0a7c0c77c61de9d17c2e262d150fb0a896274c89442b4df29742532595448171fd5a
-DIST iprutils-2.4.13.1.tar.gz 523921 BLAKE2B 8266477d7fba2493349f7abce283d4d0f640be0aaa367756d6972009da778be913e6996064932c66d84cfd1a98f73c3284ed34719237705b6d3cd5a1a1312a24 SHA512 1ae4b9370ab20c49d035e05dd3571b3e20595c160a3d173ffa2c2bbd2709f67c12ef08b3498ce5e9e6e0c8bf128ebc7d851f0b3c761b6293b3d475ad060148d8
-DIST iprutils-2.4.14.1.tar.gz 524534 BLAKE2B 43d62499f2d4dc5f800747e2ea243b31014eaa5fa0c339a84b0c9af6157b65116082080b80e89ff8a3aa70d8ec87846eccc46fefbceb996199e19f77ea8b78e6 SHA512 74ef79332134746f6b9b6890dc04bb42573f154aecbc4314198847342a909a21c0d2982cc3c849b0d1ca191d08c3b1eb5d59a334f75140830cdf91d55438e8a8
 DIST iprutils-2.4.17.1.tar.gz 524770 BLAKE2B eb3864a431193ce342810449bde2ac6a4e7a9c352611077b70f93fd3b3ca69c47cbaf7a55ef45b38f99135acc27ebba34b7fbeb8d7f704587ce96e0a8e1f29bb SHA512 d9b257a1e86350ef26e6491d5030ac864a244283697a4ca588af7ee21c2518c631a2bcfc9913783f973025d186feab8ed045b1d4674621a08b401823e9c52d3d
+DIST iprutils-2.4.18.1.tar.gz 524809 BLAKE2B c32b01ada70e67748653b8e346cdecae35f3ac240a7eaa8be0ff70590bc68b8be770bffe2f3131cbd6cbbe75812f12524c0817aa02674cd4643e846724be2891 SHA512 42da77c0fde0a2650368b2f0605d63762389ab394f755f4e4144704e155333a2ad8133731244b8383e9a334517aca45f62487229a27a2e90cf22a10c760aab3d
 DIST iprutils-2.4.7.tar.gz 467671 BLAKE2B 8ca3e77f927dcb3cd45b78e1b5e15d7edc67b3fbc8762383e0e9e84ebd42ce74927909aae926762d6bf0378d3b8d8f77cece65bb3ace746f889fbebb7fdcbf43 SHA512 9e6fd37cb72ce1d092b02f1cdfeb9e97962007327f92f4d9dd2a755489dab3a5d51a459d2f256d8453de74935a5cee8f25f71a820d82347ae67aa72a89043a91
-EBUILD iprutils-2.4.13.1.ebuild 1092 BLAKE2B 0bdc54f7a61a1fd1ddef07a7e2e4f2553ec9f7974a3a634c29507db8e6d4d1d8f45ef5fe11e1e1dbaa933f1d078f84e5496f7c0e204b38bdba362b8377683647 SHA512 437b31450bb48c43296f71034885fc33f0d0a94c8ed9386246df688a9085128f205b749e0f2d83b0b4a033e5e012a18d2f7566b5ee4e48722af088c052b3b8ec
-EBUILD iprutils-2.4.14.1.ebuild 1042 BLAKE2B 939fc7b567a365e23b1e8216922709a3c6fb8cb1b313b3f49731af52302605da68d92795b679a64c1316c886165eedaa60878b3d2d2f0899921deab968a88c60 SHA512 04546e13ebf9cbc927fb152bce0193126220aa9ff64f4397a1d776885c245a9b8f3301191dcc9cbfc8d7a38d74d3c680e572e26315d2df47d6710be3fb90a541
 EBUILD iprutils-2.4.17.1.ebuild 1039 BLAKE2B ec398fd35ed502ba946db803afed90fdc9cd3b8c28afc60fa5aa66abc217496ef921fb1fa02b1ab8a149e8580d031dc2acb193b09128995de58a76e85d6103bd SHA512 498ea8d005400e7cb63d990ec88bf3d132ab341800d7bcf14589fee231f7e1926c6d023debcc5bc687c9c87a285c15858c916aaf83ebb75e2e788407b6c7836f
+EBUILD iprutils-2.4.18.1.ebuild 1117 BLAKE2B ff482d968da9f38969628c3a0dc6d3b78e53b3c8b1a59557c1657af91f67e074b41b9ce4445f04b30ceb837300c40311efab973118fd5e747b12bd7b0b57891d SHA512 3802817f92b477b27b746c1a3fc857f21c26641913ee2ae2cbc51e16a3b0b2497bb84d6f5e03828f9b7e795cb37dfe4acaed8fbc09b0d8544a93b20361e3b750
 EBUILD iprutils-2.4.7.ebuild 835 BLAKE2B 2c35dc04a713315d0fab9e76e48795bf0d8b3a6f272b7ba2633dbc7fa1401bf71bf8251a38f778b7c008dc7763d22596337f32978c166481ce56e7a8133443af SHA512 5c9fad08625fabbd520aa02efd689fca7b1739e545fbca2d059ca4d0322b03009cb82df32bb09d118104b779bc8a1f9b43b76122eedb857e4d58d3871200ea1f
 MISC metadata.xml 338 BLAKE2B f1a657a6c8fc11e853f0530c94e8376b8b424818873d909ed8a54c0bef0e47bea40733eea3e8f8e8340562c58dd29c2d3b072023dce9edb6ba803f2774fe1076 SHA512 6323616f564434719f3466d45a7d0a41969ac75a8e6efb5b0225a915061f9a5e8698aa296633ec54f3708903b39ac2d8fe5275686a2bd76bd1ae8662b8dc7600
diff --git a/sys-fs/iprutils/files/iprutils-2.4.11.1-migrate_cand.patch b/sys-fs/iprutils/files/iprutils-2.4.11.1-migrate_cand.patch
deleted file mode 100644
index 86ae3af6af4e..000000000000
--- a/sys-fs/iprutils/files/iprutils-2.4.11.1-migrate_cand.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/iprconfig.c
-+++ b/iprconfig.c
-@@ -16827,7 +16828,7 @@
- 	}
- 
- 	if (!dev->array_rcd->migrate_cand) {
--		scsi_err(dev, "%s is not a candidate for array migration.\n");
-+		scsi_err(dev, "%s is not a candidate for array migration.\n", args[0]);
- 		return -EINVAL;
- 	}
- 
diff --git a/sys-fs/iprutils/iprutils-2.4.14.1.ebuild b/sys-fs/iprutils/iprutils-2.4.14.1.ebuild
deleted file mode 100644
index 778b5d7ea8d1..000000000000
--- a/sys-fs/iprutils/iprutils-2.4.14.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils toolchain-funcs
-
-DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
-SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/iprdd/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE="static-libs"
-
-IPRUTILS_DEPEND="
-	>=sys-libs/ncurses-5.4-r5:=
-	>=sys-apps/pciutils-2.1.11-r1
-"
-RDEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/logger
-	virtual/udev
-"
-DEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install () {
-	emake DESTDIR="${D}" \
-		bashcompdir=$(get_bashcompdir) install
-
-	newinitd "${FILESDIR}"/iprinit-r1 iprinit
-	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
-	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
-}
diff --git a/sys-fs/iprutils/iprutils-2.4.13.1.ebuild b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
index f6bbf2a45ed9..72914aac6c3f 100644
--- a/sys-fs/iprutils/iprutils-2.4.13.1.ebuild
+++ b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,6 @@ DEPEND="
 PATCHES=(
 		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
 		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-migrate_cand.patch
 )
 
 src_prepare() {
@@ -43,8 +42,12 @@ src_configure() {
 }
 
 src_install () {
-	emake DESTDIR="${D}" \
-		bashcompdir=$(get_bashcompdir) install
+	emake \
+		DESTDIR="${D}" \
+		bashcompdir=$(get_bashcompdir) \
+		install
+
+	mv "${D}"/$(get_bashcompdir)/iprconfig{-bash-completion.sh,} || die
 
 	newinitd "${FILESDIR}"/iprinit-r1 iprinit
 	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate