gentoo resync : 31.12.2018

10 files changed, 3 insertions, 584 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index a14d35cff480..43de783b68bc 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/megactl/Manifest b/sys-block/megactl/Manifest
index e78e940a7066..a5ab3539abc1 100644
--- a/sys-block/megactl/Manifest
+++ b/sys-block/megactl/Manifest
@@ -3,6 +3,5 @@ AUX megactl-0.4.1-gcc-fixes.patch 2074 BLAKE2B 6f18f85c4f4ade85fa4d273c741ee310a
 AUX megactl-0.4.1-tracefix.patch 6650 BLAKE2B cc35fb5a0bb7091b3fbeb9e31d2dec9a7d625a3cbc735c76856c68771e41eea3c53d846233add224d6c57133613c5d20a4b6d564ceed1a475ab1f5fc5db58c4f SHA512 c62bc15b9fe29b38415c7e632686f842fac2632ce7be5db5e3132ae6f024f43ef813133fa2c9038dba43ee70b322e27768e16054df550c871f817f827553c526
 AUX megactl-0.4.1.patch 1297 BLAKE2B ca70718318e464f0731f6de8227d6dda394b28053794aa20d4445a78c862a30e297f05a17be2b804d1abdbfde5cb1975998371e9e13617feb6012dcdffd50f55 SHA512 6992e585bc3a8528d45aea9f57de296c67323489d74b48f2365b6052e51a525ac5a118d652f1c2ed924cf92424ef16de8f08ff146930f25a3acd14941cab3faf
 DIST megactl-0.4.1.tar.gz 179173 BLAKE2B 778e0ef67226ca74aeaf47afa76c0842764bc95c05ef9fe7bfc57ae1d1e6395a3098301bc09dee8fdd0a5d29e8f2dcf511e0a8920538bb76824cea496de6a619 SHA512 65a97f03fbe1c76375d2e16016c1e57c7e4544bfd7185b13a330560819caf48ecad8e9f1feb1d448b45d4f862abf2799868bd357d120019a709088c90b58ac92
-EBUILD megactl-0.4.1-r2.ebuild 810 BLAKE2B 4da2467b2d69ad11941314e354543a107dba3b99361f286ae70079e86dc43cf8f69fdd7e190021b1d61ee9c7540ba497170c814a31fba425d6379d0a60109481 SHA512 a481f82731c2ce3a860bd4939048d6e3798a6c4fa6bd7c3fd10a12813868fa60c6321fc7d50cba8079a33891bb2a8e45dec8452acd3aca40b53d7825fc7747b3
-EBUILD megactl-0.4.1-r3.ebuild 779 BLAKE2B ca66f3151a610c2f046646fed0a0d0b08de9ee2dd9eea94fb4442fcb86af1e05cec9655cb6ed145f4599b3d3e29c472776ed163a01adf433ed26a346a7474a6a SHA512 e39f33c482f8d17e899f684be0deff033182590e7539faa6f5972792520ec15a419f15b73875cd6831a875a39c64a7c3b6df3f4401f1d329311e2bf19471b4ed
+EBUILD megactl-0.4.1-r3.ebuild 774 BLAKE2B aee05c7e1b726478bb3e422b8b0c1b0b3f5c733d8965e9466b46c87b727af0f5569b4ddf98c8d0112a2ed807851e963e0c9c9226821cb248a5c55bc85d4eba9d SHA512 88005c1029873720fb7a21918ed62993e8bd5892ad125d35f8f437aa8904c6daf2355df08f6ebc78950a1c08d4291d4afbaf2341de958237ce92f63fc54e9c51
 MISC metadata.xml 611 BLAKE2B ad2c97fac2b022d2e3081c8915ae3c69d7789da9e9aa899f54f8ada84f1d638f6ceaa35ff0c0f6c99e7f4c79d5d55f9cf5d84de94ac880b3314839d98f4b1ac2 SHA512 e059a6046f58afda93e50dea7b16cbcddb65baba7555ce56ce59131fd54030edfb385f0defb715b15b0a1f1855d3886417c13df38d00cd3cff44fd0bf133937f
