Remove old ebuilds (they were for really old kernels), clean up remaining ebuild, then remove myself from the metadata.

(Portage version: 2.1.4)

22 files changed, 22 insertions, 902 deletions

diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index 39c8bdfb91cb..b40f3311b8fa 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-block/open-iscsi
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.13 2007/08/28 05:08:05 kingtaco Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.14 2008/01/14 01:29:00 robbat2 Exp $
+
+  14 Jan 2008; Robin H. Johnson <robbat2@gentoo.org>
+  -files/r438-idbm-file-locking.diff, -files/backward-compile-2.6.13.patch,
+  -files/open-iscsi-485-out.state.patch, metadata.xml,
+  -open-iscsi-0.4.413.ebuild, -open-iscsi-0.4.413-r1.ebuild,
+  -open-iscsi-0.4.434.ebuild, -open-iscsi-0.4.438.ebuild,
+  -open-iscsi-0.5.485.ebuild, -open-iscsi-1.0.490.ebuild,
+  -open-iscsi-1.0.490-r1.ebuild, -open-iscsi-1.0.514.ebuild,
+  open-iscsi-2.0.865.12.ebuild:
+  Remove old ebuilds (they were for really old kernels), clean up remaining
+  ebuild, then remove myself from the metadata.
 
 *open-iscsi-2.0.865.12 (28 Aug 2007)
 
