gentoo resync : 10.11.2017

5 files changed, 0 insertions, 1065 deletions

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 3dab69965371..ea5bde92fd34 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -1,6 +1,5 @@
 DIST 0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar 53529 SHA256 930b2e409513be03864d7a66e22dfdf5c086725e22ba3cf57ad45ed8af02996d SHA512 406fc500e6356cb6729b89026180331c8717921e22fd0627abb799e73cd0f82c64af654b64922175f7f5514af621bd83dacae123a6078966264cc3cc753a7b5e WHIRLPOOL e088d7f55fa8be5a9e8fa2e886688f4d82549c9f12e2b8620012d567fd03347ae028a1d1b5bd70ee975cd3824c90e1b9435ac34ed7fb2f952a7ae0a2a6c29600
 DIST 29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar 1366247 SHA256 4eae7d13d7493c86df8b84b9a922dd9e8302e47ac80efcc47094344ce64de27c SHA512 06d887e5cd47b6bd86ea9e1a26c604b630285129dde43e6068d4b36f0e81c39cd91757e3323e77316e76b0fdf8c18a609bd216c7103ac8a4d947abd0ed6bab47 WHIRLPOOL 27c9f01d85f31781bc76411701ea5668644d83ec761f9d42ab93e3932cfefe5a6277429f889a6f9c68ce9efeb2cddaecb6ae8aa2c42ce8ea9b3a06305f2657c1
-DIST 2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar 227233 SHA256 7bfaa3a602bf388094c8fcfba989f0b121c0e71c6df4c3328244615a5cb24d59 SHA512 7669d2e11346b62420ab9db2e9a5a24bcea356099ae4d6f0a57c75ba168de9d24160277b8f044ca9a5f637c2591778150288a963787b6983d093ad64fac83550 WHIRLPOOL ba0f5a67dbc3a64ca0b21cb1f1a74b4e9b2d2c4d7a5f127de9940f375b70d0bc321f5ce6aa607bbe27d39dbdfd1d179b1457b5fcef65c0a0d4420e1194657192
 DIST 3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar 11763 SHA256 41706fa977afa65b9f6001b4ad1a8737502e6f2af8ebfc21ffb60042c4c913b1 SHA512 c834126f83008d75320eb33c5a752787d6ed7e96b4223aed329aabb08aad93d13d64a8be03d28f989d5f558e9233ae221e4eb9fec326df01b6be101ebab38b35 WHIRLPOOL 2b53e5857f8b3f9f3ba2acb04f623ff95aff1cb51b1edf389cbd4fe38d4f464d5f212e613f08103399e701158b36b1c9057f93fdd51b76517806f401ed4e0839
 DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
 DIST 4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar 2259008 SHA256 058d3ee2b7f6916502524ace23d6695a06abce7a00378ca457c63e65f45de759 SHA512 058d88fad0522a9fdae80552eecfa743cd771c7325b630762d13c1456f5f51024c6e88111d3e92ed97c69cc1013cc3d2e81332b94063113fc025951f871bf881 WHIRLPOOL d1f61fa4fe98efa7c81e5849f83636e9a798816db8f43156098781ebb95012e0f9707b562a2620eb006c72ce8e911357f3bdbafc68a9d3a2e032f7a978e8f13f
