gentoo resync : 20.03.2021

18 files changed, 27 insertions, 168 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 0ad708c92506..507dda59af26 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 6af35cc03c92..a92243ec3970 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,8 +1,8 @@
 AUX di-4.33-build.patch 1041 BLAKE2B 971d2cdcab457ede532c490d2a584ea76d7c7181587e670a18ee51431716e9fa64c1acc89ae41b51fadf58829e3d0edbd34181bd439adc50f028eac49786115f SHA512 5ed513a857585bd460e530d406488729e3b75f9a945faa600de1c41ed30762f2a5ed578ee10c5df16f3980b2063a05648d6c85c2882da8ef40e657e058788214
-DIST di-4.47.3.tar.gz 221113 BLAKE2B 9e5d07a5839f107186b6010c6429b4b30f94da3a365b04e916af0f919c0a46746e8e854f6445e6b3927b600235ffef92b216cdab48a80c37b40c6f05c6de899e SHA512 d97a99a720181bbd9f5de2c9a97b099e332df6ffbba8f59130dec19a85846339fef4a2db08f84561722262552e087619c8a181e7de1c3b5744b17312f84bab59
 DIST di-4.48.0.1.tar.gz 227599 BLAKE2B 128e72c1b3bd5b61de9a7df14d66c746b4e41e2b4a303853922f400e62bf200be82f320ca78b94d2d40bb661f2cf647d28657a807fc0bd4fc42cdc6a2e843182 SHA512 a5fbfd1c3790694b03a870ab56c61abe3f23bac12b41bdfe3d572d618a9f51194796d7fe020ff1fb196c422274ad8b2bce8d09cc01f8ba75b30696f5df11dc8c
 DIST di-4.48.tar.gz 222454 BLAKE2B 763e535e4e57c3805758dea8f7f05e75ff3d2acf9926619b8d45619bcef6157e9bd1b91a647efcee1728dbf2593ce91b934f77f24bb004d3ef546ad58e8434ee SHA512 942e71b7afbf2a4d3ef56cc2844bfbbe1a2001eee750b99951743f43b05c7bf692a59586f9efc228321ea3f91265211d71a4acc2e49e61efd15bcbaf41f98eb6
-EBUILD di-4.47.3.ebuild 696 BLAKE2B 0bcbdb88f4e1dd07a8fa7c33d559342a89fc61b30af5ae0747c151978d929152e45ca6bee199d3b13327bbef91ad585f1fa20cb9acddd5e325fb1a6731724471 SHA512 87a86586490e1dd8aad44bd987f0a5216f1758cf5669f4f387059e76d854249e3b5972ba796f0e0267de293d8b0e38870cd69c146b2f92ccc52aa67541cb51be
-EBUILD di-4.48.0.1.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
+DIST di-4.49.tar.gz 228536 BLAKE2B 1f22cc59b97c9eb41a8af984811ff5817b49fdaf8315b76968bce269fd393cd3a26da947adbd830615316c454abab71a8547ef9448ad7f21be7d107b5d561cc8 SHA512 3997057f02c2862cf238070d1a520dc1fbbbc5dc103ad524189a97d6c114ef24a33e6fc9c64e32d8eb07c4c0241ed9772c37fb078d9708426da1f5864c4718d5
+EBUILD di-4.48.0.1.ebuild 727 BLAKE2B 0709f81eccac289d1ffc40d1fe64393759c143e419a74cad238b63669acc562431de94b3cf4861777e999667d47c57b2f500b1e971eb4612dd4294bf9e26f109 SHA512 fe8bb649157f74acf53f11c63437b4d74827cded92c46fc32d22760d3c3cc8a0194bb089f3700772546b82a4652b6fcd4e0eabcda8dd31d772eec404e28d6384
 EBUILD di-4.48.ebuild 700 BLAKE2B 933be4b8f39dd46623cc6240e9898352446b096f895fd3d946c4b1678c338874ff0897da9f54abeeb16faa5771b610de532e10caff09f8871d93510b644c2ebd SHA512 6db6ca87d319e035c9bcc6142335184ac7c75e9218ba11e7ba994252103c0c8018eaea9f0d91a5cb434cad9a97fe56ff7b91acd6a24aeb6c1d33f2c98471bdc3