diff --git a/sys-block/open-iscsi/files/backward-compile-2.6.13.patch b/sys-block/open-iscsi/files/backward-compile-2.6.13.patch
deleted file mode 100644
index 3e66792aaef3..000000000000
--- a/sys-block/open-iscsi/files/backward-compile-2.6.13.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: kernel/scsi_transport_iscsi.c
-===================================================================
---- kernel/scsi_transport_iscsi.c	(revision 438)
-+++ kernel/scsi_transport_iscsi.c	(working copy)
-@@ -1234,8 +1234,7 @@
- 	if (err)
- 		goto unregister_session_class;
- 
--	nls = netlink_kernel_create(NETLINK_ISCSI, 1, iscsi_if_rx,
--			THIS_MODULE);
-+	nls = netlink_kernel_create(NETLINK_ISCSI, iscsi_if_rx);
- 	if (!nls) {
- 		err = -ENOBUFS;
- 		goto unregister_notifier;
diff --git a/sys-block/open-iscsi/files/digest-open-iscsi-0.4.413 b/sys-block/open-iscsi/files/digest-open-iscsi-0.4.413
deleted file mode 100644
index 112aaae53f0e..000000000000
--- a/sys-block/open-iscsi/files/digest-open-iscsi-0.4.413
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e0b90d2db7949b711c1f49d1da330cc4 open-iscsi-0.4-413.tar.gz 155241
-RMD160 1c1bae14cf2f2775ecaa00e873ab0a04be08c02f open-iscsi-0.4-413.tar.gz 155241
-SHA256 2b4d9f182c3c1437408ced88de9d776a28077c3bd74800e561682e819e58e10a open-iscsi-0.4-413.tar.gz 155241
diff --git a/sys-block/open-iscsi/files/digest-open-iscsi-0.4.413-r1 b/sys-block/open-iscsi/files/digest-open-iscsi-0.4.413-r1
deleted file mode 100644
index 112aaae53f0e..000000000000
--- a/sys-block/open-iscsi/files/digest-open-iscsi-0.4.413-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e0b90d2db7949b711c1f49d1da330cc4 open-iscsi-0.4-413.tar.gz 155241
-RMD160 1c1bae14cf2f2775ecaa00e873ab0a04be08c02f open-iscsi-0.4-413.tar.gz 155241
-SHA256 2b4d9f182c3c1437408ced88de9d776a28077c3bd74800e561682e819e58e10a open-iscsi-0.4-413.tar.gz 155241
diff --git a/sys-block/open-iscsi/files/digest-open-iscsi-0.4.434 b/sys-block/open-iscsi/files/digest-open-iscsi-0.4.434
deleted file mode 100644
index a7fa6b6154f8..000000000000
--- a/sys-block/open-iscsi/files/digest-open-iscsi-0.4.434
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 37912a494e212da9734eddf0e62bf792 open-iscsi-0.4-434.tar.gz 148526
-RMD160 14b6e3fa49bb5bca785d61f485ba364c0b6cbaac open-iscsi-0.4-434.tar.gz 148526
-SHA256 aac0bd55b0c0bb1a1851540f56562fb1efdf0f59a177f5388c4be74943593189 open-iscsi-0.4-434.tar.gz 148526
diff --git a/sys-block/open-iscsi/files/digest-open-iscsi-0.4.438 b/sys-block/open-iscsi/files/digest-open-iscsi-0.4.438
deleted file mode 100644
index cd431c772316..000000000000
--- a/sys-block/open-iscsi/files/digest-open-iscsi-0.4.438
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 84f85500b469484d948a0a1f861a55f0 open-iscsi-0.4-438.tar.gz 155810
-RMD160 8380f3a0669384e27e6657a4f44870e52fa8bfaa open-iscsi-0.4-438.tar.gz 155810
-SHA256 ec6e8ce4be3c4ceb729f2bf998a505f877602b92eb34b741faaf5118404ad9b8 open-iscsi-0.4-438.tar.gz 155810
diff --git a/sys-block/open-iscsi/files/digest-open-iscsi-0.5.485 b/sys-block/open-iscsi/files/digest-open-iscsi-0.5.485
deleted file mode 100644
index 3ca542aebcf5..000000000000
--- a/sys-block/open-iscsi/files/digest-open-iscsi-0.5.485
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 faebe1c44484cd140ff99bcff0aab129 open-iscsi-0.5.485.tar.gz 157355
-RMD160 fe976a223503baa904d39784326bd7fbf8c9ca62 open-iscsi-0.5.485.tar.gz 157355
-SHA256 f98b175226d0eedd7f3ee5e15537d1c9e46dc096a95b18edc4d8433bba6952a5 open-iscsi-0.5.485.tar.gz 157355
diff --git a/sys-block/open-iscsi/files/digest-open-iscsi-1.0.490 b/sys-block/open-iscsi/files/digest-open-iscsi-1.0.490
deleted file mode 100644
index 374db99c5501..000000000000
--- a/sys-block/open-iscsi/files/digest-open-iscsi-1.0.490
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9020f8e9ea4cb244e413b7d03aca0151 open-iscsi-1.0-490.tar.gz 158204
-RMD160 36b7b12080e1dab1f578b85bb11010f2535e5b98 open-iscsi-1.0-490.tar.gz 158204
-SHA256 8cad467cdcf34858d142189107bc40765beb52f5aaeecaac889370e05d2bd650 open-iscsi-1.0-490.tar.gz 158204
-MD5 ce7835ec32474e4aa0934caa7a3281fd open-iscsi-490-add-targetname.patch.gz 2699
-RMD160 5cd09da29de1f02be9bb180cef2da66b3f80dc48 open-iscsi-490-add-targetname.patch.gz 2699
-SHA256 6946ce93fd8e55dbe76474c2cbbe3fe9717aeab500173153da1d8f1d20434d7c open-iscsi-490-add-targetname.patch.gz 2699
-MD5 9f89d96ef75d91978f756e734f3a0aa3 open-iscsi-490-boot13.patch.gz 9840
-RMD160 845e72d7b0c37cfa7a8b9f0630f184f17563ec77 open-iscsi-490-boot13.patch.gz 9840
-SHA256 83b6b463c7f9d3eb4bde68637434f6d008ab518d3735c095c2b0e7e9d5d4ab94 open-iscsi-490-boot13.patch.gz 9840
diff --git a/sys-block/open-iscsi/files/digest-open-iscsi-1.0.490-r1 b/sys-block/open-iscsi/files/digest-open-iscsi-1.0.490-r1
deleted file mode 100644
index 3b300855e6e1..000000000000
--- a/sys-block/open-iscsi/files/digest-open-iscsi-1.0.490-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9020f8e9ea4cb244e413b7d03aca0151 open-iscsi-1.0-490.tar.gz 158204
-RMD160 36b7b12080e1dab1f578b85bb11010f2535e5b98 open-iscsi-1.0-490.tar.gz 158204
-SHA256 8cad467cdcf34858d142189107bc40765beb52f5aaeecaac889370e05d2bd650 open-iscsi-1.0-490.tar.gz 158204
-MD5 b956817eb22ebd8df2b72c565f20632c open-iscsi-490-add-targetname2.patch.gz 5110
-RMD160 485738c13d956c2e38663a89d34e3892590e28c3 open-iscsi-490-add-targetname2.patch.gz 5110
-SHA256 5eb8ebb9c34c48433e26142ce7ce2ff9af2f9d923c93bbd63ce6a069d5c56742 open-iscsi-490-add-targetname2.patch.gz 5110
-MD5 9f89d96ef75d91978f756e734f3a0aa3 open-iscsi-490-boot13.patch.gz 9840
-RMD160 845e72d7b0c37cfa7a8b9f0630f184f17563ec77 open-iscsi-490-boot13.patch.gz 9840
-SHA256 83b6b463c7f9d3eb4bde68637434f6d008ab518d3735c095c2b0e7e9d5d4ab94 open-iscsi-490-boot13.patch.gz 9840
diff --git a/sys-block/open-iscsi/files/digest-open-iscsi-1.0.514 b/sys-block/open-iscsi/files/digest-open-iscsi-1.0.514
deleted file mode 100644
index c036fec5788c..000000000000
--- a/sys-block/open-iscsi/files/digest-open-iscsi-1.0.514
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fc4c5bc128b8914c4adc2017396ef766 open-iscsi-1.0-514.tar.gz 172086
-RMD160 5dfd6dec0459ef795eb42019245709619d1edcdc open-iscsi-1.0-514.tar.gz 172086
-SHA256 b7c6c3d4478682f85f285f33457063b5daae07b3a1763ae05b5d7678bc51e3c6 open-iscsi-1.0-514.tar.gz 172086
diff --git a/sys-block/open-iscsi/files/open-iscsi-485-out.state.patch b/sys-block/open-iscsi/files/open-iscsi-485-out.state.patch
deleted file mode 100644
index 63a92ba2eea8..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-485-out.state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: kernel/iscsi_tcp.c
-===================================================================
---- kernel/iscsi_tcp.c	(revision 485)
-+++ kernel/iscsi_tcp.c	(working copy)
-@@ -1240,13 +1240,7 @@
- 	conn = (struct iscsi_conn*)sk->sk_user_data;
- 	session = conn->session;
- 
--	if ((sk->sk_state == TCP_CLOSE_WAIT ||
--	     sk->sk_state == TCP_CLOSE) &&
--	    !atomic_read(&sk->sk_rmem_alloc)) {
--		debug_tcp("iscsi_tcp_state_change: TCP_CLOSE|TCP_CLOSE_WAIT\n");
--		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
--	}
--
-+	printk(KERN_ERR "iscsi_tcp_state_change state %d\n", sk->sk_state);
- 	old_state_change = conn->old_state_change;
- 
- 	read_unlock(&sk->sk_callback_lock);
diff --git a/sys-block/open-iscsi/files/r438-idbm-file-locking.diff b/sys-block/open-iscsi/files/r438-idbm-file-locking.diff
deleted file mode 100644
index 0be0708925d5..000000000000
--- a/sys-block/open-iscsi/files/r438-idbm-file-locking.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-This is a quick patch to try and resolve the issue of IDBM file corruption.
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -NuarbB --exclude .svn --exclude '*~' open-iscsi-0.4-438/usr/idbm.c open-iscsi/usr/idbm.c
---- open-iscsi-0.4-438/usr/idbm.c	2005-10-18 13:10:39.000000000 -0700
-+++ open-iscsi/usr/idbm.c	2005-11-04 16:14:31.000000000 -0800
-@@ -1481,14 +1481,14 @@
- 
- 	if ((db->discdb = idbm_open(DISCOVERY_FILE,
- 				access(DISCOVERY_FILE, F_OK) != 0 ?
--					O_CREAT|O_RDWR : O_RDWR)) == NULL) {
-+					O_CREAT|O_RDWR|O_EXCL : O_RDWR|O_EXCL)) == NULL) {
- 		free(db->configfile);
- 		free(db);
- 		return NULL;
- 	}
- 
- 	if ((db->nodedb = idbm_open(NODE_FILE, access(NODE_FILE, F_OK) != 0 ?
--				O_CREAT|O_RDWR : O_RDWR)) == NULL) {
-+				O_CREAT|O_RDWR|O_EXCL : O_RDWR|O_EXCL)) == NULL) {
- 		idbm_close(db->discdb);
- 		free(db->configfile);
- 		free(db);
diff --git a/sys-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml
index 8094bc03845f..fae953e510f7 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -3,9 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer>
   <email>kingtaco@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/sys-block/open-iscsi/open-iscsi-0.4.413-r1.ebuild b/sys-block/open-iscsi/open-iscsi-0.4.413-r1.ebuild
deleted file mode 100644
index f82d655f3876..000000000000
--- a/sys-block/open-iscsi/open-iscsi-0.4.413-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-0.4.413-r1.ebuild,v 1.2 2007/06/26 02:48:53 mr_bones_ Exp $
-
-inherit versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-DEPEND="virtual/libc
-		virtual/linux-sources"
-RDEPEND="${DEPEND}
-		virtual/modutils
-		sys-apps/util-linux"
-S="${WORKDIR}/${MY_P}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_MD5 CRYPTO_CRC32C"
-ERROR_CFG="open-iscsi needs both MD5 and CRC32C support in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	convert_to_m ${S}/kernel/Makefile
-	export EPATCH_OPTS="-d${S}/kernel -p0"
-	if [ $KV_PATCH -lt 11 ]; then
-		die "Sorry, your kernel must be 2.6.11 or newer!"
-	elif [ $KV_PATCH -eq 11 ]; then
-		epatch ${S}/kernel/backward-compile-2.6.11.patch
-	elif [ $KV_PATCH -eq 12 ]; then
-		epatch ${S}/kernel/backward-compile-2.6.12.patch
-	fi
-	sed -i.orig  \
-		-e '/^CFLAGS/s,-O2,,g' \
-		-e '/^CFLAGS/s,-g,,g' \
-		${S}/usr/Makefile || die "Failed to clean up CFLAGS"
-}
-
-src_compile() {
-	einfo "Building kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-	#S=${S}/kernel
-	linux-mod_src_compile || die "failed to build modules"
-	einfo "Building userspace"
-	cd ${S}/usr && emake || die "emake failed"
-}
-
-src_install() {
-	einfo "Installing kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	#S=${S}/kernel
-	linux-mod_src_install
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm
-
-	doman doc/*[1-8]
-	dodoc README THANKS TODO
-	docinto test
-	dodoc test/*
-
-	insinto /etc
-	doins etc/iscsid.conf
-	doins ${FILESDIR}/initiatorname.iscsi
-	newinitd ${FILESDIR}/iscsid-init.d iscsid
-
-	# security
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	[ -d /var/db/iscsi ] && chmod 700 /var/db/iscsi
-	[ -f /etc/iscsid.conf ] && chmod 600 /etc/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-0.4.413.ebuild b/sys-block/open-iscsi/open-iscsi-0.4.413.ebuild
deleted file mode 100644
index a4e381cd1961..000000000000
--- a/sys-block/open-iscsi/open-iscsi-0.4.413.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-0.4.413.ebuild,v 1.3 2007/06/26 02:48:53 mr_bones_ Exp $
-
-inherit versionator linux-mod eutils
-
-DESCRIPTION="Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND="virtual/libc
-		virtual/linux-sources"
-RDEPEND="${DEPEND}
-		virtual/modutils
-		sys-apps/util-linux"
-S="${WORKDIR}/${MY_P}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_MD5 CRYPTO_CRC32C"
-ERROR_CFG="open-iscsi needs both MD5 and CRC32C support in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	convert_to_m ${S}/kernel/Makefile
-	export EPATCH_OPTS="-d${S}/kernel -p0"
-	if [ $KV_PATCH -lt 11 ]; then
-		die "Sorry, your kernel must be 2.6.11 or newer!"
-	elif [ $KV_PATCH -eq 11 ]; then
-		epatch ${S}/kernel/backward-compile-2.6.11.patch
-	elif [ $KV_PATCH -eq 12 ]; then
-		epatch ${S}/kernel/backward-compile-2.6.12.patch
-	fi
-	sed -i.orig  \
-		-e '/^CFLAGS/s,-O2,,g' \
-		-e '/^CFLAGS/s,-g,,g' \
-		${S}/usr/Makefile || die "Failed to clean up CFLAGS"
-}
-
-src_compile() {
-	einfo "Building kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	#S=${S}/kernel
-	linux-mod_src_compile || die "failed to build modules"
-	einfo "Building userspace"
-	cd ${S}/usr && emake || die "emake failed"
-}
-
-src_install() {
-	einfo "Installing kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	#S=${S}/kernel
-	linux-mod_src_install
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm
-
-	doman doc/*[1-8]
-	dodoc README THANKS TODO
-	docinto test
-	dodoc test/*
-
-	insinto /etc
-	doins etc/iscsid.conf
-	doins ${FILESDIR}/initiatorname.iscsi
-	newinitd ${FILESDIR}/iscsid-init.d iscsid
-
-	# security
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	[ -d /var/db/iscsi ] && chmod 700 /var/db/iscsi
-	[ -f /etc/iscsid.conf ] && chmod 600 /etc/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-0.4.434.ebuild b/sys-block/open-iscsi/open-iscsi-0.4.434.ebuild
deleted file mode 100644
index 46f4b89d76be..000000000000
--- a/sys-block/open-iscsi/open-iscsi-0.4.434.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-0.4.434.ebuild,v 1.2 2007/06/26 02:48:53 mr_bones_ Exp $
-
-inherit versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-#SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-DEPEND="virtual/libc
-		virtual/linux-sources"
-RDEPEND="${DEPEND}
-		virtual/modutils
-		sys-apps/util-linux"
-S="${WORKDIR}/${MY_P}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_MD5 CRYPTO_CRC32C"
-ERROR_CFG="open-iscsi needs both MD5 and CRC32C support in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	convert_to_m ${S}/kernel/Makefile
-	export EPATCH_OPTS="-d${S}/kernel -p0"
-	if [ $KV_PATCH -lt 11 ]; then
-		die "Sorry, your kernel must be 2.6.11 or newer!"
-	elif [ $KV_PATCH -eq 11 ]; then
-		epatch ${S}/kernel/backward-compile-2.6.11.patch
-	elif [ $KV_PATCH -eq 12 ]; then
-		epatch ${S}/kernel/backward-compile-2.6.12.patch
-	fi
-	sed -i.orig  \
-		-e '/^CFLAGS/s,-O2,,g' \
-		-e '/^CFLAGS/s,-g,,g' \
-		${S}/usr/Makefile || die "Failed to clean up CFLAGS"
-}
-
-src_compile() {
-	einfo "Building kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-	#S=${S}/kernel
-	linux-mod_src_compile || die "failed to build modules"
-	einfo "Building userspace"
-	cd ${S}/usr && emake || die "emake failed"
-}
-
-src_install() {
-	einfo "Installing kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	#S=${S}/kernel
-	linux-mod_src_install
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm
-
-	doman doc/*[1-8]
-	dodoc README THANKS TODO
-	docinto test
-	dodoc test/*
-
-	insinto /etc
-	doins etc/iscsid.conf
-	doins ${FILESDIR}/initiatorname.iscsi
-	newinitd ${FILESDIR}/iscsid-init.d iscsid
-
-	# security
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	[ -d /var/db/iscsi ] && chmod 700 /var/db/iscsi
-	[ -f /etc/iscsid.conf ] && chmod 600 /etc/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-0.4.438.ebuild b/sys-block/open-iscsi/open-iscsi-0.4.438.ebuild
deleted file mode 100644
index 244b48e882ee..000000000000
--- a/sys-block/open-iscsi/open-iscsi-0.4.438.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-0.4.438.ebuild,v 1.2 2007/06/26 02:48:53 mr_bones_ Exp $
-
-inherit versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-#SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
-#SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${MY_P}.tar.gz""
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-DEPEND="virtual/libc
-		virtual/linux-sources"
-RDEPEND="${DEPEND}
-		virtual/modutils
-		sys-apps/util-linux"
-S="${WORKDIR}/${MY_P}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_MD5 CRYPTO_CRC32C"
-ERROR_CFG="open-iscsi needs both MD5 and CRC32C support in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	convert_to_m ${S}/kernel/Makefile
-	export EPATCH_OPTS="-d${S}/kernel -p0"
-	if [ $KV_PATCH -lt 11 ]; then
-		die "Sorry, your kernel must be 2.6.11 or newer!"
-	elif [ $KV_PATCH -eq 11 ]; then
-		einfo "2.6.11 found"
-		epatch ${S}/kernel/backward-compile-2.6.11.patch
-	elif [ $KV_PATCH -eq 12 ]; then
-		einfo "2.6.12 found"
-		epatch ${S}/kernel/backward-compile-2.6.12.patch
-	else
-		einfo "2.6.13 or newer found"
-		EPATCH_OPTS="-p0 -d ${S}" \
-		epatch ${FILESDIR}/backward-compile-2.6.13.patch
-	fi
-	# IDBM locking fix attempt
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/r438-idbm-file-locking.diff
-
-	# clean up CFLAGS
-	sed -i.orig  \
-		-e '/^CFLAGS/s,-O2,,g' \
-		-e '/^CFLAGS/s,-g,,g' \
-		${S}/usr/Makefile || die "Failed to clean up CFLAGS"
-}
-
-src_compile() {
-	einfo "Building kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-	#S=${S}/kernel
-	linux-mod_src_compile || die "failed to build modules"
-	einfo "Building userspace"
-	cd ${S}/usr && emake || die "emake failed"
-}
-
-src_install() {
-	einfo "Installing kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	#S=${S}/kernel
-	linux-mod_src_install
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm
-
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	insinto /etc
-	doins etc/iscsid.conf
-	doins ${FILESDIR}/initiatorname.iscsi
-	newinitd ${FILESDIR}/iscsid-init.d iscsid
-
-	# security
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	[ -d /var/db/iscsi ] && chmod 700 /var/db/iscsi
-	[ -f /etc/iscsid.conf ] && chmod 600 /etc/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-0.5.485.ebuild b/sys-block/open-iscsi/open-iscsi-0.5.485.ebuild
deleted file mode 100644
index d2334db5ce41..000000000000
--- a/sys-block/open-iscsi/open-iscsi-0.5.485.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-0.5.485.ebuild,v 1.3 2007/06/26 02:48:53 mr_bones_ Exp $
-
-inherit versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE="http://www.open-iscsi.org/"
-#SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
-#SRC_URI="mirror://gentoo/${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-DEPEND="virtual/libc
-		virtual/linux-sources
-		=sys-libs/db-4*"
-RDEPEND="${DEPEND}
-		virtual/modutils
-		sys-apps/util-linux"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_MD5 CRYPTO_CRC32C"
-ERROR_CFG="open-iscsi needs both MD5 and CRC32C support in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	#export EPATCH_OPTS="-d${S}/kernel -p0"
-	export EPATCH_OPTS="-d${S}"
-	if [ $KV_PATCH -lt 11 ]; then
-		die "Sorry, your kernel must be 2.6.11 or newer!"
-	elif [ $KV_PATCH -eq 11 ]; then
-		einfo "2.6.11 found"
-		epatch ${S}/kernel/2.6.11-compat.patch
-	elif [ $KV_PATCH -eq 12 ]; then
-		einfo "2.6.12 found"
-		epatch ${S}/kernel/2.6.12-compat.patch
-	elif [ $KV_PATCH -eq 13 ]; then
-		einfo "2.6.13 found"
-		epatch ${S}/kernel/2.6.13-compat.patch
-	elif [ $KV_PATCH -eq 14 ]; then
-		einfo "2.6.14 found"
-		epatch ${S}/kernel/2.6.14-and-2.6.15-compat.patch
-	elif [ $KV_PATCH -eq 15 ]; then
-		einfo "2.6.15 found"
-		epatch ${S}/kernel/2.6.14-and-2.6.15-compat.patch
-	else
-		einfo "2.6.16 or newer found."
-		einfo "Please file a bug if this does not compile."
-	fi
-}
-
-src_compile() {
-	einfo "Building kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-	linux-mod_src_compile || die "failed to build modules"
-	einfo "Building userspace"
-	cd ${S}/usr && CFLAGS="" emake OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	einfo "Installing kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	#S=${S}/kernel
-	linux-mod_src_install
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm
-
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	insinto /etc
-	doins etc/iscsid.conf
-	doins ${FILESDIR}/initiatorname.iscsi
-	newinitd ${FILESDIR}/iscsid-init.d iscsid
-
-	# security
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	[ -d /var/db/iscsi ] && chmod 700 /var/db/iscsi
-	[ -f /etc/iscsid.conf ] && chmod 600 /etc/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-1.0.490-r1.ebuild b/sys-block/open-iscsi/open-iscsi-1.0.490-r1.ebuild
deleted file mode 100644
index e2e1220e2f63..000000000000
--- a/sys-block/open-iscsi/open-iscsi-1.0.490-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-1.0.490-r1.ebuild,v 1.3 2007/07/14 23:16:46 mr_bones_ Exp $
-
-inherit versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="$(replace_version_separator 2 '-')"
-MY_SVN_R=490
-MY_P="${PN}-${MY_PV}"
-#SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-		mirror://gentoo/${PN}-490-add-targetname2.patch.gz
-		mirror://gentoo/${PN}-490-boot13.patch.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-DEPEND="virtual/libc
-		virtual/linux-sources"
-RDEPEND="${DEPEND}
-		virtual/modutils
-		sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_P}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_CRC32C"
-ERROR_CFG="open-iscsi needs CRC32C support in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	#export EPATCH_OPTS="-d${S}/kernel -p0"
-	export EPATCH_OPTS="-d${S}"
-	if [ $KV_PATCH -lt 11 ]; then
-		die "Sorry, your kernel must be 2.6.11 or newer!"
-	elif [ $KV_PATCH -eq 11 ]; then
-		einfo "2.6.11 found"
-		epatch ${S}/kernel/2.6.11-compat.patch
-	elif [ $KV_PATCH -eq 12 ]; then
-		einfo "2.6.12 found"
-		epatch ${S}/kernel/2.6.12-compat.patch
-	elif [ $KV_PATCH -eq 13 ]; then
-		einfo "2.6.13 found"
-		epatch ${S}/kernel/2.6.13-compat.patch
-	elif [ $KV_PATCH -eq 14 ]; then
-		einfo "2.6.14 found"
-		epatch ${S}/kernel/2.6.14-and-2.6.15-compat.patch
-	elif [ $KV_PATCH -eq 15 ]; then
-		einfo "2.6.15 found"
-		epatch ${S}/kernel/2.6.14-and-2.6.15-compat.patch
-	else
-		einfo "2.6.16 or newer found."
-		einfo "Please file a bug if this does not compile."
-	fi
-	# O_EXCL locking on idbm files
-	epatch ${FILESDIR}/r438-idbm-file-locking.diff
-
-	#EPATCH_OPTS="-p0 -d${S}" \
-	#epatch ${FILESDIR}/open-iscsi-488-udev.patch
-
-	# Converts the close on error to a log message
-	epatch ${FILESDIR}/${PN}-485-out.state.patch
-	# iscsistart root/boot stuff
-	EPATCH_OPTS="-p0 -d${S}" \
-	epatch ${DISTDIR}/${PN}-490-boot13.patch.gz
-	# new sysfs params
-	EPATCH_OPTS="-p1 -d${S}" \
-	epatch ${DISTDIR}/${PN}-490-add-targetname2.patch.gz
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	linux-mod_src_compile || die "failed to build modules"
-	einfo "Building userspace"
-	cd ${S}/usr && \
-		CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	#S=${S}/kernel
-	linux-mod_src_install
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
-
-	einfo "Installing docs"
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	einfo "Installing configuration"
-	insinto /etc
-	doins etc/iscsid.conf
-	doins ${FILESDIR}/initiatorname.iscsi
-	newinitd ${FILESDIR}/iscsid-init.d iscsid
-
-	# This is for later
-	# dosbin usr/iscsi_id
-	#insinto /etc/udev/rules.d/
-	#doins doc/iscsi-55.rules
-
-	# security
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	[ -d ${ROOT}/var/db/iscsi ] && chmod 700 ${ROOT}/var/db/iscsi
-	[ -f ${ROOT}/etc/iscsid.conf ] && chmod 600 ${ROOT}/etc/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-1.0.490.ebuild b/sys-block/open-iscsi/open-iscsi-1.0.490.ebuild
deleted file mode 100644
index 709d7384d5a7..000000000000
--- a/sys-block/open-iscsi/open-iscsi-1.0.490.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-1.0.490.ebuild,v 1.3 2007/07/14 23:16:46 mr_bones_ Exp $
-
-inherit versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-#SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-		mirror://gentoo/${PN}-490-add-targetname.patch.gz
-		mirror://gentoo/${PN}-490-boot13.patch.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-DEPEND="virtual/libc
-		virtual/linux-sources"
-RDEPEND="${DEPEND}
-		virtual/modutils
-		sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_P}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_MD5 CRYPTO_CRC32C"
-ERROR_CFG="open-iscsi needs both MD5 and CRC32C support in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	#export EPATCH_OPTS="-d${S}/kernel -p0"
-	export EPATCH_OPTS="-d${S}"
-	if [ $KV_PATCH -lt 11 ]; then
-		die "Sorry, your kernel must be 2.6.11 or newer!"
-	elif [ $KV_PATCH -eq 11 ]; then
-		einfo "2.6.11 found"
-		epatch ${S}/kernel/2.6.11-compat.patch
-	elif [ $KV_PATCH -eq 12 ]; then
-		einfo "2.6.12 found"
-		epatch ${S}/kernel/2.6.12-compat.patch
-	elif [ $KV_PATCH -eq 13 ]; then
-		einfo "2.6.13 found"
-		epatch ${S}/kernel/2.6.13-compat.patch
-	elif [ $KV_PATCH -eq 14 ]; then
-		einfo "2.6.14 found"
-		epatch ${S}/kernel/2.6.14-and-2.6.15-compat.patch
-	elif [ $KV_PATCH -eq 15 ]; then
-		einfo "2.6.15 found"
-		epatch ${S}/kernel/2.6.14-and-2.6.15-compat.patch
-	else
-		einfo "2.6.16 or newer found."
-		einfo "Please file a bug if this does not compile."
-	fi
-	# O_EXCL locking on idbm files
-	epatch ${FILESDIR}/r438-idbm-file-locking.diff
-
-	#EPATCH_OPTS="-p0 -d${S}" \
-	#epatch ${FILESDIR}/open-iscsi-488-udev.patch
-
-	# Converts the close on error to a log message
-	epatch ${FILESDIR}/${PN}-485-out.state.patch
-	# iscsistart root/boot stuff
-	EPATCH_OPTS="-p0 -d${S}" \
-	epatch ${FILESDIR}/${PN}-490-boot13.patch
-	# new sysfs params
-	EPATCH_OPTS="-p1 -d${S}" \
-	epatch ${FILESDIR}/${PN}-490-add-targetname.patch
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	linux-mod_src_compile || die "failed to build modules"
-	einfo "Building userspace"
-	cd ${S}/usr && \
-		CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	#S=${S}/kernel
-	linux-mod_src_install
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
-
-	einfo "Installing docs"
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	einfo "Installing configuration"
-	insinto /etc
-	doins etc/iscsid.conf
-	doins ${FILESDIR}/initiatorname.iscsi
-	newinitd ${FILESDIR}/iscsid-init.d iscsid
-
-	# This is for later
-	# dosbin usr/iscsi_id
-	#insinto /etc/udev/rules.d/
-	#doins doc/iscsi-55.rules
-
-	# security
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	[ -d ${ROOT}/var/db/iscsi ] && chmod 700 ${ROOT}/var/db/iscsi
-	[ -f ${ROOT}/etc/iscsid.conf ] && chmod 600 ${ROOT}/etc/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-1.0.514.ebuild b/sys-block/open-iscsi/open-iscsi-1.0.514.ebuild
deleted file mode 100644
index bcf0155b7547..000000000000
--- a/sys-block/open-iscsi/open-iscsi-1.0.514.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-1.0.514.ebuild,v 1.4 2007/07/14 23:16:46 mr_bones_ Exp $
-
-inherit versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="$(replace_version_separator 2 '-')"
-MY_SVN_R=514
-MY_P="${PN}-${MY_PV}"
-#SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="debug"
-DEPEND="virtual/libc
-		virtual/linux-sources"
-RDEPEND="${DEPEND}
-		virtual/modutils
-		sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_P}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_CRC32C"
-ERROR_CFG="open-iscsi needs CRC32C support in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	#export EPATCH_OPTS="-d${S}/kernel -p0"
-	export EPATCH_OPTS="-d${S}"
-	if [ $KV_PATCH -lt 15 ]; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	elif [ $KV_PATCH -eq 16 ]; then
-		einfo "2.6.16 or newer found."
-		einfo "Please file a bug if this does not compile."
-	fi
-
-	# clean up some junk
-	find ${S} -name '*~' -exec rm \{} \; >/dev/null 2>/dev/null
-
-	# O_EXCL locking on idbm files
-	epatch ${FILESDIR}/r438-idbm-file-locking.diff
-
-	#EPATCH_OPTS="-p0 -d${S}" \
-	#epatch ${FILESDIR}/open-iscsi-488-udev.patch
-
-	# Converts the close on error to a log message
-	#epatch ${FILESDIR}/${PN}-485-out.state.patch
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	linux-mod_src_compile || die "failed to build modules"
-	einfo "Building userspace"
-	cd ${S}/usr && \
-		CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing kernel modules"
-	export KSRC="${KERNEL_DIR}"
-	#S=${S}/kernel
-	linux-mod_src_install
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
-
-	einfo "Installing docs"
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	einfo "Installing configuration"
-	insinto /etc
-	doins etc/iscsid.conf
-	doins ${FILESDIR}/initiatorname.iscsi
-	newinitd ${FILESDIR}/iscsid-init.d iscsid
-
-	# This is for later
-	# dosbin usr/iscsi_id
-	#insinto /etc/udev/rules.d/
-	#doins doc/iscsi-55.rules
-
-	# security
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	[ -d ${ROOT}/var/db/iscsi ] && chmod 700 ${ROOT}/var/db/iscsi
-	[ -f ${ROOT}/etc/iscsid.conf ] && chmod 600 ${ROOT}/etc/iscsid.conf
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.865.12.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.865.12.ebuild
index 745c9b5c8991..31772e90b81e 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.865.12.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.865.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.865.12.ebuild,v 1.2 2007/08/29 07:11:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.865.12.ebuild,v 1.3 2008/01/14 01:29:00 robbat2 Exp $
 
 inherit versionator linux-mod eutils flag-o-matic
 
-DESCRIPTION="Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
+DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.org/"
 MY_PV="$(replace_version_separator 2 '-')"
 MY_SVN_R=865
@@ -40,7 +40,7 @@ src_unpack() {
 	fi
 
 	# clean up some junk
-	find ${S} -name '*~' -exec rm \{} \; >/dev/null 2>/dev/null
+	find "${S}" -name '*~' -exec rm \{} \; >/dev/null 2>/dev/null
 }
 
 src_compile() {
@@ -50,7 +50,7 @@ src_compile() {
 	export KSRC="${KERNEL_DIR}"
 	linux-mod_src_compile || die "failed to build modules"
 	einfo "Building userspace"
-	cd ${S}/usr && \
+	cd "${S}"/usr && \
 		CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
 		|| die "emake failed"
 }
@@ -73,8 +73,8 @@ src_install() {
 	einfo "Installing configuration"
 	insinto /etc
 	doins etc/iscsid.conf
-	doins ${FILESDIR}/initiatorname.iscsi
-	newinitd ${FILESDIR}/iscsid-init.d iscsid
+	doins "${FILESDIR}"/initiatorname.iscsi
+	newinitd "${FILESDIR}"/iscsid-init.d iscsid
 
 	# This is for later
 	# dosbin usr/iscsi_id
@@ -89,6 +89,6 @@ src_install() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	[ -d ${ROOT}/var/db/iscsi ] && chmod 700 ${ROOT}/var/db/iscsi
-	[ -f ${ROOT}/etc/iscsid.conf ] && chmod 600 ${ROOT}/etc/iscsid.conf
+	[ -d "${ROOT}"/var/db/iscsi ] && chmod 700 "${ROOT}"/var/db/iscsi
+	[ -f "${ROOT}"/etc/iscsid.conf ] && chmod 600 "${ROOT}"/etc/iscsid.conf
 }