dev-java/netbeans-java: removed obsolete ebuilds

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xCFE47E2F

10 files changed, 9 insertions, 2370 deletions

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index d864c0a253f6..4a1f4cc57ba3 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/netbeans-java
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/ChangeLog,v 1.28 2015/02/04 21:38:45 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/ChangeLog,v 1.29 2015/02/04 21:55:38 fordfrog Exp $
+
+  04 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  -netbeans-java-7.0.1-r1.ebuild, -netbeans-java-7.0.1-r2.ebuild,
+  -netbeans-java-7.1.1-r1.ebuild, -netbeans-java-7.1.2.ebuild,
+  -netbeans-java-7.1.2-r1.ebuild, -netbeans-java-7.3.ebuild,
+  -netbeans-java-7.4.ebuild, -netbeans-java-8.0.ebuild:
+  removed obsolete ebuilds
 
   04 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org> netbeans-java-8.0.2.ebuild:
   restricted compilation to jdk7
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 598d5da6ca1f..d84c81d93f46 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -1,103 +1,43 @@
 DIST 0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar 132323 SHA256 e3591d9a40c8829eca5f12a12513f3919be4b07923b0aabad1ba4b9f472d79d1 SHA512 4aacd1a1bf7a177e496d604af5d55a05efeeb3c3d2aa6ebe7606bab9278980dc7ef37ef6debb405bf71bf4d4907b8ad2792a7a224987f2ca02fe7fa1be6808d4 WHIRLPOOL 23406d70f15bf7ddcda79a86985b9978a3b72fafcab6e8e3c665cf0958cc07aa095e9a857e5d9c097de52fe6d2bc4f0216f7cb50d4984d83e14d9fad1eba3e53
-DIST 13BDBD486B15C1C7FD2D8392FE5D62D5A5AC10D6-eclipselink.jar 8613667 SHA256 61afc55662d2683adfda5c5f17bad1f1e9ec1911a1fe086a359cbad188fac0d0 SHA512 0c9b58ed573d5ab378eeb11394e1c0e27ec73cc78809b58c53cda3a178c633b65334067c4a43da1d9182e7558304e221306ac1371f1f26daab6a3187f2fe1527 WHIRLPOOL 5b27e0ba67c6d32eff5f77b99164a8a5d1061dfce5432984d884b4d0cea0e014f67dbe38ac17323a22f80e27e04714ebb552ed03d693d1ad3e452cbef3f26967
 DIST 1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip 2266616 SHA256 0a3cff406a0146bba304253003dd8bfa5ce1ab10b115e7789f410a61e4e5294f SHA512 5cbb33bfdb154d0816df4e0dc131e49b40bb80df410b1164322a996c1ad4e26726a1c26c6ee2129f9f74627ddfb8368139c7b0fc7615a2ee2e2c49f2a38f350f WHIRLPOOL e5c5eb631f6ed151581f173b2365769733de89d50be8ddc0e3087a71a88a320e32524a835d44705d42e9c1be0cdd468e3af1784928b200020e266de2166359c0
-DIST 1FC667D74A0BB8B767F6974099F6C282C0D7EEBC-nb-javac-api.jar 174955 SHA256 ba97ad115955e917a238677a7f44115a61ce6931237b7512357e4c3ea1fd0e6e SHA512 77dfb011f9c5e6b33649101c64ab869601f1c7b3f729af8365fcbc3b6798869287d655809808fc0eb70666cc73c9d8efba252e835b72a5978d302a46306714e1 WHIRLPOOL bd61095052e097b5aa339357acf46c82def35305ee8869faac340fdc733a3851867c6ebc60138b5a4a9854ec549b5fc0121f65462809b172e27b05d8517ea6dc
 DIST 204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar 24791 SHA256 65b2b43e50058f8fbdbc8459167abc4af65b502b6b44737a2bc71fd94d13abff SHA512 30b32697083be1d3f4a603d35b4753c2187109718ddf2e877dea6a441ee467f0d81c61226798cdfc5f327500589586c10b29fb18ce64d9a014f5afcdf24e7662 WHIRLPOOL 46675cef2127e0195617b7f18af5d04e1840668d6a4deb06ee9622b1cb3c138e5aa68bc2f639c33344c81f65372d273fb8e2611ebaab176ee31c9a9ab3b3ea6f
-DIST 23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip 73250 SHA256 5682250c4b676401aac7434fb402fc740a41932dd8f85b5b4a68fb8b02d620c9 SHA512 d2d9cf7b2c3b80d816c33ad081cb83f8f00a0b55b530eee2a45e97c728d10ec19a884bacbb532d55e46666546ba7da480e45a5bb1cb9b20e0f65223582fbc6df WHIRLPOOL a563976addb791deba0dac3fa05681c6807e93c0da5295d0e46e4d35d8f30d9960ed5bbccd73796c2de7f0c61584cdac7ef8e95060749ea22bf3961f169eecee
-DIST 263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar 11516 SHA256 b0423ec165cd14f378fb1a929dc671d1360eb1183a596de583b5c3366b772b8e SHA512 0caf3ebd92e29360a48fe134075b7e6b544c25b05750026f3b7756d488075794cdc0623ab45e27ab020e9060e293f49453ded863a6dba42bead6e77fe8f6bef2 WHIRLPOOL 71f5ce13c64a7db0cc5bfb604cbdd61de989603d27a8b18ae68fb1829d488931169618b82d907d5c59ad7c1e5eb87f5e0cdfadf308d80d17daf5150fe8f64d10
 DIST 29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar 1366247 SHA256 4eae7d13d7493c86df8b84b9a922dd9e8302e47ac80efcc47094344ce64de27c SHA512 06d887e5cd47b6bd86ea9e1a26c604b630285129dde43e6068d4b36f0e81c39cd91757e3323e77316e76b0fdf8c18a609bd216c7103ac8a4d947abd0ed6bab47 WHIRLPOOL 27c9f01d85f31781bc76411701ea5668644d83ec761f9d42ab93e3932cfefe5a6277429f889a6f9c68ce9efeb2cddaecb6ae8aa2c42ce8ea9b3a06305f2657c1
 DIST 29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip 4889768 SHA256 56dbc271fd84baa0e4b045f07b67b55a003f824833cde8689d4c7c85ddae04f3 SHA512 cb6097f7662c408fc1beed0775128fc089a4a287a9e74e28d75cad5f1100931c8c4dcdd13040e5aa15eea1ca46517876154ae7bc26ae5225aa45403e108c6195 WHIRLPOOL 699575caeb7f068e3934766eb492d9bc8c6049a9ae0105e43cd9ce6eb380f6f1825c0fea00325862e587b0161b5459b1c3417503e053e655d20f018c69f4d520
 DIST 2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar 227233 SHA256 7bfaa3a602bf388094c8fcfba989f0b121c0e71c6df4c3328244615a5cb24d59 SHA512 7669d2e11346b62420ab9db2e9a5a24bcea356099ae4d6f0a57c75ba168de9d24160277b8f044ca9a5f637c2591778150288a963787b6983d093ad64fac83550 WHIRLPOOL ba0f5a67dbc3a64ca0b21cb1f1a74b4e9b2d2c4d7a5f127de9940f375b70d0bc321f5ce6aa607bbe27d39dbdfd1d179b1457b5fcef65c0a0d4420e1194657192
-DIST 2BD49695E9891697C5F290AA94C3412DFB95B096-lucene-highlighter-3.6.1.jar 89203 SHA256 9dd5669f10402903e0f5e1e83c72b1622b84f5ba1fbcddd1dfb35e9a4034d11e SHA512 b8415376c5ef9ed0d97735207b733d3ba455c5fc043b19f90d4fd298241f4426e04fb62304bd9d565c6a6c61cd3edffb77fae3cb6fe2c7794df3532a278e0048 WHIRLPOOL 6caeaf93831cb58ab4e2bd7d0a531a7443539fcbf9dbff25217d7c5cdf53c68f50963782a8f7ace7a3e0ba758c30509fc5fcc16008fcb08906f20ef106b0fff9
-DIST 2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar 2949032 SHA256 246e5a55e92a3b4bcada2e3793b33fd460331beacf8d385ef0ffffe9318e494c SHA512 15501ef06a5ba73eebaa8e4b8065ab80b6d81eaf790573ed8fcf90de49dac85414c45a77ad39a974e4e9b0c2fab6835ab2719671a77eb438f0e415523d8e34be WHIRLPOOL c4293118c96e739c898ef69d7611df7aadb94da187200f61ce40252668417c85e97c46ad3c063c0e0253a929cc4b70de033c2792ec4575496713193e838dae36
-DIST 2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip 3195366 SHA256 5e7ed2618a8e9278ac2caeb5d0f46b95df6f59277b7b51b1976dbb74820d25d1 SHA512 96a403980c0150ad6274189f95ee9ac59d18df649306c1e4299c68416ce06228f12d1d70e1201867786a1acf5404d4f3429ac95f67d5dd3f73ee91e1900557fb WHIRLPOOL 6583e9aab0bfb4bb00c517aed504c6eb5e44fd343e65a2ebf66f7a0c68dcc864c93713863689647765988d51a78f568359f5919815c689549c80775e379be227
-DIST 33693E782E0F99CA7E2DEECA0222F493EBB6BC82-eclipselink.jar 8318722 SHA256 7e3c0907588f91ffe0ec255e76a325ec743320f45dacfa149b738859f1587cb2 SHA512 0228388b7f3414dac0d4e274a42f72a184d4f8cf7299224b87deba5a353cb61327489723b4879a00b50df67a9323c3cc9667b75e2278c8b9bbf467b24cca7750 WHIRLPOOL d42b1c7e635a3f23775991e73340fefea0805a3e5eba3fc87d1a4f522bc039eaca1fa669135c53e348c63a02149c48cb1bdd8ab5dead40ad1920b0e930796165
-DIST 37AB23511498C4A55B2F15EA8EDB18D754E6CD8F-indexer-artifact-5.1.0.jar 23828 SHA256 a6b182a1ce536842f45489dba4fe13d194dcf801307de6d5cba5f01590966336 SHA512 f92b11e7fa5df918db9c5b1df618a4f6c0fc0f81febeb652d1afdf9d8a331ba6736696d2257e2172026dd194840db3c487dd2f6ef8a1f4065b4cd32585748dfe WHIRLPOOL 6f3580a6afc9c22551f9703b11ae24442eb40491d7f8ef8ad849ef49701181c661a72b4cf456a36ce011efbf8a820c9888119bfe69e199f05e51aba30bf0af2d
-DIST 3A33D0056725FC9ACA375DF19327BFB8818E3C47-hibernate-3.6.10-lib.zip 7399211 SHA256 b34d35ca0704f22620d662e027e169aeea8a1cb03fa59effa92c12cfecf6bf5c SHA512 29e3f59360b7926cc25d233d7f8c05557eac448be05e444fd88a0867e76425f76a4c92a0e0b69f2437cf3c66b8ab8dfe09b974d865331b2ad15941aa5091e888 WHIRLPOOL 8f9a60c292838f7b5ee0d3749392bfae63264de53142364d14e8dd2636386ec850a9219ebc62049e8b0ff9e9e78f80fe192cb20726b30aa7af3785041f2ab48b
-DIST 3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar 126856 SHA256 28a500f9150a9b7ce76179d0ec13a7227032c4997d226e5685550ae2c2e54393 SHA512 185908185192ae9a3f9aab1053688debf992df56301df249f30facb7ea624ac7eb86ac3d7f36b1244dfdc1d7ee8941be5be0f8eb97a02fb853eb7de0c0d42145 WHIRLPOOL a602303288638dbf551db25edb662cc98e0af9dfd773a7d45db12e124a5534e4a2cd7a93e3b15cd830d9f100e8134d2cd1922bebbebf9c2963b508b23fefeb8a
 DIST 3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.3.jar 126856 SHA256 28a500f9150a9b7ce76179d0ec13a7227032c4997d226e5685550ae2c2e54393 SHA512 185908185192ae9a3f9aab1053688debf992df56301df249f30facb7ea624ac7eb86ac3d7f36b1244dfdc1d7ee8941be5be0f8eb97a02fb853eb7de0c0d42145 WHIRLPOOL a602303288638dbf551db25edb662cc98e0af9dfd773a7d45db12e124a5534e4a2cd7a93e3b15cd830d9f100e8134d2cd1922bebbebf9c2963b508b23fefeb8a