+EBUILD di-4.49.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/di/di-4.48.0.1.ebuild b/sys-block/di/di-4.48.0.1.ebuild
index 0b91156a628d..340e3ad752d2 100644
--- a/sys-block/di/di-4.48.0.1.ebuild
+++ b/sys-block/di/di-4.48.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/diskinfo-di/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 IUSE="nls"
 
 RESTRICT="test" #405205, #405471
diff --git a/sys-block/di/di-4.47.3.ebuild b/sys-block/di/di-4.49.ebuild
index fdc9517385ce..0b91156a628d 100644
--- a/sys-block/di/di-4.47.3.ebuild
+++ b/sys-block/di/di-4.49.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Disk Information Utility"
-HOMEPAGE="https://gentoo.com/di/"
-SRC_URI="https://gentoo.com/di/${P}.tar.gz"
+HOMEPAGE="https://diskinfo-di.sourceforge.io/"
+SRC_URI="mirror://sourceforge/diskinfo-di/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="nls"
 
 RESTRICT="test" #405205, #405471
@@ -34,5 +34,5 @@ src_install() {
 	emake install prefix="${D}/usr"
 	# default symlink is broken
 	dosym di /usr/bin/mi
-	dodoc README
+	dodoc README.txt
 }
diff --git a/sys-block/metadata.xml b/sys-block/metadata.xml
index d54bebd2d4aa..9f059ded816c 100644
--- a/sys-block/metadata.xml
+++ b/sys-block/metadata.xml
@@ -33,4 +33,3 @@
 		Kategoria sys-block zawiera programy do pracy na urządzeniach blokowych.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index c67b121803cf..c295ba322ce2 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -5,4 +5,4 @@ EBUILD nbd-3.19.ebuild 1295 BLAKE2B 48593bf37c7960ee2bac437e447c5000f776b31e3c5a
 EBUILD nbd-3.20.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
 EBUILD nbd-3.21.ebuild 1309 BLAKE2B 73495cbbfd1fc4c702e855f5a000a2e4727f5da7f52e44468146affaa30cbd7569b04cbeeb9b758c7b809c8b80871debdce7952c5b34c7e68c359785d71e4554 SHA512 2189fa47adaf7c300bd525eebc906512d3c4747571b3548930b1d2fc8a21b8900db247bc9c68ec16e3d1db48af6c773020b836b37757cb584cb86804fda34012
 EBUILD nbd-9999.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
-MISC metadata.xml 428 BLAKE2B 517a7a18e27635aee079f823c121ad151ffad3c815c63853bef3ac17fd05f6f3a5e8028a0189fdde60cd339774a8ee34334ee724044368ecc92de07c1b995cb8 SHA512 6cf2e9181f243ca20efac7684b470f288f5f75de387e3e2389dc21f41e4e037d6962a98c4eb249f009f1e02038ba53858d2feb41218e0422d05d11d1ab067cc0
+MISC metadata.xml 489 BLAKE2B 13de137846e31045a97f7672b54d57e90dfaa1fc5af93ea634db818fa289a088d2a0aa8be2ca14c5f68c2fcace77373ae991425730fce7fee8fef1790fc54053 SHA512 b03527f176309631c352662713ce1dfd9ba1c1325dfe3180047edc01e440c92885a3f17cc7ca170ec9add3ada0022d34b455de25e7117b99b795a30afc3971a1
diff --git a/sys-block/nbd/metadata.xml b/sys-block/nbd/metadata.xml
index e233f07bc3f4..5b7f47daa471 100644
--- a/sys-block/nbd/metadata.xml
+++ b/sys-block/nbd/metadata.xml
@@ -10,5 +10,6 @@
 </use>
 <upstream>
 	<remote-id type="sourceforge">nbd</remote-id>
+	<remote-id type="github">NetworkBlockDevice/nbd</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 4e467b58ccf7..ed129f2badc1 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -12,12 +12,10 @@ AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31d
 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b
 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.1.1.tar.gz 616859 BLAKE2B 7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672 SHA512 88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
-DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a SHA512 a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd21760cccc7f7ef07128d1aef8ee2e3
 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6 SHA512 0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
+DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
 EBUILD open-iscsi-2.0.875.ebuild 3710 BLAKE2B 19bdadc17ba56edadb5ff18eaf00e08ef71fb4baef0cfaed73355bf09b2c4311f8cb9d99f9220ddcb14bdcbce0a1dc782ef895916f19d06c0fbc1f5297115974 SHA512 dbedc69c799eb9172d7c150102a58b79bfa1a40c5841a05819339c866204503a70f3482701b2faf667f07dcda6c2d4275f4b2c5a6c0f3009755a86d5951f4bf2