diff --git a/sys-block/megactl/megactl-0.4.1-r2.ebuild b/sys-block/megactl/megactl-0.4.1-r2.ebuild
deleted file mode 100644
index e23df7597d41..000000000000
--- a/sys-block/megactl/megactl-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils
-
-IUSE=""
-DESCRIPTION="LSI MegaRAID control utility"
-HOMEPAGE="https://sourceforge.net/projects/megactl/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-gcc-fixes.patch
-	epatch "${FILESDIR}"/${P}-tracefix.patch
-}
-
-src_compile() {
-	cd src
-	use x86 && MY_MAKEOPTS="ARCH=-m32"
-	use amd64 && MY_MAKEOPTS="ARCH=-m64"
-	emake ${MY_MAKEOPTS} || die "make failed"
-}
-
-src_install() {
-	cd src
-	dosbin megactl megasasctl megarpt megasasrpt
-	# it's not quite fixed yet
-	[ -x megatrace ] && dosbin megatrace
-	dodoc ../README
-}
diff --git a/sys-block/megactl/megactl-0.4.1-r3.ebuild b/sys-block/megactl/megactl-0.4.1-r3.ebuild
index e5546968b342..fe2546898713 100644
--- a/sys-block/megactl/megactl-0.4.1-r3.ebuild
+++ b/sys-block/megactl/megactl-0.4.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 PATCHES=( "${FILESDIR}"/${P}.patch
 	"${FILESDIR}"/${P}-Makefile.patch
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index ffd74798c025..f3f21acfa806 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -22,21 +22,15 @@ AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31d
 AUX open-iscsi-2.0.876-Makefiles.patch 1416 BLAKE2B e953a6b5b802feae3068322782f3cd278c878814100fb37bee81400bed76096f08d01575e42d71538ae76086261dccc65104e3df19f3e36e3e660726cdbd3ec5 SHA512 f6038dc8c8d2a31528844f348bc8144616b69bf97f01986a4481b3a81de4bc896204a48c290f8b156d1e85ffd792439251fd52a498d053ed84d21d8b07d1d240
 AUX open-iscsi-2.0.876-musl-fixes.patch 2323 BLAKE2B c69d973bdc48adc1f4f8e5680f8cf108172f708889bb740cd7960f09dd48ee29d6ccdbf6f1ed08579838fc1913cd3c8ee0b9325714e793de5884eb6faea0e161 SHA512 2224465ba4ae0f8eb195a1181304e17285c6501320f1458b6eb9d092a19c08bdedb08e8b88bfc319eb878a18fb1b487842719fa24f69f5885b1ba7845197fe12
 AUX open-iscsi-2.0.876_p20180814-musl-fixes.patch 2057 BLAKE2B 6dea839a582be9e096ec35cd61eaf173300353e71bf2df57ca420c2a7921e91282fbd206815cbdf5baab8ffe499b86412092680bc4b9342fa1796d5a2fc502ed SHA512 10db0c0123342797824ec241d0769b431ce10aaca32d0242ebee98258e6236ee5492afc8b8a20a9842339fbb4a0c7c4c7c158b4d0c6651890d4c1af9e81733bd
-DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df SHA512 66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac SHA512 f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
 DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc SHA512 d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf
-EBUILD open-iscsi-2.0.872-r2.ebuild 2987 BLAKE2B 9de1e02c0f2373cdcfb333d8e944f6329dba97fabafbd41ad375519e5c10f9d9d47d58053616caf098b27ec220dc5098a2d0ee39ed33878d1bc89c00e66db280 SHA512 4572c1e2d0cf162d414d3c3771acabaf25f2057d7c25853adf5cc61106a59c86e9d3241690af477ab78023b3af3d1ee5d311ce88a21e7274accc169daf45e41e
-EBUILD open-iscsi-2.0.872-r3.ebuild 3163 BLAKE2B 37fc57e2fe93d99c8c863092d63fcc372899f519a9001b3fff3d24350e502ba100811f316c841a3d2e0a00250ec65219af6efcd40167bb08c7dda35984f395a5 SHA512 611cad8dca44eba6c5d512bad51b6018e3c6ab9b1a187c96f56957ab047789b53e9f4ec211b5a6fc6d8c08615812a03b95ed98d80505156952236e7a4a67c4c1
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
 EBUILD open-iscsi-2.0.873-r2.ebuild 3251 BLAKE2B 795d8c65c1cd02f4d891750809f51dd3ef876e11caa382b7cee606bd624e511bfcc1ecd97875aebd9ce03d4d08859832bdfadc0e675e28444df26231407f7ece SHA512 476a6b0bdbfd789292bebb31ca4e9b594268fcd9a77924e1c885afe651880336755c62ac1dcc953eeda889c69d7bbfe85c88687d2356b238d0680de6ae367613
 EBUILD open-iscsi-2.0.873-r3.ebuild 3304 BLAKE2B 9cf11c61e50fca885d59bfd625db48f483d89ee7d1a0fe2eaeece59e6d4b56cf4bcfe092ca1e36c70371e9e1b58c178adb25a2ddd545554831714a56625a4f7f SHA512 14c3afdf5b5ed0f2b315fc2908c5e8886433669cef7e3f0f67eede9e01313cae47f0a71e78b4ba78404e48cd02359b543c9d644852f0c380146c77cddc44cd52
-EBUILD open-iscsi-2.0.873.ebuild 2347 BLAKE2B 1e9a9726dce22fec8219c321fc0e65749a528a8ae938c4ea52cdf17dc5c852278b346bbb8bf605c3cda89e0d09bdfc9e17498bb44bafd9f7993fe61c4d7a9cb5 SHA512 3e7d598c2db4a0d47814377d396722e95b906400d8de9d2a15a531a062f680575cf9a8eb1556c4cba4d342b3e4365ccf1f5ec76512c899b5726a8013bf43add9
-EBUILD open-iscsi-2.0.874-r1.ebuild 3629 BLAKE2B 53330a69aee8fd137f5d09965e86f21deec97f5cd1ba6168b4d50eb47cf13e2d8e2493707110191d3d7c91d38720a5b1666e32bbc0686a9e8f4db09936638d18 SHA512 f9dbe5b16a4580351f424c98dafde5e83e99bda84d2d389b96b34f772a757097195adb183df2030a8b15da752ac449c2588fbb11a4fb9cfb7095a4fa31b7ab00
 EBUILD open-iscsi-2.0.874-r2.ebuild 3666 BLAKE2B 05affe10aa1657fbfe9aee479f5ba48c20c2877eb77dae3439bc5588efc12e8851ee03b6884c04fc5a32073ea06643a6ce4e8c0216b492c0e9f762ee2268eb27 SHA512 7104db5ae04c1abc3553cf83ddc027c83d32523a1979fcebaa2c0f4e57b02ef800c88babdb4bdf2930335b79d185bd9269015676d40faf83cca95b1387c8816e
-EBUILD open-iscsi-2.0.874.ebuild 3164 BLAKE2B 3a001be2ab05943a7614f35e39da4286751cece5e2b7832799211fc1a33c81b437e22ba64269f46a19e38ae80a11993b2e0d5d7d7beb036acf1ce02139cb0b5e SHA512 19219e336d2e289dfa0d2b1e28d8b7d1274f734fd6cd55be1512254412a2688122fc1fe6137d4050cb62160981a358366184c668369212103d28fcdaa1305278
 EBUILD open-iscsi-2.0.875.ebuild 3713 BLAKE2B b3ec80066fd3c7bf72e56361e59213ba8b8a4d57e777394e5842458620a712c14ad93cc1b69f47f266360570cc6c63be94582ea3f460730ef920320a5635c397 SHA512 8af21fe4129b7af58f2e126bb5c6f8e7f6b764246686dd2a7c80e13ea90f691bcb6722a8a4a6d688d096fa7d414fd52c0a214d7c1212d40495bbbddd241b7132
 EBUILD open-iscsi-2.0.876.ebuild 3620 BLAKE2B 62aa39170d32cea0f523cf148fa3770fc027b4db72d719996c5621062be9e9f593c95bf3b4a108ae62c13a172a84dc96ffa6587e3e3f51f9635af10abb3a0d6a SHA512 1bb4f8e5e98b93a704242a89e40b692f83dac92497fe018fd87fd635d2a289b7597874fdfa02004b3fd01e2809e45ea514c2a9f86d8ee29c12533bb2638785ff
 EBUILD open-iscsi-2.0.876_p20180814.ebuild 3720 BLAKE2B 3c79355c91913be2b77b5150c3828e70f08938c6911e96121920fe7d0cc86caa2303580b97d33c2f7b7a84333935f54969eddb14361fb513ca086d8ff286ad26 SHA512 df58eff2caabc6afd4a1ad416bbac464c7f6cb5e8cfa2ccf4b6dc0b971f00e091bfbb2e17a50781b858586ca01e9146bf2dca9ac56d7b46a1305664f728fc2b9
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
deleted file mode 100644
index e56b51bec426..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug slp"
-DEPEND="slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}
-	sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtion options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-}
-
-src_prepare() {
-	export EPATCH_OPTS="-d${S}"
-	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
-	epatch "${FILESDIR}"/${P}-glibc212.patch
-	epatch "${FILESDIR}"/${P}-dont-call-configure.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-isns-slp.patch
-	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch
-}
-
-src_configure() {
-	cd utils/open-isns || die
-	econf $(use_with slp)
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building userspace"
-	local SLP_LIBS
-	use slp && SLP_LIBS="-lslp"
-	cd "${S}" && \
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		user \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die
-
-	einfo "Installing utilities"
-	dosbin utils/iscsi-iname utils/iscsi_discovery || die
-
-	einfo "Installing docs"
-	doman doc/*[1-8] || die
-	dodoc README THANKS || die
-	docinto test || die
-	dodoc test/* || die
-
-	einfo "Installing configuration"
-	insinto /etc/iscsi
-	doins etc/iscsid.conf || die
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die
-	insinto /etc/iscsi/ifaces
-	doins etc/iface.example || die
-
-	newconfd "${FILESDIR}"/${P}-conf.d iscsid || die
-	newinitd "${FILESDIR}"/${P}-init.d-r1 iscsid || die
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi || die
-	fperms 600 /etc/iscsi/iscsid.conf || die
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
-		cp -f "${ROOT}${in}.example" "${ROOT}${in}"
-	fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
deleted file mode 100644
index 4e5854c5f89b..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug slp"
-DEPEND="slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}
-	virtual/udev
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtion options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-}
-
-src_prepare() {
-	export EPATCH_OPTS="-d${S}"
-	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
-	epatch "${FILESDIR}"/${P}-glibc212.patch
-	epatch "${FILESDIR}"/${P}-dont-call-configure.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-isns-slp.patch
-	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch
-}
-
-src_configure() {
-	cd utils/open-isns || die
-	econf $(use_with slp)
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building userspace"
-	local SLP_LIBS
-	use slp && SLP_LIBS="-lslp"
-	cd "${S}" && \
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		user \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die
-
-	einfo "Installing utilities"
-	dosbin utils/iscsi-iname utils/iscsi_discovery || die
-
-	einfo "Installing docs"
-	doman doc/*[1-8] || die
-	dodoc README THANKS || die
-	docinto test || die
-	dodoc test/* || die
-
-	einfo "Installing configuration"
-	insinto /etc/iscsi
-	doins etc/iscsid.conf || die
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die
-	insinto /etc/iscsi/ifaces
-	doins etc/iface.example || die
-
-	newconfd "${FILESDIR}"/${P}-conf.d iscsid || die
-	newinitd "${FILESDIR}"/${P}-init.d-r1 iscsid || die
-
-	# udev pieces
-	insinto /etc/udev/scripts
-	doins "${FILESDIR}"/iscsidev.sh
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/99-iscsi.rules
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi || die
-	fperms 600 /etc/iscsi/iscsid.conf || die
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
-		cp -f "${ROOT}${in}.example" "${ROOT}${in}"
-	fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
deleted file mode 100644
index 9e1610b73956..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs
-
-MY_P="${PN}-$(replace_version_separator 2 "-")"
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="debug slp"
-
-DEPEND="slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtion options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefiles.patch
-
-	sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
-}
-
-src_configure() {
-	cd utils/open-isns || die
-
-	# SSL (--with-security) is broken
-	econf $(use_with slp) \
-		--without-security
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS}" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		user
-}
-
-src_install() {
-	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
-
-	dodoc README THANKS
-
-	docinto test/
-	dodoc test/*
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	# udev pieces
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/99-iscsi.rules
-	exeinto /etc/udev/scripts
-	doexe "${FILESDIR}"/iscsidev.sh
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
deleted file mode 100644
index 4f623960f7be..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator linux-info flag-o-matic toolchain-funcs udev
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband slp +tcp rdma"
-
-DEPEND="sys-block/open-isns:=
-	slp? ( net-libs/openslp )
-	infiniband? ( sys-fabric/ofed )"
-RDEPEND="${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefiles.patch"
-	"${FILESDIR}/${P}-musl-fixes.patch"
-	"${FILESDIR}/${P}-musl-ethtool-compat.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtin options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	RDMA_MODULES="INFINIBAND_ISER"
-	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
-	if linux_config_exists; then
-		if use tcp; then
-			for module in ${TCP_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use infiniband; then
-			for module in ${INFINIBAND_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use rdma; then
-			for module in ${RDMA_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
-			done
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
-	default
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-	append-lfs-flags
-}
-
-src_compile() {
-	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
-	# is messed up already here, so it's not making it that much worse.
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		user
-}
-
-src_install() {
-	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
-	# Upstream make is not deterministic, per bug #601514
-	rm -f "${ED}"/etc/initiatorname.iscsi
-
-	dodoc README THANKS
-
-	docinto test/
-	dodoc test/*
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	# udev pieces
-	udev_dorules "${FILESDIR}"/99-iscsi.rules
-	exeinto /etc/udev/scripts
-	doexe "${FILESDIR}"/iscsidev.sh
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
-		{
-		  cat "${EROOT}${in}.example"
-		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
-		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
-		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
-	fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
deleted file mode 100644
index 400251eb5d08..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator linux-info flag-o-matic toolchain-funcs udev
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband slp +tcp rdma"
-
-DEPEND="sys-block/open-isns:=
-	slp? ( net-libs/openslp )
-	infiniband? ( sys-fabric/ofed )"
-RDEPEND="${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefiles.patch"
-	"${FILESDIR}/${P}-musl-fixes.patch"
-	"${FILESDIR}/${P}-musl-ethtool-compat.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtin options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	RDMA_MODULES="INFINIBAND_ISER"
-	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
-	if linux_config_exists; then
-		if use tcp; then
-			for module in ${TCP_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use infiniband; then
-			for module in ${INFINIBAND_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use rdma; then
-			for module in ${RDMA_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
-			done
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
-	default
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-	append-lfs-flags
-}
-
-src_compile() {
-	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
-	# is messed up already here, so it's not making it that much worse.
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		user
-}
-
-src_install() {
-	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
-
-	dodoc README THANKS
-
-	docinto test/
-	dodoc test/*
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	# udev pieces
-	udev_dorules "${FILESDIR}"/99-iscsi.rules
-	exeinto /etc/udev/scripts
-	doexe "${FILESDIR}"/iscsidev.sh
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}