@@ -12,35 +11,21 @@ DIST 694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip 5870668
 DIST 7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip 5678488 SHA256 368284af56e08cbd0c4a696663ce6f484eeddf4d710a14066da470ac9ee2709b SHA512 d49f22b3ce2bd49f3ddfc35f86c0c21accd45a07b710b0787560b9969e40700d408a25e8e02d10f0d937ce642cbcab222d4e8fa28bd442e34c768b63e5583b41 WHIRLPOOL ec07b768abdbe9aa8608c36aa6bb4641dc18bdfd21d93974f82ddb9074b1f03da17fd043a6bfbfb98a8715c8ba16b5fc2585e9b0d47119a6573fb0b446ae9487
 DIST 839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar 136324 SHA256 3f74c7c7b9c924769cf3c5b4d52d21aa63e9a2ccbf16f5d26c30ebb31b99699d SHA512 c75746a1b82ef2c7ae13a33f06ec82292934e4348ead4a57d0e6b356ba79903e4658d031dd347e1e2c627288de6585c125a70e0f1d47a696db1eb967cbc36da3 WHIRLPOOL e34c8337c9cf7f43d8d219471b12beca1c7cf2bf9a310ee2dce49fc35bf819d47bbeb92ffeb7bf45bca640a987ce8d5337505938b44e83537a078478d8737f79
 DIST 84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip 4599034 SHA256 0a4a0c3e24bfe028a7741950347086e5aa49d8ed1fa59cff5c74c23f28bf8685 SHA512 5058624cadecf56182afe021b94b4ef10375b217000155a30d6f16d24286e985d472deaf47271a8239c15b5941a412b58c918e5f0684f5045690be322e0acc5d WHIRLPOOL 4258ce692b381cabe0b2e345c99f0a0e6bba7e5ee7eeef2604bb1bf686d549199a270fbe9d380197d5ede660da20269fe2ec75bdb01950dd0e71b73ba096ea50
-DIST 8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar 2759394 SHA256 3dc7e0c55b5bab5daaf38344ec079ccc5a7acd672c7b539dacf8d55b377192b3 SHA512 e15bcc568f3cd6aa0ebf362f0d09e2380a4e02dd67a6a62970c8614bcaedb9d043828d99bca12c207010116dcc062129adc7e87d73170002e2ea9b147170b5c4 WHIRLPOOL 13cf4685bf778014bc347e2550266cde8d2d43051f295c6a2c3bbf7e6259caafcec3e9bd717070972b469e46bf32c5360009b061168d8834c8c595911f616970
 DIST 8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip 266314 SHA256 36c3189a2d495bc713bfeac0eaf05612fe90d8df6c3c20d943bea38d290cd375 SHA512 f08cf953e56966a239d3ff31adc1b3ad74aac76207c4f92d860b13a2ddfbc6cb9ebe8223959ebebbdc6eb8f358a170ff8de544e58bf72a7c12eb101c32b02f46 WHIRLPOOL f3734e3b036eb9e8407478c9b27f86b616506db89d6b7411b531679e89db62f69b0434c490d9c2b1656887d1d8ce2bfa2f6464821a19e0b2b67a12a9da11414e
 DIST 91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip 6377019 SHA256 4257d1d0586bffbd66dcf3bd97913b0ec0e82f9f8dfb9cc4d3c74f0d82960240 SHA512 b43fce0d1e39985395b3f161908d52a3c7eb4b1d70b9f0485cde5b782c2ef861594e1f49d71059cbab8fb71d5fbdeabbdb9c40866b9596bc8677359b79876c99 WHIRLPOOL dbb3a33546aebded4fef949a54d02380e1d202d09923e52e3f3d3dd8feb8ec77dc5f997d815e271d3afa649a3f445943f365233d04a63673fd1b06baf0e919de
 DIST 9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar 1539086 SHA256 cef4436bae85c31417443284f736e321511cd1615268103378a9bf00b1df036d SHA512 cf8c1218f59a20e4bff22a1b179299e632258dbab92992b6600f1af3ddba1ffd10daa709e758deade56f37dc34245bff23a0789b0d57c97805767a1639602653 WHIRLPOOL 56fe9714058c7d661fb39e4d80becf17c799a9083c1a236da65446897e3c1e81c2773923b7a50dd4b3ad396b182731c750484da14965d1ee263c74d051884882
 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 B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