-EBUILD open-iscsi-2.1.1.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c
-EBUILD open-iscsi-2.1.2.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c
 EBUILD open-iscsi-2.1.3.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c
-MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
+EBUILD open-iscsi-2.1.4-r1.ebuild 4055 BLAKE2B c2f93f6e5fd37d4a539f14f4f47f01ac1d36bb885388a7563d699a26aa82f7eeba1c3a601d19cb1f1fb920ca398bdf76a189c9d310fc07882c7f112bb9d23de3 SHA512 49fb0acc1ebe9ff0b8a56e39d18edcf41976011275a79ded8801285922358b932cfc13930237632a4ba99c501d3a2a0c96a3d6aa1767c01dde8b691078b4aa77
+MISC metadata.xml 458 BLAKE2B 78071dafcae7bfa7045dcc2724e55ffa92b12658356bdc0a7b7f01214a7681c265a986bc7113e9b4f5f73f3a795a11ba88a2040f0e791129cdd89c70c6dfbaf7 SHA512 3a84213f60f1baee774962a70a4f5f2dbd5f8f353e746a88217451d409561613d6656b56ea1e917441dd300a0945441473f1b090b16d40d8887ad5680dc59c01
diff --git a/sys-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml
index b84660b0b8e9..409bac132b63 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild
deleted file mode 100644
index d7ff6b52509f..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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 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/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband libressl +tcp rdma systemd"
-
-DEPEND="
-	sys-apps/kmod
-	sys-block/open-isns:=
-	sys-kernel/linux-headers
-	infiniband? ( sys-fabric/ofed )
-	!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.1.1-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 -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
-	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} $(usex systemd '' -DNO_SYSTEMD)" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		$(usex systemd '' NO_SYSTEMD=1) \
-		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 $(find test -maxdepth 1 -type f ! -name ".*")
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	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
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [[ ! -f "${EROOT}${in}" ]] && [[ -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.1.1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index d7ff6b52509f..48c3a385ff33 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -72,7 +72,7 @@ pkg_setup() {
 src_prepare() {
 	sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
 		-i etc/iscsid.conf || die
-	sed -e 's@\(/sbin/\)@/usr\1@' \
+	sed -e '/[^usr]\/sbin/s@\(/sbin/\)@/usr\1@' \
 		-i etc/systemd/iscsi* || die
 	default
 
@@ -115,7 +115,7 @@ src_install() {
 
 	local unit
 	local units=(
-		iscsi.service
+		iscsi{,-init}.service
 		iscsid.{service,socket}
 		iscsiuio.{service,socket}
 	)
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index 3b92ee6675c2..caa6b8e6cd29 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -6,7 +6,7 @@ DIST open-isns-0.101.tar.gz 301912 BLAKE2B 98c9c36640ee4d3796538a00e7ab2e4cfb057
 DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
 DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
 EBUILD open-isns-0.100.ebuild 1261 BLAKE2B e3506bb9111cbca5e33a53d03213361687f572181971bd9760b3f0416e39ae748fe0b4288b45e1c4ec7feb2338365b31c80a8e7ca950fbc2d666cb9d45624c33 SHA512 19ec911eebf9c99572334c8fb71a67f6db12e951d9cc6c10023dc1e96186d65df8882075ac6ad3302c9a69a93a543e34dcf8911ae8468506391b77110ccbe98f
-EBUILD open-isns-0.101.ebuild 1156 BLAKE2B 73e2fb83feca8d8dfc401a994554cc5e0df44547c9f9f1a48dbb7698a560b02e0bf2eb5f38843cd195511b19570ee6f966d3cfc5c63de2e5fdf32fa8a592a586 SHA512 684ed4a4d1ba3c9ba42a5b53c337fd70658a8a2adfd26c84ad6fcbc0b9aebf1eb86141e45f62bb906d514c37501c3b2b85b8a1846cf848c3c3d08b6e6c5041fb
+EBUILD open-isns-0.101.ebuild 1193 BLAKE2B 7ddcc9de1b8ad65734b9a34668ac6f2fa901b03c073a7f2e6a861ebbdf6a938e805c8d7ce2e325ef1083f1d053d6da8a82a82d347d23bff51e80e8bfac8d5152 SHA512 25465d2f691b14506b5f92c42cb2a5bdc23eb6a85824008b13c089e778f1382e3bf91a344c6f0daa1c2fe5c6e31c817cdde013dab1283addd6ceb463feb49770
 EBUILD open-isns-0.98.ebuild 929 BLAKE2B 962fd74c8666f42bb2d4879d17b212e18cd49c756ebeb68deb94cb7e9129d5973f2ead0a6b3ff21ee90578f05b7e5ef001c441e5f7bc6dba05cecd4acaac1b91 SHA512 ec3fc2fffc5f677787983e190e2a8f2b71632d48c0537ed2d84b0a4eed3af5a72bd989eaf04dd1b88cfa270fb6bb6cee64aa65127669a8a627bbbfa86d40fdae
 EBUILD open-isns-0.99.ebuild 1092 BLAKE2B 1e0ce4502ab428063bae59b56a2f6df6353fcbaf839e37c4fb5a6602be2e70c3f41bc8a8fbd98c680a84a70452fd46043b3f90a2e9e6d650fb8beff287ca6e70 SHA512 56a48b518e7d8316cc77c92cf8160fe792920a781f4e0f30f861e3803a0e228f913f579eaeb92d41df38d94af966687d72e12dc84fcec9892c227d64f236f914
-MISC metadata.xml 342 BLAKE2B 428bf589c8161595c69d65533c0df938c71d69fa6d56b1e4ac2a14bf528d5b93645fc667d3f8b698d4e28ca874c1ffbffb7d4daef712ffc79f5e10e542bf53e7 SHA512 a056b81c2e162e8b13a54f463476fea5f203b9929aeef07629b600d8f11eda26fe0402aec5e56a411e544b39d6c38a5766f773d4a699c72680f11f8dffc4bced
+MISC metadata.xml 342 BLAKE2B 3ecae5f098564e59660a3e1de7a3b6ee2dcb7cd2d7ad2acc37e61680910e1fbd5edd2540e20783ca642440bc947cdb40feb6a84e434aba123346f48c6ee48265 SHA512 02d015cd6497b76f48eea880b745556f1a433db2893b91ef8254cf40a1bda2209feb42c01ff29dd6e4a3fdf588a8905076952e838b89a29ab99ccfc39927940a
diff --git a/sys-block/open-isns/metadata.xml b/sys-block/open-isns/metadata.xml
index c3470797ff9d..2d10cd2ea31e 100644
--- a/sys-block/open-isns/metadata.xml
+++ b/sys-block/open-isns/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sys-block/open-isns/open-isns-0.101.ebuild b/sys-block/open-isns/open-isns-0.101.ebuild
index 96ec16b185b7..5f7c4bb83ec7 100644
--- a/sys-block/open-isns/open-isns-0.101.ebuild
+++ b/sys-block/open-isns/open-isns-0.101.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
 src_prepare() {
 	default
 	eautoreconf
+	touch aclocal/ar-lib || die #775389
 }
 
 src_configure() {
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index 2d2be36c86fd..229d7aef7c33 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,3 +1,3 @@
 DIST targetcli-fb-2.1.53.tar.gz 39586 BLAKE2B 35e5cea72580ba26b8397027e92446c129af5a94ab9458eed63ec731289065bcce759a77558a022c41b4ed73eefe865000e60b4e17816836f13056cb07071069 SHA512 acefa7f8df8ee901cae8f04cbeb264d6024100e2d8b8343024bc52842af88a23d1bf5dd880ff2c77046bd8da8493630b4e357103617c02d1a90947e42c3a7c92
 EBUILD targetcli-fb-2.1.53.ebuild 721 BLAKE2B a43c18f7f0951e2c9aaa7971faeb2a0cefda3f81ae6e16ee1d804c6d78f7a2cf77be9fc4671d99f4e6d016fa8f840ff0fd6d410b2be8455287e87dcfec981670 SHA512 7b57be73dbf1c490628280728f018be2600514bbcb4f9cf837734da365c0a6f672fc3059a6f07f1daab5a4212143b577a1cce1b9d41a8156bffa463b9c248171
-MISC metadata.xml 735 BLAKE2B 6306128a74e5466aeb66571b1cfa2594415c8f824a9a0b45280693825cac5529e445b8dcf3f0a7983906bf9db33547438876cdc8a3e819d135ce8193d5f83070 SHA512 ccc02ad3448f3518ada4bd17c84a3bbe3b585fe5b54c83a2aa9d2ac98b3e5d6aaa32da81116ede44a53f6fee73fa8f1f7d0f0d37a2fd553d5cc87fdb18201307
+MISC metadata.xml 765 BLAKE2B 5a12363893c568f146f903613937866223e8669db98dc0d52d32171c825d6c99538f3f2f98aa96763d6dff408da70b3d3954cf60d2035fe3d9d31570b41ffa08 SHA512 66a601fbd1a83b46049db14f5e57270fb717f3e007ca2cb3c38f6e0b17c8432b0c1613d55af2dacccfb0779993d1266965f95f37ed56c16ca499851d198bd216
diff --git a/sys-block/targetcli-fb/metadata.xml b/sys-block/targetcli-fb/metadata.xml
index 2bcdb6d3131e..7e9f22942fd3 100644
--- a/sys-block/targetcli-fb/metadata.xml
+++ b/sys-block/targetcli-fb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>sir.suriv@gmail.com</email>
 	<name>Diogo Pereira</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index b36dd3eada9d..886050603261 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -4,4 +4,4 @@ EBUILD zram-init-10.5.ebuild 1812 BLAKE2B ab1bf793161192950c29473c2bf6e1479f6ec0
 EBUILD zram-init-8.1-r1.ebuild 1420 BLAKE2B cc89bf351776d5ecf21fbb4cf6f01fde82f66128740691973aba48242247009c7c291a3be9e42aa52b9902d29b667df91eec34cd8c20fa7d225d142269ab8add SHA512 f2458e9cf76bc3649f89fb6badcba7161b22a8a10acb35fc0eae2676e785cf4812c09364383dae3fe7cf621ed303fae26971eb18a1911d2125abf55cbd0de19f
 EBUILD zram-init-8.1.ebuild 1315 BLAKE2B c69bbf1dbeea335ea19d2ba94421d63383caa2c5f3f647574bb7eb7e74d51a015c37657def90747abc8d3d9523a7f2e4d7719e87e8908896ad48c91b85d3f709 SHA512 13a8fecf004cf3ff28e533fba8ff437e89d4feee47abf52019276ebf6eb59d23fb8fed8b550cd33c20b5dc6ec66fcfd79e1a66c0aaad4cf6d931a9d7f3599073
 EBUILD zram-init-9999.ebuild 1807 BLAKE2B 0aff41827844d8ff19b03a2a6370cc079f8b21640b50f937267b98be411ba9da1bc417352f58256e458ad7adc26bf6fb30fc3436f2daf02ac9fcd545c73eef9a SHA512 4e76467040b537ef691be7dca32a99f18dd10fa78a3fa62aace937e182300523f5c2e238b4731d9b2a937f300055c429c3233b23228e10574aa2d262913c8632
-MISC metadata.xml 725 BLAKE2B 1bec9f0a9fdcaddc89365d689cd2b661520180a822e2044935c2ab131b01d500f1f1a68049b0e4f4c5a400669fce87c824a749ae0852e477c10f2ec5af5d998a SHA512 32cc2ffc65cd72a8813a30a592d8ac722ba3c0860d5ad31931628fc5e89bf13ee9b04532681e01d750895a035316b2f10a170ce8543b05f147df3a314f5fe329
+MISC metadata.xml 739 BLAKE2B a907095c7d155c98084d75046884123f2012c1bb5de20bc91546de31768c8a7ab78d5f9d8ed53ae308c8f71c6b69cb97adf214a331fd540d197798ee5b156ecc SHA512 9f2f591bce9762df432c7273565b4bdfd76f1beefa91b5fecb84978ab348901b47c233b888f12b29662b9d8f142b5b14808b9e57ccf0b2670349d053fa4163bb
diff --git a/sys-block/zram-init/metadata.xml b/sys-block/zram-init/metadata.xml
index 013ba527f064..f4d1636d972f 100644
--- a/sys-block/zram-init/metadata.xml
+++ b/sys-block/zram-init/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>beatussum@protonmail.com</email>
 		<name>Mattéo Rossillol‑‑Laruelle</name>
 	</maintainer>