-DIST 3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar 126856 SHA256 28a500f9150a9b7ce76179d0ec13a7227032c4997d226e5685550ae2c2e54393 SHA512 185908185192ae9a3f9aab1053688debf992df56301df249f30facb7ea624ac7eb86ac3d7f36b1244dfdc1d7ee8941be5be0f8eb97a02fb853eb7de0c0d42145 WHIRLPOOL a602303288638dbf551db25edb662cc98e0af9dfd773a7d45db12e124a5534e4a2cd7a93e3b15cd830d9f100e8134d2cd1922bebbebf9c2963b508b23fefeb8a
 DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
-DIST 3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar 703702 SHA256 cbd15f322f4c107a1701dba6a98075cd33068bd4a1a52afbd8559c23a99c1cf7 SHA512 cd22c28ce591649c517fbca6dde8f035b39db0b2f0c15b5de06d3e4174eecbacbaf4c03cac211a53dd281e22c9ff43a40dc510c3c539d0717f09cfaa1bd513f6 WHIRLPOOL 50c92b6d6f1bca66c812243ae66ba72e44fc56338cb877682b4fac12dd48f3fdff9453b39625edade7f91413b13204f6b4aa82dbc0758cf63357bf8bd5888f81
 DIST 481935A7F53B55502187BD3C28C2BC0D957BB643-org.eclipse.persistence.jpa.modelgen.processor-2.3.2.jar 11465 SHA256 e94d66afa66402646b85ddeb6efac49a7ddd55e4c1ee0fd972f8ad3d04020cae SHA512 eceed1a6505450e0e09de49d1dac99e5b66530672ebd3e252e7ca717653ca521d6618b1ab595ac183cc76cc4a4c1efd1282a1784a9fd86aaea170273cdc4c33d WHIRLPOOL e292b40e5a7b40a5f79299c02daf497d419150809bab0d02365a685b16fec9f8b9354b87b58133228a22db7b61e03b62dca20e395c21b5d610eaa1ba1e2c6795
-DIST 5282CF4CDBCD0210798283E0E35B3A1FDA994D37-hibernate-release-4.2.6-lib.zip 13136531 SHA256 fb46270982c080af55818a610ccb8f77b5b4b85a7cd3edd8890a86f57b78a4a8 SHA512 dc52c97310d05b432a1d4ce667c00e870030c5e2ffbf413beb2a566e5ecfa7d8f3855ce4a806a8b57dcfed6600f28f0680d5bd871a0dbf0c984c9bbac252bb44 WHIRLPOOL 9852a28bdff03a67b42993a97e70d7c610a63dd26e8ea327a8a10e5d88b51624763f921cb2b67f37842cfdd1d8d0235e55e753926643c2205314da31bce4bdbb
 DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 SHA256 0c05ac203cfc63f1a6d59dea84d915220e18e8e37a57cfbb317e769f992f3e8f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1 WHIRLPOOL 88043adc7057b68647d9205782e46a2d7824533b9a46366e7949459e88fd2ac7be6dcd1bc1c7371e071c7efc5fcf6d3956c211f97932cee0e0a4f47c58db6983
-DIST 59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar 2286677 SHA256 763aeee3fceaed696f61bf14f922ea9c6abaa0af2afce2ec586efec32e677074 SHA512 66fd44b2a3e0845e8bf1a8725781aef247bda1717e87a777a6ab8b8fa28be5da4a5710fc00262c17079a6afc43b80c89dcf9ea4b074b953425f16158b163ca31 WHIRLPOOL fc6ba93a2ba88feca14f79454cc6cc066d4b7508e2f52ac23c27d57f9773db82704626b57e0d9b9b19fb7fb7a5e904fe7a534b7d321f6dd43542498263389399
 DIST 5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar 162126 SHA256 227c4888011550cad0aed4c07e187b9f8e873c01558a08f014d288987415a9a9 SHA512 de26d1e19a625adb040b6aa870762ecf8f1ffdfb2c82f58cc7a82f1a029249862dcfd39b6a995f63f04d9b36ef23a8ba8518c9cff1b5e2242e6ad5268790b5ba WHIRLPOOL 20dff7b96369cda98dace4dc38f7e013de9ccf7119047183f936bd58e1d8c6154fa913f906dd1996d8e989d16a4e92502aacf937f730a8b63728208b96455a7f
-DIST 60169962AA9DE533DE6298110E54880A1C8B0C01-spring-framework-3.2.3.RELEASE.zip 5650499 SHA256 0a0f2ebddad501468949fdd004687cf3f6c8b2eb710f88012556ec4281e81837 SHA512 d3f4d5a6445d1fc3aec121f589a11f87fe472c6791aac920068955be4299b54f832902d96fa47732b138ca5860284e0dfae0c28c20fbb4e22bf054de4f8b34ce WHIRLPOOL b2da7fb8167d9ef036937da7c0ebe0c3ca8cba3c65ddf344b33723f5b4614422d6ab65f9940b2e1fa9af3382a95997584fe1f153310275f087b07089e3c27868
 DIST 653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar 34559 SHA256 dbb8c53ccc0b16a9dd8370d6e7de63102468caedac1e5fa2eb418319a6875293 SHA512 d32a2f280382fd1b783baac8ef17bdb9853455a9645131cd35325ac04b78e128506fba0b1926d1024030a66bf9d2bd43ce9d5bf4e46ca2738790d4685cc615c3 WHIRLPOOL 1006171abf5b00d4b1a16e741f6a997e4c6a34113d1db2f4149ef77ab2e41afec63c17f72394fdc9537a13516be555ceeba23820eaa24a1cdf5bcec89daf155d
 DIST 663FA7BA7FD8538E44DE9FDC5315C4F733C13E96-org.eclipse.persistence.jpa.jpql_1.0.1.jar 704059 SHA256 4d31c9c6c2dde44fd3c7a0fc36a188530fbd67eea541a00c6220d71be015c616 SHA512 6a22b5497fff262ab7c722d8b2e1905e8a1e9d9603bb05d050d6dfabc6ebf8b7055303be3e7fb83fa8a2c77410dd53a1cda140102bb778f14b325372d3b1f7ef WHIRLPOOL 4db06d03c759297762c48b237798037e60b7ab41c051eec2090d9133a6c8d68c248cb229a31ea6bba33eba51a2a812dc3504c07664863ac8bc53471b30226254
 DIST 694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip 5870668 SHA256 91370093a4dcf8fc434f06039da0ca1a359530c665da110a97e0e2fe3ea84028 SHA512 49a0854318678ec52641babca57bbf57ce8d67825dc9b0565df77b8fc6bc90a2b02a3ace7dce737de49de2eb7d1f2885ca901350e8826a63c4dd5381f03fcaa6 WHIRLPOOL afbd6831d26e66b9a318e2ed060b2147a51493be68ec8c97ebaa6b38808bf55d52ad54ad20f520299d471cd461bcfcd70a48142035a51ed9732c37c075f3a970
-DIST 6AE2C83C77A1FFA5840B9151A271AB3F451F6E0C-lucene-core-3.6.1.jar 1537987 SHA256 65daa20a1bd247a99086a9c36fd2469f8caee9f482a663ba63a41f7ce9c25e3b SHA512 9c51f5039e66fdf73c1b41784d5ae4cafed63dbbcf7d57d1f165cc54c07c4184335ca1ff4bbdfb8288eca232da5c3c8ad0712ca98c5cc686552a7f7782bea0ad WHIRLPOOL 4cf5cfec25762309fd9c8679edd2831a2cb7cf4d76a86f1a220387a3070d1d9a8544633bc4ea2c791e70a5914c9f75e1cc9992341ae5175d4e8d2f24914cf1f5
 DIST 7306EFB94B54B650A21AF595913219D7FA85FB12-nb-javac-impl.jar 1785093 SHA256 4f7d8241224f2d5bfe4463bf11936d11af7b707fc697128967e3265c8217d0c3 SHA512 a6a4eeaca654fa2cd72c2ae829eeebb40372f08514bf815c45abcfcb958f2b69e9fa007944a6ec6a1d6de5d3e038996151b11127500e9e7f6a67e40864983f65 WHIRLPOOL 02f21aaaf35ef1532554a24bd55dc65fe271ecbb50e7b17d9b34a50c22d7e858b01c0ee974537b537f49c57d5427da7a24fc2a4e5b8455e1723ce560c9353cc7
-DIST 7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip 4155185 SHA256 22cc81921af00b1bf18b1c1b14a4f61e2882d5a2335b1940797fda2b2b4bd8a4 SHA512 706231b1325092eec77984a8bb707a92f73c35a5729098e81d94447b3f4fd359d26aa73e786d57efe97d46a4b0c5803770f7d3b945d7701e3434cd2ad5c8932b WHIRLPOOL d4b1fa71d136b83be8df0cf12550728f5e494ed4a265ea009cb252b5b3ac65a6eef44bc673b187f207f50c10aa51e67629c06460f4a88b6fe3bcfc27127052d7
 DIST 7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip 5678488 SHA256 368284af56e08cbd0c4a696663ce6f484eeddf4d710a14066da470ac9ee2709b SHA512 d49f22b3ce2bd49f3ddfc35f86c0c21accd45a07b710b0787560b9969e40700d408a25e8e02d10f0d937ce642cbcab222d4e8fa28bd442e34c768b63e5583b41 WHIRLPOOL ec07b768abdbe9aa8608c36aa6bb4641dc18bdfd21d93974f82ddb9074b1f03da17fd043a6bfbfb98a8715c8ba16b5fc2585e9b0d47119a6573fb0b446ae9487
-DIST 7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar 11465 SHA256 2f2f412c975f8ca54175f4d205d13e3ce43825ddcbd3bb69134257165f701196 SHA512 7c707084917554734e7b67c60d69e78cec8cd169bd4fe9a4ae2706bfea0c5c78f6a1baa2b1f6948b5df78614ef5cba117244f5b79b15d5c6b58e220aa4a2ea22 WHIRLPOOL 795f107d46e719d757e4afb04de781302d2c057ddfa0f30e82e2e43f3395c6e7b53879d0759d1288c3f71da92fbff117e598e2052d6d2229ae60d2bd6b321709
-DIST 7F267F8656463BCB6D7441D3F6436C8F516AC18C-org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar 1365645 SHA256 5cc5b83ce3a70c5b97ca2f125aafa438a24815ffb5510ee39f78964e56cb7bf1 SHA512 955c5cb855fb2d4ed820bc2f2826958e3d0da540ddb22539983fad89a4067e50a2c857ba7c05d7dcb613175dca5bb9dc97e40107e5b9eb43fc18f138193dc0ad WHIRLPOOL b74b495b143acc981c9e99727dda2fea8ab226c4065e6a5e0f6d85c8701a7d90cfab311b620aa7635a404bafebaf43a6eeddefbb8c75f81769006f81ee77b086
 DIST 84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip 4599034 SHA256 0a4a0c3e24bfe028a7741950347086e5aa49d8ed1fa59cff5c74c23f28bf8685 SHA512 5058624cadecf56182afe021b94b4ef10375b217000155a30d6f16d24286e985d472deaf47271a8239c15b5941a412b58c918e5f0684f5045690be322e0acc5d WHIRLPOOL 4258ce692b381cabe0b2e345c99f0a0e6bba7e5ee7eeef2604bb1bf686d549199a270fbe9d380197d5ede660da20269fe2ec75bdb01950dd0e71b73ba096ea50
