Bump to latest version. Various whitespace/coding style fixes.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 82 insertions, 35 deletions

diff --git a/sys-block/tgt/ChangeLog b/sys-block/tgt/ChangeLog
index 5cd0cc7fdf2e..327dc64574aa 100644
--- a/sys-block/tgt/ChangeLog
+++ b/sys-block/tgt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/tgt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/ChangeLog,v 1.10 2011/02/02 17:30:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/ChangeLog,v 1.11 2011/04/14 15:29:08 scarabeus Exp $
+
+*tgt-1.0.15 (14 Apr 2011)
+
+  14 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> +tgt-1.0.15.ebuild,
+  files/tgtd:
+  Bump to latest version. Various whitespace/coding style fixes.
 
 *tgt-1.0.13 (02 Feb 2011)
 
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index ea4c2cc60956..2d04c10cb335 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX tgtd 3497 RMD160 9d5879263cd154d44429413d5e509ed51c980940 SHA1 3ede20bb7bfea2b8130565e987d50ecc128e466e SHA256 5c6e599c63d3c8a0567b5d1eed7fb470c8dac1fe0f7a90b15cc37a92a8f5788c
+AUX tgtd 3532 RMD160 fe892479c889fceed091fdba183cba019db10bb6 SHA1 c466764ce5c6270669bc207e688ecacf6dcd0a15 SHA256 a7b64cc3b5d6cd24525ce7939e460ede9860845b2b838e399eab13aa573d5248
 DIST tgt-1.0.13.tar.gz 354801 RMD160 aeb841b68b7fba83a63e4d5736573fd8d75232d7 SHA1 167868fedd6b834c8355921da9788d6ca2f35410 SHA256 7221dbddf4744593ea75ad9365205dab90c01b2f1a568f4b7d5276dcbef520e6
+DIST tgt-1.0.15.tar.gz 349985 RMD160 ae0e542b33992cbdb086303fdeb4ff4c8adbf4a1 SHA1 d1c0bb5c104789cecc2fb24d34f06aacd2acffc5 SHA256 42ba7b12f918909190f58ff282165c0a41285e729537478c519d3621cb7cf89e
 DIST tgt-1.0.9.tar.gz 328407 RMD160 cde3593300cc697b1503a54f366df8710e480686 SHA1 0411a1def66953143eca9e20b29d465e0ca04fdc SHA256 86c956bf865fc20bf6196f729a6c8ee4f9ca3742b9fe6d39a60fc8c19e31a361
 EBUILD tgt-1.0.13.ebuild 1297 RMD160 3f375672ad07d5ebcda014503f0953bf486389aa SHA1 da2046566066d8ad400b301695123183cabf50d0 SHA256 8a6bb94f1f8215d3cd703da162be6e22ae5484141cf048d248d5849da51e62a5
+EBUILD tgt-1.0.15.ebuild 1277 RMD160 5e16db373b756a5c9bc4efc7bca5adc4096d27c4 SHA1 404db7bce3c549f092501ae5d64b6614a0d189aa SHA256 b410b017897eb1e8b1fd3d185ae098809c77be3ad34729bf7df409e3012fd870
 EBUILD tgt-1.0.9.ebuild 1300 RMD160 e39a85acdb3ba5ea03a30f670b435ed233e11c71 SHA1 b4dd8faa8e6b6f73ce04f2b0ea2c5a6b1490b968 SHA256 b1e24a84c01433743aa205ab3877a4c12c9efddf68acbcd267276d10f4530bde
-MISC ChangeLog 1534 RMD160 23b1e5947ebcc91a57f2969db3eb3da5c4af3201 SHA1 14f0b35a089183252abbc8580b202ea78ca18f0a SHA256 276c2b06173f6ad5fbf36ee9b799479a6daec7aea269d4fc26c84bc251feb526
+MISC ChangeLog 1719 RMD160 bb9ddee9806fdc24608a5f949f559d70461578fa SHA1 3a3155cbb0139ba9686ae6840bd653ed4ea5fdc2 SHA256 c38502a44388a245559f7e88bfc8f204f999831a69c2ab3f87e3df10778b228e
 MISC metadata.xml 543 RMD160 b0d3677bf1fba5558a59be35c20b13145eb23857 SHA1 42d2e81ccbe31a14effdef6282dc4941eb1dadc5 SHA256 aae4c8747ac788f5ddeb7c6a5d5f33adb83c7606a3974ce7396e198431544de9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNSZT5AAoJEOf+E+/4L5LmLugQAItoXc7Dto+/RjnDVNpPWFkv
