old

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

16 files changed, 21 insertions, 1134 deletions

diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index 208a33322e11..b3a27f0d4ba2 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-block/open-iscsi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.53 2013/08/18 13:26:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.54 2013/08/18 15:27:36 ssuominen Exp $
+
+  18 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/CVE-2009-1297.patch, -files/iscsid-2.0.871-r1.init.d,
+  -files/iscsid-conf.d, -files/iscsid-init.d,
+  -files/open-iscsi-2.0.871-makefile-cleanup.patch,
+  -files/open-iscsi-2.0.871.3-glibc212.patch, -files/open-iscsi-2.0.872-init.d,
+  -open-iscsi-2.0.870.3-r1.ebuild, -open-iscsi-2.0.871-r1.ebuild,
+  -open-iscsi-2.0.871.3.ebuild, -open-iscsi-2.0.871.ebuild,
+  -open-iscsi-2.0.872-r1.ebuild, -open-iscsi-2.0.872.ebuild, metadata.xml:
+  old
 
   18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> open-iscsi-2.0.872-r2.ebuild:
   Stable for x86, wrt bug #479786
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 465e5e8d01c3..147537e6f3fe 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,49 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX CVE-2009-1297.patch 798 SHA256 b52320fb0e25876d7b9cd7a40e1a01246a9175822c98c3796d6e2822fda39af5 SHA512 d4f2488f643f1e35ec22f2c1e50a5a200afec933cc64b35e939844822ecd004834f107957ddf4f2cc126d3459500ae2ccfbf4c8900704f23211d76e142791256 WHIRLPOOL 8ef48cbe4b57caf070cd408537e40de0d2e038bb06d5653f371ae0041f5559898957d50b0ff10f682de0e919c9fccea5e717907de9eabb19ef292146f05fc819
 AUX initiatorname.iscsi 1282 SHA256 4ae558522881796f67ad5915ecf38d01e64c9d9768469847adb17405404485f3 SHA512 c37990050123c6f805016f009a3d09452db2a3cfbb359efa50350c7ff4b6adc75bc1f8aba26190829729b75639b8e52c77f31bd719c5f945869941f651121743 WHIRLPOOL 7ff4ef48a7d3decc96160681a8ed82b6848b238ac38f8973d3e5da12e346a0c26f7bee67d7ba81197b9fecb679e9046e6fec85f90d97068aa622aceca875bda0
-AUX iscsid-2.0.871-r1.init.d 2974 SHA256 c99b8f85bb319cf1b304ab9322529f63ec213a3b61a53d360990ddc1f8766390 SHA512 f643b4dc391bec476e12586fc3da547514d4afb4441c7a70b67628a40ad7fec043ef50840bbc17a7c06694022524ed2c392f1e4f16675214d927fdaf67638bab WHIRLPOOL b8406191150d941363816bd8b6627b05f1c29ba53e68da744aec3aec97a21bbcdc0f1423f7519f39e1b3a56ccaa9e816c6fcacb331e727d87a24fb35fa28c63e
-AUX iscsid-conf.d 422 SHA256 3e2a63143e3167f20844ef94f1383180b69c245092583856fd26316674cf4114 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a WHIRLPOOL 19e7dc2d647a271dd67bf2f92e3c866719b1a7c978ecc86395d3586ab0c897e93ab4dce740497a6139f4fae1c5a34c455b806c627c9a9f876133d808890a85bf
-AUX iscsid-init.d 2784 SHA256 8ff8f100a6058d31605de54b1f210d5293c4b7441973e5793f42f67cac4fed30 SHA512 2b28d6017fdc9d3fa378d672391b2570f8d008c74f49ed874061c407b91db537fa481de899b099d7873dd611103a68f87fd14b21069b762bf6368a615c8df9c9 WHIRLPOOL bbfdc9dd933c4e90dcca3613beaffe3a954c83c5dcfd26e98bb871370cc61c11090db1149fae4abaec9042b987b25a709f7da3c59271a9dd371dc5b6e71533f5
-AUX open-iscsi-2.0.871-makefile-cleanup.patch 1205 SHA256 8412850ea40dd7b5bacbae18c760ef305df36dbaa507d9618555e32c8e8e2ae6 SHA512 ffbecbb056a7940cb4d4fae09c65584fe37f977bf6054112cdb1507abee3abc7d27ca2634e1d205518ffbafa96dc5e60d9d5bb474236f5816e3eb392bb3de5fd WHIRLPOOL 16920cf306a9c1273abd0d0f83497ae279d540e1ea3357fdb849cbe86bdb1499fef82e96b00836a19aa2c0b28e4d3f4d38f64dd77686b55093232648c29c53f2
-AUX open-iscsi-2.0.871.3-glibc212.patch 413 SHA256 e8904176278a437f26b9f6e62377c5c018fa7cae31ead28a1651b8ab7b4b951c SHA512 7c60e63eb9e3e6d5b926e1a714d29d3197718b7b0b4620e314e52238a1b2a6e55480d67b925cae9fd7ae08abc86bf0916a9338c4a9be354960f3f66a4936bb89 WHIRLPOOL 18e44c368a4c12762eb260ee1ce0c36b339870d431a8bf1d4f10e918e5b78e956d9d81f973713ee5489669a4e59113ad6b15159f0172399a98c8c331833c7cfa
 AUX open-iscsi-2.0.872-conf.d 422 SHA256 3e2a63143e3167f20844ef94f1383180b69c245092583856fd26316674cf4114 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a WHIRLPOOL 19e7dc2d647a271dd67bf2f92e3c866719b1a7c978ecc86395d3586ab0c897e93ab4dce740497a6139f4fae1c5a34c455b806c627c9a9f876133d808890a85bf
 AUX open-iscsi-2.0.872-dont-call-configure.patch 296 SHA256 92ab247afde924a6d07643abc2cb34598a2fb13f62718684803ab44b9bce7241 SHA512 513e775695288b747b40cfb9815c9083b61637f0e3ba241f5d5f3363730059ac4a01e55c23ab3ff983da7d3a5b40448447740ac35e0748c4d5e8942946146522 WHIRLPOOL af5c1cae289cf669dcd9cc6ce02e6a7e6603dceb8f3827d79f4d7adeb35aa9c9c6e588e1e915c078c31532a9985f4fb2a74fe7270269c686be4d7f6c2083ae06
 AUX open-iscsi-2.0.872-glibc212.patch 266 SHA256 e7b299da12daed432f18a115b7a14eadb61a3db13df89af21a9078357ebf63ca SHA512 8d869642b27dc7d243cf5697858a19127e5e627dd62fd2a8879e4baf84f87aa07e7682faa5f7153ef75e8f9a78ae9b1a84e3260f449fbbb26d848064ec736630 WHIRLPOOL c501c6d8ae334974635f25060b29e326da7a6ef33062c518cd115fa7cae6a63ef3901dc7e1c421a70557b114cead6cc951a09712cf19c83c7f79ec96635fe7e4
