gentoo resync : 15.09.2019

7 files changed, 35 insertions, 144 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 05e70e0ebd4b..a213078ae50c 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 41f0a28607b8..2662e73fbebe 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -10,6 +10,6 @@ DIST mbuffer-20190725.tgz 145246 BLAKE2B f0ec2826fcf59543c255c484bf3c901f8c51563
 EBUILD mbuffer-20150412.ebuild 795 BLAKE2B 92d4c504fb558dafd340c80c814240c3dc266a8f1a28bddc8621004269da216a16b2630a637963c0478208c0e5761a6ee99570dbf1a96fd84058a377190c04ce SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b
 EBUILD mbuffer-20171011.ebuild 1419 BLAKE2B b623eea89a7b8d913c885b818d94b83ca4883df2d44d2c36463d2e62d9240affed87290989359c51a380e56a763d31f98440de4a011a05692aa2ec686b890d07 SHA512 94da802069d9c9336d85fc837ab8debbd5441aa69530714b3f90690ff13b7e9ef42a86448ba1e443b60b3cacf7ac9646397b5c3f5f71256b5dd631490439539c
 EBUILD mbuffer-20181119.ebuild 1456 BLAKE2B cf6f4a9db384e77059cb01cf4e2e0c94331e59a17a66e1a4734d85edc591b616f59884fe68ec055238b66e464a655314a1121fe2ee11124ea7417a964b9f1fd9 SHA512 12c54c5a023a249722715250565fc04a398cf113e1719c47e5c0efd29f7f9638a9527fa25cf98d887d50f1a11acff00f652caf001887a3125994c2b14fdd421a
-EBUILD mbuffer-20190127.ebuild 1459 BLAKE2B a87dde3b2660aef09ce4f5a856e4b0ef749670d8bf12b2360fee723f2e25cc1fc0323da076d873958702330376219fb0d2022432ad7fb4fe74cbe3ca73f4d66e SHA512 c83578e3dc9f649ee256c0b5e2b1353f09d04812fa065dc036755d1d2a71b64c3075158a9d13b12aea7380ba6b79a10983637c603bb1c11ed94cc9786afd8231
-EBUILD mbuffer-20190725.ebuild 1461 BLAKE2B 532bf0487562555bb3d4b4eb6b34a108fddb36bee4a02aa9e97b1f817a8f4ec8f3402261a333992c1b13cb52f819c39a3cb826ccb98e6ef73ed7ccb96d21dd87 SHA512 2c05fd3280392b9b09f3165495e838ced872e8964c5d73cf6eb9d43d89bd3920494154763d15a7745cea0537e860875d5d171b127a4bf8104e2085ec9a467636
+EBUILD mbuffer-20190127.ebuild 1464 BLAKE2B eb49a2d2959912cdad38097667959bbfbf69b48fe7cc9a7e331288c89dfa497cd9753f8643f3ee555923ccf7e52e955f7e58678e534845e155c5441fbd0de4d0 SHA512 2dcba70d1f2bad1de1bdcd9d32985208a5df63e1991b69ff66fb75d464a4b5a4e152ae3b896f87e21bb3679cca288c05b3ccf6f5b669b83ad9f25f440ecfe06f
+EBUILD mbuffer-20190725.ebuild 1466 BLAKE2B 693667b7a90f4d0de456bcf841be298e019edc44adbebf712f4a90858da448b7dcc64fa293b002358c8faa5a97d1c98e422e916d92e938d0becc7a5c343fb0ef SHA512 9ae3ca85f847930c5994d04fa18bda6aa6a5e80d7b561d21dba39cab39e1f74254229a3acab3659039c980773f962d11ca9994f5d224e6489df92fe8aeeef405
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20190127.ebuild b/sys-block/mbuffer/mbuffer-20190127.ebuild
index f28c2f43b29d..5ace4d03fc75 100644
--- a/sys-block/mbuffer/mbuffer-20190127.ebuild
+++ b/sys-block/mbuffer/mbuffer-20190127.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="debug ssl test"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/sys-block/mbuffer/mbuffer-20190725.ebuild b/sys-block/mbuffer/mbuffer-20190725.ebuild
index 77c4badc66e9..f0ec344687e4 100644
--- a/sys-block/mbuffer/mbuffer-20190725.ebuild
+++ b/sys-block/mbuffer/mbuffer-20190725.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="debug ssl test"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 08ab8e2e2c0b..96b01745d520 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -17,12 +17,10 @@ AUX open-iscsi-2.0.877-optional_systemd.patch 2308 BLAKE2B 32ad0dd559cae999e5fa1
 AUX open-iscsi-2.0.877-pkgconfig.patch 2882 BLAKE2B f763ae55aa0bc9e7d2f525a069bd7b35cc8f71fa51c5251ef1ca917373cf963f3ad26418bd72f68cadaa1678f86c9f246070a4ae03fc21fa49b52428a30b6290 SHA512 0da14100fa93fd256d6f6cbe4126be1f2fb874d3570fcdc09e8cb77052cc98413d8bde2bcaca6b7bc286b2494f8cca7c707813ecd4f290cc63cc8aa2ea8347af
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 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
 DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef SHA512 1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
+DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
 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-r1.ebuild 3779 BLAKE2B b781e9f244e37563113547b2c8e1a5bffd3f3b6fce0ddbac6853a0bedccbced4dcaa2893bc53d90e43663777b384ec0216f634af2096d042a450f5d3d4e015b2 SHA512 aa0bc1df9b116ad9f233706e741ad56bde58204b01572a520f3af6017567a9929939d47df527b40841d6ba2e01a0a0472621167e31f62e7de377f49cec39d44a
 EBUILD open-iscsi-2.0.877.ebuild 4038 BLAKE2B e9b029d7ce68a087b74dd898fb16131081f9258151b7b066dd56ca7d4be7d44a3f6087e98174b9fb0682a9b9efff1e3d6ecf553c2465f812398b9f61b7e98843 SHA512 75c8dc09217e30f3bc7a2ed99b8102b4244587baee647edc6583bcabce63d4a5a85447fe09e87a215746e66b265ca3c24c589f5ba08b96f786f708b992d2b50a
+EBUILD open-iscsi-2.0.878.ebuild 3996 BLAKE2B 9bd9e7b64838e3e3e02f0e7fc00706f580687db254bde71c89aa547050025ed1c7d2d10b8f3727d091adf051cc3f73eea456fea28c5bb92c5b11feda56590ee1 SHA512 3da8ce679baa5a0adcf65b553f65cbbe6d22970c409c02bf0f25f8b9bb4b4c9cbda3aaafd85d38289ef437fb08cb53cec83ecdd2634889769e47c852835d1b2d
 MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild
deleted file mode 100644
index 2f34ac971b3b..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools versionator linux-info flag-o-matic toolchain-funcs udev systemd
-
-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 +tcp rdma"
-
-DEPEND="sys-block/open-isns:=
-	infiniband? ( sys-fabric/ofed )
-	sys-kernel/linux-headers"
-RDEPEND="${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.876-musl-fixes.patch"
-	"${FILESDIR}/${PN}-2.0.876-Makefiles.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
-
-	pushd iscsiuio >/dev/null || die
-	eautoreconf
-	popd >/dev/null || die
-}
-
-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
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	systemd_dounit "${S%/}"/etc/systemd/iscsid.service
-
-	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.876_p20180814-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild
index 8d18bfc1ed40..a1f80e0a3472 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild
@@ -1,37 +1,39 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
 
-MY_COMMIT="96c1a8e344d93594a3bb4faa848f878cc7315bde"
-
 DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband +tcp rdma"
+IUSE="debug infiniband libressl +tcp rdma systemd"
 
-DEPEND="sys-block/open-isns:=
+DEPEND="
+	sys-apps/kmod
+	sys-block/open-isns:=
+	sys-kernel/linux-headers
 	infiniband? ( sys-fabric/ofed )
-	sys-kernel/linux-headers"
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	systemd? ( sys-apps/systemd )
+"
 RDEPEND="${DEPEND}
 	sys-fs/lsscsi
 	sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.876_p20180814-musl-fixes.patch"
 	"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
-	"${FILESDIR}/${PN}-2.0.876-space_in_node-mode.patch" #685190
 )
 
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
 pkg_setup() {
 	linux-info_pkg_setup
 
@@ -68,7 +70,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
+	sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
+		-i etc/iscsid.conf || die
+	sed -e 's@\(/sbin/\)@/usr\1@' \
+		-i etc/systemd/iscsi* || die
 	default
 
 	pushd iscsiuio >/dev/null || die
@@ -86,8 +91,9 @@ src_compile() {
 	# is messed up already here, so it's not making it that much worse.
 	KSRC="${KV_DIR}" CFLAGS="" \
 	emake \
-		OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \
 		AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		$(usex systemd '' NO_SYSTEMD=1) \
 		user
 }
 
@@ -107,7 +113,15 @@ src_install() {
 	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
 	newinitd "${FILESDIR}"/iscsid-init.d iscsid
 
-	systemd_dounit "${S%/}"/etc/systemd/iscsid.service
+	local unit
+	local units=(
+		iscsi.service
+		iscsid.{service,socket}
+		iscsiuio.{service,socket}
+	)
+	for unit in ${units[@]} ; do
+		systemd_dounit etc/systemd/${unit}
+	done
 
 	keepdir /var/db/iscsi
 	fperms 700 /var/db/iscsi
@@ -116,7 +130,7 @@ src_install() {
 
 pkg_postinst() {
 	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
+	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
 		{
 		  cat "${EROOT}${in}.example"
 		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"