gentoo new year resync : 01.01.2021

4 files changed, 31 insertions, 70 deletions

diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index eb9ed0bb31fc..527ef5535045 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,7 +1,6 @@
+AUX tgt-1.0.79-fno-common.patch 605 BLAKE2B e3673ec6f1dd9021da4a0b44b099ccbfed52ba75318e7e43b20d55b2bdff5bc28686792a5be36d753a36aa149ba5f6836211cd8953194d0fe468c167a32132ae SHA512 efcf1e28c52cbfb93ed16a1326b581c8027948e160b87b7fb692c38eebf6f3aa704f854b30a7e4ac36e9d5c9571d0e4b0a6c322d6c895ac02ecd81a8cb07812d
 AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5217935044dd61237171b368dc1747017fbd9094d8c3acae4dfde0d5dfff69957c3f8800d63c SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91
 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30
-DIST tgt-1.0.78.tar.gz 297886 BLAKE2B c9edf8e5d0fe6a9788ff6bea4097f6cc0a8a905ffdc1943dcab538843445ede9142e1684121dad7f80677207607e20695bdad04fef622364c23df7cbeab1339a SHA512 dedafd490b6a042041fb9c8ed751747ec85f3bddab849fee301e0cf43b18aa92f5609657136700b867667fbff9ace62f4733c535cd425d8c71b072a7d7029430
 DIST tgt-1.0.79.tar.gz 297898 BLAKE2B d0f18dac863d6983a00eb9513bcbe17b5cbed76fad998af74b65311c1ace6f281bfb1bf639713e10124a520ad3916ef79ca0a81cef97b5ef678c25cfa9a71eaa SHA512 d71b0a08bd1cdc717e22c4dd0a229e84bd19e02e01037231ee80d9ab24848bc7274050e1ffe7d9a3d50149c892ed1e6ea382e54dacc341650f4534629116be07
-EBUILD tgt-1.0.78.ebuild 1511 BLAKE2B f8c27f0ea227cbbe2cfd26d8c38c5834a21114fba89bc0d2574629802cd93f9954022a6dbfbe3375538f5fb5f5c31612dfcf1ea2de2d1ff3b31b03c55bbbe026 SHA512 bd541ac602eee81239c350b7b34e812fac716175bb29bb5869727807dc2e3c81e9f353e7b24df7817a32fe7318ac25137ac42cc9b21a55e694d7976125815643
-EBUILD tgt-1.0.79.ebuild 1515 BLAKE2B 2e355b6de4af36ad27d9b433c428a1f5fb56305a0d3805212af7a9b34c188f0d666a6e0b8b6d76bb1d526b55ee70cda8a6ba18f25ac8ff0592bfbb67be5eacac SHA512 0137b26fae4524999ed5c08c026d3ce9fe00c2378eb6564c8bc6872f3dd2b0bb66a28c0d5b70294f3f6dbc2263cf264936ca715688b860ec2006461ef914daa4
+EBUILD tgt-1.0.79.ebuild 1528 BLAKE2B 1e5251e85ecb1e12481a6885322512a9b349022826a7863bac3bb0a51da9a0724a75c92e50a590fb3e5d65835683c36f25e96a553f0c856c9d06b43a557046f8 SHA512 dd469a9dfd831ab7c38a3b4b380cb58b512a926e2d832509f76a75ca7a8f997d84e031cd343cdfefb52fef7386b2ee308889db6af2d0ef6581d5a4e9057f8c1c
 MISC metadata.xml 748 BLAKE2B 8d60bc130112e0edf5f4e9b6e73a717606c19ebccc6a0e302fa30cbf3dcb0fc17b0642ae117c954ed7d3e43e520b1f250830675e1f6b780630508256eb0bc6b8 SHA512 b17ab1fe2165d7d4f03decec67cecc199804d3f5408495b469a21a2dacc228fead46e73c1a3fb7ddc2439f7af8c5ffa0969635ce1f75a77f43ec364525c0dce2
diff --git a/sys-block/tgt/files/tgt-1.0.79-fno-common.patch b/sys-block/tgt/files/tgt-1.0.79-fno-common.patch
new file mode 100644
index 000000000000..08933df021d8
--- /dev/null
+++ b/sys-block/tgt/files/tgt-1.0.79-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/usr/iscsi/iscsid.c
++++ b/usr/iscsi/iscsid.c
+@@ -1074,7 +1074,7 @@ void iscsi_rsp_set_residual(struct iscsi_cmd_rsp *rsp, struct scsi_cmd *scmd)
+ struct iscsi_sense_data {
+ 	uint16_t length;
+ 	uint8_t  data[0];
+-} __packed;
++} __attribute__((__packed__));
+ 
+ static int iscsi_cmd_rsp_build(struct iscsi_task *task)
+ {
+--- a/usr/iscsi/iser.c
++++ b/usr/iscsi/iser.c
+@@ -92,7 +92,7 @@ char *iser_portal_addr;
+ struct iscsi_sense_data {
+ 	uint16_t length;
+ 	uint8_t data[0];
+-} __packed;
++} __attribute__((__packed__));
+ 
+ static size_t buf_pool_sz_mb = DEFAULT_POOL_SIZE_MB;
+ static int cq_vector = -1;
diff --git a/sys-block/tgt/tgt-1.0.78.ebuild b/sys-block/tgt/tgt-1.0.78.ebuild
deleted file mode 100644
index 3c44b0ae3640..000000000000
--- a/sys-block/tgt/tgt-1.0.78.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-MY_TREE="159138e"
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="fcoe fcp ibmvio infiniband rbd"
-
-CDEPEND="dev-perl/Config-General
-	dev-libs/libxslt
-	rbd? ( sys-cluster/ceph )
-	infiniband? (
-		sys-fabric/libibverbs:=
-		sys-fabric/librdmacm:=
-	)"
-DEPEND="${CDEPEND}
-	app-text/docbook-xsl-stylesheets"
-RDEPEND="${DEPEND}
-	dev-libs/libaio
-	sys-apps/sg3_utils"
-
-S=${WORKDIR}/fujita-tgt-${MY_TREE}
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	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
-	eapply_user
-}
-
-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
-	dodir /etc/tgt
-	keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.79.ebuild b/sys-block/tgt/tgt-1.0.79.ebuild
index d6261e6104c8..a014556fa53f 100644
--- a/sys-block/tgt/tgt-1.0.79.ebuild
+++ b/sys-block/tgt/tgt-1.0.79.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 MY_TREE="b43dbc6"
 
@@ -15,30 +15,32 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
-CDEPEND="dev-perl/Config-General
+DEPEND="
+	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
+	dev-perl/Config-General
 	rbd? ( sys-cluster/ceph )
 	infiniband? (
 		sys-fabric/libibverbs:=
 		sys-fabric/librdmacm:=
 	)"
-DEPEND="${CDEPEND}
-	app-text/docbook-xsl-stylesheets"
 RDEPEND="${DEPEND}
 	dev-libs/libaio
 	sys-apps/sg3_utils"
 
 S=${WORKDIR}/fujita-tgt-${MY_TREE}
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 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
-	eapply_user
 }
 
 src_compile() {