-AUX open-iscsi-2.0.872-init.d 2971 SHA256 ff62e08cd55d659ef5df1f477bd835a1d29984fd707801a9ef4d0dfe9c7caf79 SHA512 4ba6f52bd5e2a39fab4c0be81bebbcd18db5af8118f4cfe2f85e2bde75ab4dc7abf131144f3528e7a5e3887a4bd0f7eb44b64b10f392510af985639ec7ebcf09 WHIRLPOOL 79df614d278c92111c0fbab4382400c71033ff1227e81fb28abf1ad6269a7575b6b472b049ec73308509020688ef17246eb06770f05ff5a8e6111d7a6bffdd7e
 AUX open-iscsi-2.0.872-init.d-r1 2973 SHA256 3295044666e1be799a0311f71e9db43aa050f8a02948af8008a6cd7b8c77357d SHA512 737403d25407e35f85418798838e2fe4ee69da12f110d16757bfd15a84ab894dfbf55ad541af96d80d7860610522af7fda8bbe4e834c7d29eb6c0d381c9be73c WHIRLPOOL de2e95b90823add0fc494cfcd485e8702f9f6d8d195ed4e35d38294b6052a0eab6fb61d5c2622efe8930a4cf6221e4020edb288fac0eef02ee19e2e920b28ee6
 AUX open-iscsi-2.0.872-isns-slp.patch 871 SHA256 d83640c9a7f9d7fed2b502d0164f6f8a91adb87f45e79a793954eae536a22138 SHA512 8aa4e6897c3284b7d914b7805d37a5d21014d66514675a4878c05535c460fc5ffafb43628f4112226f116fb8d941f14fc66246f0d395f0e44c90610494546f73 WHIRLPOOL f98cb605e1311792c6c9e5e03d2508cc05a10a94fc36feeb70c0b558f65861f743bdb1896da971dc93bac67638f69b8ac4a27ff7bfc9ef3c9c735c1f4ded81af
 AUX open-iscsi-2.0.872-ldflags.patch 309 SHA256 b8544087dfbc579209d326f825a251f6fc10898ca29ce46264d4a86ceac95941 SHA512 4204a615e10d52130a2fb39b81d99df45350b7f7431fa4e110e535ece2c1aab2cda0b8e787561a051c232a80f2cd99af007e94c1ca122727aac7854eee478219 WHIRLPOOL c8a6a6fad91680df09227a5ae29b2a9f7c172c0a9326e3d53ec5c16ae63fe733ab392949e777c5ca3a3c01d6a07d925f22a2dc82bbb53c3b76a7ed7b7e5010fd
 AUX open-iscsi-2.0.872-makefile-cleanup-pass2.patch 2134 SHA256 8725f8aba89f86c275f9a53bfb066d392b43e6ba5496c09bc2d9543453f45122 SHA512 ee1700c010578160f2fe3bb2f5a7eca4bde900faa138445eaf6b1875a7ad89d5c13b530d25a0ac5844213fa118b4e5253180414956d4e514dae0ede936dee2c8 WHIRLPOOL ef5377ca5d95e7ce12727dca3a3547e59b37c21772799e24be0cf6725e432502bcfd7156990be98405f0382793247d3edc3cba6e85fc45261ddaa2a797180679
 AUX open-iscsi-2.0.872-makefile-cleanup.patch 839 SHA256 c0e92ba2211dd74e89dcc0c5793e02ad8ad06b41a07a0687007bba6415546dfd SHA512 bc4cae49f435a4396a88b5d238c1f72a808c5d272042ee1acfe6c27d96613b9fc03ba2ce7e40d0a0f4aef2a924a66b45fb8a1e6db131415668c5336c5a4cf720 WHIRLPOOL 4045bf2826a33460f00218a65dc1e1614aac1bf16a07f4752546df4066c9e4c0420d5fa5b235b634a4bfd1c5626ab1813b6f595ab2b71743755ac378b41e8138
-DIST open-iscsi-2.0-870.3.tar.gz 301242 SHA256 8ca6708895b17424efe20a4f6cbdf32ea44c40e7d9faa0f9c44bd720bae715ec
-DIST open-iscsi-2.0-871.tar.gz 330514 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb
 DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 WHIRLPOOL 4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935