-DIST 8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar 1672677 SHA256 be4a7722d0b37ef497ef2a08876abb4f8e89477383501efb53a1975abd5063b7 SHA512 740d399093a63563d1e7b2ee2518f1422bc6203a86666379253db8c926b818d33a96184f862450c3f06ad6ec926931d42e95641db5047f18926c4cfd17aa8118 WHIRLPOOL 1081d93cba4f5af2d8e9e50d547724e13be503dcc9b317a4454a9d37fcba01bb9ddf1b9d5a0d5ef245f4129ce5b3782de94e1966fbda536b9c37b7f827bc35aa
 DIST 8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar 2759394 SHA256 3dc7e0c55b5bab5daaf38344ec079ccc5a7acd672c7b539dacf8d55b377192b3 SHA512 e15bcc568f3cd6aa0ebf362f0d09e2380a4e02dd67a6a62970c8614bcaedb9d043828d99bca12c207010116dcc062129adc7e87d73170002e2ea9b147170b5c4 WHIRLPOOL 13cf4685bf778014bc347e2550266cde8d2d43051f295c6a2c3bbf7e6259caafcec3e9bd717070972b469e46bf32c5360009b061168d8834c8c595911f616970
-DIST 8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar 6383304 SHA256 b2e19c48066648bb30f7e1763d3049c1537b4816bb385e3dd47157bc11077963 SHA512 88ace8fcf2d162f1f144c2506dda8cce9e971870cefbff86d4b8d1acdccce7da8c0fa3872785a76361169ca335a2a003dba3f7ee02b91aad57fdb8a9f3ba820a WHIRLPOOL e9fe8670ebe73a4f75e0bc60812e53fe801171d57b177bd632fa88008f0d271c8a7ef116edcb289607d39c3aa3012d481a7d56cc6265d0ba708818496d117a8f
-DIST 8D36897DA80FE60AB5263534A3CF522F466E8200-ant-libs-1.8.4.zip 2269333 SHA256 7a7d90a0ae0edac9afedcda96b923523fe6d81a11e8e3f11bbfa1f55a8e4ce8b SHA512 1692ca2ca23e04a14eaa3037c51e6c2cd3d04583135e513946a6a389b7192bf4c9bb90b43cba228afa0226d9a2208284de241d224986675625e6b406c8265deb WHIRLPOOL dc68e1d21e3ce466a8ef7b29d22f3e095114840b4bccda6dc970ade0507f9ea29153af5c38ea480377a3aa6cffecea9f4df2f5f82cbb0aabdabfef36ced8770e
 DIST 8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip 266314 SHA256 36c3189a2d495bc713bfeac0eaf05612fe90d8df6c3c20d943bea38d290cd375 SHA512 f08cf953e56966a239d3ff31adc1b3ad74aac76207c4f92d860b13a2ddfbc6cb9ebe8223959ebebbdc6eb8f358a170ff8de544e58bf72a7c12eb101c32b02f46 WHIRLPOOL f3734e3b036eb9e8407478c9b27f86b616506db89d6b7411b531679e89db62f69b0434c490d9c2b1656887d1d8ce2bfa2f6464821a19e0b2b67a12a9da11414e
-DIST 907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar 2284306 SHA256 4284a90a28993a18379c5b682eb63a77e6eb2911b5c1f2a60aace19b4938c91b SHA512 3260f3665a8ce2a47e72af3cabd3249b6d8581e8295b91e4c9401bd0c3b116c5259e2187152c3b622e162f539bd04e544a3e3005496f522ee2f804c5d7ae5918 WHIRLPOOL cdfc3200f2b8ef196394cd8ba5916345f27c8fa4437253fc282dd5ee8a6d4ad671640fd6502692df5997fbc2583c24d20c67a6cfbaf76b80e3ea13e40a96ebfb
 DIST 90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar 6541344 SHA256 318137800eda8d9ada333e001ab0f7eb24b16bf2d9896736c1822efdf78e784c SHA512 8e50c32c69cc2d201645411b775e1c26c3adb89bce839135621838b5e348f08805157b55c0bdd1154e3489f3b3374a1df027714ec2aa3d7cd405eda19c843568 WHIRLPOOL 7156f54b77175fcc9c748450099a81077e04f4ca105a9ce32c5caf0c5e58082eb2175906f36cb8fb6362cb5f350226526a15cace271d8f38a033aac5345b76a0
 DIST 91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip 6377019 SHA256 4257d1d0586bffbd66dcf3bd97913b0ec0e82f9f8dfb9cc4d3c74f0d82960240 SHA512 b43fce0d1e39985395b3f161908d52a3c7eb4b1d70b9f0485cde5b782c2ef861594e1f49d71059cbab8fb71d5fbdeabbdb9c40866b9596bc8677359b79876c99 WHIRLPOOL dbb3a33546aebded4fef949a54d02380e1d202d09923e52e3f3d3dd8feb8ec77dc5f997d815e271d3afa649a3f445943f365233d04a63673fd1b06baf0e919de
-DIST 9B589FACB68780DCF96121A893F97307D47116DF-nb-javac-impl.jar 2671929 SHA256 cc5b0fa9d88fbd4d442ee470d1ca24e554e7617d014e866b412dc8d3abdbb37b SHA512 03f1848dcb3cd1b8af2c20f09b2fdbd2a403f021372224ef2bcfcdfe3c145b6f01fd057769715031cde4289ee178cbb6eb649d0e1b3c4791002759194bd941f0 WHIRLPOOL dac02d46c1391cf3c2fa0400591532ee0b417e420abd85567beea862ca5f6a07fb18b9b00d74ae22f9f038bdd42243550a9cff6f2b619a9a44f413ab2febdd5d
 DIST 9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar 1539086 SHA256 cef4436bae85c31417443284f736e321511cd1615268103378a9bf00b1df036d SHA512 cf8c1218f59a20e4bff22a1b179299e632258dbab92992b6600f1af3ddba1ffd10daa709e758deade56f37dc34245bff23a0789b0d57c97805767a1639602653 WHIRLPOOL 56fe9714058c7d661fb39e4d80becf17c799a9083c1a236da65446897e3c1e81c2773923b7a50dd4b3ad396b182731c750484da14965d1ee263c74d051884882
-DIST A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip 3076808 SHA256 39d928daced5072063fa3b9da3b6826ea2f52c4aa9082109eff9847fc1a442f1 SHA512 5eddf64c33b9edefc242e77cc0e8304a71d8c499e5871d2c595d6fa6d935eaba1b52bcb7ffab19437936a658c983a5d13f3721cbafb55bff3097f437aa7b10bd WHIRLPOOL 767f0fc697507da3164c8e70504cb3a0bdd6b66579e993c375d713c813724129ff7fc20af737c2d43d78309aa54a82e37b2582378e7e7a376c41a5c3193572fa
 DIST A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip 675425 SHA256 088464e2a7e6650b6f57434087ebe8f48947a3d343986741d79ca6bb23624b67 SHA512 bff8f89e96ae7b5cf22bbdbcbf95c1b6c789626a4f3f972a7216c3a545b3f85a67950c022f19c36edefb8e3fa605968b31e267166922dfb46fdd56bc16e4bd7e WHIRLPOOL 13cc312ba143fed133394d054d8a2b4f086d0dc9f5a5da3bebd83a62c30109bd16c6da5619ee6f0c4d66160280f6659685730f98e46063686aca4d4df8ef9fdb
 DIST A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar 89171 SHA256 377b2ddcb7c902daf5dd3d22a1ff5b8da4ad6f7fd6c5e5da4731d17a8d935534 SHA512 b66922bb86a5eb787a76714a6bf2c2adfd8469ea9c3031d9b5970373f71a2349b1e8156213397b9119cc9510e48905b181388744bf2189e04e18922023dacb12 WHIRLPOOL 9a5c93989dd79f803e050189d5cf1e741f0a2a1514b848fcbd51ee868125533a816525738f491da1f0915050343b73f7f8b58e4fe35230610a20b13475143663
 DIST A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip 19717645 SHA256 618aa42390667bd4cf2343edfe134f5665d9815379ec311c3c776c9dbd21831d SHA512 160fa0353baa9b31090432053a2d602fdffa663fe1f83ad79de4788ed74d3e5938d0bba0ef28ff4a946e6bc99c3a629b3fc8ff7d44ada98348fee816cb39b42e WHIRLPOOL 23408ae921b1712584eef8d51678547cf24ce3db75743524cbb046511cac60f162ab46e4c3b65e639d9c8b3f2463b674791f491d6e377ef69207ef701b7dbc09
