gentoo resync : 17.02.2021

5 files changed, 64 insertions, 2 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 0c942f81e764..8092c140136d 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index ecfd67f09fe0..f3957136925e 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -5,6 +5,6 @@ DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7
 DIST mbuffer-20200929.tgz 147855 BLAKE2B abbcb4b29013ed24b4135a8b7576a0e728c3b5f1987558f0582711b1b00333caea8b55a02c4506ac179a4dae04977ee64572df09a210bf34bd71fd336be7e418 SHA512 332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996
 DIST mbuffer-20210209.tgz 147894 BLAKE2B ff6b1da468d34b1fef66178200f68998da0ef4042424845157afbd59e53dbef9e3d003ec9c1a663b28c0e3291d515841bb0a29dabf72a4dd781f6dde2b69b17d SHA512 82a3fd769c6935164db41dbc2e189fef27068c5d4604be923f42f6a9ba3dc3668e6918ba838a0015e9b5becde8b42c9268aa679e3aadb770c517873790f842d1
 EBUILD mbuffer-20200505.ebuild 1580 BLAKE2B 7d4d32ea78865d3fe29f94f77e2c2228814b37587bf97ceea6010ef0c99da441bba41344c2b5c4ba38cba7eb64a3e803a5f48ad4785d4bbac858db75fc891352 SHA512 eac277d0ec3650f05087ba0c3e50b15e088eda8c7de182d40334318c44cf54e895c8885bd3a42473cceb31882dbf5ec57f8792ce23c69ca8fe64f18f504dca6d
-EBUILD mbuffer-20200929.ebuild 1584 BLAKE2B 4845dfa86a843a71205e7e27fc84f815e91004f76c793fa15c900fa7e2640729eea6f6296201361c288f8e29167742e86e55584f47ead4be946783a346f2f5ed SHA512 195b142df6c028675a6b311977f38524ea2e50032b428ab233f15a3576090da193ad0bcaa7b661b4c65cbe3b4ea24d52dee5ffeaa2a4aacb54ba65179f0f7d1d
+EBUILD mbuffer-20200929.ebuild 1582 BLAKE2B b9437a653554366b43dc1bba1b84fdefcfd85873141bdc19416d281b23d720fb14e9003ffbd9310e012903c04aa38d9cbb7c5da4f019777105d90710808b29ae SHA512 7f755da461b9028347feab8d76987d345cc1999dc2519c59bf2bfcd7077f4c2a57fb094be541f13b60722ce0420a7555e5edc63d5e056377c86eb432d522c151
 EBUILD mbuffer-20210209.ebuild 1586 BLAKE2B 2b37d5199d3e4d8dec45677169a8585ef117630f82bf850e32d0f7d90c47726419d0884cc071d34402f2b7f70c741da5af04f4ffce889eb51740e16ba466f0d6 SHA512 41841737e3827d8299733d3d32e880aebf7eeff90a31ae6c66d012a4db4469d47b15a91d366d9a8288d65ff3061db8a246e7eb8cab6974362ada7d21b357990b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20200929.ebuild b/sys-block/mbuffer/mbuffer-20200929.ebuild
index db3d4576b205..ae2a126c6962 100644
--- a/sys-block/mbuffer/mbuffer-20200929.ebuild
+++ b/sys-block/mbuffer/mbuffer-20200929.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="debug libressl ssl test"
 
 REQUIRED_USE="test? ( ssl )"
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 0b76be3b5fb6..045b72297439 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -2,5 +2,7 @@ AUX tgt-1.0.79-fno-common.patch 605 BLAKE2B e3673ec6f1dd9021da4a0b44b099ccbfed52
 AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5217935044dd61237171b368dc1747017fbd9094d8c3acae4dfde0d5dfff69957c3f8800d63c SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91
 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30
 DIST tgt-1.0.79.tar.gz 297898 BLAKE2B d0f18dac863d6983a00eb9513bcbe17b5cbed76fad998af74b65311c1ace6f281bfb1bf639713e10124a520ad3916ef79ca0a81cef97b5ef678c25cfa9a71eaa SHA512 d71b0a08bd1cdc717e22c4dd0a229e84bd19e02e01037231ee80d9ab24848bc7274050e1ffe7d9a3d50149c892ed1e6ea382e54dacc341650f4534629116be07
