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

Package-Manager: portage-2.1.4

23 files changed, 34 insertions, 991 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/Manifest b/sys-block/open-iscsi/Manifest
index 94b20ae05db3..1fe87496aea4 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,7 +1,3 @@
-AUX backward-compile-2.6.13.patch 472 RMD160 a17b352422d0613089cee57d837b9dfd28196c4f SHA1 847f7f4bac36880f03c8a835a9664b5cbb6c4eb1 SHA256 061903e19e737b4d4b7453f241c9ae91713040c382abe0417a1174365d300b3b
-MD5 087c05b579d7b3dbce791fcb8ed1219f files/backward-compile-2.6.13.patch 472
-RMD160 a17b352422d0613089cee57d837b9dfd28196c4f files/backward-compile-2.6.13.patch 472
-SHA256 061903e19e737b4d4b7453f241c9ae91713040c382abe0417a1174365d300b3b files/backward-compile-2.6.13.patch 472
 AUX initiatorname.iscsi 1282 RMD160 6af81c25d2704e2c6bb98ff5155de91cdbd17ff7 SHA1 2d2b0a50652772e0e3a16f3a90ef5977639b97ee SHA256 4ae558522881796f67ad5915ecf38d01e64c9d9768469847adb17405404485f3
 MD5 c1652519ed63d33125269c9016b962ba files/initiatorname.iscsi 1282
 RMD160 6af81c25d2704e2c6bb98ff5155de91cdbd17ff7 files/initiatorname.iscsi 1282
@@ -10,92 +6,19 @@ AUX iscsid-init.d 2541 RMD160 cda6eddbf72c399127d74d7aca62769789dfe98a SHA1 3455
 MD5 62eae9dd8f5ebf34937b450c298234cc files/iscsid-init.d 2541
 RMD160 cda6eddbf72c399127d74d7aca62769789dfe98a files/iscsid-init.d 2541
 SHA256 60903a4a356f2a201c978e42b6adb6233ffcda6105000e1029d93d6406dad904 files/iscsid-init.d 2541
-AUX open-iscsi-485-out.state.patch 670 RMD160 581c941a63d17b634aa6b1da72453a644e938117 SHA1 067a3e7a91355e5050eb275172e26544fbbb9b12 SHA256 ae1b8c3bc518047b615a33ce16837efa82a8bfbd9503d1baa139e4c79d443fc4
-MD5 75e7cc8aa2b2cce092ff4d80ce7bbe3d files/open-iscsi-485-out.state.patch 670
-RMD160 581c941a63d17b634aa6b1da72453a644e938117 files/open-iscsi-485-out.state.patch 670
-SHA256 ae1b8c3bc518047b615a33ce16837efa82a8bfbd9503d1baa139e4c79d443fc4 files/open-iscsi-485-out.state.patch 670
-AUX r438-idbm-file-locking.diff 865 RMD160 30c4b04f2ce8aab0755fb1eb792a265a1f7cff88 SHA1 19e85fc17172be275ace71ec2016bcea556579af SHA256 6840ebe2fde815306a46a443b207e8c99beae14ea3e0558b20c51df2abfe56b2
-MD5 1b1ec0732d8609b14f7aae743da78f49 files/r438-idbm-file-locking.diff 865
-RMD160 30c4b04f2ce8aab0755fb1eb792a265a1f7cff88 files/r438-idbm-file-locking.diff 865
-SHA256 6840ebe2fde815306a46a443b207e8c99beae14ea3e0558b20c51df2abfe56b2 files/r438-idbm-file-locking.diff 865
-DIST open-iscsi-0.4-413.tar.gz 155241 RMD160 1c1bae14cf2f2775ecaa00e873ab0a04be08c02f SHA1 34e97eb74328bab710ca16c42ea3d51da9b0ccc7 SHA256 2b4d9f182c3c1437408ced88de9d776a28077c3bd74800e561682e819e58e10a
-DIST open-iscsi-0.4-434.tar.gz 148526 RMD160 14b6e3fa49bb5bca785d61f485ba364c0b6cbaac SHA1 57802b7fbfc943ab2559c5f4c790dbd2b0042bac SHA256 aac0bd55b0c0bb1a1851540f56562fb1efdf0f59a177f5388c4be74943593189
-DIST open-iscsi-0.4-438.tar.gz 155810 RMD160 8380f3a0669384e27e6657a4f44870e52fa8bfaa SHA1 5472014019f5ca3eb1ddcd27a0b0649270ed4d58 SHA256 ec6e8ce4be3c4ceb729f2bf998a505f877602b92eb34b741faaf5118404ad9b8
-DIST open-iscsi-0.5.485.tar.gz 157355 RMD160 fe976a223503baa904d39784326bd7fbf8c9ca62 SHA1 855ad92f86a9c69d0fccf377ab5c599155be455c SHA256 f98b175226d0eedd7f3ee5e15537d1c9e46dc096a95b18edc4d8433bba6952a5
-DIST open-iscsi-1.0-490.tar.gz 158204 RMD160 36b7b12080e1dab1f578b85bb11010f2535e5b98 SHA1 746c07286ba9483362df2ac53af7a8d1f58e91a1 SHA256 8cad467cdcf34858d142189107bc40765beb52f5aaeecaac889370e05d2bd650
-DIST open-iscsi-1.0-514.tar.gz 172086 RMD160 5dfd6dec0459ef795eb42019245709619d1edcdc SHA1 f1e94dd06f3bfa775864e168a315164423673311 SHA256 b7c6c3d4478682f85f285f33457063b5daae07b3a1763ae05b5d7678bc51e3c6
 DIST open-iscsi-2.0-865.12.tar.gz 230395 RMD160 b663cc4773a9ec55ce0e27de63e53d334a1e7111 SHA1 e5e6e23f7f8b624f29ffeecf80ed8332e0048718 SHA256 f6413d9d7f03bdcac76a3dfa3931a163553694937ae9170aa79ef3d91eae13e5