-DIST AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar 1673570 SHA256 a8f7a0047d8ca6021fbb2deb8c65ab0a658f10aba1a99d451aa05f25e1be171d SHA512 09a5cbd69ad2e06fb7721063d01721188f715ffd87c594b496d376b53c72fafa366dcf5e8652d95d1cd4f51de35df7fc835c44dd9bfd73dfa6f357665dcd6ec2 WHIRLPOOL ddf3ba6988134b6b0a563757356543350624dff96eb83a9348331d95cd9a230c27257ed0bb5581e5812a9c964f6c3e12a8ee6f5359a8f4ddee93092089b5bb35
-DIST ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar 130227 SHA256 c221b2ffa32c021c4219883ff43e20bbcb90644996cdbd18f8625a1913009f81 SHA512 0507546ff9e3c47dbeede6930d672842c4240a15d530875f8cb33ebd20a01204ad6cd1996dc9f18cecf5abd5c4656f5faa6d0e870d5b3db9ab07426292c7f9af WHIRLPOOL 3f8b6711b8586d44fbd6b6afddd8577a5e8cc63f36d2476768a2677195194d4abab4c94715ce3221c745fc7b29b8afd04e81f4d10ee39836cad4913e208dafaa
-DIST AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar 24703 SHA256 d542a451c09313576942e8c201bdbd4a8545da57f9bfe9c9af9712945add6766 SHA512 2806b1eef19c270bad1b5ce2009925e086c6d356f1a530033af3d7842d324a3dc0fe4d83a23ccd75637c57ec23985430ad54ee2134657d51830dc6950bb59d22 WHIRLPOOL 73387e7fd849eb6b0f4c5aa732b51de4ca189c67338ac76d6dcafd22bab5c982813ad2004582d4854e0dd1f1bb2358a748b92c11ae8b61b88fe1f3a79ef5443f
-DIST B1D9BFCBC513472E819CB6C7E1018D26439D400A-org.eclipse.persistence.jpa.jpql_2.5.0.v20130507-3faac2b.jar 1396640 SHA256 a1ab1845519fea0fe518a22b0af26af50b5f69d9e19c4f0da8a6bdb750cb9fce SHA512 32d61be04151799ddfbb9210b88c7adf5dc4a2c4d134cb9cfeb75751327d431804dfbce478cf88af1815ed6e958788f7de9c74f0c7b251dfb5cd11680dbdc94b WHIRLPOOL ed15339405b093b50f1502258f96d568b30bdef42e4eefe80f0f7ab5e51f396d8e2c2e9d714ffdf5d24de6c2bcefa730e8bfbcab393b236517c197343a5f5d18
-DIST B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip 301845 SHA256 0667f86903d97f78ec1022ef1f31a173990bf69b3f882f95e11ea2bf968ec7d0 SHA512 7029859684e39e3ce6ef05e5e40b791ca8296a33ef4ae2521da002cfe03d9eecb0bd274e806b59487fb9b3c330bf76296f5922187ea9d448bfa0d21e4363d739 WHIRLPOOL 19668b1896abda74c7bf26cf9f8bae6e75413c7c5ef40b7a1d5b8c933a2063dafa0b446f285001056b90b2734b90c9adece66eecc70242d7058b3f02e9c4b7d2
-DIST BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar 6503498 SHA256 ddd722c70d74201e7f06463e6b59fd2563d2b043a36825cb47ede8f9bf03c213 SHA512 75574753b37decfbc62d59bb9b007233d581d34bd88696f2a7b1ec01e8bbf6f90956d0b5431ba03f66963877e293892405f7ded25b400cd035af4eb748c6c35a WHIRLPOOL c8ad505fb06901be9c9628facc05af1de4ff82e0e803b256219713374dd1b497752f9d0f4ae99d485048e7e77b156377c4237e330e04a90f281534e2ec22c1a6
-DIST BE675D922E5BFAF6557EB5E05A06B0B5047C08B1-org.eclipse.persistence.jpa.modelgen_2.5.0.v20130507-3faac2b.jar 44520 SHA256 a5b673799f2d407d845d484c3df1d2f7eebdb3b0240fc5e2fff2848c800644cb SHA512 8daf4f7c9725fb46d99e462a6af724210eb9dea557f2e7a30172fb70f6f3e7d1e22ad7e28a47864ad495624513d618fc20134f499adccac932f96f0c40a1d7dc WHIRLPOOL c63b7bb65b200c232a7e273a3c4ff2975bb7fed60b65df6ec0533d181fa742af33d8ff2bec3f018996115a2d6545bf279d9c19c6d536d04f08fca4f2190fed11
 DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 SHA256 817762baeabb24daf8a41a9716e31f85a7659147d09264a499f4d35b0fe04115 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b WHIRLPOOL aae6bc05d3b441443b9f0d80e65fde81614b0206eee5714f4e51ceaa0adb778758a5d65efb3a4963111f3b258753e0154447914a5586251883d22b0c1e09f9f3
 DIST C54C41DD33054070647ED50F209CC77A05BA5563-spring-framework-3.1.1.RELEASE.zip 4830417 SHA256 a8e0c288398abf48e2222160a4e935353e988cb6093385628e7ce20c26b339e6 SHA512 9b5e577a96d1bc83cccf853b662b026a9f2b525c4d8d1647e7fd43c91c6f87e6c738d3bcf37771144976d604b319e47529fd40215c144114f3da38802dd14d66 WHIRLPOOL a73f82cba991df2d2ac2f698e25d95bdfaf58468b26775b67666d3f5ea52ad11465e7c12a92f65d0b5beea42529a0882134b214c782770adf203514c45af9196
-DIST C7526615424CD22908969630FD1D2B27818B6DCA-org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar 45718 SHA256 b9b3630d16a426766995164efd50098130baccd9fbfbdf1da9f5a8da46f82421 SHA512 d417402a4e198dd1a2d65c74d73bdd8488f90c3fadf23a72dc7123bf236d1562c4db55211c53471c9d141fd8634c66b2f3646f476873c351e4072c3ba75b9df8 WHIRLPOOL c4d7aa090bbfb77960e688e08de1d160d3af97b23d7b96c7b7afce3332774c9a516789c043c861041a3ebe6aad814f438b8c64a2fbdc7a204142282c194dbee8
 DIST C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip 5029407 SHA256 7492417ca97835935912d931f9c2a1c9d98fc35fab455d086fd11f7ff663acb8 SHA512 5573e1287766cd82bb63b6a048f7a3461f8bc38dc3b66ddea63a334973039fe6671967fa0391c85f6a2bf7ad8d783bf6d7fd3934cb0ea8c98ac9e45ae5bf56e6 WHIRLPOOL 58ec1e5057174c2236f1b001b077c6345a82e1a586406da2866b8e8470b2df7fe087c5718cfa83bee6084984e0fc0c8ccba2efe18c42d08884fcee779ad01b22
-DIST CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar 220841 SHA256 f6140d9e9f52a50c381ac500c119b268bae84e84c9ba37d361baf22d4e4ec68f SHA512 3fbf7b2e6d4674f6ee4dd210e80d3d61452399a2722959105bd276b5e959edce39ac932c0ef9e8453eb6c7598aff244c5072ad8f9a927ea720c3226a548cbcd6 WHIRLPOOL b0bf637ce741808e87f7d5f1d97a1d4fa90e1548836dda90cb498e333f995bff6973fe1cdfb251391a36bae5c1a473f097b9ebd1f2f08e3aa46f050d9cc607b4
 DIST CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar 2949268 SHA256 7865677c19d1373c7126751c30bf9719bbe7431f9b8a160e78cd53d74534f4f1 SHA512 c8902a4f552f558f83ced82d7983ddcc05b49acfd85f7062d544648ac433fef98f5c77eb089a7401ea454220ff249f61445d833ec7a2697bccdbf78d13dc224a WHIRLPOOL 6f6d80865869242354c3d900217c48f6a28e5412234cc9cd637748941762822cebbd7a6398bbe6ede9aae30bad0987c8b4bf674b483fa78c4854a3dd7b7d95aa
 DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 SHA256 67d175c1858005308ae9a02ff85c0bc7efc9a2a3c058a6838d51769f417f5247 SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc WHIRLPOOL fc40cf8d49919d3ef38f6c3473736f56ee5ac1d4db848681536c3bd3532cb112e9490e76c1ef7b15d88b2ab87ed54e58dbf1227c173a3256194b5887d37f8a84
-DIST D388DFD4853B4C82C4BE4EDB38AB56904208723E-nb-javac-impl.jar 1780249 SHA256 788c63ffba904422041d310eb218c48b36170fcddffa6dd98b4a066bb1b45bd7 SHA512 d06e63a5c3b5ed27e05ca5b735fdc79b713c7d2c948799a642354b30b56e59f33c12f33b0c1db8069ee75e0410ae183c518522263b814aed922995d262f5b3d3 WHIRLPOOL 9c53bc9cc140e187e79a22e8336db6a09a82dde30ad011abd881f9ce6f9e30ec7144320b6013260fd3701d6d26133eedd96182e4de8563d7df024d50e3f062be
 DIST D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip 84706 SHA256 214c8f6da105d8bcc4583f3f160d94fa4a8ec266c4fea4b5e12929a6386fec3a SHA512 5dd4270d3514f448f2d1533b099dbe64aab97c21e89066c467a3332d354f0675e27f6ed5ca1b23c01a2222c8e1ad261c374ae6549b9323951763b7a542a386f5 WHIRLPOOL 88a6357f335bd50d3cf3608cee0228b0c99b4b20a962e2dcd68b83c3fdd49b113618342f87cb8b758ad18612efdff0128876ae9018eeba5b682cd8267f97f8fb
 DIST D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar 120575 SHA256 51945be4ed200cfc439d2db986bdcc184ecdfec5d0880a8c2854f88dcf20df0b SHA512 788bb5e115a77e12e9329db70e0b6edca185ebd5e30a8178f451da3a8492acba8c89848873acff224868772f464f17bd9eccc9130638d49c95593edd697d3dd2 WHIRLPOOL 9026c59ae69df71d205278a2cd7aeae24c72d74f1356bbf7d3dbe2fcceddb02948a94a87d4f7e6d710a5cc4e642d0de38d16690fff830d10b8372bcbecdd86b5
-DIST D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip 4054621 SHA256 5901b2a23c80f2669016697aadf27fefd8350fdd5cc876f8e979d5aac92a857e SHA512 30cc8ce002795153d9890255c76892f41e6eb81377f28330a8f600821cb4d537da17863706be175c835f82841ca84f92a477af629e3e807b68e9fb3507d4ac1d WHIRLPOOL a3e13022627cd30327e72b26358c613a47f5cf88bbc60448a34283d096f49af37518c04c5e9f3454e4494bac8b915342bbaabf62447e3e3d1c33ddd5cf3b3447
 DIST E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar 173813 SHA256 39fa3597e77942f589e299942e4d5f25ae04f699edfe6bd9135d5f425845649b SHA512 ca940f40881ff5a908fafc80f6aa90866d58c54189bfc073a2559ee76496f3127df920abda5d9c7aacf9a54cda693884127c1e3f696d4fc8367351313c900cc5 WHIRLPOOL fae1db760f988f4e2886d8a2f9b2384a194bf8b579825971466a21ec4fa4971a6e4e56b477ba0b61e2e034777af6c49c66d4425734cd6f9db4aca15041b384f6
-DIST E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar 130251 SHA256 cc025405fbfb86113b6f0c2f80c6d34babc59be0ef2c8778043ad108296faa21 SHA512 3c45bd00492d106cf8637ffe2a2a59eb5233dffbe5c264c1639ea933c4aaa5fc3214ea3e9c786e68e7d6855741abe62cd2b2f12f131c42660c4099261d98150e WHIRLPOOL f454a2f925ffc1dad0c1d456e9f2fbb0ed9c1573f90d9118a2439dddb83c3900d8251851f4801c2be6a8115c4fd3ba46daa3f2ace1996b1ad0635eb1927648d3
 DIST EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar 231058 SHA256 7dbbee8f9000b1a157b75425f54495dd90c63621f5a8a88f40e5780712c12a5e SHA512 6905f464090d20fb1003540d43e03aa4fd2340da75b84a9fc4b040686c7c29a97e463da0a0436ff92426f38d405fa205635d820e6f2400f7e4f3be430d53facb WHIRLPOOL 4e8b554ef8382e64792056e42ecf0e9f6d9aee75c17411a9083d34337ad69f7922c3b94b4e0771ccf384b9c2723c6c5ed59b8069c833c0d97a108a31f770907c
-DIST EF8C44153240A0AA629340D17629290DB1C66CA1-indexer-core-5.1.0.jar 227196 SHA256 6a3e69faa6fa7328b6153802a477b56d718bbc96f2af0c9fae4c25b84cb992be SHA512 ed4ff12e7013b6a21e9a4a5ef82c05ff10ae41c4699506943477a561819da97ac16f34f328ba4b312ceb751cd9577dd2cbfc7d3869f69ee0b26239e45112d8b6 WHIRLPOOL 88e83559a932d4c257ba7d80c9be6fa1fa223357d6f4da0742a2f055ee9d4915364ab7c5c1701d63b0fc5119e2758b85f23caf6fe01d17fcf7a0156041dcfdff
 DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0 SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6 WHIRLPOOL edd56a338e08e788a307849794387069a60b1873a3a8fa29e1e7045fbf8a2f1ff175e68579df3789fdf6af8f7f94de2430560a89de48d64c22e76b1fe95b6505