+DIST tgt-1.0.80.tar.gz 298256 BLAKE2B 3a678730b3c492832b96e160e9672354aa32a3cc463e2845b1b475c238172b99c1706d3d387697c199c4f3004d8b2c4230d17bd356ce9103028525f8007c89a9 SHA512 6e48013a7da527799f25dc224bb261f7c5cf0aa3893bc337b9f4878a45d116be701a373c533ab6fa79771ccd633501c83b48084828bf6167af72e35795bb1c4f
 EBUILD tgt-1.0.79.ebuild 1574 BLAKE2B 073d55d323fd8baa437414df07e42bc797cbcdf14f7d762e74d05a87d5d7b24d6c751931c2ff60fd9c416460dc7adddfdc75408e810c718a41c2a7d8c6d706f5 SHA512 027343c091ca27cb94645107034168f69306edf2831691c97b2f8b68ca362637f27eafd610682b36c64a985e821bb92951598108d376c457aebb3160bc6fc062
+EBUILD tgt-1.0.80.ebuild 1532 BLAKE2B 6c968ba0df2a3175acdf2ad1b5af429e56d5f3734a1977fe24b7cef6697614502e1c05fffd1ae43c9381ab2453704dd4784c2398f5405b32d467fcad8c37efc4 SHA512 0ffa90469835602d41e588267c7eb8407bb056693aec5dd406b588df86b247ce489bdc17cfb9e6874e4c7dac7f19269818086048dddb0977328ab5ad52ff0361
 MISC metadata.xml 748 BLAKE2B 8d60bc130112e0edf5f4e9b6e73a717606c19ebccc6a0e302fa30cbf3dcb0fc17b0642ae117c954ed7d3e43e520b1f250830675e1f6b780630508256eb0bc6b8 SHA512 b17ab1fe2165d7d4f03decec67cecc199804d3f5408495b469a21a2dacc228fead46e73c1a3fb7ddc2439f7af8c5ffa0969635ce1f75a77f43ec364525c0dce2
diff --git a/sys-block/tgt/tgt-1.0.80.ebuild b/sys-block/tgt/tgt-1.0.80.ebuild
new file mode 100644
index 000000000000..56d41db46e3c
--- /dev/null
+++ b/sys-block/tgt/tgt-1.0.80.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs systemd
+
+DESCRIPTION="Linux SCSI target framework (tgt)"
+HOMEPAGE="http://stgt.sourceforge.net"
+SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="fcoe fcp ibmvio infiniband rbd"
+
+DEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-perl/Config-General
+	rbd? ( sys-cluster/ceph )
+	infiniband? (
+		sys-fabric/libibverbs:=
+		sys-fabric/librdmacm:=
+	)"
+RDEPEND="${DEPEND}
+	dev-libs/libaio
+	sys-apps/sg3_utils"
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	default
+	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
+	# make sure xml docs are generated before trying to install them
+	sed -i -e "s@install: @& all @g" doc/Makefile || die
+	sed -i -e 's|-Werror||g' usr/Makefile || die
+}
+
+src_compile() {
+	local myconf
+	use ibmvio && myconf="${myconf} IBMVIO=1"
+	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
+	use fcp && myconf="${myconf} FCP=1"
+	use fcoe && myconf="${myconf} FCOE=1"
+	use rbd && myconf="${myconf} CEPH_RBD=1"
+
+	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
+	emake -C doc
+}
+
+src_install() {
+	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
+	newinitd "${FILESDIR}"/tgtd.initd tgtd
+	newconfd "${FILESDIR}"/tgtd.confd tgtd
+	systemd_dounit "${S}"/scripts/tgtd.service
+	dodir /etc/tgt
+	keepdir /etc/tgt
+}