-DIST B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar 2259343 SHA256 551a7c1bfacb60eebe7eb5b004b69f546840cc3fca82f44431e4ac6215163f39 SHA512 67b973d2a3d52fba14ec2d285f4c2f0b0490be04d73c38918c2657f7fc257656f793e1e4eaa9221579ed93cd3ec1ce0c120f5b4fbc86582b95308c1f8b64fb79 WHIRLPOOL ae6e765a49e0cf8284a3496005a571f96ba730133c220ea77b8d19520a8579e4ac4879f1218ec38c0210c56add19ead8b3a4d104613c9788387213ce8561c8cf
 DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 SHA256 817762baeabb24daf8a41a9716e31f85a7659147d09264a499f4d35b0fe04115 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b WHIRLPOOL aae6bc05d3b441443b9f0d80e65fde81614b0206eee5714f4e51ceaa0adb778758a5d65efb3a4963111f3b258753e0154447914a5586251883d22b0c1e09f9f3
 DIST BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar 11429 SHA256 bf363540ede1db9782511d5ddcfcc6871d5026946ba4d214061ca992f064e128 SHA512 f7a69e5622153a3f6568a7b28b753ab0d19adea6c34a265b5efeaf95a9961dd0af711d0719956e0859fa3c63a1c06237381c35f20fb14e1fc9d9894f09f3522a WHIRLPOOL 4d223e3c256956d05ebf7d5e58ae3276027f0ff2effa8b54a3a8badf480029e19b8cb1b880139bde75167d886daaa6bc9c1d27c68d3b5bab01babbe607f56b54
-DIST CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar 10121 SHA256 c229a949b35bacebe798971b05b1fa6bdee4e923fcc08f02a7ae0a71fc6de4c7 SHA512 22333aab9419fafc86544492d384683a14c7f5feb313d9555f424ed4db46dd82c5a53b74b6e41221cf7d48d640145a63a653b4a05575df8ab2a2fba1b85815fa WHIRLPOOL 18dbad03b5cbcaa76ab528b2af074f566b3cd0a786e3e8bf2b56b8e0e265461fc15527a41e013f8685d1c824f48e28607833f30e02143a09be360574be38f3d3
 DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 SHA256 67d175c1858005308ae9a02ff85c0bc7efc9a2a3c058a6838d51769f417f5247 SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc WHIRLPOOL fc40cf8d49919d3ef38f6c3473736f56ee5ac1d4db848681536c3bd3532cb112e9490e76c1ef7b15d88b2ab87ed54e58dbf1227c173a3256194b5887d37f8a84
 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 E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar 173813 SHA256 39fa3597e77942f589e299942e4d5f25ae04f699edfe6bd9135d5f425845649b SHA512 ca940f40881ff5a908fafc80f6aa90866d58c54189bfc073a2559ee76496f3127df920abda5d9c7aacf9a54cda693884127c1e3f696d4fc8367351313c900cc5 WHIRLPOOL fae1db760f988f4e2886d8a2f9b2384a194bf8b579825971466a21ec4fa4971a6e4e56b477ba0b61e2e034777af6c49c66d4425734cd6f9db4aca15041b384f6
 DIST E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar 227553 SHA256 2884a6c80cb647199c9edf9d00c5b709502aa63092279b93b9a50ba1578bfc32 SHA512 5ff83f5925fa4250ecb46e08f7f064ccf5d637bff14edadf16abbcd0d6a6203cedd07a64cc5718656249d18b17a1016f7152094da3f8ed13fdbee9afbdfcd926 WHIRLPOOL d80fbd65b3aefa48361b4bafaf179e8076caf97cc7b2a4b5f7437a14f30ea568aa86b699fb2dcc1fb6a4042b131702c87e37d8cf04591f8669414b89d0acc185
 DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0 SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6 WHIRLPOOL edd56a338e08e788a307849794387069a60b1873a3a8fa29e1e7045fbf8a2f1ff175e68579df3789fdf6af8f7f94de2430560a89de48d64c22e76b1fe95b6505