-DIST F83E685280F97AC09ACAFF71262C3718CDC98995-nb-javac-impl.jar 2736632 SHA256 782055f6cc398ea85202796a0009ae88254de0e76ad17683a5a84449e464859e SHA512 a2701e0237e754b9b97dc11ee85fa823505391cdaf8f598c57adf677b074204096b84a3ca85997a596cdff1f25368b1b7ea2ece66b0ee09ae32ee707dbef6cd5 WHIRLPOOL 8c3864978ce626b3437b2f98cd22cf08215522285ab9083955b035b3845f33e0260f619a7912bc84a2c0baf586c4c111bc0d81cc0b023d477b8ef8cecedaee2b
-DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 SHA256 4dea45582ff69620a906347fc1b085bb1cffb75e215cb55ec74181ae240a5be4 SHA512 e51ae65323d3552dd3e0ecfbf228566f0f76df2ba5ac1b3f230296dd433562155740f04eb238490378a6e6c33d0f0869ebba45e61c1b642db945d2f998423faf WHIRLPOOL fb5a64269c16be2d1c578204098f5ed58d59a068f485fa0abbdaf0d1e1fe393a7633df3208e4cb34f8628cc0ca2e3f181686594c4b1767044de2fd635558e9ff
-DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f SHA512 ec81bbef311f891dd4371644afd549bef460e8e70eed49f7dbb5aec68f386097f340a411932345ba7bc786a1aef1f0b70a719d8e784b048d5ebf8b1e9ef3bb44 WHIRLPOOL 5c4440c6e2b75209b00030d1e78c28600dc387cc836be8b74bd2d55a6426c5a10d57e21a9572b83f499aa9ed6c33e2ecce44a82c440bba818e4d22c1cf856a55
-DIST netbeans-7.0.1-201107282000-src.zip 175987235 SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa SHA512 c2b4122d7bf8332455ac71d72e76d29bc31e13d892997e153ee1bb99a019f58bfc12179a24ab2bdaaf1c61ad823b7c24857523d0363ea6856b81a0aaef9d2eca WHIRLPOOL 296b51405e16e580101f15a459f4e07ec31ab353fec1e4c4d5ae79ff7d378e994291c7c378f380fbf83d1718366f38bbb3801834079db466a1c3bade099d7fd0
-DIST netbeans-7.1.1-201203012225-src.zip 172146133 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4 SHA512 e43d5477f6d6bc5471af4f7b624a806a88d34e9467ea6dc228dbbdb374e1bf073b96b3ab3c85a301207f6abb1ee6292c6fe1e859f78a620ff6654e5617b880c1 WHIRLPOOL 22e8d1c562d3702ccd0e66012819447c92fc7cc1c5f0c52ceb9f9990372b1f7b976b3b1b8e31bd1bfb96726fbb8963c4e444ff0fad931d75a8201d6dcb012bac
-DIST netbeans-7.1.2-201204101705-src.zip 172346251 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c SHA512 9470f00021fd401e33c9bb4871e40780f1775e0e41c6d0c28ee0ac157c3eede324703d0ed8b1cf14e22441a14ba82fdf72315d7135f55b2a8ffa75f935496f23 WHIRLPOOL ba64a70001e8a18080cc58279e3ba70f61b3ab2c51d2f0be81bec178610f9ff37d41a77d2d5f39e16a8c07e9a7931d1487f35054d2d5fa7e379bb8edab09fc1b
 DIST netbeans-7.2-201207171143-src.zip 174804170 SHA256 7fbbb9e2d3daa41344800a7571e94574aa54fb586b514095ec31b87f1dd4551a SHA512 7306039b30ebddf5766b8d938f1b69291e6bfa20ed54866d38a9832dba8a568e9b79577aea963dd36d93a4e0a5e487a64cf404720c5d62316307181f7e4a17e1 WHIRLPOOL fda3e9772c0f9b3b6abc65231c2642567711e3d72cf031625f3c47fed35343484b81e6897510a71410cd797a14d956af8d9ed336993753b7085c7303d8ab9e02
 DIST netbeans-7.2-r1-build.xml.patch.bz2 2476 SHA256 ba0812d86c8d77cc69c75899d5b070d8b8c7dd1e33b5bdc7ac6e166d5015601d SHA512 8d0a2d80afafe875d9872a0aa15b2ade41f174ae522bc0363021e8d490dfd43b09a97af9c77dd635b56964fb57fd218424c17de0a13b946d55247db06a3e8c33 WHIRLPOOL 3833520b791d6fcb3b531b4cb1fbeec2fbadcc05e8c8a439794ea83bfb315e538d6039d2a6a188735cd996e916a1e5e88871050392947a2f5702accf9fceb16a
-DIST netbeans-7.3-201302132200-src.zip 179174245 SHA256 5be4ee16868ca3f2a73b397ca1b1a83d7603657722cb033a37925e8ee0ebeab3 SHA512 c616ae3e148b677ad74b4e113fe2d5f9e97029a601abf39558e35c57085362dc802d0eb26be9ab05731bce14dd10c5af22d4b77251471da95421ad28e08ce700 WHIRLPOOL 66670d62c023f321220c7cd416c0d0347055e618c9501df56934a35bf6f15ebde37245c78ab6416ce3c5cc733b4f8bc0e9c9d2a94f8d940e64443dab2e5967f8
-DIST netbeans-7.3-build.xml.patch.bz2 2463 SHA256 ec0a58213907f7c8656ded1ba3f21dd0a2197b6eed46d7d5ba37f6afb0ae2a79 SHA512 1f8164efab23f7fdaf7da0191f36043cc10d9a4865e38761c24c83a822d8b1b7abfb891f6072654fdfcd314f6fdf0010cb8560c2222ec07e4b4b217b91142079 WHIRLPOOL 47d8e784b65a9863d6c9c122288720544384b4f9f6815325247cf12fc2dac5678b27b72e0b7580052096957acc245b7f8f1c54b97a1877a3ba1021bf871d08dc
-DIST netbeans-7.4-201310111528-src.zip 185900858 SHA256 b6c584c2091d600dcb4d10a732812864265f6ec776da11b4f700195eb3d6fd05 SHA512 424124000026e161bf91688106c0d25668869abde49b6f0fad1a2a8a9ca3b40e664f14056132f3ded43bc319056b2ac56a705c3624f175f279824cae42f9a9a2 WHIRLPOOL 0200e37fc6ca22d8e679327c55fb2fec2fc030106e3802cdec2dde2766df354faec3659a4867cbfc908c673c1a770f59b37c6b4b9cd391b3844d6af11cafc01a
-DIST netbeans-7.4-build.xml.patch.bz2 2685 SHA256 3ffbe61e33ab28f39acbe28209469c673ac97ba4620e9ab7391537b9d242da6a SHA512 247c67cf53ee40e94768d547218664cbf82c487f16982a43daed054a17327f168f35319ed4fa2def995adf3f0a6d25f85a3bb23ff4a84aa4e4f751257f255545 WHIRLPOOL bceeaebe6a7079910cfabcbf48738694b8b86a5ab7147002182eba3c305a310febe5861abdc3e63df904b45fcf3a5ecb3007c15611b59b4ce53406e578d13c47
-DIST netbeans-8.0-201403101706-src.zip 194215149 SHA256 737a6fe9313e720590933773672c1f241820b795ce384a605743f3eeba0a9396 SHA512 dbc4ea3852ac0a698729a7698f2dccff427680bf01234c8a463268540e886f57b39697ec124fc0701cd52b558987961fc82e6f27bc9f0fc115159d250fddd676 WHIRLPOOL 47d914d023212076c463a99eda49b202aa6c05a2ffd5c32b61f97a4cd76930c94e18059292a8520359f38736e838a7c2d053ecf584493dbb3a9d8f5133ed6b36
-DIST netbeans-8.0-build.xml.patch.bz2 2685 SHA256 3ffbe61e33ab28f39acbe28209469c673ac97ba4620e9ab7391537b9d242da6a SHA512 247c67cf53ee40e94768d547218664cbf82c487f16982a43daed054a17327f168f35319ed4fa2def995adf3f0a6d25f85a3bb23ff4a84aa4e4f751257f255545 WHIRLPOOL bceeaebe6a7079910cfabcbf48738694b8b86a5ab7147002182eba3c305a310febe5861abdc3e63df904b45fcf3a5ecb3007c15611b59b4ce53406e578d13c47
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
-DIST netbeans-9999-r1-build.xml.patch.bz2 2379 SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e SHA512 7f28a0b2536ea84ebaba26df072411f62db01873e7803f2e28400b55bd61f0857b5508668bd03894364333edf6b8cf9901b823980a8f51f8d6a711bd3a47cb59 WHIRLPOOL 74dcc47859101722f9879bf0cf2dadd210555560b2fcd036e43ac099c71fe0c712b360aadad8e88092a324c93ff42fc2e467e89e3227f23a24d55b9c9e2c27b6
-EBUILD netbeans-java-7.0.1-r1.ebuild 15026 SHA256 612252dbf2d60a930a8ba68223fcf05ee6adb471adb4a5924b8e965e5832153c SHA512 0136d00acc8a2034584d4194b88704a7b015aa1a1779cc13bba2cc1231ee3fcfb069f287fb779436f95c460f455a46904b9837cd2bf2e38938f7bc68f82219fb WHIRLPOOL 6da11e46d97702b36b1ec6ba731cb8e6692417e23f5a6fe7adb0fada7fbd444249ef70571019da0a8bf0447299b432159f6157f27cc9eaeee043ff41bc2e94b2
-EBUILD netbeans-java-7.0.1-r2.ebuild 15048 SHA256 24360116a64a118eb5e23d7fa14ba59c85a63e0c09326e39d84c6d7a83b00aac SHA512 9ed68c5f02a98dbfa650bb15784c4529389867dfc660174e093dea7947b70a27a1a8cfcadf81ccaf04d07688d7b33cc5fe9ed4a0047e831ef0423ad967a03d8b WHIRLPOOL ac376a28aa3b9560c4cf6630afb889885456b977183c78ca7a48150c173a58813106a1efbad0bb8370ae308086db0585d9185b3f735c1f0b3a4316e376880881
-EBUILD netbeans-java-7.1.1-r1.ebuild 15028 SHA256 644f85c7eb4021630706f86c6aeea5fd5228fabf26d1e82fca0e52ea36c83a08 SHA512 9a5603fa2beff17f585f041ae782f234058ea125fbec5bb7dd4c7e24476da91193a5dee307fe4a79001eeb7539f1357a56d0e3f0f4d57cde5554d46084ea08cf WHIRLPOOL 311f643228e0f7576c931d2bb1a4e4f60ea3dc6c779ab262153ab77f3477c8f230272bcd23dcbc3f837623e9c7ff978139b22d46eb7aea53929440ef7c9bd383
-EBUILD netbeans-java-7.1.2-r1.ebuild 15050 SHA256 bec8a0667446997e8d8d70ed96530b07d726c819e4f4f9a795b3aebd740ffca5 SHA512 904292ed98640b9a0ad652a377ac1bcc5e3b38b37b5214b42b8e5936fc8c748e6ee257f23ea63be19d9baa87ff834027dc68541fc1ebddcc188113bdb9df2102 WHIRLPOOL 7df0e59d649694512889fdde625a32e553980f0e9b17644649443567c9219b5acb8525539701a25203e141eeed3bcbe7992220cd20109e350fd00c9cf561254b
-EBUILD netbeans-java-7.1.2.ebuild 15027 SHA256 aceae390386f086fa8e88eb893a3c8a12f137edb651a8c8e0c4e83eccd150851 SHA512 76655876d9cabe550f444d9f9e12028d04ec8cb30a8317328fd63f4fd631f9053665cd9e83b0d7b5b4c6943489ace414d86bfb9dce38100233aa19eda1826db9 WHIRLPOOL abb9aacad2157e7a2cb476d48dc30cd240330d62bdc3f75805112a00f07318416281312979abd5b0253100cfe2c760aeb85956cad166c78ba04cd0b1337d0d05
 EBUILD netbeans-java-7.2.ebuild 12310 SHA256 aba859271f98f3bacf1055cb21818f32ea0f7d262db51d5960ae9db72909910a SHA512 7156645931d94b7e7b6c4ddb8a80e8bb0ba18d60cf6d348a92bcc125ec69f27a03f56b5e585592f97d4e1ab91797fec874571fb460f6ce0e99c84d723fcb8bbc WHIRLPOOL 647850f4bbedad14e83059ee2c81a3588737c1d6652ccf2524723835d5cee820e8602f6f9f1cd694647cc1bd7542da0fb136be957095f0818d421fe94f2d8d05