-CTs8obEHBUQm4DE+/uSvqtd9G76QMB4GMcUFEA18KIv6UgbQjL5JO96EZlVhG+S2
-QTD1eYlWxIEV/ChPK1zU0JyiU34fznDNOvDj+sJxYBESFL+mOA93Gl76oPLZ1G7k
-+KvdK8qY7ECo6zpwRSu6P6HkimMYKrZBSBItwZFtz4JID5soGVGq3JAPl+46gLE6
-WiVHrT74MkkMnpFobsmte3zeFUwHdd56ci1m1Q6GnMoW4qLNDwaiiGM+wmoqF7TS
-uLIULVTfLO0h8NfXXCCAJIEWyxrt/6oEDI/m2dYnzfXFnrLlaOo8pK40UeFcYqfZ
-CS5tCeTUMH0bMgATAcH/gEUJTBljtnCtLIEsU48UlTgb9yqmXim2naGEysk8HuuS
-vwCVrX3HKl2mP7R7GJ5y+0WPnmtJPJULYgL6u7rNNNU7zv5y3Gz+WzdZeWYpQdou
-5keU4zfjQXwcCjxIBOHmwoG5YSJJIZg8SwOW/b18Qe+yOW2R4N9hl6z2Yh7BEvj9
-CeG9o5VMMtayBE6nOgn6FbS5iLIz3VOOaTpX4CiDJkeiQqIslAwb7scrJ2hnOKUc
-C0pU7gQDBm/lZvgDtolYeW9qljMesFr19nM/FJ9uOkr/NLOOR9YMJwBnUyhXQQdS
-vkm+JNaZsLPVV2h3XO83
-=/ML0
+iEYEARECAAYFAk2nEsoACgkQHB6c3gNBRYdgqACgxPJg4JVamBAu0Z3wwBXSmtnn
+VGkAn0FQAKwQ+idKF72MZutF+wlI7wog
+=189N
 -----END PGP SIGNATURE-----
diff --git a/sys-block/tgt/files/tgtd b/sys-block/tgt/files/tgtd
index cbf209ed54f4..280b790176a3 100644
--- a/sys-block/tgt/files/tgtd
+++ b/sys-block/tgt/files/tgtd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/files/tgtd,v 1.1 2009/11/25 16:33:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/files/tgtd,v 1.2 2011/04/14 15:29:08 scarabeus Exp $
 
 TGTD_CONFIG=/etc/tgt/targets.conf
 
@@ -11,8 +11,7 @@ depend() {
 	need net
 }
 
-start()
-{
+start() {
 	ebegin "Starting target framework daemon"
 	ebegin "Starting ${SVCNAME}"
 	# Start tgtd first.
@@ -37,8 +36,7 @@ start()
 	eend $?
 }
 
-stop()
-{
+stop() {
 	ebegin "Stopping ${SVCNAME}"
 	ebegin "Stopping target framework daemon"
 	# start-stop-daemon --stop --exec /usr/sbin/tgtd --quiet
@@ -52,7 +50,9 @@ stop()
 	RETVAL=$?
 	if [ "$RETVAL" -eq 107 ] ; then
 	    echo "tgtd is not running"
-	    [ "$TASK" != "restart" ] && exit 1
+	    if [ "$TASK" != "restart" ] ; then
+			exit 1
+		fi
 	elif [ "$RETVAL" -ne 0 ] ; then
 	    echo "Some initiators are still connected - could not stop tgtd"
 	    exit 2
@@ -61,8 +61,7 @@ stop()
 	eend $?
 }
 
-forcedstop()
-{
+forcedstop() {
 	# NOTE: Forced shutdown of the iscsi target may cause data corruption
 	# for initiators that are connected.
 	echo "Force-stopping target framework daemon"
@@ -74,7 +73,9 @@ forcedstop()
 	RETVAL=$?
 	if [ "$RETVAL" -eq 107 ] ; then
 	    echo "tgtd is not running"
-	    [ "$TASK" != "restart" ] && exit 1
+	    if [ "$TASK" != "restart" ] ; then
+			exit 1
+		fi
 	else
 	    tgt-admin --offline ALL
 	    # Remove all targets, even if they are still in use.
@@ -83,15 +84,14 @@ forcedstop()
 	    tgtadm --op delete --mode system
 	    RETVAL=$?
 	    if [ "$RETVAL" -ne 0 ] ; then
-		echo "Failed to shutdown tgtd"
-		exit 1
+			echo "Failed to shutdown tgtd"
+			exit 1
 	    fi
 	fi
 	echo -n
 }
 
-reload()
-{
+reload() {
 	echo "Updating target framework daemon configuration"
 	# Update configuration for targets. Only targets which
 	# are not in use will be updated.
@@ -103,8 +103,7 @@ reload()
 	fi
 }
 
-forcedreload()
-{
+forcedreload() {
 	echo "Force-updating target framework daemon configuration"
 	# Update configuration for targets, even those in use.
 	tgt-admin --update ALL -f -c $TGTD_CONFIG &>/dev/null
@@ -115,8 +114,7 @@ forcedreload()
 	fi
 }
 
-status()
-{
+status() {
 	# Don't name this script "tgtd"...
 	TGTD_PROC=$(ps -C tgtd | grep -c tgtd)
 	if [ "$TGTD_PROC" -eq 2 ] ; then
diff --git a/sys-block/tgt/tgt-1.0.15.ebuild b/sys-block/tgt/tgt-1.0.15.ebuild
new file mode 100644
index 000000000000..64505e3573ab
--- /dev/null
+++ b/sys-block/tgt/tgt-1.0.15.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/tgt-1.0.15.ebuild,v 1.1 2011/04/14 15:29:08 scarabeus Exp $
+
+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
+}