-DIST FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar 2766800 SHA256 cd65bd26b26b7823fc8a00ec84d951532403f8c665f114ac7704ec5f9b90af22 SHA512 164a438eb6b55534037705505cb3adda39dc4e813535f0108ff6cf65e9f39db58069a22678c2484a22e2da1b1d70063b5a56e55f8c56a51f8d9953c1791c17ec WHIRLPOOL e551a60bc8d10869fe35c558dff3d3249f18922ebc32ea9a170b468e025762fe31d154a6dd1239c390c70c9cbd70639a98532492b108d9acf69e07419a818f6e
-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-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
-DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-EBUILD netbeans-java-8.0.2-r5.ebuild 13330 SHA256 572951549a9ed5612cf7ff1ed902aef9cd601c251d896d9bb1d5742771b5783c SHA512 bf75a399b5c9515fea1913720a71c796c1010a2d4cf439b3865d6b8255b4dce43a5f6fb0895fe43f262a9365dd7eb7ef796935911465b6788d80b917a4a63018 WHIRLPOOL f7ee8ecef4904de2cb5e664c7c849ed6fedd843f720049317390831348b97f6cdf22c5043f16bb48b79117f09702c9badc9e206fd63ca3e6f45cab50225bdddf
-EBUILD netbeans-java-8.0.2-r6.ebuild 13352 SHA256 844777b7f609be6d5064dc27645d53e4d9585b2bcd6faf6c7d99d0e8bd68fd89 SHA512 96b0fd5d0931d0b4fc152aef4cdb472304921d522cfdd80aa1d27ecb50c4fc74f8b406ac52d6f4c498237c4a67099373c27b6417f8cf19f5f367c34becc0e055 WHIRLPOOL be6f7ab03dee8139f5e9e965141efd30ddd7449b32802af334932d77ceb99a196edfd0f1703100105b27979364cce4b6b6debf6c96baf9933cf78d01b85b57cf
-EBUILD netbeans-java-8.1-r2.ebuild 14810 SHA256 7a2422b1f9ca7114d5c57badba4521f100f8155ad343b0a6c33181074c3a93d9 SHA512 947233cafb92870e73220864acf8f46add0ace047183132c7afdb092ef1c988989f8c46bb5d551b61d70f35e77a16a97fea477df0b312687375a595ac1b39945 WHIRLPOOL f8cd56409866310db867a19c453f2257aa1438fd633ff5587a9d31f22db321bf4126d2661e4de7b5b8ac304ba7f5ac0d7e1b30a607b4fd7edc385f0f3ab360c3
-EBUILD netbeans-java-8.1-r3.ebuild 14832 SHA256 240f2ad91bf57fd193cc017c1fb10a09f05d0776ef9306618af2a588bb3f1425 SHA512 03f70df6bb90c61b9f5a194b0352673059ee941246b6a5ad2b5d351b1fa857b268e283c7bd2a6057ddb3c70232b0e0a72319ee2c06225b62463354e8b85a2f25 WHIRLPOOL 00ee2af02c185f6c3a6a79ae5cb457a807d507f1840698246cde007e502efb7d6cd73342667138bfd410b2e6adca2cceff1dce1b74999297d0e93b0e14a79357
 EBUILD netbeans-java-8.2-r1.ebuild 15304 SHA256 ed3ff1d5bb42b1173e8333867574fe96f7fc1fe048fba74d854eff1718d5cb42 SHA512 c08f766179e97b6866c137b51216f9d9115304cebfe3d7cdb64b9b804a396125e32c0f313150edf41ecc08e37049a3dfad2a546f2417e2d98d7bb02b26ef6547 WHIRLPOOL 10412cdd88f6740aab811a396be2bef9fbe2c733e8a3d1b7179b22e4ba7374c1e659cde384dfd7b9bc401c76ef03d2d08f2e432f38138ace4a31710aa3e4200d
 EBUILD netbeans-java-8.2.ebuild 15282 SHA256 334361c59cc8b6a9a3e4f934565bed91f92b48b1011f5432a9c1d9fff320cc25 SHA512 d89f60bf78b3ae17c820dee321c282bc3e12c2e04674852cd2c19da82f61af627ccbb6540257f85432ae950e20f0e30bc4e7b8528dbb7bc808d7605224c97a0f WHIRLPOOL 0080afeae7e9cff1701663abc84ad8951b2e3842315f759484e67f30df9f0d95cc1c21e6e970b138b47f4486c271b7a0eacada8b529b2a9fa1f2de5ac2576854
 MISC ChangeLog 4985 SHA256 be70e57eb32425dffb7544c83a454b80bb5c7c445e5b9574023ddbff4e72bccb SHA512 172b676aa4a1325c7f9377ba36fe5bd25839345f7d029c1050c2963eed7ff5a3d1674c5606d204ca27f6bd1bcd627f9497fef8a138be725ae58a6755d07e1367 WHIRLPOOL 4eb4b8dfeb8426e8cd6700f848839733a6330fc942b8e8112920e0e1f49c8201a9dea92b0fe3336f68565291fdbd86a850cc794ae52183e9781087b9453a0d65
