commit: 2505a5ad76bdcb0995350545630e4451c234343e
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 19:48:44 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 19:55:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2505a5ad
sys-block/tgt: bup and cleanup
Package-Manager: portage-2.2.26
sys-block/tgt/Manifest | 4 +-
sys-block/tgt/tgt-1.0.19.ebuild | 51 ------------------
sys-block/tgt/tgt-1.0.22.ebuild | 60 ----------------------
.../{tgt-1.0.24-r1.ebuild => tgt-1.0.63.ebuild} | 27 +++++-----
4 files changed, 14 insertions(+), 128 deletions(-)
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 58da7eb..d3def75 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,4 +1,2 @@
-DIST tgt-1.0.19.tar.gz 241676 SHA256
69fd9e9528a70c272bcc3cd00ad6754edd819a0a1ce0fad21587d33c457c6f68 SHA512
613b9fe18da5013e6e3db92ac8595c21a8f78768679750c6f920bf678c9edeb4e499ed33685019e6f7249f72bd017ed13f2c175f9b5fce7d5b5013b0c0c1a61f
WHIRLPOOL
c35cab8b5874e7385a51eed272d315db0a76e1c2d2f8f4068d2c3ff7ac0eea7d1c22dac82dded044a7dd11e7926973f01ba5a6fba292247a429aba1144ab3155
-DIST tgt-1.0.22.tar.gz 227522 SHA256
a23e97d9e1bd2b5f0be06c7f441f70b8fcc98ebf1ce61b57d0e81f60c1cbcc06 SHA512
bc1def6c1b95a13351f2e2351d795d5338f3fe68b921574619547399598ff5b0b958b71749ec94ebb6efe2bcd0f941db1641334fabb4ba49aeda9a126385fdfe
WHIRLPOOL
5a1da8431575cecb034d83db2e23fbea68cf5f3d3e7fbe67bbc3f77525f91b1e9d4cf5832d84dc433eb41546bac421b97739f79144184b685375e0239534168e
-DIST tgt-1.0.24.tar.gz 231583 SHA256
43758d81345c176774c9ec3b823295c6b090ab60406cd47c7a636d77af4362bc SHA512
9afc1ee0d56df0ae7a8a12c33522aefd0bde2f2874fcd9f7fcbe33bcdb2852ae72e9a161dbcc6cac4f7d88b496476693701d11f1a42057e9cbb93e28af0113ae
WHIRLPOOL
94711df40bbf7bea32f073c6a9e284203785217ae9811b8c072fc4487c88a6973ac2ffd62b44ce19ee894fa0ee94ed6efd4b1c1d7f706e782425d1a3bf08a3d3
DIST tgt-1.0.60.tar.gz 295304 SHA256
619b5250e4bc63971a26c05a3eea353beb4009ed0ffa06aab5f8ee25346cfb0a SHA512
4abca297e89dd92d1d1480f26af39a80f1cb7cd67e54911f4bdf29db8531b1df51fe214af05e685270e439bf702d4805542773c29baecc7a94ef271b2a0b97fb
WHIRLPOOL
26119b14f741f6094fc816f48a58f1694b47505e7a0963e10e2efdffd49782886735c9b2463850d7ad03c149293f4b31512ee1b994607a5bbd30f0cee56f68fd
+DIST tgt-1.0.63.tar.gz 295305 SHA256
18aa8ad63edae7f3705577580cdbd35e312371155a2cf2059bbe96ed46efef21 SHA512
d68509c2384f969794c3d26d8cdf2994f33cf70f20e207eea25031ad310ecdeea6883d74c4589d85bd168e4abfa293bdefaa35ae603732f187e127f8d0c7b037
WHIRLPOOL
440d2f7adac630f1f1a6a7262269835d47c1f1f2346703f84a813dc03a12dc57d6458e506c513d3a8cf3594b924246868b2772b11f0ab5eb109dbd4b3f15fdee
diff --git a/sys-block/tgt/tgt-1.0.19.ebuild b/sys-block/tgt/tgt-1.0.19.ebuild
deleted file mode 100644
index d7c0173..0000000
--- a/sys-block/tgt/tgt-1.0.19.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net";
-SRC_URI="http://stgt.sourceforge.net/releases/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ibmvio infiniband fcp fcoe"
-
-DEPEND="dev-perl/Config-General
- infiniband? (
- sys-infiniband/libibverbs
- sys-infiniband/librdmacm
- )"
-RDEPEND="${DEPEND}
- sys-apps/sg3_utils"
-
-pkg_setup() {
- CONFIG_CHECK="~SCSI_TGT"
- WARNING_SCSI_TGT="Your kernel needs CONFIG_SCSI_TGT"
- linux-info_pkg_setup
-}
-
-src_configure() {
- 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"
-
- sed -e 's:\($(CC)\):\1 $(LDFLAGS):' -i usr/Makefile || die "sed failed"
-}
-
-src_compile() {
- emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-}
-
-src_install() {
- emake install-programs install-scripts install-doc DESTDIR="${D}" \
- docdir=/usr/share/doc/${PF}
- doinitd "${FILESDIR}/tgtd"
- dodir /etc/tgt
- keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.22.ebuild b/sys-block/tgt/tgt-1.0.22.ebuild
deleted file mode 100644
index b7517da..0000000
--- a/sys-block/tgt/tgt-1.0.22.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit flag-o-matic linux-info
-
-MY_TREE="3e216c9"
-
-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 ~x86"
-IUSE="ibmvio infiniband fcp fcoe"
-
-DEPEND="dev-perl/Config-General
- dev-libs/libxslt
- infiniband? (
- sys-infiniband/libibverbs
- sys-infiniband/librdmacm
- )"
-RDEPEND="${DEPEND}
- sys-apps/sg3_utils"
-
-S="${WORKDIR}"/fujita-tgt-"${MY_TREE}"
-
-pkg_setup() {
- CONFIG_CHECK="~SCSI_TGT"
- WARNING_SCSI_TGT="Your kernel needs CONFIG_SCSI_TGT"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- sed -i -e 's:\($(CC)\):\1 $(LDFLAGS):' usr/Makefile || die "sed failed"
-
- # make sure xml docs are generated before trying to install them
- sed -i -e "s@install: @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"
-
- emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-}
-
-src_install() {
- emake install-programs install-scripts install-doc DESTDIR="${D}" \
- docdir=/usr/share/doc/${PF}
- doinitd "${FILESDIR}/tgtd"
- dodir /etc/tgt
- keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.24-r1.ebuild
b/sys-block/tgt/tgt-1.0.63.ebuild
similarity index 72%
rename from sys-block/tgt/tgt-1.0.24-r1.ebuild
rename to sys-block/tgt/tgt-1.0.63.ebuild
index cccaeb8..2fb5edb 100644
--- a/sys-block/tgt/tgt-1.0.24-r1.ebuild
+++ b/sys-block/tgt/tgt-1.0.63.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
-inherit flag-o-matic linux-info toolchain-funcs
+inherit flag-o-matic toolchain-funcs
-MY_TREE="e039354"
+MY_TREE="eca74a7"
DESCRIPTION="Linux SCSI target framework (tgt)"
HOMEPAGE="http://stgt.sourceforge.net";
@@ -15,25 +15,24 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="ibmvio infiniband fcp fcoe"
+IUSE="fcoe fcp ibmvio infiniband rbd"
CDEPEND="dev-perl/Config-General
dev-libs/libxslt
+ rbd? ( sys-cluster/ceph )
infiniband? (
- sys-infiniband/libibverbs
- sys-infiniband/librdmacm
+ sys-infiniband/libibverbs:=
+ sys-infiniband/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() {
- CONFIG_CHECK="~SCSI_TGT"
- WARNING_SCSI_TGT="Your kernel needs CONFIG_SCSI_TGT"
- linux-info_pkg_setup
tc-export CC
}
@@ -50,16 +49,16 @@ src_compile() {
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-${PV}.initd tgtd
- newconfd "${FILESDIR}"/tgtd-${PV}.confd tgtd
+ 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
}