-EBUILD netbeans-java-7.3.ebuild 12581 SHA256 f4440d84f6bb07508f09365d9c30e97d13fdb6081e986db9c34b5bc7db290757 SHA512 7bc93e55791ab640353c6eec704f77abcb2e5195ac2b193abbfaf335c0687c61e08c62141ace3cd7c66ff19763cbcd9e4390fee7107578eeede9c3990581ff0c WHIRLPOOL 2a2ceabef489e15dc6a95fa428aa6192e3ca220cfe85001dc7e0b44c9485360b36956d50f298c9d047e3648adb0946073060975a026c56fbb88cb4a6b5027802
-EBUILD netbeans-java-7.4.ebuild 12910 SHA256 6b41b0247defe71c37a2d4419de4ac81452169b3da3f13d3a21b9a4fdc491e95 SHA512 797d05650c237b30ed11778f853f9f1a304acd3468118bbd268604fa37c9251dbac72a938656d43c0841a5ba44056c9655b261dcbc53695755206bfab581f15f WHIRLPOOL c5e064230d1f611f194324ebb7c52e0d1b832954b18544a02474a167e4b8f000526a921804685fecec38f187f997a22344f56a92cd20130719ba42081427d475
 EBUILD netbeans-java-8.0.2.ebuild 13448 SHA256 1456b274ba2184b8137bf10761a682a9255d1454a3edaf62d67fe2659063708b SHA512 1b93bf080785573dfb93b4ef09e20e996f1c2084abb5e9b4f82713f9d0950bf9e5905766496e94d3d463a17e2d612ebd07c7e7e8fe10b8da9750dfe0dd104141 WHIRLPOOL 1d7275877036507c41d46b78c2e63798e8843869a27c46d347e7d9835b283ef89c720c14e20947a7dedcbebc8dc4cdf405171a68caca163a2d014d7d67923dab