diff --git a/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild
deleted file mode 100644
index e503634d6709..000000000000
--- a/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-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/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-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/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.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/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.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-classpath-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:3
-	dev-java/jdom: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/c3p0:0
-	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-1: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.2-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}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-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}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.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}"/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.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.2-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-3 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 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-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
-	local dinstdir="${D}/${instdir}"
-	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 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-3/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.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
-	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.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/xmlstreambuffer.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/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.2-r6.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r6.ebuild
deleted file mode 100644
index 140e2aec0abd..000000000000
--- a/dev-java/netbeans-java/netbeans-java-8.0.2-r6.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-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/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-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/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.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/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.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-classpath-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:3
-	dev-java/jdom: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/c3p0:0
-	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-1: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.2-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}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-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}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.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}"/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.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.2-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-3 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 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-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
-	local dinstdir="${D}/${instdir}"
-	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 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-3/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.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
-	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/glassfish-transaction-api.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.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/xmlstreambuffer.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/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.1-r2.ebuild b/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild
deleted file mode 100644
index 372d97c7c6dc..000000000000
--- a/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.1"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-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/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.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/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.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
-	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
-LICENSE="|| ( CDDL GPL-2-with-classpath-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:3
-	dev-java/jdom: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/c3p0:0
-	dev-java/commons-cli: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-1:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/oracle-javamail:0
-	dev-java/saaj:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-simple:0
-	dev-java/stax-ex:0
-	dev-java/stax2-api: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.jdk8.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 ]; 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.1-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}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-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}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.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}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.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
-	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-8.1-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-3 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.12.jar
-	java-pkg_jar-from --into maven.embedder/external jdom 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}/maven/lib
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || 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-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
-	local dinstdir="${D}/${instdir}"
-	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 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-3/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.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
-	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
-	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
-	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
-	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.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 javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.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 stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.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/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.1-r3.ebuild b/dev-java/netbeans-java/netbeans-java-8.1-r3.ebuild
deleted file mode 100644
index 8afa2cc57ec6..000000000000
--- a/dev-java/netbeans-java/netbeans-java-8.1-r3.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.1"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-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/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.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/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.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
-	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
-LICENSE="|| ( CDDL GPL-2-with-classpath-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:3
-	dev-java/jdom: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/c3p0:0
-	dev-java/commons-cli: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-1:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/oracle-javamail:0
-	dev-java/saaj:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-simple:0
-	dev-java/stax-ex:0
-	dev-java/stax2-api: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.jdk8.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 ]; 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.1-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}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-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}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.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}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.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
-	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-8.1-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-3 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.12.jar
-	java-pkg_jar-from --into maven.embedder/external jdom 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}/maven/lib
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || 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-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
-	local dinstdir="${D}/${instdir}"
-	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 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-3/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.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
-	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/glassfish-transaction-api.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
-	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
-	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
-	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.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 javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.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 stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.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/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}