-DIST open-iscsi-490-add-targetname.patch.gz 2699 RMD160 5cd09da29de1f02be9bb180cef2da66b3f80dc48 SHA1 1c2bf5eb3f765e6575e71da5d5dff0706a13f9ad SHA256 6946ce93fd8e55dbe76474c2cbbe3fe9717aeab500173153da1d8f1d20434d7c
-DIST open-iscsi-490-add-targetname2.patch.gz 5110 RMD160 485738c13d956c2e38663a89d34e3892590e28c3 SHA1 5b82c300cba2bcea78d8dd555617f5d35d044e67 SHA256 5eb8ebb9c34c48433e26142ce7ce2ff9af2f9d923c93bbd63ce6a069d5c56742
-DIST open-iscsi-490-boot13.patch.gz 9840 RMD160 845e72d7b0c37cfa7a8b9f0630f184f17563ec77 SHA1 2061973e0aaf8ded76a935d3152828fa2cac2c56 SHA256 83b6b463c7f9d3eb4bde68637434f6d008ab518d3735c095c2b0e7e9d5d4ab94
-EBUILD open-iscsi-0.4.413-r1.ebuild 2394 RMD160 2f85bed293853153bdffa10c0d0c30e64fa2a365 SHA1 a1825b3ea6950c5f689d12b6804e7e0e6df0d434 SHA256 dcafca710c83c634036dc216f06059d5279a4efec214f33f459c9a57c2209fec
-MD5 7b8782291aa1dc91871d00fda22f02f3 open-iscsi-0.4.413-r1.ebuild 2394
-RMD160 2f85bed293853153bdffa10c0d0c30e64fa2a365 open-iscsi-0.4.413-r1.ebuild 2394
-SHA256 dcafca710c83c634036dc216f06059d5279a4efec214f33f459c9a57c2209fec open-iscsi-0.4.413-r1.ebuild 2394
-EBUILD open-iscsi-0.4.413.ebuild 2321 RMD160 1bdce0ff810ddc7cb2a3de59d0ff8d177d837c6f SHA1 e50b283826660c12f80fd47a3dc192309c4930e3 SHA256 86076862415dac182a484e6f6abc6a5e63749f64409d55f5d50fe3c5a1a0714b
-MD5 85dbd5381f7a7bc46758d9d68a92e604 open-iscsi-0.4.413.ebuild 2321
-RMD160 1bdce0ff810ddc7cb2a3de59d0ff8d177d837c6f open-iscsi-0.4.413.ebuild 2321
-SHA256 86076862415dac182a484e6f6abc6a5e63749f64409d55f5d50fe3c5a1a0714b open-iscsi-0.4.413.ebuild 2321
-EBUILD open-iscsi-0.4.434.ebuild 2448 RMD160 2e028a403358a5c8be9d795da6fe279506ff45e0 SHA1 926763d3609067249b8224e39764285adf4ae883 SHA256 0471aea58b78a82bbc9d7fd90b4ede18a3e6cd6cddd988a11f18a56564e63ad0
-MD5 2d564916b8e8ddc76b4b8a8dba28f03e open-iscsi-0.4.434.ebuild 2448
-RMD160 2e028a403358a5c8be9d795da6fe279506ff45e0 open-iscsi-0.4.434.ebuild 2448
-SHA256 0471aea58b78a82bbc9d7fd90b4ede18a3e6cd6cddd988a11f18a56564e63ad0 open-iscsi-0.4.434.ebuild 2448
-EBUILD open-iscsi-0.4.438.ebuild 2801 RMD160 1661e8a9c80970f795e520bd04e227ce15d340cf SHA1 cf54657418e5aa94b85fe4ae0be639145866f23c SHA256 817ff0b0b471437c8954a3ac2c06946cceaf3fea974b5a941de0316bdba9cbff
-MD5 d190bcc565ecea652bb010d13ab77a1d open-iscsi-0.4.438.ebuild 2801
-RMD160 1661e8a9c80970f795e520bd04e227ce15d340cf open-iscsi-0.4.438.ebuild 2801
-SHA256 817ff0b0b471437c8954a3ac2c06946cceaf3fea974b5a941de0316bdba9cbff open-iscsi-0.4.438.ebuild 2801
-EBUILD open-iscsi-0.5.485.ebuild 2780 RMD160 4a6f5654002d8377d6a6257ed180a8272d22b311 SHA1 2f3bf217613c2f85678e9896b238257413ba95c4 SHA256 5dde802b7dc4b403ace9cc44fa2d76c125202b88e1eb04ec27afe8a30354fab4
-MD5 d62ba4a67a09ebd9c31bfc06a00ec1a0 open-iscsi-0.5.485.ebuild 2780
-RMD160 4a6f5654002d8377d6a6257ed180a8272d22b311 open-iscsi-0.5.485.ebuild 2780
-SHA256 5dde802b7dc4b403ace9cc44fa2d76c125202b88e1eb04ec27afe8a30354fab4 open-iscsi-0.5.485.ebuild 2780
-EBUILD open-iscsi-1.0.490-r1.ebuild 3520 RMD160 5ff1fdb0b889ed42f213408081f74ef315b4d091 SHA1 b2ac51e2b685804dabc91db7cea8b66dffe6f713 SHA256 4a46e5ef98ebd61c986919d72c2d43d11be203637df341c44df52648c1860041
-MD5 0782cda3a025d24583a931926e5be11a open-iscsi-1.0.490-r1.ebuild 3520
-RMD160 5ff1fdb0b889ed42f213408081f74ef315b4d091 open-iscsi-1.0.490-r1.ebuild 3520
-SHA256 4a46e5ef98ebd61c986919d72c2d43d11be203637df341c44df52648c1860041 open-iscsi-1.0.490-r1.ebuild 3520
-EBUILD open-iscsi-1.0.490.ebuild 3522 RMD160 17a0bcf1f1e3a14eab6998d3e7bffcd090fc37c7 SHA1 c757b2f50b473c8a11281497c3b8dcbad2ddea36 SHA256 af1dcd975a5cf544b59daaa950654469bb6e12c90c2df49753d1a08052ae7c58
-MD5 1131b83a6da9bd772bd5619c042300cd open-iscsi-1.0.490.ebuild 3522
-RMD160 17a0bcf1f1e3a14eab6998d3e7bffcd090fc37c7 open-iscsi-1.0.490.ebuild 3522
-SHA256 af1dcd975a5cf544b59daaa950654469bb6e12c90c2df49753d1a08052ae7c58 open-iscsi-1.0.490.ebuild 3522
-EBUILD open-iscsi-1.0.514.ebuild 2830 RMD160 90bf69ae041e6ddcddddcd160b2a253e771819fb SHA1 59ba099d4d08767990af1310af7612f98c412626 SHA256 df158d07066e767f575d0afe3cab23da06f5b3e582293bcdc0984313acb546b1
-MD5 4cbf5b036a8479bed75970be133852c5 open-iscsi-1.0.514.ebuild 2830
-RMD160 90bf69ae041e6ddcddddcd160b2a253e771819fb open-iscsi-1.0.514.ebuild 2830
-SHA256 df158d07066e767f575d0afe3cab23da06f5b3e582293bcdc0984313acb546b1 open-iscsi-1.0.514.ebuild 2830
-EBUILD open-iscsi-2.0.865.12.ebuild 2567 RMD160 2bee2e914c1eddb432a3f2ec5ce828cb83320074 SHA1 b77dc8fa0ee01819a7a4c950e6a7b0e737981ccd SHA256 06745f3d50e54814ff51be47b3f9727487d897007b736b1be75286825d9265bd
-MD5 1eb08b8c2334d3ce05919cf1e3a3f069 open-iscsi-2.0.865.12.ebuild 2567
-RMD160 2bee2e914c1eddb432a3f2ec5ce828cb83320074 open-iscsi-2.0.865.12.ebuild 2567
-SHA256 06745f3d50e54814ff51be47b3f9727487d897007b736b1be75286825d9265bd open-iscsi-2.0.865.12.ebuild 2567
-MISC ChangeLog 2780 RMD160 1e638a42e33908995de30037d5c7b66b54f7118d SHA1 44691af4cda5ec4bfee82400d410d0bb0c4f58de SHA256 32ede309054c5eea176ab274087170ce172bc760817674fa3ad08f84a7710632
-MD5 52f12a336a551b9b9c98f2f39961242e ChangeLog 2780
-RMD160 1e638a42e33908995de30037d5c7b66b54f7118d ChangeLog 2780
-SHA256 32ede309054c5eea176ab274087170ce172bc760817674fa3ad08f84a7710632 ChangeLog 2780
-MISC metadata.xml 287 RMD160 97248cff453c9e9940ce62d98e3c67f63b5b8fa3 SHA1 e09080682bf0487460b26c82a0366b24edd624c2 SHA256 8a6c17ffc1c1c1dfee83b59d5a7dbbf194dda2a30885573759e37ce0f5b27c55
-MD5 9d8c10c64e14053fd11c8cd60fb1d9e2 metadata.xml 287
-RMD160 97248cff453c9e9940ce62d98e3c67f63b5b8fa3 metadata.xml 287
-SHA256 8a6c17ffc1c1c1dfee83b59d5a7dbbf194dda2a30885573759e37ce0f5b27c55 metadata.xml 287
-MD5 737e568bdc128d01e90899cebd3e662a files/digest-open-iscsi-0.4.413 256
-RMD160 190cd62b4e5891493d0b0e4e854dbadf2aa8f8f2 files/digest-open-iscsi-0.4.413 256
-SHA256 3f0063ee62f05de610eac3ffface2fb462fff0022d575b15b99bcfbd65e0616d files/digest-open-iscsi-0.4.413 256
-MD5 737e568bdc128d01e90899cebd3e662a files/digest-open-iscsi-0.4.413-r1 256
-RMD160 190cd62b4e5891493d0b0e4e854dbadf2aa8f8f2 files/digest-open-iscsi-0.4.413-r1 256
-SHA256 3f0063ee62f05de610eac3ffface2fb462fff0022d575b15b99bcfbd65e0616d files/digest-open-iscsi-0.4.413-r1 256
-MD5 7435ae8a2dc31f230277855dad63a3d7 files/digest-open-iscsi-0.4.434 256
-RMD160 e3cbe9940bd81554860ca438e676ce03b1766dd2 files/digest-open-iscsi-0.4.434 256
-SHA256 dcbc76a20632d5f55a3fff5945bfc3984db6367a9807183b49b0049537304a05 files/digest-open-iscsi-0.4.434 256
-MD5 82e2579dcc1f940632d97e59761630ad files/digest-open-iscsi-0.4.438 256
-RMD160 2e356ac63deeb1481464ced166d9d31070355dc9 files/digest-open-iscsi-0.4.438 256
-SHA256 2e438c986bd49ba70c9d6afb93b9131c5beb7898fa7d6558229829cfc75eb740 files/digest-open-iscsi-0.4.438 256
-MD5 9878fff8ccf7d43ac07c315700a91c04 files/digest-open-iscsi-0.5.485 256
-RMD160 9ee348cf082366f049d35080b09e42185046f38c files/digest-open-iscsi-0.5.485 256
-SHA256 f34b16ca4e8890ddd22cee025968c95d455343d8b50ee8d974af98a248f5dde3 files/digest-open-iscsi-0.5.485 256
-MD5 dd5f0ac7aef8142ae201c1a511f54a82 files/digest-open-iscsi-1.0.490 810
-RMD160 be8c7c073541c54293606f625b8c91c6e7889ded files/digest-open-iscsi-1.0.490 810
-SHA256 8b6698c20b3c885fa8aa9de393dda259df923ae9b9b35fc071896378d9e59b17 files/digest-open-iscsi-1.0.490 810
-MD5 c6ea6d101c83448607b5cbf07b17e845 files/digest-open-iscsi-1.0.490-r1 813
-RMD160 df0a3952f06f68b93d353df4d827527e4678d6a1 files/digest-open-iscsi-1.0.490-r1 813
-SHA256 19e2d67b39564385e18f89d27612aa50ed0ffa5a6a7051bc069f413a4457fb45 files/digest-open-iscsi-1.0.490-r1 813
-MD5 dab20ecbb35ceb14bb8712ee7b86618c files/digest-open-iscsi-1.0.514 256
-RMD160 3e2fdcdb61c1c989ae2dc24a2261d10c74546034 files/digest-open-iscsi-1.0.514 256
-SHA256 e9048d3e8304d25d6f797988e235412471c7af3d8582874a1a92aa79617a3eea files/digest-open-iscsi-1.0.514 256
+EBUILD open-iscsi-2.0.865.12.ebuild 2572 RMD160 e6ac1699d340a98cd5155789191fb1fa5a08ab11 SHA1 2e5800ab5853179b014c4693ed8449b2cd301d48 SHA256 aa3ecb705af8564581cebfaaefb0c320fec04df6838fdfd7bd53fa061a2159fc
+MD5 308f8f33946044b6fa262cca0466ce2c open-iscsi-2.0.865.12.ebuild 2572
+RMD160 e6ac1699d340a98cd5155789191fb1fa5a08ab11 open-iscsi-2.0.865.12.ebuild 2572
+SHA256 aa3ecb705af8564581cebfaaefb0c320fec04df6838fdfd7bd53fa061a2159fc open-iscsi-2.0.865.12.ebuild 2572
+MISC ChangeLog 3358 RMD160 0b239f4280f6c712408308c3e32ccb7496140116 SHA1 fcbd133210bdedefd307aaadf2b89e9145cb2dce SHA256 d8c6ebe554c3c654ca6eb753f1977e29728d05e8b6520f5cbd7038db7cf6752a
+MD5 85d9360dbb4e3ae5d8441a4f5bb49cdf ChangeLog 3358
+RMD160 0b239f4280f6c712408308c3e32ccb7496140116 ChangeLog 3358
+SHA256 d8c6ebe554c3c654ca6eb753f1977e29728d05e8b6520f5cbd7038db7cf6752a ChangeLog 3358
+MISC metadata.xml 224 RMD160 38404e7e41fb07335d42010dc13acf089800ff81 SHA1 7a8b4b22614bfad69b006ed05d773db39af7194a SHA256 5c462d2f7ca491a9e8be04d0a498050b974c31258b264a3ee7a1495d63780502
+MD5 334e4f71306cef3c0456b8ba59bbbfe8 metadata.xml 224
+RMD160 38404e7e41fb07335d42010dc13acf089800ff81 metadata.xml 224
+SHA256 5c462d2f7ca491a9e8be04d0a498050b974c31258b264a3ee7a1495d63780502 metadata.xml 224
 MD5 56e2d4430e5875cae5fdda1d1f9df19e files/digest-open-iscsi-2.0.865.12 265
 RMD160 bfbf40b0cf937417b877b3f8bda652635ab51ffb files/digest-open-iscsi-2.0.865.12 265
 SHA256 5b0cfee8fde8af489446b8e91160da4877cc0d8f224651a0526e138bb72761c8 files/digest-open-iscsi-2.0.865.12 265
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
 }