-EBUILD netbeans-java-8.0.ebuild 13420 SHA256 3ed01b6f956260c5b0e46dac75adec8a4a48c6349c5558eda9189fa2d7094e24 SHA512 5a1f43cd5aa50b2fe06e0f2c6a40c381a627465f1b4ebc3a123ff073c73b7dcdc35e89bf01e2babe025f8546baecfd02d74f2d0913eee878289cddc09ed70f88 WHIRLPOOL b0fd5395b012f9fdd4c666121c4140317ee02e67d72d26822284b87cb5e2078ca2952bd7f948646d6d9c7fffcb4600e64d4264858f1001941e24462807319f00
-MISC ChangeLog 4408 SHA256 aa449e7b3b679da5a7d481e1bd1d56b0a50271c1086dd5ebb8d9b55a4e88ebd3 SHA512 47b8bb0f357794d195893bd24436db38b182f02265f96881073684976ae0a7078b07aad517f9d4109608bb804380a07a82d9dde572180d85dd8842bc181e7565 WHIRLPOOL 0118bee93ff369eabb1a34da768f9d089d2818e0def01cd2dd1012830f89ed652a1cb8ff1436353b1ad3dd98487042682edb275e3bc0d49ed816ffdc54ca7ab4
+MISC ChangeLog 4734 SHA256 1898e43a18ac4c300546130e6dc43f8f23ab81b8beaba6153e40c792f54f065a SHA512 538a79ddb6920d508d3f49752dc07ab97878e483dd6d44d05e8bee611f12748362c7626af5f5ed4eaf8005d2f85945cf432768b55aa1f1e32efd2cf2c22d8e20 WHIRLPOOL 1b7b139570f7dc06baf48dca7f4ec30da33e1c919616ee443afa37ed4242984bb903256844b16c76bc715b27ae5c3be1d2a0eeca375ad6dd0d02da04dc9a1276
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43
diff --git a/dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild
deleted file mode 100644
index f8f5f9fa29e7..000000000000
--- a/dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild,v 1.1 2012/03/22 15:41:49 fordfrog Exp $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="7.0"
-SOURCE_URL="http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
-	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-	http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip
-	http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar
-	http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar
-	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
-	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
-	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
-	http://hg.netbeans.org/binaries/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar
-	http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar
-	http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
-	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
-	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
-	http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/appframework:0
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0
-	dev-java/swing-worker:0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/ehcache:1.2
-	dev-java/fastinfoset:0
-	dev-java/javassist:3
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/jsr250:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/jtidy:0
-	>=dev-java/maven-bin-3.0.3:3.0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.0-build.xml-r1.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
-	ln -s "${DISTDIR}"/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip maven.embedder/external/apache-maven-3.0.3-bin.zip || die
-	ln -s "${DISTDIR}"/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip swingapp/external/appframework-1.0.3-doc.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar j2ee.eclipselink/external/eclipselink-2.2.0.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar j2ee.eclipselink/external/eclipselink-javax.persistence-2.0.jar || die
-	ln -s "${DISTDIR}"/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.2.0.jar || die
-	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
-	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
-	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
-	ln -s "${DISTDIR}"/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar maven.indexer/external/indexer-artifact-4.1.0.jar || die
-	ln -s "${DISTDIR}"/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar maven.indexer/external/indexer-core-4.1.0.jar || die
-	ln -s "${DISTDIR}"/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
-	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
-	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
-	ln -s "${DISTDIR}"/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip libs.springframework/external/spring-framework-3.0.2.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.0-build.xml-r1.patch
-	sed -i "s%../o.jdesktop.layout/external%\${netbeans.dest.dir}/\${nb.cluster.platform.dir}/modules/ext%" java.examples/build.xml
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-	java-pkg_jar-from --into swingapp/external appframework appframework.jar appframework-1.0.3.jar
-	java-pkg_jar-from --into swingapp/external swing-worker swing-worker.jar swing-worker-1.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
-
-	insinto ${INSTALL_DIR}/ant
-	dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	doins -r ant/extra
-	dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	doins -r ant/nblib
-	dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm appframework-1.0.3.jar && dosym /usr/share/appframework/lib/appframework.jar ${instdir}/appframework-1.0.3.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	# javac-api-nb-7.0-b07.jar
-	# javac-impl-nb-7.0-b07.jar
-	# org-netbeans-modules-java-j2seplatform-probe.jar
-	rm swing-worker-1.1.jar && dosym /usr/share/swing-worker/lib/swing-worker.jar ${instdir}/swing-worker-1.1.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# dir: eclipselink
-	# eclipselink-javax.persistence-2.0.jar
-	# eclipselink-jpa-modelgen-2.2.0.jar
-	# eclipselink-2.2.0.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
-	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
-	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
-	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
-	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	# ejb3-persistence.jar
-	# hibernate-annotations.jar
-	# hibernate-commons-annotations.jar
-	# hibernate-entitymanager.jar
-	# hibernate-tools.jar
-	# hibernate3.jar
-	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	# jdbc2_0-stdext.jar
-	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	# gmbal-api-only.jar
-	# http.jar
-	# jaxws-rt.jar
-	# jaxws-tools.jar
-	# management-api.jar
-	# mimepull.jar
-	# policy.jar
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	# woodstox.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jaxws-api.jar
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	# indexer-artifact-3.1.0.jar
-	# indexer-core-3.1.0.jar
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	# maven-dependency-tree-1.2.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-aop-3.0.2.RELEASE.jar
-	# spring-asm-3.0.2.RELEASE.jar
-	# spring-aspects-3.0.2.RELEASE.jar
-	# spring-beans-3.0.2.RELEASE.jar
-	# spring-context-support-3.0.2.RELEASE.jar
-	# spring-context-3.0.2.RELEASE.jar
-	# spring-core-3.0.2.RELEASE.jar
-	# spring-expression-3.0.2.RELEASE.jar
-	# spring-instrument-tomcat-3.0.2.RELEASE.jar
-	# spring-instrument-3.0.2.RELEASE.jar
-	# spring-jdbc-3.0.2.RELEASE.jar
-	# spring-jms-3.0.2.RELEASE.jar
-	# spring-orm-3.0.2.RELEASE.jar
-	# spring-oxm-3.0.2.RELEASE.jar
-	# spring-struts-3.0.2.RELEASE.jar
-	# spring-test-3.0.2.RELEASE.jar
-	# spring-tx-3.0.2.RELEASE.jar
-	# spring-webmvc-portlet-3.0.2.RELEASE.jar
-	# spring-webmvc-3.0.2.RELEASE.jar
-	# spring-web-3.0.2.RELEASE.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/toplink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# toplink-essentials-agent.jar
-	# toplink-essentials.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
-
-pkg_postinst() {
-	elog "Note that if you change your version of ant, you have to re-emerge"
-	elog "this package to get updated the link to ant tasks of that specific"
-	elog "version."
-}
diff --git a/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild b/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild
deleted file mode 100644
index 4e1c45f0b2f5..000000000000
--- a/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild,v 1.1 2012/05/27 16:10:38 fordfrog Exp $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="7.0"
-SOURCE_URL="http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
-	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-	http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip
-	http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar
-	http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar
-	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
-	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
-	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
-	http://hg.netbeans.org/binaries/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar
-	http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar
-	http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
-	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
-	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
-	http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/appframework:0
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0
-	dev-java/swing-worker:0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/ehcache:1.2
-	dev-java/fastinfoset:0
-	dev-java/javassist:3
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/jsr250:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/jtidy:0
-	>=dev-java/maven-bin-3.0.3:3.0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.0-build.xml-r1.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
-	ln -s "${DISTDIR}"/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip maven.embedder/external/apache-maven-3.0.3-bin.zip || die
-	ln -s "${DISTDIR}"/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip swingapp/external/appframework-1.0.3-doc.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar j2ee.eclipselink/external/eclipselink-2.2.0.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar j2ee.eclipselink/external/eclipselink-javax.persistence-2.0.jar || die
-	ln -s "${DISTDIR}"/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.2.0.jar || die
-	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
-	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
-	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
-	ln -s "${DISTDIR}"/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar maven.indexer/external/indexer-artifact-4.1.0.jar || die
-	ln -s "${DISTDIR}"/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar maven.indexer/external/indexer-core-4.1.0.jar || die
-	ln -s "${DISTDIR}"/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
-	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
-	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
-	ln -s "${DISTDIR}"/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip libs.springframework/external/spring-framework-3.0.2.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.0-build.xml-r1.patch
-	sed -i "s%../o.jdesktop.layout/external%\${netbeans.dest.dir}/\${nb.cluster.platform.dir}/modules/ext%" java.examples/build.xml
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-	java-pkg_jar-from --into swingapp/external appframework appframework.jar appframework-1.0.3.jar
-	java-pkg_jar-from --into swingapp/external swing-worker swing-worker.jar swing-worker-1.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
-
-	insinto ${INSTALL_DIR}/ant
-	dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	doins -r ant/extra
-	dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	doins -r ant/nblib
-	dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm appframework-1.0.3.jar && dosym /usr/share/appframework/lib/appframework.jar ${instdir}/appframework-1.0.3.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	# javac-api-nb-7.0-b07.jar
-	# javac-impl-nb-7.0-b07.jar
-	# org-netbeans-modules-java-j2seplatform-probe.jar
-	rm swing-worker-1.1.jar && dosym /usr/share/swing-worker/lib/swing-worker.jar ${instdir}/swing-worker-1.1.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# dir: eclipselink
-	# eclipselink-javax.persistence-2.0.jar
-	# eclipselink-jpa-modelgen-2.2.0.jar
-	# eclipselink-2.2.0.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
-	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
-	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
-	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
-	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	# ejb3-persistence.jar
-	# hibernate-annotations.jar
-	# hibernate-commons-annotations.jar
-	# hibernate-entitymanager.jar
-	# hibernate-tools.jar
-	# hibernate3.jar
-	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	# jdbc2_0-stdext.jar
-	rm jta.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jta.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	# gmbal-api-only.jar
-	# http.jar
-	# jaxws-rt.jar
-	# jaxws-tools.jar
-	# management-api.jar
-	# mimepull.jar
-	# policy.jar
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	# woodstox.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jaxws-api.jar
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	# indexer-artifact-3.1.0.jar
-	# indexer-core-3.1.0.jar
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	# maven-dependency-tree-1.2.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-aop-3.0.2.RELEASE.jar
-	# spring-asm-3.0.2.RELEASE.jar
-	# spring-aspects-3.0.2.RELEASE.jar
-	# spring-beans-3.0.2.RELEASE.jar
-	# spring-context-support-3.0.2.RELEASE.jar
-	# spring-context-3.0.2.RELEASE.jar
-	# spring-core-3.0.2.RELEASE.jar
-	# spring-expression-3.0.2.RELEASE.jar
-	# spring-instrument-tomcat-3.0.2.RELEASE.jar
-	# spring-instrument-3.0.2.RELEASE.jar
-	# spring-jdbc-3.0.2.RELEASE.jar
-	# spring-jms-3.0.2.RELEASE.jar
-	# spring-orm-3.0.2.RELEASE.jar
-	# spring-oxm-3.0.2.RELEASE.jar
-	# spring-struts-3.0.2.RELEASE.jar
-	# spring-test-3.0.2.RELEASE.jar
-	# spring-tx-3.0.2.RELEASE.jar
-	# spring-webmvc-portlet-3.0.2.RELEASE.jar
-	# spring-webmvc-3.0.2.RELEASE.jar
-	# spring-web-3.0.2.RELEASE.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/toplink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# toplink-essentials-agent.jar
-	# toplink-essentials.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
-
-pkg_postinst() {
-	elog "Note that if you change your version of ant, you have to re-emerge"
-	elog "this package to get updated the link to ant tasks of that specific"
-	elog "version."
-}
diff --git a/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild
deleted file mode 100644
index 88e7dc4e5cdd..000000000000
--- a/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild,v 1.4 2012/12/06 13:02:31 fordfrog Exp $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="7.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar
-	http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar
-	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
-	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
-	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
-	http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar
-	http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar
-	http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
-	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
-	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
-	http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar
-	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
-	http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/ehcache:1.2
-	dev-java/fastinfoset:0
-	dev-java/javassist:3
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/jsr250:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/jtidy:0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant -a -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-		eerror "Please remove following symlinks and run emerge again:"
-		find /usr/share/netbeans-java-${SLOT}/ant -type l
-		die_now="1"
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
-	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
-	ln -s "${DISTDIR}"/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.0.jar || die
-	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
-	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
-	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
-	ln -s "${DISTDIR}"/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar maven.indexer/external/indexer-artifact-4.1.2.jar || die
-	ln -s "${DISTDIR}"/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar maven.indexer/external/indexer-core-4.1.2.jar || die
-	ln -s "${DISTDIR}"/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
-	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
-	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
-	ln -s "${DISTDIR}"/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.0.jar || die
-	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
-	ln -s "${DISTDIR}"/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip libs.springframework/external/spring-framework-3.0.6.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	#insinto ${INSTALL_DIR}/ant
-	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	#doins -r ant/extra
-	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	#doins -r ant/nblib
-	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	# javac-api-nb-7.0-b07.jar
-	# javac-impl-nb-7.0-b07.jar
-	# org-netbeans-modules-java-j2seplatform-probe.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# dir: eclipselink
-	# eclipselink-javax.persistence-2.0.jar
-	# eclipselink-jpa-modelgen-2.2.0.jar
-	# eclipselink-2.2.0.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
-	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
-	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
-	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
-	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	# ejb3-persistence.jar
-	# hibernate-annotations.jar
-	# hibernate-commons-annotations.jar
-	# hibernate-entitymanager.jar
-	# hibernate-tools.jar
-	# hibernate3.jar
-	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	# jdbc2_0-stdext.jar
-	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	# gmbal-api-only.jar
-	# http.jar
-	# jaxws-rt.jar
-	# jaxws-tools.jar
-	# management-api.jar
-	# mimepull.jar
-	# policy.jar
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	# woodstox.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jaxws-api.jar
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	# indexer-artifact-4.1.1.jar
-	# indexer-core-4.1.1.jar
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	# maven-dependency-tree-1.2.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-aop-3.0.2.RELEASE.jar
-	# spring-asm-3.0.2.RELEASE.jar
-	# spring-aspects-3.0.2.RELEASE.jar
-	# spring-beans-3.0.2.RELEASE.jar
-	# spring-context-support-3.0.2.RELEASE.jar
-	# spring-context-3.0.2.RELEASE.jar
-	# spring-core-3.0.2.RELEASE.jar
-	# spring-expression-3.0.2.RELEASE.jar
-	# spring-instrument-tomcat-3.0.2.RELEASE.jar
-	# spring-instrument-3.0.2.RELEASE.jar
-	# spring-jdbc-3.0.2.RELEASE.jar
-	# spring-jms-3.0.2.RELEASE.jar
-	# spring-orm-3.0.2.RELEASE.jar
-	# spring-oxm-3.0.2.RELEASE.jar
-	# spring-struts-3.0.2.RELEASE.jar
-	# spring-test-3.0.2.RELEASE.jar
-	# spring-tx-3.0.2.RELEASE.jar
-	# spring-webmvc-portlet-3.0.2.RELEASE.jar
-	# spring-webmvc-3.0.2.RELEASE.jar
-	# spring-web-3.0.2.RELEASE.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/toplink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# toplink-essentials-agent.jar
-	# toplink-essentials.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
diff --git a/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
deleted file mode 100644
index 47f2507f4429..000000000000
--- a/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild,v 1.4 2012/12/06 13:02:31 fordfrog Exp $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="7.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip
-	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar
-	http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar
-	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
-	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
-	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
-	http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar
-	http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar
-	http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
-	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
-	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
-	http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar
-	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
-	http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/ehcache:1.2
-	dev-java/fastinfoset:0
-	dev-java/javassist:3
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/jsr250:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/jtidy:0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant -a -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-		eerror "Please remove following symlinks and run emerge again:"
-		find /usr/share/netbeans-java-${SLOT}/ant -type l
-		die_now="1"
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip o.apache.tools.ant.module/external/ant-libs-1.8.3.zip || die
-	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
-	ln -s "${DISTDIR}"/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.0.jar || die
-	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
-	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
-	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
-	ln -s "${DISTDIR}"/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar maven.indexer/external/indexer-artifact-4.1.2.jar || die
-	ln -s "${DISTDIR}"/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar maven.indexer/external/indexer-core-4.1.2.jar || die
-	ln -s "${DISTDIR}"/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
-	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
-	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
-	ln -s "${DISTDIR}"/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.0.jar || die
-	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
-	ln -s "${DISTDIR}"/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip libs.springframework/external/spring-framework-3.0.6.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	#insinto ${INSTALL_DIR}/ant
-	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	#doins -r ant/extra
-	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	#doins -r ant/nblib
-	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	# javac-api-nb-7.0-b07.jar
-	# javac-impl-nb-7.0-b07.jar
-	# org-netbeans-modules-java-j2seplatform-probe.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# dir: eclipselink
-	# eclipselink-javax.persistence-2.0.jar
-	# eclipselink-jpa-modelgen-2.2.0.jar
-	# eclipselink-2.2.0.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
-	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
-	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
-	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
-	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	# ejb3-persistence.jar
-	# hibernate-annotations.jar
-	# hibernate-commons-annotations.jar
-	# hibernate-entitymanager.jar
-	# hibernate-tools.jar
-	# hibernate3.jar
-	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	# jdbc2_0-stdext.jar
-	rm jta.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jta.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	# gmbal-api-only.jar
-	# http.jar
-	# jaxws-rt.jar
-	# jaxws-tools.jar
-	# management-api.jar
-	# mimepull.jar
-	# policy.jar
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	# woodstox.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jaxws-api.jar
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	# indexer-artifact-4.1.1.jar
-	# indexer-core-4.1.1.jar
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	# maven-dependency-tree-1.2.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-aop-3.0.2.RELEASE.jar
-	# spring-asm-3.0.2.RELEASE.jar
-	# spring-aspects-3.0.2.RELEASE.jar
-	# spring-beans-3.0.2.RELEASE.jar
-	# spring-context-support-3.0.2.RELEASE.jar
-	# spring-context-3.0.2.RELEASE.jar
-	# spring-core-3.0.2.RELEASE.jar
-	# spring-expression-3.0.2.RELEASE.jar
-	# spring-instrument-tomcat-3.0.2.RELEASE.jar
-	# spring-instrument-3.0.2.RELEASE.jar
-	# spring-jdbc-3.0.2.RELEASE.jar
-	# spring-jms-3.0.2.RELEASE.jar
-	# spring-orm-3.0.2.RELEASE.jar
-	# spring-oxm-3.0.2.RELEASE.jar
-	# spring-struts-3.0.2.RELEASE.jar
-	# spring-test-3.0.2.RELEASE.jar
-	# spring-tx-3.0.2.RELEASE.jar
-	# spring-webmvc-portlet-3.0.2.RELEASE.jar
-	# spring-webmvc-3.0.2.RELEASE.jar
-	# spring-web-3.0.2.RELEASE.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/toplink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# toplink-essentials-agent.jar
-	# toplink-essentials.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
diff --git a/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild
deleted file mode 100644
index c5612228e289..000000000000
--- a/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild,v 1.2 2012/12/06 13:02:31 fordfrog Exp $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="7.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip
-	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar
-	http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar
-	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
-	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
-	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
-	http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar
-	http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar
-	http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
-	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
-	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
-	http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar
-	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
-	http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/ehcache:1.2
-	dev-java/fastinfoset:0
-	dev-java/javassist:3
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/jsr250:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/jtidy:0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant -a -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-		eerror "Please remove following symlinks and run emerge again:"
-		find /usr/share/netbeans-java-${SLOT}/ant -type l
-		die_now="1"
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip o.apache.tools.ant.module/external/ant-libs-1.8.3.zip || die
-	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
-	ln -s "${DISTDIR}"/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.0.jar || die
-	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
-	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
-	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
-	ln -s "${DISTDIR}"/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar maven.indexer/external/indexer-artifact-4.1.2.jar || die
-	ln -s "${DISTDIR}"/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar maven.indexer/external/indexer-core-4.1.2.jar || die
-	ln -s "${DISTDIR}"/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
-	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
-	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
-	ln -s "${DISTDIR}"/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.0.jar || die
-	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
-	ln -s "${DISTDIR}"/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip libs.springframework/external/spring-framework-3.0.6.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	#insinto ${INSTALL_DIR}/ant
-	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	#doins -r ant/extra
-	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	#doins -r ant/nblib
-	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	# javac-api-nb-7.0-b07.jar
-	# javac-impl-nb-7.0-b07.jar
-	# org-netbeans-modules-java-j2seplatform-probe.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# dir: eclipselink
-	# eclipselink-javax.persistence-2.0.jar
-	# eclipselink-jpa-modelgen-2.2.0.jar
-	# eclipselink-2.2.0.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
-	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
-	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
-	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
-	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	# ejb3-persistence.jar
-	# hibernate-annotations.jar
-	# hibernate-commons-annotations.jar
-	# hibernate-entitymanager.jar
-	# hibernate-tools.jar
-	# hibernate3.jar
-	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	# jdbc2_0-stdext.jar
-	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	# gmbal-api-only.jar
-	# http.jar
-	# jaxws-rt.jar
-	# jaxws-tools.jar
-	# management-api.jar
-	# mimepull.jar
-	# policy.jar
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	# woodstox.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jaxws-api.jar
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	# indexer-artifact-4.1.1.jar
-	# indexer-core-4.1.1.jar
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	# maven-dependency-tree-1.2.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-aop-3.0.2.RELEASE.jar
-	# spring-asm-3.0.2.RELEASE.jar
-	# spring-aspects-3.0.2.RELEASE.jar
-	# spring-beans-3.0.2.RELEASE.jar
-	# spring-context-support-3.0.2.RELEASE.jar
-	# spring-context-3.0.2.RELEASE.jar
-	# spring-core-3.0.2.RELEASE.jar
-	# spring-expression-3.0.2.RELEASE.jar
-	# spring-instrument-tomcat-3.0.2.RELEASE.jar
-	# spring-instrument-3.0.2.RELEASE.jar
-	# spring-jdbc-3.0.2.RELEASE.jar
-	# spring-jms-3.0.2.RELEASE.jar
-	# spring-orm-3.0.2.RELEASE.jar
-	# spring-oxm-3.0.2.RELEASE.jar
-	# spring-struts-3.0.2.RELEASE.jar
-	# spring-test-3.0.2.RELEASE.jar
-	# spring-tx-3.0.2.RELEASE.jar
-	# spring-webmvc-portlet-3.0.2.RELEASE.jar
-	# spring-webmvc-3.0.2.RELEASE.jar
-	# spring-web-3.0.2.RELEASE.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/toplink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# toplink-essentials-agent.jar
-	# toplink-essentials.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
diff --git a/dev-java/netbeans-java/netbeans-java-7.3.ebuild b/dev-java/netbeans-java/netbeans-java-7.3.ebuild
deleted file mode 100644
index f0d26849367d..000000000000
--- a/dev-java/netbeans-java/netbeans-java-7.3.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.3.ebuild,v 1.1 2013/02/21 15:49:09 fordfrog Exp $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="7.3"
-SOURCE_URL="http://download.netbeans.org/netbeans/7.3/final/zip/netbeans-7.3-201302132200-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.3-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/8D36897DA80FE60AB5263534A3CF522F466E8200-ant-libs-1.8.4.zip
-	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar
-	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
-	http://hg.netbeans.org/binaries/37AB23511498C4A55B2F15EA8EDB18D754E6CD8F-indexer-artifact-5.1.0.jar
-	http://hg.netbeans.org/binaries/EF8C44153240A0AA629340D17629290DB1C66CA1-indexer-core-5.1.0.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.3.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/6AE2C83C77A1FFA5840B9151A271AB3F451F6E0C-lucene-core-3.6.1.jar
-	http://hg.netbeans.org/binaries/2BD49695E9891697C5F290AA94C3412DFB95B096-lucene-highlighter-3.6.1.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/D388DFD4853B4C82C4BE4EDB38AB56904208723E-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/663FA7BA7FD8538E44DE9FDC5315C4F733C13E96-org.eclipse.persistence.jpa.jpql_1.0.1.jar
-	http://hg.netbeans.org/binaries/481935A7F53B55502187BD3C28C2BC0D957BB643-org.eclipse.persistence.jpa.modelgen.processor-2.3.2.jar
-	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
-	http://hg.netbeans.org/binaries/C54C41DD33054070647ED50F209CC77A05BA5563-spring-framework-3.1.1.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/ehcache:1.2
-	dev-java/fastinfoset:0
-	dev-java/javassist:3
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/jtidy:0
-	dev-java/mimepull:0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk7.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant -a -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-		eerror "Please remove following symlinks and run emerge again:"
-		find /usr/share/netbeans-java-${SLOT}/ant -type l
-		die_now="1"
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.3-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/8D36897DA80FE60AB5263534A3CF522F466E8200-ant-libs-1.8.4.zip o.apache.tools.ant.module/external/ant-libs-1.8.4.zip || die
-	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar j2ee.eclipselink/external/eclipselink-2.3.2.jar || die
-	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
-	ln -s "${DISTDIR}"/37AB23511498C4A55B2F15EA8EDB18D754E6CD8F-indexer-artifact-5.1.0.jar maven.indexer/external/indexer-artifact-5.1.0.jar || die
-	ln -s "${DISTDIR}"/EF8C44153240A0AA629340D17629290DB1C66CA1-indexer-core-5.1.0.jar maven.indexer/external/indexer-core-5.1.0.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.3.jar j2ee.eclipselink/external/javax.persistence-2.0.3.jar || die
-	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
-	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/6AE2C83C77A1FFA5840B9151A271AB3F451F6E0C-lucene-core-3.6.1.jar maven.indexer/external/lucene-core-3.6.1.jar || die
-	ln -s "${DISTDIR}"/2BD49695E9891697C5F290AA94C3412DFB95B096-lucene-highlighter-3.6.1.jar maven.indexer/external/lucene-highlighter-3.6.1.jar || die
-	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
-	ln -s "${DISTDIR}"/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/D388DFD4853B4C82C4BE4EDB38AB56904208723E-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/663FA7BA7FD8538E44DE9FDC5315C4F733C13E96-org.eclipse.persistence.jpa.jpql_1.0.1.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.1.jar || die
-	ln -s "${DISTDIR}"/481935A7F53B55502187BD3C28C2BC0D957BB643-org.eclipse.persistence.jpa.modelgen.processor-2.3.2.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen.processor-2.3.2.jar || die
-	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
-	ln -s "${DISTDIR}"/C54C41DD33054070647ED50F209CC77A05BA5563-spring-framework-3.1.1.RELEASE.zip libs.springframework/external/spring-framework-3.1.1.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.3-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS73_PATCHES_DIR}" -a -d "${NETBEANS73_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS73_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
-	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
-	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
-	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
-	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	rm jta.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jta.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
diff --git a/dev-java/netbeans-java/netbeans-java-7.4.ebuild b/dev-java/netbeans-java/netbeans-java-7.4.ebuild
deleted file mode 100644
index ea4765ef116e..000000000000
--- a/dev-java/netbeans-java/netbeans-java-7.4.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.4.ebuild,v 1.1 2013/10/16 09:49:28 fordfrog Exp $
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="7.4"
-SOURCE_URL="http://download.netbeans.org/netbeans/7.4/final/zip/netbeans-7.4-201310111528-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.4-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/33693E782E0F99CA7E2DEECA0222F493EBB6BC82-eclipselink.jar
-	http://hg.netbeans.org/binaries/3A33D0056725FC9ACA375DF19327BFB8818E3C47-hibernate-3.6.10-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/1FC667D74A0BB8B767F6974099F6C282C0D7EEBC-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/9B589FACB68780DCF96121A893F97307D47116DF-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/B1D9BFCBC513472E819CB6C7E1018D26439D400A-org.eclipse.persistence.jpa.jpql_2.5.0.v20130507-3faac2b.jar
-	http://hg.netbeans.org/binaries/BE675D922E5BFAF6557EB5E05A06B0B5047C08B1-org.eclipse.persistence.jpa.modelgen_2.5.0.v20130507-3faac2b.jar
-	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
-	http://hg.netbeans.org/binaries/60169962AA9DE533DE6298110E54880A1C8B0C01-spring-framework-3.2.3.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/javassist:3
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/jtidy:0
-	dev-java/mimepull:0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.4-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/33693E782E0F99CA7E2DEECA0222F493EBB6BC82-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/3A33D0056725FC9ACA375DF19327BFB8818E3C47-hibernate-3.6.10-lib.zip hibernatelib/external/hibernate-3.6.10-lib.zip || die
-	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
-	ln -s "${DISTDIR}"/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar maven.indexer/external/indexer-core-5.1.1.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
-	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
-	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
-	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
-	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
-	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
-	ln -s "${DISTDIR}"/1FC667D74A0BB8B767F6974099F6C282C0D7EEBC-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/9B589FACB68780DCF96121A893F97307D47116DF-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/B1D9BFCBC513472E819CB6C7E1018D26439D400A-org.eclipse.persistence.jpa.jpql_2.5.0.v20130507-3faac2b.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.0.v20130507-3faac2b.jar || die
-	ln -s "${DISTDIR}"/BE675D922E5BFAF6557EB5E05A06B0B5047C08B1-org.eclipse.persistence.jpa.modelgen_2.5.0.v20130507-3faac2b.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.0.v20130507-3faac2b.jar || die
-	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
-	ln -s "${DISTDIR}"/60169962AA9DE533DE6298110E54880A1C8B0C01-spring-framework-3.2.3.RELEASE.zip libs.springframework/external/spring-framework-3.2.3.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.4-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
-	rm asm-commons-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm-commons.jar ${instdir}/asm-commons-3.3.1.jar || die
-	rm asm-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm-3.3.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	rm commons-collections-3.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm javassist-3.12.0.GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.12.0.GA.jar || die
-	rm jta-1.1.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jta-1.1.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
diff --git a/dev-java/netbeans-java/netbeans-java-8.0.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.ebuild
deleted file mode 100644
index ee5967ac67b6..000000000000
--- a/dev-java/netbeans-java/netbeans-java-8.0.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-8.0.ebuild,v 1.1 2014/03/23 18:57:46 fordfrog Exp $
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="8.0"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.0/final/zip/netbeans-8.0-201403101706-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/13BDBD486B15C1C7FD2D8392FE5D62D5A5AC10D6-eclipselink.jar
-	http://hg.netbeans.org/binaries/5282CF4CDBCD0210798283E0E35B3A1FDA994D37-hibernate-release-4.2.6-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/F83E685280F97AC09ACAFF71262C3718CDC98995-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/7F267F8656463BCB6D7441D3F6436C8F516AC18C-org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar
-	http://hg.netbeans.org/binaries/C7526615424CD22908969630FD1D2B27818B6DCA-org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/c3p0:0
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/javassist:3
-	dev-java/jboss-logging:0
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/jtidy:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-8.0-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/13BDBD486B15C1C7FD2D8392FE5D62D5A5AC10D6-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/5282CF4CDBCD0210798283E0E35B3A1FDA994D37-hibernate-release-4.2.6-lib.zip hibernate4lib/external/hibernate-release-4.2.6-lib.zip || die
-	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
-	ln -s "${DISTDIR}"/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar maven.indexer/external/indexer-core-5.1.1.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
-	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
-	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
-	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
-	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
-	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
-	ln -s "${DISTDIR}"/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/F83E685280F97AC09ACAFF71262C3718CDC98995-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/7F267F8656463BCB6D7441D3F6436C8F516AC18C-org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar || die
-	ln -s "${DISTDIR}"/C7526615424CD22908969630FD1D2B27818B6DCA-org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar || die
-	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
-	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-8.0-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
-	rm asm-commons-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm-commons.jar ${instdir}/asm-commons-3.3.1.jar || die
-	rm asm-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm-3.3.1.jar || die
-	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm javassist-3.15.0-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.15.0-GA.jar || die
-	rm jboss-logging-3.1.0.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.0.GA.jar || die
-	rm jboss-transaction-api_1.1_spec-1.0.1.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.1_spec-1.0.1.Final.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	rm log4j-1.2.16.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.16.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}