-DIST open-iscsi-2.0.871.3.tar.gz 331617 SHA256 2aefded8bcc854acaa7d9df9455408484d894e2bed407ebfeb95bb07773fab53
-EBUILD open-iscsi-2.0.870.3-r1.ebuild 3055 SHA256 a910def4f79dfb8576e9bf359f35d23c9bf7613c2eb2d186cec8dd647f20e90d SHA512 8a94bbbec18c3397e7df10336556d2b38202333980bdad7c37c18224b33cd3aeeec7abddd740610efca4bc52787a24bfcb2cf9db5b792338f4f905d3733686d9 WHIRLPOOL c19c2eb47a1c66158731036c52a9ff506a1398db0780957e89c8d98af16be3e67a95ffcec45728a254e1a39a0e592e67eb56a4c009d0e68462d0cf5206ce7a54
-EBUILD open-iscsi-2.0.871-r1.ebuild 2580 SHA256 c02b63d0e40f1db7fb1034fefcf1884e9f65c7eba3c455548d75b3c622bd8c94 SHA512 5af6777c926dc3aa4a5567070e07ab1010dd1e6a26f00d23ff3dc79d8dafa29031899d490ccec25d5be4f620f926bf6d8af852b415f0be3629783e0f37f9b237 WHIRLPOOL 667df1f2aedbbeed7e877b6f60e2a9e932968ac6bf00da8cd5e6f2aefa06dca9a83b5dd548d0d01d33cf1d98493457418f686221ae7ad1860b2214ce988f6022
-EBUILD open-iscsi-2.0.871.3.ebuild 2564 SHA256 47c655f1da09451d18812965074d8a164dc417064bef584738b964bf88e5ecf7 SHA512 ff233a51d5e04c38c1f4a63d2e44113da92dccb997d3da5cfe53be4b2e64abc10f7b207e2e44d523f6b2963d999163bc5699bf1e8fa200bb8298d320f371df06 WHIRLPOOL 1178e45eea30c98c5a36c665abdec75bc24710ad834df2c24aaa0b33458a45e72d14e23b6178ba7d8cc0cda9fb049aeeb20c2e8cc0d8e8b1cbec0023b28e52d9
-EBUILD open-iscsi-2.0.871.ebuild 3148 SHA256 851f68fa11c0dfd5a12f242825701ad2360e11ae9af02e0da65e453856ad4d03 SHA512 06d75f4ae74c675de7e71d21f15c876b2b8989d69ed8b3d63f58c5e29744a8900955910643c33f591f61f2ca3ae6463aa62d15216ac9a475181574998d22261f WHIRLPOOL c532ed919ca0863d73808648e057d322508cfed91021e22e6b71c33b37a3259576292aab87cfc2f77f8d01a916b3f197cca0a99a0ef4be5cdf1dd38586369484
-EBUILD open-iscsi-2.0.872-r1.ebuild 3132 SHA256 2779357bf561f91467d3d8cb3cfa22bfb89b2c9fbfc1b526b9e72b05f31621d1 SHA512 d15d6ff2f527146d60cef784c085191fc0fad221616e4aa1a79d661029a4f6461f622a7be8940d797d70ea0405c0e8da8a5dc17e4ed7942480c456f41ae9beb9 WHIRLPOOL b5a899f9fd1adbaaa833465492958a28804924ed607e43e98704826377b4fcae8b2cfca5d34710707e0fac3e09a586f29e594c7fce8537909e5b906c46bf11ba
 EBUILD open-iscsi-2.0.872-r2.ebuild 3132 SHA256 23921f8e4ca9fb0e701326ac19a44f42596700e5bd4bfd8503687d044e00069f SHA512 da03ec0b64f24f7c8ca0e5f695ff3fe5cf6a222f4859025995ba765b9c1053af10e419f2e5ea65ccaa8a91e3e16ff01fca28413a631b78eba9d80d473afa7b56 WHIRLPOOL cecedfd5fc3d5f3ef5ad4214eb4b7c01cd0aaec783c322e7e862f1f27751f8df3b2b5512adeb3dbca7d10bedfdbc1a7d9b4f57804bc71162a6219da151aa4aec
