[gentoo-commits] repo/gentoo:master commit in: sys-block/tgt/

[Matthew Thode]

commit:     545de417d05767378b467c7d533dc8dfc114c782
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 19:10:31 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 14:39:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545de417

sys-block/tgt: 1.0.75 stable amd64/x86 with cleanup

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 sys-block/tgt/Manifest          |  2 --
 sys-block/tgt/tgt-1.0.72.ebuild | 65 -----------------------------------------
 sys-block/tgt/tgt-1.0.73.ebuild | 62 ---------------------------------------
 sys-block/tgt/tgt-1.0.75.ebuild |  2 +-
 4 files changed, 1 insertion(+), 130 deletions(-)

diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index e07b28d3dad..ec94cf70983 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,5 +1,3 @@
-DIST tgt-1.0.72.tar.gz 296698 BLAKE2B 6625bf87b37f4683aaf0c29264e69e400c6d238c9eaa7d9bb6fd46a76b542a8477ad8c7e9913d3dde70caaf02c323a2c01a3bd78b2d092829f4530015225012f SHA512 4fdb1b8f3c2487f66629024132f7fa53ab69b9eba67d380fb18aa2d9c143e77bdf808b3ff8d1e2bf1d4420cf1792944d6f79731ddbb095d52b53d573d9f1281c
-DIST tgt-1.0.73.tar.gz 296814 BLAKE2B a3c81c00f716678aa9388f6a4562bd0b6fe0e2c705aee9655f942ffafae4bab3bbbaff521a8b7aefab208a354e0c1c617b85cdd08247a77d1026d0482d2b6528 SHA512 e6410f16c54f71d9a33d511438169a0ca305a7b9a9dd6abbaae9f0b31c18223fa1f3a11b575322d3bb94df129b4f9b186079a7d7cbd27e31734151154edab1da
 DIST tgt-1.0.74.tar.gz 297109 BLAKE2B 8ad439a1df437b87a6bf94a8c0403c4ae26a6b77ddc3b44758134199efa5b55dafd09cd2ac3f1b12abc3a77077dffdcab1e9b2aa0a97fcd2e2c19ba24a5cd9cf SHA512 aa905b44a3495275549d4abe8542e2b6b086bbab79b83d2902cba1e6124889a8873d479d1111128416b23c7681433fbe37c1772e8578bb12bf80b96267f65c0a
 DIST tgt-1.0.75.tar.gz 297374 BLAKE2B c3db3701980b78328decd857b3a031f1e735553b33163bc012b55084a0c1ce803e90b93771c6516542168448ab872a641064c90bd01444b49c353c35a37e2985 SHA512 e2da4f49b1b89b67084a535abc1f6c28f289d25a6fce1cd6a9238df64c7a1e29eb11f4d074cd6dfda4cc37524e0f6831fbdee8d32a03d50ff156bc1369de04d8
 DIST tgt-1.0.76.tar.gz 297349 BLAKE2B b5f954b7497fd54d2156bb8ae7c90c2e158e59dd5cd2f8ea25a87403b1d4c491ce07d4968d27f13d5a195a4824554f98a07091f500cb520dffd856454736ceeb SHA512 4c25f8f0553f95d58ed694e44f85bddbacbebe12d531725b7db03de5f6728c85a9b8968a39bea5b2126aecde9dd254855d9d6e8686c310fa53daf976738edfe1

diff --git a/sys-block/tgt/tgt-1.0.72.ebuild b/sys-block/tgt/tgt-1.0.72.ebuild
deleted file mode 100644
index bacdb72d61a..00000000000
--- a/sys-block/tgt/tgt-1.0.72.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-MY_TREE="8f94634"
-
-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() {
-	epatch "${FILESDIR}"/${PN}-1.0.69-sysmacros.patch #580594
-
-	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
-}
-
-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.73.ebuild b/sys-block/tgt/tgt-1.0.73.ebuild
deleted file mode 100644
index 0677386365d..00000000000
--- a/sys-block/tgt/tgt-1.0.73.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs
-
-MY_TREE="013223d"
-
-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.75.ebuild b/sys-block/tgt/tgt-1.0.75.ebuild
index fbac7f620a1..faa70d87cac 100644
--- a/sys-block/tgt/tgt-1.0.75.ebuild
+++ b/sys-block/tgt/tgt-1.0.75.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General