-EBUILD open-iscsi-2.0.872.ebuild 3104 SHA256 fef94227d2ea4cfa5590e399cec850c070c82eb80dfa288d42d560ba71804de0 SHA512 4a01583d2f0c20b4b8e5913b35f7f3c3fda4dc9f23b495bab784e628fd6e41f98f4a76fadcb576c5d3dd37038711b1efd8159068977c44b41a794b049f173283 WHIRLPOOL 9ee40a6c8f7d474ea492a02f3357be4589feadb2b0475e5c61f6e705bd2c021a917f60916369ed3eae3f7b88d966674e256d509262d063090d5e5b739d865252
-MISC ChangeLog 10767 SHA256 39cf28460ae1c6962c21df438d85e9e87984359c1d567d7f33ce5b12a6387267 SHA512 5763b26df71afdf0f8980e1969c1f89c0a1546389bc3e790e44c062e58acd06966e4ed591338650223704bca1146b2cf855152130336d75cfc37efb9989d1e4e WHIRLPOOL 32755dbc4a38d7c4d98bbe4de4df7515579690bac1cac485555b1113832adeaa63408d7cf1a306b47e047662f963fe5d360c1a5964d764f94f1a90ae78dbf090
-MISC metadata.xml 302 SHA256 d518f6f4112e36f35164044266791dc4a7ef4a96750ed385d00094132ce3f741 SHA512 6b2081139fb894a7ca47f0e4f6aac5da71c31ec2e2b33cb7257e470cd576e13c770684ce71fe1584dfe460c252e90fb6159b245c82a3f9a2ebc47dad060375d7 WHIRLPOOL a2a2bd2d586aa3c10ba22b36ff958c8995f3ac2c6be1012aae194d0188b34be7257903626917acc20d68668fc13e9ef462ccb80141c53272f692ec2e92d321ae
+MISC ChangeLog 11276 SHA256 0cfd3b8d374536b8eda144db5e737b1aaadf05f1026d7402f912633a9b422b72 SHA512 1ed9b34f5b5cac064b6c75ffed43da33b825ceef70aa3fb71f43e006cd3281ef4387deb4dfb71ed7d30b9eec2a861909f6d2b8e52fc11a039e49f35a33c7d6a0 WHIRLPOOL 7743117ea60cc625f126e1910624b74b9812c95167ae05522e08761be0de917af23ed1c44321ddb12a42aca2a489206dafbecd8080b510f629775388031eb9ae
+MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSEMtkAAoJELp701BxlEWfepIP/1MJ8Qi3jkv78rlzOezy+drU
-M5V/wcUGFxsiCXgZotE9m5zs8dzWTXlJtrgDSTHXcKKRppAvKa1fprI6UAF2Wt9e
-a1x8L9d/wxaZfHeuPCu/i+ZOsJ0ID7JelFLWD4e6FlHCfcatdX+PA+67imziHWd7
-58ypaBLLqIZQem2OlJ+YzpF8ninna+6gB+ufxQAphi7WGX9PVBQwBi9WZ94v9aM3
-J2aHk1UC7cE/PXOm7h7ogtTvoZ9i9dxOPnslf9SGOKuNpNh8ltmgpPujwI9tgWEV
-oK2cnMPTf/bMBWTpTcW4e123q+D1NSd1I6HxGB7EA2589RdbLCV0u7visc+XSrOH
-Hd/NwRFnvYJ1Vr9PLxGB+N2KfmPoQagjz8rVZnqOz22hgQvRU85fxthXRbZ/DdnX
-tm2kxLGeX/SOTbu7kWlOfZgc969WB2Uv6PJ5ANBDyAtdEnaP1cZ2ULtmLewjjrkj
-gFfo5dYEKRHa9GphshCQ2faC9uw/7r7fmWUVJBAhLCGc/EzrDKxuabPzlJgP15cY
-w1ejBOS65kZ9JXzPWnfLM/FfTAUD1eppZBynY+hGvx92+lRP5MWwFSpTxbJR4jnF
-SFM6y9Av3IumkfVXHY3jklHXHsOfb62l1myAPpzUlsKr0x5aJFXdJDzJmoqC/tSx
-m+Alb4GPzDAWYjfjMLlk
-=DPZl
+iQEcBAEBCAAGBQJSEOdJAAoJEEdUh39IaPFNDpoIAIrP97qQi6xevz7Dy66JzYr0
+GlTCebQu02U3h1PXUovCIDBGf2Er3flpOU2N9id1QQegYEuoqZicx9OOtzDEStvf
+420SgkF2833UUH2KhIXxsfDRcJX+HqjqAUvJ9AUxtVERMi3Xql4BZgSuijfLBuSX
+DtkqogUC/QxXiZxJjFy1btaATqSMvbMSZeZw4xvYvol671Ek+wMloxjti+vx/AVC
+eqN2Jsh+YAvvAHBBX5GTI3rgdB5ny2qB4HbBkpqi5HETEOVIrRDSH3kpnvS3mZJc
+QsCKrhWWsfdgwNxWEIryouMDH4GsEkN3gGD9yHCtLL8yD+JsTg/nDNjHVtVKF8U=
+=SaPl
 -----END PGP SIGNATURE-----
diff --git a/sys-block/open-iscsi/files/CVE-2009-1297.patch b/sys-block/open-iscsi/files/CVE-2009-1297.patch
deleted file mode 100644
index d1728fff7e65..000000000000
--- a/sys-block/open-iscsi/files/CVE-2009-1297.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- utils.orig/iscsi_discovery	2009-10-26 23:09:08.000000000 +0100
-+++ utils/iscsi_discovery	2009-10-26 23:11:56.000000000 +0100
-@@ -104,24 +104,22 @@
- 
- 	connected=0
- 	discovered=0
--	df=/tmp/discovered.$$
- 
- 	dbg "starting discovery to $ip"
--	iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df}
--	while read portal target
-+	disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})"
-+	echo "${disc}" | while read portal target
- 	do
- 		portal=${portal%,*}
- 		select_transport
--	done < ${df}
-+	done
- 
--	discovered=$(cat ${df} | wc -l)
-+	discovered=$(echo "${disc}" | wc -l)
- 	if [ ${discovered} = 0 ]; then
- 		echo "failed to discover targets at ${ip}"
- 		exit 2
- 	else
- 		echo "discovered ${discovered} targets at ${ip}"
- 	fi
--	/bin/rm -f ${df}
- }
- 
- try_login()
diff --git a/sys-block/open-iscsi/files/iscsid-2.0.871-r1.init.d b/sys-block/open-iscsi/files/iscsid-2.0.871-r1.init.d
deleted file mode 100644
index afcdb5f76d96..000000000000
--- a/sys-block/open-iscsi/files/iscsid-2.0.871-r1.init.d
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/iscsid-2.0.871-r1.init.d,v 1.2 2012/02/09 08:35:05 robbat2 Exp $
-
-opts="${opts} starttargets stoptargets restarttargets"
-
-depend() {
-	after modules
-	use net
-}
-
-PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid}
-BINARY="/usr/sbin/iscsid"
-
-checkconfig() {
-	if [ ! -e /etc/conf.d/${SVCNAME} ]; then
-		eerror "Config file /etc/conf.d/${SVCNAME} does not exist!"
-		return 1
-	fi
-	if [ ! -e "${CONFIG_FILE}" ]; then
-		eerror "Config file ${CONFIG_FILE} does not exist!"
-		return 1
-	fi
-	if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then
-		ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name."
-		IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi
-		IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g')
-		ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}"
-		echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}"
-		eend $?
-	fi
-}
-
-do_modules() {
-	msg="$1"
-	shift
-	modules="${1}"
-	shift
-	modopts="$@"
-	for m in ${modules}
-	do
-		if [ -n "$(modprobe -l | grep ${m})" ]
-		then
-			ebegin "${msg} ${m}"
-			modprobe ${modopts} ${m}
-			ret=$?
-			eend ${ret}
-			if [ ${ret} -ne 0 ]; then
-				return ${ret}
-			fi
-		else
-			ebegin "${msg} ${m}: not found"
-			return 1
-		fi
-	done
-	return 0
-}
-
-start() {
-	ebegin "Checking open-iSCSI configuration"
-	checkconfig
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend 1
-		return 1
-	fi
-	ebegin "Loading iSCSI modules"
-	do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp'
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend 1
-		return 1
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS}
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend $?
-		return $?
-	fi
-
-	# Start automatic targets when iscsid is started
-	if [ "${AUTOSTARTTARGETS}" = "yes" ]; then
-		starttargets
-		ret=$?
-		if [ "${AUTOSTART}" = "strict" ] && [ $ret -ne 0 ]; then
-			stop
-			return $ret
-		fi
-	fi
-	return 0
-}
-	
-stop() {
-	stoptargets
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --exec ${BINARY} --pidfile ${PIDFILE}
-	eend $?
-
-	do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r'
-	eend $?
-}
-
-starttargets() {
-        ebegin "Setting up iSCSI targets"
-        /usr/sbin/iscsiadm -m node --loginall=automatic
-	ret=$?
-        eend $ret
-	return $ret
-}
-
-stoptargets() {
-        ebegin "Disconnecting iSCSI targets"
-        sync
-        /usr/sbin/iscsiadm -m node --logoutall=all
-	ret=$?
-        eend $ret
-	return $ret
-}
-
-restarttargets() {
-        stoptargets
-        starttargets
-}
-
-status() {
-	ebegin "Showing current active iSCSI sessions"
-	/usr/sbin/iscsiadm -m session
-}
diff --git a/sys-block/open-iscsi/files/iscsid-conf.d b/sys-block/open-iscsi/files/iscsid-conf.d
deleted file mode 100644
index 02e584fbce52..000000000000
--- a/sys-block/open-iscsi/files/iscsid-conf.d
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/conf.d/iscsid
-
-# config file to use
-CONFIG_FILE=/etc/iscsi/iscsid.conf
-
-# you need to specify an initiatorname in the file
-INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi
-
-# options to pass to iscsid
-OPTS="-i ${INITIATORNAME_FILE}"
-
-# Start automatic targets when iscsid is started
-AUTOSTARTTARGETS="yes"
-
-# if set to "strict", iscsid will stop, if connecting the
-# autostart targets failed
-# AUTOSTART="strict"
-
diff --git a/sys-block/open-iscsi/files/iscsid-init.d b/sys-block/open-iscsi/files/iscsid-init.d
deleted file mode 100644
index 6ef184b32cf8..000000000000
--- a/sys-block/open-iscsi/files/iscsid-init.d
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/iscsid-init.d,v 1.5 2009/03/20 16:23:50 dertobi123 Exp $
-
-opts="${opts} starttargets stoptargets restarttargets"
-
-depend() {
-	after modules
-	use net
-}
-
-checkconfig() {
-	if [ ! -e /etc/conf.d/${SVCNAME} ]; then
-		eerror "Config file /etc/conf.d/${SVCNAME} does not exist!"
-		return 1
-	fi
-	if [ ! -e "${CONFIG_FILE}" ]; then
-		eerror "Config file ${CONFIG_FILE} does not exist!"
-		return 1
-	fi
-	if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then
-		ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name."
-		IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi
-		IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g')
-		ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}"
-		echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}"
-		eend $?
-	fi
-}
-
-do_modules() {
-	msg="$1"
-	shift
-	modules="${1}"
-	shift
-	modopts="$@"
-	for m in ${modules}
-	do
-		if [ -n "$(modprobe -l | grep ${m})" ]
-		then
-			ebegin "${msg} ${m}"
-			modprobe ${modopts} ${m}
-			ret=$?
-			eend ${ret}
-			if [ ${ret} -ne 0 ]; then
-				return ${ret}
-			fi
-		else
-			ebegin "${msg} ${m}: not found"
-			return 1
-		fi
-	done
-	return 0
-}
-
-start() {
-	ebegin "Checking open-iSCSI configuration"
-	checkconfig
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend 1
-		return 1
-	fi
-	ebegin "Loading iSCSI modules"
-	do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp'
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend 1
-		return 1
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec /usr/sbin/iscsid -- ${OPTS}
-	eend $?
-
-	# Start automatic targets when iscsid is started
-	[ "${AUTOSTARTTARGETS}" = "yes" ] && starttargets
-	return 0
-}
-	
-stop() {
-	stoptargets
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --signal HUP --stop --quiet --exec /usr/sbin/iscsid #--pidfile $PID_FILE
-	eend $?
-
-	# ugly, but pid file is not removed by iscsid
-	rm -f $PID_FILE
-	
-	do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r'
-	eend $?
-}
-
-starttargets() {
-        ebegin "Setting up iSCSI targets"
-        /usr/sbin/iscsiadm -m node --loginall=automatic
-        eend $?
-}
-
-stoptargets() {
-        ebegin "Disconnecting iSCSI targets"
-        sync
-        /usr/sbin/iscsiadm -m node --logoutall=all
-        eend $?
-}
-
-restarttargets() {
-        stoptargets
-        starttargets
-}
-
-status() {
-	ebegin "Showing current active iSCSI sessions"
-	/usr/sbin/iscsiadm -m session
-}
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.871-makefile-cleanup.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.871-makefile-cleanup.patch
deleted file mode 100644
index 6ca2a4eabab1..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.871-makefile-cleanup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar open-iscsi-2.0-871.orig/usr/Makefile open-iscsi-2.0-871/usr/Makefile
---- open-iscsi-2.0-871.orig/usr/Makefile	2009-07-10 20:55:58.000000000 -0700
-+++ open-iscsi-2.0-871/usr/Makefile	2009-11-12 00:58:16.467960344 -0800
-@@ -48,14 +48,14 @@
- all: $(PROGRAMS)
- 
- iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- 		iscsistart.o statics.o
--	$(CC) $(CFLAGS) -static $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- clean:
- 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
- 
-diff -Nuar open-iscsi-2.0-871.orig/utils/Makefile open-iscsi-2.0-871/utils/Makefile
---- open-iscsi-2.0-871.orig/utils/Makefile	2009-07-10 20:55:58.000000000 -0700
-+++ open-iscsi-2.0-871/utils/Makefile	2009-11-12 00:58:56.404623435 -0800
-@@ -6,7 +6,7 @@
- all: $(PROGRAMS)
- 
- iscsi-iname: md5.o iscsi-iname.o
--	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(DBM_LIB) $^
- 
- clean:
- 	rm -f *.o $(PROGRAMS) .depend
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.871.3-glibc212.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.871.3-glibc212.patch
deleted file mode 100644
index b6f752b3d2ca..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.871.3-glibc212.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/334077
-
---- usr/iscsid.c
-+++ usr/iscsid.c
-@@ -29,6 +29,7 @@
- #include <signal.h>
- #include <sys/mman.h>
- #include <sys/utsname.h>
-+#include <sys/stat.h>
- 
- #include "iscsid.h"
- #include "mgmt_ipc.h"
---- usr/iscsi_sysfs.c
-+++ usr/iscsi_sysfs.c
-@@ -22,6 +22,7 @@
- #include <string.h>
- #include <errno.h>
- #include <dirent.h>
-+#include <sys/stat.h>
- 
- #include "log.h"
- #include "initiator.h"
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d b/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d
deleted file mode 100644
index 40713dc894f3..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d,v 1.1 2011/06/07 14:32:38 sping Exp $
-
-opts="${opts} starttargets stoptargets restarttargets"
-
-depend() {
-	after modules
-	use net
-}
-
-PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid}
-BINARY="/usr/sbin/iscsid"
-
-checkconfig() {
-	if [ ! -e /etc/conf.d/${SVCNAME} ]; then
-		eerror "Config file /etc/conf.d/${SVCNAME} does not exist!"
-		return 1
-	fi
-	if [ ! -e "${CONFIG_FILE}" ]; then
-		eerror "Config file ${CONFIG_FILE} does not exist!"
-		return 1
-	fi
-	if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then
-		ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name."
-		IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi
-		IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g')
-		ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}"
-		echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}"
-		eend $?
-	fi
-}
-
-do_modules() {
-	msg="$1"
-	shift
-	modules="${1}"
-	shift
-	modopts="$@"
-	for m in ${modules}
-	do
-		if [ -n "$(modprobe -l | grep ${m})" ]
-		then
-			ebegin "${msg} ${m}"
-			modprobe ${modopts} ${m}
-			ret=$?
-			eend ${ret}
-			if [ ${ret} -ne 0 ]; then
-				return ${ret}
-			fi
-		else
-			ebegin "${msg} ${m}: not found"
-			return 1
-		fi
-	done
-	return 0
-}
-
-start() {
-	ebegin "Checking open-iSCSI configuration"
-	checkconfig
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend 1
-		return 1
-	fi
-	ebegin "Loading iSCSI modules"
-	do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp'
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend 1
-		return 1
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS}
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend $?
-		return $?
-	fi
-
-	# Start automatic targets when iscsid is started
-	if [ "${AUTOSTARTTARGETS}" = "yes" ]; then
-		starttargets
-		ret=$?
-		if [ "${AUTOSTART}" = "strict" ] && [ $ret -ne 0 ]; then
-			stop
-			return $ret
-		fi
-	fi
-	return 0
-}
-	
-stop() {
-	stoptargets
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --exec ${BINARY} --pidfile ${PIDFILE}
-	eend $?
-
-	do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r'
-	eend $?
-}
-
-starttargets() {
-        ebegin "Setting up iSCSI targets"
-        /usr/sbin/iscsiadm -m node --loginall=automatic
-	ret=$?
-        eend $ret
-	return $ret
-}
-
-stoptargets() {
-        ebegin "Disconnecting iSCSI targets"
-        sync
-        /usr/sbin/iscsiadm -m node --logoutall=all
-	ret=$?
-        eend $ret
-	return $ret
-}
-
-restarttargets() {
-        stoptargets
-        starttargets
-}
-
-status() {
-	ebegin "Showing current active iSCSI sessions"
-	/usr/sbin/iscsiadm -m session
-}
diff --git a/sys-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml
index 253da72600c0..96a2d586367d 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<use>
-  <flag name='modules'>Build the open-iscsi kernel modules</flag>
-  <flag name='utils'>Build the open-iscsi utilities</flag>
-</use>
 </pkgmetadata>
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild
deleted file mode 100644
index 96351ac78990..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 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.870.3-r1.ebuild,v 1.4 2012/02/25 06:30:10 robbat2 Exp $
-
-inherit versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~mips"
-IUSE="modules utils debug"
-DEPEND="virtual/linux-sources"
-RDEPEND="${DEPEND}
-		virtual/modutils
-		sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG}) libiscsi(${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}"
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-	epatch "${FILESDIR}"/CVE-2009-1297.patch
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	if use modules; then
-		einfo "Building kernel modules"
-		export KSRC="${KERNEL_DIR}"
-		linux-mod_src_compile || die "failed to build modules"
-	fi
-
-	einfo "Building fwparam_ibft"
-	cd "${S}"/utils/fwparam_ibft && \
-	CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-		|| die "emake failed"
-
-	einfo "Building userspace"
-	cd "${S}"/usr && \
-	CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-		|| die "emake failed"
-
-	if use utils; then
-		einfo "Building utils"
-		cd "${S}"/utils && \
-		CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-			|| die "emake failed"
-	fi
-}
-
-src_install() {
-	if use modules; then
-		einfo "Installing kernel modules"
-		export KSRC="${KERNEL_DIR}"
-		linux-mod_src_install
-	fi
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
-
-	if use utils; then
-		einfo "Installing utilities"
-		dosbin utils/iscsi-iname utils/iscsi_discovery
-	fi
-
-	einfo "Installing docs"
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	einfo "Installing configuration"
-	insinto /etc/iscsi
-	doins etc/iscsid.conf
-
-	# only contains iscsi initiatorname, no need to update
-	if [ ! -e /etc/iscsi/initiatorname.iscsi ]; then
-		doins "${FILESDIR}"/initiatorname.iscsi
-	fi
-
-	# if there is a special conf.d for this version, use it
-	# otherwise, use the default: iscsid-conf.d
-	insinto /etc/conf.d
-	if [ -e "${FILESDIR}"/iscsid-${PV}.conf.d ]; then
-		newins "${FILESDIR}"/iscsid-${PV}.conf.d iscsid
-	else
-		newins "${FILESDIR}"/iscsid-conf.d iscsid
-	fi
-
-	# same for init.d
-	if [ -e "${FILESDIR}"/iscsid-${PV}.init.d ]; then
-		newinitd "${FILESDIR}"/iscsid-${PV}.init.d iscsid
-	else
-		newinitd "${FILESDIR}"/iscsid-init.d iscsid
-	fi
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.871-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.871-r1.ebuild
deleted file mode 100644
index c83134352a29..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.871-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 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.871-r1.ebuild,v 1.9 2012/02/25 06:30:10 robbat2 Exp $
-
-EAPI=2
-inherit versionator linux-info eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="debug"
-DEPEND=""
-RDEPEND="${DEPEND}
-		sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtion options don't work. See this for
-	# more information:
-	# http://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-}
-
-src_prepare() {
-	export EPATCH_OPTS="-d${S}"
-	epatch "${FILESDIR}"/CVE-2009-1297.patch
-	epatch "${FILESDIR}"/${PN}-2.0.871-makefile-cleanup.patch
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building userspace"
-	cd "${S}" && \
-	CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
-
-	einfo "Installing utilities"
-	dosbin utils/iscsi-iname utils/iscsi_discovery
-
-	einfo "Installing docs"
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	einfo "Installing configuration"
-	insinto /etc/iscsi
-	doins etc/iscsid.conf
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-	insinto /etc/iscsi/ifaces
-	doins etc/iface.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-2.0.871-r1.init.d iscsid
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
-		cp -f "${ROOT}${in}.example" "${ROOT}${in}"
-	fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
deleted file mode 100644
index 0316c2777a27..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 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.871.3.ebuild,v 1.8 2012/02/01 14:21:56 ranger Exp $
-
-EAPI=2
-inherit versionator linux-info eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/"
-SRC_URI="mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="debug"
-DEPEND=""
-RDEPEND="${DEPEND}
-		sys-apps/util-linux"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtion options don't work. See this for
-	# more information:
-	# http://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-}
-
-src_prepare() {
-	export EPATCH_OPTS="-d${S}"
-	epatch "${FILESDIR}"/CVE-2009-1297.patch
-	epatch "${FILESDIR}"/${PN}-2.0.871-makefile-cleanup.patch
-	epatch "${FILESDIR}"/${P}-glibc212.patch
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building userspace"
-	cd "${S}" && \
-	CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
-
-	einfo "Installing utilities"
-	dosbin utils/iscsi-iname utils/iscsi_discovery
-
-	einfo "Installing docs"
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	einfo "Installing configuration"
-	insinto /etc/iscsi
-	doins etc/iscsid.conf
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-	insinto /etc/iscsi/ifaces
-	doins etc/iface.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-2.0.871-r1.init.d iscsid
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
-		cp -f "${ROOT}${in}.example" "${ROOT}${in}"
-	fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.871.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.871.ebuild
deleted file mode 100644
index e7b555956242..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.871.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 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.871.ebuild,v 1.5 2012/02/25 06:30:10 robbat2 Exp $
-
-inherit versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~mips"
-IUSE="utils debug"
-DEPEND="virtual/linux-sources"
-RDEPEND="${DEPEND}
-		sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG}) libiscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_CRC32C"
-CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-ERROR_CFG="open-iscsi needs CRC32C support in your kernel."
-
-pkg_setup() {
-	linux-info_pkg_setup
-	linux-mod_pkg_setup
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtion options don't work. See this for
-	# more information:
-	# http://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-
-	for module in ${CONFIG_CHECK_MODULES}; do
-		linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	export EPATCH_OPTS="-d${S}"
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-	epatch "${FILESDIR}"/CVE-2009-1297.patch
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building userspace"
-	cd "${S}" && \
-	CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
-
-	if use utils; then
-		einfo "Installing utilities"
-		dosbin utils/iscsi-iname utils/iscsi_discovery
-	fi
-
-	einfo "Installing docs"
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	einfo "Installing configuration"
-	insinto /etc/iscsi
-	doins etc/iscsid.conf
-	insinto /etc/iscsi/ifaces
-	doins etc/iface.example
-
-	# only contains iscsi initiatorname, no need to update
-	if [ ! -e /etc/iscsi/initiatorname.iscsi ]; then
-		doins "${FILESDIR}"/initiatorname.iscsi
-	fi
-
-	# if there is a special conf.d for this version, use it
-	# otherwise, use the default: iscsid-conf.d
-	insinto /etc/conf.d
-	if [ -e "${FILESDIR}"/iscsid-${PV}.conf.d ]; then
-		newins "${FILESDIR}"/iscsid-${PV}.conf.d iscsid
-	else
-		newins "${FILESDIR}"/iscsid-conf.d iscsid
-	fi
-
-	# same for init.d
-	if [ -e "${FILESDIR}"/iscsid-${PV}.init.d ]; then
-		newinitd "${FILESDIR}"/iscsid-${PV}.init.d iscsid
-	else
-		newinitd "${FILESDIR}"/iscsid-init.d iscsid
-	fi
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872-r1.ebuild
deleted file mode 100644
index 6a46e747abd1..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2013 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.872-r1.ebuild,v 1.6 2013/01/06 11:10:30 ago Exp $
-
-EAPI=2
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug slp"
-DEPEND="slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}
-	sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtion options don't work. See this for
-	# more information:
-	# http://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-}
-
-src_prepare() {
-	export EPATCH_OPTS="-d${S}"
-	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
-	epatch "${FILESDIR}"/${P}-glibc212.patch
-	epatch "${FILESDIR}"/${P}-dont-call-configure.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-isns-slp.patch
-	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch
-}
-
-src_configure() {
-	cd utils/open-isns || die
-	econf $(use_with slp)
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building userspace"
-	local SLP_LIBS
-	use slp && SLP_LIBS="-lslp"
-	cd "${S}" && \
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		user \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die
-
-	einfo "Installing utilities"
-	dosbin utils/iscsi-iname utils/iscsi_discovery || die
-
-	einfo "Installing docs"
-	doman doc/*[1-8] || die
-	dodoc README THANKS || die
-	docinto test || die
-	dodoc test/* || die
-
-	einfo "Installing configuration"
-	insinto /etc/iscsi
-	doins etc/iscsid.conf || die
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die
-	insinto /etc/iscsi/ifaces
-	doins etc/iface.example || die
-
-	newconfd "${FILESDIR}"/${P}-conf.d iscsid || die
-	newinitd "${FILESDIR}"/${P}-init.d iscsid || die
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi || die
-	fperms 600 /etc/iscsi/iscsid.conf || die
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
-		cp -f "${ROOT}${in}.example" "${ROOT}${in}"
-	fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
deleted file mode 100644
index 3699a18a289c..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 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.872.ebuild,v 1.6 2012/04/03 17:13:59 sping Exp $
-
-EAPI=2
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="debug slp"
-DEPEND="slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}
-	sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtion options don't work. See this for
-	# more information:
-	# http://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-}
-
-src_prepare() {
-	export EPATCH_OPTS="-d${S}"
-	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
-	epatch "${FILESDIR}"/${P}-glibc212.patch
-	epatch "${FILESDIR}"/${P}-dont-call-configure.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-isns-slp.patch
-	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch
-}
-
-src_configure() {
-	cd utils/open-isns || die
-	econf $(use_with slp)
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	einfo "Building userspace"
-	local SLP_LIBS
-	use slp && SLP_LIBS="-lslp"
-	cd "${S}" && \
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		user \
-		|| die "emake failed"
-}
-
-src_install() {
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die
-
-	einfo "Installing utilities"
-	dosbin utils/iscsi-iname utils/iscsi_discovery || die
-
-	einfo "Installing docs"
-	doman doc/*[1-8] || die
-	dodoc README THANKS || die
-	docinto test || die
-	dodoc test/* || die
-
-	einfo "Installing configuration"
-	insinto /etc/iscsi
-	doins etc/iscsid.conf || die
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die
-	insinto /etc/iscsi/ifaces
-	doins etc/iface.example || die
-
-	newconfd "${FILESDIR}"/${P}-conf.d iscsid || die
-	newinitd "${FILESDIR}"/${P}-init.d iscsid || die
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi || die
-	fperms 600 /etc/iscsi/iscsid.conf || die
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
-		cp -f "${ROOT}${in}.example" "${ROOT}${in}"
-	fi
-}