netbeans: bumped to the latest nightly sources

Package-Manager: Portage-2.3.5, Repoman-2.3.2

40 files changed, 161 insertions, 158 deletions

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 83a5e0f40..9b81f6e6e 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -35,10 +34,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
 EBUILD netbeans-apisupport-8.2.ebuild 3017 SHA256 d297639605e30c93fe6a853d1aa859a0639dc7993b52abef9553e57410cb12b2 SHA512 48ca1cb4d64aa2ee6695e82a5298212c5f8e483f95c2079a16f12bdfb447604bf4498c7b0e1dec94bb90015b84b6ea84a997dd5d71289a4795d8a85755fe5c8b WHIRLPOOL bd86b1a72f5d476c8efcb146635fe94e316187c488136ba312ab263e52fc0eb690726d6f5a4cab055538be6a964c87d2299239a0783e3a713b032e2698a184d0
-EBUILD netbeans-apisupport-9999_p20170307.ebuild 3063 SHA256 22135d679f03652d39938a5c7fb7956c24f05a5059d7ab080700974c1a61ce47 SHA512 e2e1ad45ea79ef2ec3676da1172d56c3c4a18fac3e5ea0d656eec6df40a5ecb448e171abfe2908fd8229f47c746e81c0d6184d8e53cb16531bad358dec53199a WHIRLPOOL 5f9f8018ac01bf2f31d474c5eb7a42975b6a192597c6a48d203f888b3d9f1b399c1dc7f4b062886bedd149351530736ae6234ba74821d963d1f3fcc73c8b21ea
 EBUILD netbeans-apisupport-9999_p20170308.ebuild 3063 SHA256 ffe3e2d5fa4a6775a9b88f2ef83f178a778852dda8795041e8415d772610bfac SHA512 ee44329b2da315656ce923bacbb980498155f8eb91868b80fc5c6b200adb1af87f3bc28850b639725a32ce842b39d92828dcc28c9c65eaeb27e2193482d2a118 WHIRLPOOL da56f97538577c77274fb91ba438b539a9dba6675130f5ef63bb924780b503b4a816ba639b8f7a121e25270b91e0318f9fe8218dda4a624fe60d9105cb7bee4c
 EBUILD netbeans-apisupport-9999_p20170309.ebuild 3063 SHA256 8cbe0af59a6ec3591b5e5925b426127c11827862d9b19faf8f5b8d0bf631c6fa SHA512 c33939eb6d610d035a3cf73fc3dd475b63044e895547e687d79a1fcef86cad9e7c08ac194c8a3e2ceb99596877d617ee95763e0fad3cea788fd31246514cb07b WHIRLPOOL b8d9aaed1de737e35a08ed39cfd425096e0434d17ae9ffc87cecd2700c34787de4ffee4981db46bdecd9933e9629559d4a2dc89fffe5a8d3e829379cf7e24856
 EBUILD netbeans-apisupport-9999_p20170310.ebuild 3063 SHA256 19fc33ebbb40e149d97cf76ee4115558718e449124c87ee9d2e9ca6c4234a5ed SHA512 f7bdeaa1073d717dd6913947de9554f2341a21821a0e05f98ecc9f94067c35d4cf5fdb8be28c676e70ccce8b1e9064cf307385585c5e7e27c9f889fda51beec9 WHIRLPOOL 72bbcadfa61379c2ac4ffe41365a4d1c7ae5498f0d30a6d3480dd670c23074a67edf9a1012f35eb806336c61ee08e98ca40f64f2aae7815cfdbc3e0bba2eddca
@@ -67,4 +66,5 @@ EBUILD netbeans-apisupport-9999_p20170401.ebuild 3063 SHA256 032abefd1391ab097b4
 EBUILD netbeans-apisupport-9999_p20170404.ebuild 3063 SHA256 e556ca60371bf79deca2976ac06b13e2cf231415254dad19b6d92b402803db56 SHA512 e365b355cee6d3cacdc2ab5c3b2fdee72eb8c3ee66bf68034b62347f4d9e3280a39730ab95efb48383db9671ec597dc2c7670089a2396dd7e01aa53c8c83230e WHIRLPOOL 0db65b71130d0c385fcf59472957df015b4867850ad4a39e35e65460d0a28eac4496a680e292d977a9b2852e961e910cbacceda7c1b8c55708d227da0f0a379c
 EBUILD netbeans-apisupport-9999_p20170405.ebuild 3063 SHA256 b15f69199c2a4e7a6df0d650aaf31c39fce56ac8e76916167e514e8f2ce76738 SHA512 c80b282e80f1c9ac6df82c12ba5900380636298b2be90fbc7b4c27b7de486b8765b9fba56eb28ab5fb21e3c71a531325aa8053824b3e67978986f7660fb5b69a WHIRLPOOL ccf835229d9b1e147c64828fd8a4f501fe9b50ed96d45afe7a8a2bbb379a475121b73dc90a4b327743e00c922fb0f5a8f206118ce48cdc408f2b9868ce99e602
 EBUILD netbeans-apisupport-9999_p20170407.ebuild 3063 SHA256 999919bcce414ba774f17889b854ad6085ad7ae98c188cd863125b7af9cde071 SHA512 f534eb839d4a549cc83e0e81548566c12dbaa5f370f51e3b49ef738ecddf028a76b1dbe6ba88b6c70edf4acaced6f91fbbe306e9107368d076663d16aa6bf251 WHIRLPOOL e4db764cbfead1097bc63cd68e89d77c8af1f105d6bf4730952e9a8d8eab815d7e923851260d5695e405052d5caa7da7336019b95112097a9ef82276ae172b58
+EBUILD netbeans-apisupport-9999_p20170408.ebuild 3063 SHA256 95f1d41a4d0bb42c626848a1941fd2c8d0903cb7e38a6b9a7f7b99deb128cfec SHA512 d96ef8944959368c4ab17c96be78308ee6924f90cc07af1349db505892e58bd9b0133f6bdbc24e5fdb50bd3af10fd87ec23ee8c3e5d280edeadce9c19871c1ea WHIRLPOOL cd5a402ec84089180b1b731ab3e44b2c139615a5a9dd83b132f6855833aac351c001429edb2e8756ee9bc541373d2fab9596c147195a788f007185fd033bda3e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20170307.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20170408.ebuild
index abdec1312..f14137723 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20170307.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans API Support Cluster"
 HOMEPAGE="http://netbeans.org/projects/apisupport"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2"
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -41,14 +41,14 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 }
 
 src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 2b9fde3c4..71f613059 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -3,6 +3,7 @@ DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee45
 DIST 43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip 38904 SHA256 d97735f723292f9fe534d0821841370ee3a14a577c3fc959078ae865c16201d4 SHA512 ae3b1865e32403c09354fe9bda5092f88bdfc9bf36c18f21dbf4cccbbb2874881aee3cadea039860a3ddc5770b9ba95201faeb13ebcdfe5a403fee12e8935852 WHIRLPOOL 8a5f7ff0b4b94054a0fcd7366d37f6cc34f3c5e90d94172447993b9bc06753e13d57fbb2d2c14fe2a4ca5b15285b5165fc7f66b6012710669878cea67c6463e8
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
+DIST 6356FC5709DA48844F0E64E241657F1B26AE6EF1-t-common-1.0.zip 383528 SHA256 3c91bc83d426616f3faee026eb04dcfdcc7c0dbd9acfff4f4f9b1f0c36425754 SHA512 65963632458a0b7f6d689d8569dddcebe6e99e14da4430c308dfe346a2649b0b1ad9bf82ade9e4d39afc96c71def54912a698972926eb6a2f7a8c605b62a4d5a WHIRLPOOL c5bc66c65b33209cc21f89dba7cbd09286c229385aee6af7a387140742cf9f66cc3fd7e825334acb7c28acd6a414946679b1c5d676210fce0033b128a3c24c9a
 DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
 DIST B7B417DE191ACF30A60E061437B810840128A89D-cnd-build-trace-1.0.zip 39877 SHA256 e452619abbe694e735eb88b59a4b28bdd76b867d8ab777fda3a2f7bda696b3cf SHA512 7c7241920e358a27425be05213ea4cfdfedccdc51b6503b36f40377d554957bf8356ebe93d765066584457b25a757f6a79d49328d45b4099d3ac2425a6994fc1 WHIRLPOOL 4eb5615b78bf67f975dd2471cf10ff809633c955025c1d9a27c2b9ec7911983f96e31d0af17a77116f5d298b69a5d89baf3ff12029bb3660ae989f884416cf6f
 DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
@@ -19,7 +20,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -48,10 +48,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
 EBUILD netbeans-cnd-8.2.ebuild 4423 SHA256 1487855aaa8f09e80adacd9b3e06916c1758d40738b1b6fc472f979a8793c421 SHA512 da88aa7647b608d8ac2fd40eec2bca162070e9553451201685b2eea63b706340f13e94179476d5370d734af615b861cb85d61dab402286bc410152ef879fe6d7 WHIRLPOOL 7c0ecfe3e5f968be11ff6ad236a3e1c2ad12d3565e3362bfec160b27bb3012624d474372e16399ad983045156e5043b050df94a1665d869ca627599df03fbb0f
-EBUILD netbeans-cnd-9999_p20170307.ebuild 4474 SHA256 fed4bf491b7ec6938812a2a558e6e6d3cc77abbb7f9e14634465c5fae5a91271 SHA512 60aaf215878f91c20689adf76fcff42d9afdeeb0f8f416d78d588aded9d3db0ea4f2b7148c5d1ac63c2ec6838fce4efb69e8871920f035e366b80f0c95d89346 WHIRLPOOL ec830e0796524700cecb8209c321ce971867be98164fedc2c4a292514bc05cd65233f8dba60d0b5810e51f8d95375761f8dd20f394d2303fee0f7be40ea9e023
 EBUILD netbeans-cnd-9999_p20170308.ebuild 4474 SHA256 2bc3523930380fdcf84fa3264488c7a6e3ec02ff38fa8fe76205e45241843e4f SHA512 a2bf432c113964d0b03f8a7247057f75b9213560a60a048b6deb6dd0b433b3c43bebd51824f6ac38b16358b7e0364b95be1c0f8e805f260574a105a80f395b39 WHIRLPOOL 091fb6f724aa90e6be200549e6474f82381cb58b56358f31eb161cf5e68c846b983ab28cea6680f5a0980129b53cbf1ca0047bc7871fa768a9a84a78b65af398
 EBUILD netbeans-cnd-9999_p20170309.ebuild 4474 SHA256 d925f16345ec919db9510ae18b54f61fbe07517c885e4cb7b43102a54cc3eed3 SHA512 db3e36f145d06c18bae8eba20e8be67f4cc0f005731bc730366f372d6ec29b5e0a34e02297ffb88fde6236130e923e1bd6ad6e2b2482daec82bea0d47fab6b17 WHIRLPOOL 7a63f7a1986aef41d8da3def77b25f8826ae8f58d9e16360e6b4c673eb091bf726de98817d30e52efb0e1dff73d5b05b5ea743cee7992c20960c5e77678d72bd
 EBUILD netbeans-cnd-9999_p20170310.ebuild 4474 SHA256 9d4fe74394f6a6fcccd104b21b034e359a578492ae87bf4e673c724b59338d54 SHA512 3ec2d9304cfe16b2363a2966c8791da12bdd095edf948143b8642cbd260bf174b98d5b7e4b5b3679abae7e0cd1e3c20787f78445f263bbb67a0a28556ec3969b WHIRLPOOL e2cf81f00660d43ba85703b4f9141f31d34097d92fe2d4d324d08eae9f8e986c750b6a30ce579e45858ab31a8d65a55d06797845503acc4dd1ffce9587d778a4
@@ -80,4 +80,5 @@ EBUILD netbeans-cnd-9999_p20170401.ebuild 4474 SHA256 d0027a7c96ff354e1956cf2456
 EBUILD netbeans-cnd-9999_p20170404.ebuild 4474 SHA256 031de4d0c68b01b62ddeff63c1ed334c4dd6cc1654eb0c82b1cfc1141f12959b SHA512 97c3537a8c0c5295ff9050f612ab0d9b31e31b4461e9c6d189964e642c030c04fe242373497f5f9ba98b3071f6b846766e3e49cff0ec3b4aad8d58d12516e382 WHIRLPOOL e7ba1641867f79f09747460e6fb2804cebcc969f7dd10a54ec21ad9e497a7123d41984dc7feaae16e32117ff913e4483a467dcfff1afc9c1746751eba6101e2b
 EBUILD netbeans-cnd-9999_p20170405.ebuild 4465 SHA256 ef494f9a0ff2f99fc490197539c864a6e9201bce31a0c4762aa4a2ee9d7f7a94 SHA512 d02db9cc264404259e7dc1ac875ae83759461b5ae99d6307e784e2943e296ee6c7e137586b28edc872036803ad348868502cc9245faa7e02dc9e6e5f4fa78ccf WHIRLPOOL bf84d2a37e0f7ce8cc0939c8be9a8c623161601939c33d818a65559795a9e244b44c8245edc93e86bd20095efce2f043b2c7a6afc63ebe7d671276bcbe9d1baa
 EBUILD netbeans-cnd-9999_p20170407.ebuild 4465 SHA256 58a44df94a3d0b3fda85b5eb4cd0a623342d08f0c812187bd0ffb40be5baa087 SHA512 358a40d741ad2d301c669cdcb291edc1a1ab92c2c9b455dee4f3eb0fbbb00dc10a43928c65499cba6aa55c4db246eadaf3eb1ba0bf117ccf0bb122bf7822f044 WHIRLPOOL 191b3d2790d10b37fdbb379243be8a110f475020d7c09e6f1c5b4635803e8fe88964a7411d8cdd823392afe4461e6275a612aa5a1a4ac166e25de96e680e6b36
+EBUILD netbeans-cnd-9999_p20170408.ebuild 4684 SHA256 8f38d7a636166bab30a019651570283f44e43e42894e08950f78ba6354f02def SHA512 f356ed8982cb05975789e9da7dffd7fe3653fa4dc949beb383a4af2e5ee6c7d764898995bf8ce4f1a8f0d372f224f8eb93717d10512fae18907d510842cd6682 WHIRLPOOL 964da000748fd3f9cc5ade9eab2e0b54eac4d8cb85365c67cffc0582dd97c3b6290dc201a64dd0f20b591c63687e32ebde750511a767751be6f5dc1e4a8a2ece
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20170307.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20170408.ebuild
index d51409dc0..bf21e76b4 100644
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20170307.ebuild
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20170408.ebuild
@@ -8,15 +8,16 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans CND Cluster"
 HOMEPAGE="http://netbeans.org/projects/cnd"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
 	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
 	http://hg.netbeans.org/binaries/F3A74CD526DF05DFBFF96D0072BB71A334B52AD9-clank_0.3.9.zip
-	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/B7B417DE191ACF30A60E061437B810840128A89D-cnd-build-trace-1.0.zip
 	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
-	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
+	http://hg.netbeans.org/binaries/6356FC5709DA48844F0E64E241657F1B26AE6EF1-t-common-1.0.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -50,15 +51,16 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
 	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
 	ln -s "${DISTDIR}"/F3A74CD526DF05DFBFF96D0072BB71A334B52AD9-clank_0.3.9.zip libs.clank/external/clank_0.3.9.zip || die
-	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/B7B417DE191ACF30A60E061437B810840128A89D-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
 	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
 	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	ln -s "${DISTDIR}"/6356FC5709DA48844F0E64E241657F1B26AE6EF1-t-common-1.0.zip libs.dbx.support/external/t-common-1.0.zip || die
 	popd >/dev/null || die
 }
 
@@ -66,11 +68,11 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	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 --build-only --into libs.jna/external jna-4 jna.jar jna-4.2.2-stripped.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna-4 jna.jar jna-4.2.2.jar
 
 	einfo "Linking in other clusters..."
 	mkdir "${S}"/nbbuild/netbeans || die
diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 4015da517..2d12a2732 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -10,7 +10,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -39,10 +38,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
 EBUILD netbeans-dlight-8.2.ebuild 2601 SHA256 a9144264d25a2646f188d9655f5f0d967cf4deaa39798d908180a4d03d25c926 SHA512 37b761dd475da060a75e057b737e770de52c2f76c732f4ed91d0fdaf0cfee95e5631d2796567a0bf2f98e323bb4bc509bc6d2c3ac3ac65834256e60c858fbb2d WHIRLPOOL a3f9dd29ea4c714ad1f58246a24a543a3e2501536fc72a5e1e1f5f8083bba60902f2c1b8b3844fe779588045d55e10c6ce588e885a0399fc521d01d19e01414b
-EBUILD netbeans-dlight-9999_p20170307.ebuild 2647 SHA256 0a4dde7311757585adc738e9d348dbafa4b9ff4dfbcc2b77a58e2b945f03069c SHA512 bb89dbb6e0c1066f27abcb9585f220fe0d141adfd727c80fbb471a37856424b4260c4cf33f8b7b27168af7143154b2140767a51f4831cf53c08517379c7cdccc WHIRLPOOL 4af4703dc74a13e0df4b7c6da19cda236b96b0aa855727734a4af3f4609bbb3831b8b0b73136439006c71e4d5b6c7b56322af7e1f45e3ff784321a316ad721cc
 EBUILD netbeans-dlight-9999_p20170308.ebuild 2647 SHA256 5e6e07674ad68a09e11d94b1b9c394ba1638235f4d1d508316dc0e2683a17077 SHA512 315269782d50ca922df936b82482e370e9fbd1d22a9d4021e8ef060f520eeba1de7fa564d524b0c500dee5c1750a24a909400ed650320c612418d3e98a3760c0 WHIRLPOOL 0c81e4b43bff9f737ed1ea96f46acadb1a58d5626e438d74f6472b438ceeefc8f96d247c1ae8accf899bafd69b4a97a05ffb4817027cd9a4468721fa29a365d5
 EBUILD netbeans-dlight-9999_p20170309.ebuild 2647 SHA256 1803c321fe9be62b16ed536e731760e87f3093c1b161ba30814b54559dc31dc5 SHA512 92a7273a2a02327b8cd04e910f79fe067d4512440a6cd68e247a2741cf1f839913864d935ce670825640b59cf3dc785c71f21238773f960e1a16148c97a14301 WHIRLPOOL 8f6d882f9ad56b9a9d351583910ca4365b6acb18b32ef1843faa98fd8a17d7ed62f2258e1ef229df37112ed603ccda795318e7be3ff080759e22dc455ba4d761
 EBUILD netbeans-dlight-9999_p20170310.ebuild 2647 SHA256 ee361af6240a71fa406c4599adac7e17f30b2b87521ebf50d833990bc2578c44 SHA512 359f89f18a42e0a792c28d3a2c360bff1aed5a8e28437c7b6863d16a3aa0a2cb9e3fcb0931ce19cdd27a3cbdb1666fac7defc10d923e3e559616b1db327a1c82 WHIRLPOOL b7d537e1168c506f133b52233f42c17a53b95ca718a9ff1937dfcccd7a1aaa962685c93d77d2a8bff6e7dfa9a9027f54ead7cf93189c2a995abbb034fec8afc3
@@ -71,4 +70,5 @@ EBUILD netbeans-dlight-9999_p20170401.ebuild 2647 SHA256 b2c7d93645bc1836ebd4ec2
 EBUILD netbeans-dlight-9999_p20170404.ebuild 2647 SHA256 2c3628c8800cc0ff17576e789138a4080999c47b2af5186164fc519cd667513c SHA512 99c676ab4bd7220dfa639a1ed1c3a17ae62b1c9b18c0658b40bf02c32f77c203aa9e73cb3cf3c8db7c05917d8414212758e35d1dd258ec1f9770715f6d9f8f9c WHIRLPOOL 3d763aebc0aef2355491cf2458d0b72990d15b8f1613c594c0d61687399d66062115f29c9f48ff038e70b3278952c9b70681100addbf0366b9fa9865e86d7e67
 EBUILD netbeans-dlight-9999_p20170405.ebuild 2647 SHA256 541a315fb01cfcfca5eb1357bfd75a38730ccb95eed78e6935b79dd4127439c9 SHA512 1c50c637ca6ef04e755a891c5b6dd906d34fcff37ccf6c549886572040ebb34ee5594a14067f5d6beadab7cf7cc09d3a80662c6887859aa021843bf8095a40a2 WHIRLPOOL 0a57c4e1875d1c67bf73222fbc039aece2692b0e48d0a7ae7be907b756854d08e459c509091a64a96c2198e4011ffaa2d82825067a0a8125b62dc6f4f9fdcb6d
 EBUILD netbeans-dlight-9999_p20170407.ebuild 2647 SHA256 d45137aa03558601204532993171c1addda7f5e9cfb48cf285be920cf4d10ee7 SHA512 c7c979261999c42d85d6aeb0e7cf714f7b7df3668400e19808622e521c78beb0e7b4bec6347c5af349e0a244c8d8742b792c4628b968803f50199ba7292fc131 WHIRLPOOL 9e1e57086b07382c5722e25d24b4a999c668a931424c5948afac9f2c5ac19411d7e20439818d008e91390c4d34687d7705887b1fda97d39fc5076f1286984a9d
+EBUILD netbeans-dlight-9999_p20170408.ebuild 2647 SHA256 640676f3020d79b841ed508cf20140a2a5a2ff546207f12897ddb626d69ec002 SHA512 27fa1bf3b689712754cd635e6362503715e40b65566ceef1d3f88aa914830f34c25d74669f74fdf06655e31ea8fb7833b1d4a5c62fedb9b56796c01667a2507e WHIRLPOOL 03a73c5b44e1a332f92bcedc2f5699036aaa9a045f394d8b48d7095b9f0d88b433cc345288f0ebcfe82dd14c2ad65d59cd5ab2a8e4821c0d71048c75ffa31c07
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20170307.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20170408.ebuild
index f20f593a4..0edd3fe2a 100644
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20170307.ebuild
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans D-Light Cluster"
 HOMEPAGE="http://netbeans.org/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/FDB0530AE633084C1CAD9A2CADFFB8AE1965BD8B-fs_server-1.0.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
@@ -39,7 +39,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/FDB0530AE633084C1CAD9A2CADFFB8AE1965BD8B-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
@@ -50,7 +50,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 373dd35dc..7a1eb1dff 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -38,7 +38,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -67,10 +66,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r2.ebuild 15888 SHA256 9cb96d719e48c85410390c1ef8ef5da6b14ed303d87ba99393893d04cc69e5db SHA512 084229391752bf92e3f01bddc1e25034315b099df1b3773cebb93e4d5bf726d5f3a73d5651f3863c909e327f51852d2bda05cdc2c8c362ced9cf4583287a1466 WHIRLPOOL a5dc785abdbb3cbc19667dbaa9229527c8a2024f77d490500d942744db8418daf8bc0c98ab98773931d81e900f7b4c1a1301f3206e9f527f3cdc7ba90565c437
 EBUILD netbeans-enterprise-8.2-r1.ebuild 15458 SHA256 83e8c2d97274710d27ab543979b2c3c91a3b1bcd74ead97ff737cdd2e98b81c4 SHA512 9b55ee87c85cb7fcf54dcb790dd2aa492f237f3ed72f74753cf3c830a56a2794dd73e035bb64b4fa0d28586391da9bccb814d5a8229b46d7715ba6b05a2acd60 WHIRLPOOL fefaf332629afe897c408fa202ca31f972f869be094a2a0d700e1be98b665e61f43c22666874b8ff1525770ae1da272e55d5fbb98e984555ac431e9525e5d6db
-EBUILD netbeans-enterprise-9999_p20170307.ebuild 15504 SHA256 e21c00c4ed4f7ab0d790f8b68206a0d349391438d98df2ab8d11b652bf5e1b6a SHA512 5ff580dd313361ed313f14c744f163103a7cb31df1a32aa55c2d23c3145061a88745aba0e3cc40b3dc3cf1d6c315aefe24bec3f612e13f6358111431012d3b82 WHIRLPOOL b33c2164e51c871d8580835e68b870c1115f18d6067b44414a862d520f439fa097e7e4299750878ae3935f451bfc70d50516a6d7baaddf64741bd869004ac96f
 EBUILD netbeans-enterprise-9999_p20170308.ebuild 15504 SHA256 246331c416cc2c7b8fe0c3b8310c8893ddf09c20efde2d09cdd9625c8b6f3e9e SHA512 207b0b18f71f3c19ddab036ba2f66ff11376469aad6692cd33b753762a73f66045a4630c9601aa711e6560f23246cac3d1e5554f3eedad90f1bc1edc4fdc070a WHIRLPOOL 45d033e3c906153264e90b29881a63b1e75b97af3adb5bd998cb3238460d6d25daa844efa60a51fbde48dee8a4d1291e89e17a705149a76b5ee1c965ef3e0db9
 EBUILD netbeans-enterprise-9999_p20170309.ebuild 15504 SHA256 7f6575bc3a590830b3ed668d393ae50ab0577f0a374f75227a2cf659917e483a SHA512 87cd77d9fbffa4f9f1e15669788b364ee67d96c01260dc4a634693590c19671810906b756b36a12b9f58f1454473c39f658966fef5dd145d06f0ede7db3f097c WHIRLPOOL b134ebe162b95189cc5855a0dac5e3f6e8f92105b33226546ca2f444eea4a0213233cccf4eef2e9f736c3fba4ae55189e99a2e248c867b48a2e1d9f1887ad048
 EBUILD netbeans-enterprise-9999_p20170310.ebuild 15504 SHA256 16dc8f06c193d81b404b50c6a8f13578fb273f330025aa4e3d69160ffdaaca01 SHA512 949559c3eb27d94660763235fcd0652dc3cc500a1f0872b62406eaed4d7282a3c19296ebf3465245219078b7009fe79e93bafdeed06cf80c6f1b9a09a5ea901e WHIRLPOOL c5e371cfe812040e1806c1831990c4a6457b6686b01cde53dbffc9d8db200fa33b33db2dd49510dd5a9a8de070e1f48a56c162f1cee19401ad9fadda8485db22
@@ -99,4 +98,5 @@ EBUILD netbeans-enterprise-9999_p20170401.ebuild 15504 SHA256 51707187806da5ac9b
 EBUILD netbeans-enterprise-9999_p20170404.ebuild 15504 SHA256 f14a758e54cc5eb134911ef3614be77eda230a705638c6f6d1c46a6a75db9dea SHA512 171a73fbdd239ae48586150774fe5d8915ee3cabf6b65851f52242960f92f3169ad22b60d0b30be800206ade2a651a4ac7d745444a67450450df95f610fd878f WHIRLPOOL 9e8898eea9c9ba438e3fef3550d192de9a0dcb7b33fbb491a1cb467e2b7a5424e776f361a101059a8e346d78a06d467d8de8302296348534ccfa71ab5c51089f
 EBUILD netbeans-enterprise-9999_p20170405.ebuild 15504 SHA256 5b10c8f940c3bbdc3dd7f7d296f4147fb2f90664d874d6e6c7066337bfec1f7c SHA512 7ca6c913b7857c8a7ceebcfa1560a21cc4956840b5f68b809288614d9e9f3829ba857a1d45f086b85b9e1b3a8883feaa5f330108c40d6644c4091bbbc35070aa WHIRLPOOL 47839c6ed9b509b1559f05c312a33017a770afb9e3e7dbcbeeeb8686144036372bcaee901ef79f15c325371492e1c09978758cb9d824a116a7ff7f6d8e495d42
 EBUILD netbeans-enterprise-9999_p20170407.ebuild 15504 SHA256 4852c1d8a7b4928b490bf2a7fffe196ea76b4610428f719aa4b09e20fd1708a9 SHA512 702e0acad96f8c4c884f30ae8298ed8b68e4941616ff2bee1201494c677b71d2f5e276a38ebc2eda3e90e1705421f04436e2786ef01ab5c3e1ef435f3fc1cd05 WHIRLPOOL cf42fd22cf31c56ca404fcfb24534063b2d40a0c4bdb017c85172a9687c1e73e208f1bad7275e437ada785c25b4baeed0b9c21d916dac79398935c904acf9f38
+EBUILD netbeans-enterprise-9999_p20170408.ebuild 15504 SHA256 513f7d0f8c522a8cba7200c67f6d73803c6c701f930d5afc8be00cb707ce2985 SHA512 00c9d10ac7ffba77a0aae5d45d8e52d18c9e77956afd3a093191ceabc84c63371b253a3db30192e6314d7f224ce27869688c6884488e69dc55ac9660c78e1d3a WHIRLPOOL 9c599537f291974cb70f578c1b8973d87afeb77a2dbb3e31c45ac165501451ee8899f89eaa6dae39d7042af869f3af33604ec8f1818bf005958bd408beb18e80
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20170307.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20170408.ebuild
index 460b2ed72..59a6bd69c 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20170307.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Enterprise cluster"
 HOMEPAGE="http://netbeans.org/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
 	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
 	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
@@ -96,7 +96,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
@@ -137,7 +137,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index e30c5a98e..3ad4e56ad 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -35,10 +34,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
 EBUILD netbeans-ergonomics-8.2.ebuild 2546 SHA256 562cac72a53f5be657a76106196678970146ba0c35254f6d7c6b472baa985f46 SHA512 613a289721beb0f8ce557fe80344fcc5da8004805ef187575e3224763d7f6c811368eafe22024f88c7d580e1b0564c13b5faace2071e7f9823c9cc720faa675a WHIRLPOOL 32eab90158868db4767b7a6d44488c7b12ba97ceea50e699f3c9b297b98234647746398ea8aa85aaafc5b87efe862b8f74227feabcc8ebb4cf417662e1afc48a
-EBUILD netbeans-ergonomics-9999_p20170307.ebuild 2592 SHA256 6c3f0e85a4b97432b1276b08f9490a92d26d88293c028d3ffeda80f0c747dd8d SHA512 6126c365f6fb544d7b4f0c21f56b45d4cb3e743156502ba8a4c55c2992672880690956d544d0f526b9640c5b97d5a10615f31d60f439f034f332de7a6d1a22fc WHIRLPOOL 9dcb0dcb9a3eaaf93b6ff80aa5bb9febdf5a0b6a68343066378fbf4e0840ba2d68925962ad089145f1d32d96f48dc1a59643c6964103797386b065865738fba1
 EBUILD netbeans-ergonomics-9999_p20170308.ebuild 2592 SHA256 c29e7087c230d9e3011088f5578283842ac7f778ae1fa581d0c0365aebc9d506 SHA512 b1ddef41ec537ef0fec1b5ab55719aeff87e0ce041de0443a6ba31e887801d81b305a2b9cc0824290235793aeb1dd000180ee9c770a3227619e72ccb1803165a WHIRLPOOL 81a1646f7186b63f976859b5dfdb2407993ef0f39256d6f70a35120b1cc4ec0f892dccdf207eb51f323fe2fbd6e7efa15cb9f2b07c9a41cad59752a651e4334f
 EBUILD netbeans-ergonomics-9999_p20170309.ebuild 2592 SHA256 298d8770466493e8968551876e0da5719e7aecfb56050edd71e8c8b33a2c0a45 SHA512 8d1d060d67512868c04b8142e56786f855831ed85f3a1762bbfe811c3afc2a48d511c2efb5b4b47f7e8e6bd7ec1f0375063d3617b241d28308db6f3866bd3571 WHIRLPOOL aea0f6386c58228ed64c5a1aff95649698e993dc6a8ea7f8b5d74f2a63f3e74fd9631f1d02ac0eb7e27813300ae2613f4b098d76d2e2bd5d38f6c20e091c74a7
 EBUILD netbeans-ergonomics-9999_p20170310.ebuild 2592 SHA256 57fb24dd82d789dbbad95b85673c7cd157258ca449b0901d60ef8b24f4236ed3 SHA512 0cba6518a852a01a8287455f983224f4742e856deda9483016097129309fcfc8609062b40d17d7f58a82298ee2d9e129feea68de244402093e05014f4f0b922b WHIRLPOOL abf239e1af57452423842aa2b1cf10d1cd0744ed59ed6c4fb64a94b7829b6961c4fc4637b164a01f24f60a046ff0717743a9f83cf19e7b79a31e9d601f66c84c
@@ -67,4 +66,5 @@ EBUILD netbeans-ergonomics-9999_p20170401.ebuild 2592 SHA256 1fd2858d5409971d59e
 EBUILD netbeans-ergonomics-9999_p20170404.ebuild 2592 SHA256 aafdf2135482e5f4cf093bd89b23dca94976688368637fb7f9342d2c03e86aeb SHA512 d3aa4b80636600fd87648b436c1fb2aac211021b52d28ebc3318628cead11b5e126556b4b8a3ee9c04c958fdd3c39c82582cc7452420f4cb6b4d98ef65d52df6 WHIRLPOOL 2230487ed0329d88d7294580102b397fcee788a2e4051df2a2477ae454ec15d7a19febc1bffd448e8a1aca4566a089675514d6b978c6cd2793d75123e6fae855
 EBUILD netbeans-ergonomics-9999_p20170405.ebuild 2592 SHA256 1dceeb826d8c7507ca4abf2027eb5b027e768a097ce5122e9c815ff52be7af73 SHA512 e4df185594453443cb6201da1189bb89f9e9483d4a2fc163d408eb677a489370a9220a4e023460dfd671e77217cb79f8a8e932d5c7cf5d713fb52df05e2f969a WHIRLPOOL ad60e3045bcdd42334b255ec28630ef3c0d850f0f2756389f9e9d6d2fe4ceefbef5278b317f005cdd0d823cd1ebcb5a0a9a4a7e49d232588494282db7269e016
 EBUILD netbeans-ergonomics-9999_p20170407.ebuild 2592 SHA256 83eb397bdb85cca6fc388a24bd915d826c434f9aef18493be52df03898b0322e SHA512 3a8e7e36d13e8a5275df0d57b2598c4749617e77f2140adbf196febef9acd268dd33c7487fd894dcb8925510b18463fa0be1814bfb41f04830dd2ee068fb5efe WHIRLPOOL 6a1018a017b5db5e0b938a1d3442e4026e28846ab0b31eb26c09e417a63e77daae310967739b1de6ad434d08e70d124b06579b6d7b2070ee615651011f59c2a2
+EBUILD netbeans-ergonomics-9999_p20170408.ebuild 2592 SHA256 4690ed5cacc0eec5c5217d01f19687e6d9d084f712cd6d20ef5cebcfc72f9d36 SHA512 9bd5abd33547e450cc0da1046656308f6e78f8fecb1432e4afa43c6437ca63d6d110634426305f1ae6ed2c28bb0ceabd942c0cbff6c8f182350748462e5f8317 WHIRLPOOL a19decd44162328beb2fd89ea5c11b24ef291e635aab2a61edbb28fb8820907741569036c0f10e0dfc44efa66403a2f96fabaeed225e6927eeee8aeca26c8803
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20170307.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20170408.ebuild
index d41c6db56..2826c01d3 100644
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20170307.ebuild
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Ergonomics Cluster"
 HOMEPAGE="http://netbeans.org/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2"
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -39,14 +39,14 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 }
 
 src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index bef024ec6..96366814c 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -12,7 +12,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -41,10 +40,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
 EBUILD netbeans-extide-8.2.ebuild 3010 SHA256 1bdbcf2a1d0f75022ffb06195ae2d12011441610997582c2c98db5ed0c7a33cd SHA512 cc7a2c14e19c2fb36e4bdd677dbce3a117027fa946190c337f11215297b5ac25cbc1e127a0f769e6f9c6dcd656088601837f751792d58fb84d06dc73500ca4ad WHIRLPOOL 37fa4cd7c950ff60c09ed7f5eee528b9f4729c86f20d70060e3a3f3ec2c3a212dcf7f9d578cbf65869873996a0c2bea67c0a84dfb4b530eb20e97f0761e27028
-EBUILD netbeans-extide-9999_p20170307.ebuild 3062 SHA256 f62008fca46e07fddbd344cbcde831e5f9edb64f9151525114820c04f1e2d5b3 SHA512 b19d8be2302478faa2c66dac23c812172dab4c633bb90db1b5d5ec87e24ca209a874e9dde2ef167f91e4fc96d6dab3c58554e77adc73a6c3a8bcbf8ae06a0879 WHIRLPOOL a9d6bc07438fd17eb4deb4607f1e06a20790076cfe1b550b4c0ba7e3109604e3c937a17b3389a7152285ac419abd26e3c29a4f76f58abb5eea380a4b686b0891
 EBUILD netbeans-extide-9999_p20170308.ebuild 3062 SHA256 6f67df896cd412786eac88d58d415b950d2aecdfd821ce565b2c2835a4fec109 SHA512 97ca109e747e234b136f9c0a73f8d0cc50680a672170be5d29bea6ed5cc3572a616faa76666eb570629728c2b465861d3b973986f1acda03d4a8bcbf3679e5f4 WHIRLPOOL ec1a0a28048275b9ca024dfa6489e145412118393acd791df930addb033041050ade71712268fbc1e8a92dda5dc9caa7f8829455ea290068577cb4c166f5dbf4
 EBUILD netbeans-extide-9999_p20170309.ebuild 3062 SHA256 b2fcb212464b0bd36437aa45138ea5801e061f10bdc8bd159ef9ad0ddb86e632 SHA512 f5a12b785f115e33670b2989d63aed57e14d38caa1808ef8027aebc3488e3651115e99fb1b7acda6ec38dee2a097f377862539bf7fe34b523fb38b663bc15d19 WHIRLPOOL ad8ece1d3644b4b170376404542de2d59ddd769313a744acd80adc8ddc8d2fd860b5580001e6a7ca94fef00d6bc6082a13ced72b7718e78fa304928ab0ef3863
 EBUILD netbeans-extide-9999_p20170310.ebuild 3062 SHA256 41363592243f1bd78083bd927822e2d69bac50df176af428d6475207076d5eb4 SHA512 7bac315812c27c619e7f73a18e6128f7d40f4247b7d8e7b0a9473b30450d6c0fbcadd10dd976a143f0be0092265dd969d1a10cefeeef1115226e60d90ca2ba66 WHIRLPOOL 3cff9c573ee3a6b2ba8c6ec0466d4bf287cb3d5d04ca66386bafbac1bcb531b07ad513ada604f9bdd3ca4f0f40d2f0b994bf315f4378648a534a67a4fbf31afa
@@ -73,4 +72,5 @@ EBUILD netbeans-extide-9999_p20170401.ebuild 3062 SHA256 12cee9850db562babb1a8d7
 EBUILD netbeans-extide-9999_p20170404.ebuild 3062 SHA256 099b2170316d0365f5ae4d3a2f0c2a32337d7c0c89cd7c6b448e18dee058cbc3 SHA512 9e221678c09ed1f9248dd2d1788f13870522fc4a62ae0ae747f6755b5f8a6def75e9034a54c1d690cda315f2eb567b5485f71b010ebb6a3a61fe7f67217e5a46 WHIRLPOOL ff6c8d95996511dbfc83b6a0c30007dc7573f67c65da91dc8027795b0ba715f1d5d47716111e201b8656da9f9a1ecd74ea3b6b89ad79461819aa293e3f6b9286
 EBUILD netbeans-extide-9999_p20170405.ebuild 3062 SHA256 f6c3e72bba5afdfc9125180fa2820ef01c602dbf116859491000ce84e1f7ec6f SHA512 a74a66d8e7da31f9b4cb0eba47fa804c54b066e6c36b5f6faed2c5a82bd5eac65f8f087429aa43e610d603169fc0860f0f77b1d7af79c28b45e44a84214a7aa9 WHIRLPOOL 8017c5cf22a51b17772b3c76b256cc273298a451afd62cd2359755df7f2f1de829a7d816856ed8d3bc37a04253952b6abf8817f703928f40387e0272db0cb9dc
 EBUILD netbeans-extide-9999_p20170407.ebuild 3062 SHA256 e3b851ec4f96e224a1eba72cab6bbb530e27337f395b78214233370ae7e1e35b SHA512 83332714a646968064981a8c5fbdd98ad081f096d475dbb5cdc649a5eb05e3dd9b4d75f03c7a5ad8a9234d07a10e438951827648517c4fc1a82930a0903c0cdb WHIRLPOOL 30450654d057c88a7f9c163b4bfadf5a0a90ad9bb5eef6ff2cba4fb0d4f18e29c5dd535bd99aec0f95221aceb71afbbebd50b4ab2bdf83eb8af86b4d03cdf1bf
+EBUILD netbeans-extide-9999_p20170408.ebuild 3062 SHA256 4bf930f38f385dd1737346eff5a5077ac2693382bc846b4567b28d43a84b9ebf SHA512 0f9e324fc3603c1bf9bef0acc69d9b260dbbba43bfdd33eb20e698ff8a0611e6e274d0c118de3af980009c4c83faf890295368a65c94e8b0d0bde20ae7a09741 WHIRLPOOL 094fb302d627125523e1efb1e746022a26a370b4ac351565abe30425d7ef3e98db459b77432c24d2018e52217869c334bfefebbf110f9402ef2777bcab9cb194
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20170307.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20170408.ebuild
index fecffd9fb..3a93fee2b 100644
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20170307.ebuild
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans ExtIDE Cluster"
 HOMEPAGE="http://netbeans.org/projects/ide"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip
 	http://hg.netbeans.org/binaries/F6E0317E5F315E395DA47E5B008D01FAA48C91FB-ant-misc-1.10.1.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
@@ -40,7 +40,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip o.apache.tools.ant.module/external/ant-libs-1.10.1.zip || die
@@ -52,7 +52,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index ba360fe4a..f8e903e15 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -37,10 +36,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
 EBUILD netbeans-groovy-8.2.ebuild 3049 SHA256 d27659e9363401a753323eb9b308c5780660c1d6116b67934db229adf23518e6 SHA512 4837f0b044cce627b26dcfc55e5abf132fdcd76d2264f1f9e892278f5a79ee0b2a222c641a036aec971016faea6cd5dfd9d5ac0015dbacbbf362a3241315dd56 WHIRLPOOL 408b16296780f36f1bc032f5578a024c6934ef82d8018d611935725a8c4c43451ebf750a4d8ffaea59ed4577a4aa6cf19d4a2806e899348e700a3a5aa65d7b95
-EBUILD netbeans-groovy-9999_p20170307.ebuild 3095 SHA256 b315ce648c315b2b5fe7280973711e862f29dedbbf9aa6df593ee2cd021141b9 SHA512 cd4482ef7ec51958a522ae19e3de5185cc103cf61714f4a9c2cae0f9ddb5c6b90412a9e1dcc2b88c6529b5563d28090a79e09592b5d48043f58981f0c9a9d1f9 WHIRLPOOL fd07783f0629a3d782e3462d36d1c1f88f5a1bd1c0ba5a01d74fa05fe315b49df6e0a33492571447002679824b903e10908df2b47c131987687ba440ba75c5b5
 EBUILD netbeans-groovy-9999_p20170308.ebuild 3095 SHA256 76553cf9028160c17ef655b1d1ea1ba17a48078bd0cd57d41c4d7ad99b5fd8a2 SHA512 5ac908b368f5dd635b6f207d38d7e94508013f2b7cd98dbec09553ab3e4eebc94f4311de4efd2389b03998a25e4b2a225cea2834aacc86fbeb82622135825afa WHIRLPOOL b7036b4258aa61567fdbb8617fcd7783dd63ba058bbdeaedec5fb7b42908e2142b65a9f2691e0d51aeab744e60ed4a8a71a18841fb2fd0090ac477cfd7d07a72
 EBUILD netbeans-groovy-9999_p20170309.ebuild 3095 SHA256 a5aa92f53c0840aa18038254fe95a70a15a517ca0519b9af601c2a3ce46834b2 SHA512 5d50170b0cb22aee72e239af2ac09368f6ffd7cd1f61fe9a7b919a15d933ef8f256442c8570480569181c42ed0e91c721d16ff1ee51950b3dfc23cb15a50f4e4 WHIRLPOOL a86071e964fc4335046d126e28d392477d573ee2e1d3355a06c651cc32042969da3a30c6b03ef8e7961787f0973c2bea046199e1bc8616bc88098c3667b05340
 EBUILD netbeans-groovy-9999_p20170310.ebuild 3095 SHA256 03ff55e8a8a471fdc9aeba054c09c766febafc32e8d66ad66c4d863d19858f04 SHA512 1e514181eb00bb1fe0644c5b5d8565cd693a81811dba9e09cd2771a0c13d7bc6a4c548a6647aadc408b0ac81f7ce0005944d837ffee8f4f0250a1dbc22424636 WHIRLPOOL 6fc1b9141af0bccd65ddec5e5dedfd23f22ce399ce0bc01407381b69a4d603e39e4b0943212d1176dc4b2ae6e8d28a9a80a0909a75e78a490752ae3c4fb57bfe
@@ -69,4 +68,5 @@ EBUILD netbeans-groovy-9999_p20170401.ebuild 3095 SHA256 f521932dcc81873dd4aad69
 EBUILD netbeans-groovy-9999_p20170404.ebuild 3095 SHA256 8e7dc11bf5f550ffb6f60e815fbf4ec5c7b547029be058d45139e7af36fe7274 SHA512 016e6ae058da074fe287c0be0fd38441ff8d26a2a1bd1d7910394178a6d9eaec8eda7110311dde6d0469b06c18da4f3f9c6c0f1834f6c9b3bf83943c84144cb7 WHIRLPOOL 07ddb77aacc88c3f201bf7f6e91769fccd86d084923121d89f5702dcba08e344b6c3655e18c7bface73c224368357abedb20116cc64843836b30e6b1c40ea592
 EBUILD netbeans-groovy-9999_p20170405.ebuild 3095 SHA256 2d635a22c7e4afccdfed2aac460db33680c5f64cc6cf413d706394db58a8b396 SHA512 687365753f747fca9c2e583bb3020be2df128733cc0c426b928f1bf22adf3f90c07dad16802deb7c3463b22ab4586dc92a3f7efe8dfb6f194a9ed47502f9a853 WHIRLPOOL b98f083d012aa6c0c30b16ffa7bc37cca852b2ed007112b1067f5f0e879c2e0214a5f469c32249253d8d9e10e8586eb6ade876e5b7917e03d901bdbbc281eab0
 EBUILD netbeans-groovy-9999_p20170407.ebuild 3095 SHA256 0a4ae117a1b1fdf8e99b910dbdf82c7a9f95d3d26ffe7cc8d5a39deb2f45c111 SHA512 a9f417d9df82524ffd6764c1c05ff560e7e579e0773e3ba35a2915485cd64351d81f1c49ae23035acd2b9a9d4d2cef9444106f555ca07969fb43968698f1aeb1 WHIRLPOOL d91ab0142c6092b96332139f92429d52528c139baee756441c1d89b54a03b8152835784c41ef41cdc8e9a34927317acf038d4946044e34d5dc2f268ab81538bd
+EBUILD netbeans-groovy-9999_p20170408.ebuild 3095 SHA256 1817e27263d33f497401d61443928211a12b7dbfd9dd98d4479d8f0ac0affe66 SHA512 0ad18ae8c06fb18789b575d506d23ee35fddbd4ff68ea5904aa91afa6ca3c27e3e78477f169047da0b05308446d18057f48dc83810438f40832b34b5c8fe39b2 WHIRLPOOL 01d8d8fa3b37922a81f115e2ec677ac343b4772ad29c9f8785aedf36bf82b4814affba55f41dbe3c9025795898d5e1e4212d93c64b9b15dc7e501c76bfd37326
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20170307.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20170408.ebuild
index 9e9f351ce..47c89ef82 100644
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20170307.ebuild
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Groovy Cluster"
 HOMEPAGE="http://netbeans.org/projects/groovy"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
@@ -41,7 +41,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
@@ -52,7 +52,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 3c4f302a7..877f2bedf 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -40,10 +39,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
 EBUILD netbeans-harness-8.2.ebuild 3759 SHA256 e01750b4f4f98443276da2d8c4cb341d559dc6c8e9972bf2f81329c340f5c65a SHA512 4cea21e0b7e6b4d619600a312a4c4f77609e875869d5e66bd1e84bd1a076470440f0c70014238f41612031773e60f9e2ee7891584f96a07ad76020cd4fa6e043 WHIRLPOOL f45e09fc166586f1cbc10e13e2b130508dced6fc01c621e0f6f4fc802bf89d908ac7f7c189f1c8ed16bb7f4cada32a2bec89bc0c6c059b908ad5b68eb015f934
-EBUILD netbeans-harness-9999_p20170307.ebuild 3805 SHA256 bb646a9b9cdd987facca992f2fe85928872d8ac5a16b76e867e6131fc7902318 SHA512 1c9236beb89a9278f03f19fe83b17bfafe5eaa81c7bc6816c11676d01a140dce2130e7b633d501ba5fd56e1f058d28d47af835045ad320d78af06e369e210623 WHIRLPOOL 5d6fd49a8e4ff94a1d2cbf82d603937fcdf4a5ed4f6dff6475fa02280bda252835c9ae63f3fc79c101fed65bede3f3d831cf471a76e99bbf5b0107ce10065d0d
 EBUILD netbeans-harness-9999_p20170308.ebuild 3805 SHA256 7ac6438b6f87ab8341f2357d8919ef237ca43f22fea33df35235680c2e574409 SHA512 af90d6d3164850a56df6bcdce269499cfd61dea53e73eb42f16d9efdaf6667f84f9c097450c520791c9cea42d1d41c0694b1e1c84fdedf3e66e878b4e61a8501 WHIRLPOOL 166c58bde000dfb9dd5d256769f6747a7c36951001dff1637ba51c61ec2844b71382eea9d22baa588a7402b1518053f384ced3776cd4eae1f624c17dce179f18
 EBUILD netbeans-harness-9999_p20170309.ebuild 3805 SHA256 6c7a99f138dd768b55f343fc0712c424cee3be22479352bfb543b1f1a41074a0 SHA512 df787d9bde29bfe86317b999d9f95a8a47c5ec72f858583397e018fd757df03a7f9fc36865c360c04f7ddbe1f4807fc828a8ef2b2c860b1712e2300d162f3ccc WHIRLPOOL 6a269c974454c39d04d07fe9c3135d5457e55b30eb24e7ee7d3527d0fd707c7f060119878938d87736b87dc7262031eca28fe76dce4a9e8f85bc41a59e687493
 EBUILD netbeans-harness-9999_p20170310.ebuild 3805 SHA256 a40d1a9dd3c38c7658efd26c323521619e7027ae07b11fd2ed431e13c78a9e50 SHA512 e9c3dbf377005a586ff7e35dbddd68ffd22a02c05917eaa9503bf6a9e221334ed1b5ade2217021ad6f36d32a3ec3cbd4a20c6d6052af314774a048ec0f85fef1 WHIRLPOOL 0b662c356949b15851be34d3ed1e385f9d0681d441d22394d1cc0041641caa52e89f945d89701ea559bf05bfbb225fcccb00b3899cb1bb8935c711ce3a003c08
@@ -72,4 +71,5 @@ EBUILD netbeans-harness-9999_p20170401.ebuild 3805 SHA256 a7de445c07f454201bdbe4
 EBUILD netbeans-harness-9999_p20170404.ebuild 3805 SHA256 8456da5d0f3a507990f5b7b35fb334c86858c02cad725b3b93c4f16c42b213ff SHA512 2757165521a8899b56c247bc53e1cc283632e502630563b3a860af235c4fc188a2c863e22cffaea8f4d39830e7c62cd91ecf0d8a44819e3bd0e0efc8920080c2 WHIRLPOOL efa5c3a6122573114dfff032a2ddff2a95e082e114b4a49e416ffa9c31061b7d63cca2571fbf7f72e890c6b7d333b972afc722134155d39454d8462d673f88a8
 EBUILD netbeans-harness-9999_p20170405.ebuild 3805 SHA256 53a68674dd41a44e7f19b069b2103cb3fd5351e10678963895cfc4fadff5dff9 SHA512 b9edf8ee7af99f72aecb7a724d54ceea775773262dc31b846b2b3f18b5bdbbb9ad537062feffed8a2852431088dd1bb37066b5801859e722e52857b2ff5c1732 WHIRLPOOL 44acdb75627c13a2e5e6b870b6f880159b25193e4647762c86fc542d9f5e79727c06f63451f42fe8f8255d58759492e559b93c5d7a0d31d45a29bc040a77ced8
 EBUILD netbeans-harness-9999_p20170407.ebuild 3805 SHA256 92df387012ab918966a82a1bac79b699a1f42c26f7b61d625b12e68d27dde458 SHA512 875312398eeace3e4059462b62005263a3fc1867aa0007e80de5d83253232a08743d53100c45aa3a10531f891c72bfad15ca92533462ce1d693bed3c8a4dc42c WHIRLPOOL a8f1dc5bf0b7d439ca90ad1c17ec071b56612c395db7ade8b9b8a2f88a1c333c7e6dafb2a505d835836747339aadc04c98f5b1eeb8f55c71914586ba4be9df2c
+EBUILD netbeans-harness-9999_p20170408.ebuild 3805 SHA256 99cc52ed0a9add71b00fbf4b2e3cf4a1e95a6df28238b8170c36052652ee07ef SHA512 12fb752df2a59ff731679790ccf7458d0564596d7a4bcb0222243ec72c40a9d15ae7e2bdfa2fd1664500bb39dae5b6a43bab2384b5957610ef6d598f85dedd46 WHIRLPOOL 32e989d68abb735cc042500379eaa0ec5c303e9cd945afedde25c2ea3ef116048fe4a1256f3dcde627cc94346ca98d5af2a7e710d8a29c0d9977d726e6849353
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20170307.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20170408.ebuild
index 5e7028c67..c55365970 100644
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20170307.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Harness"
 HOMEPAGE="http://netbeans.org/features/platform/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
 	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
 	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
@@ -43,7 +43,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
@@ -58,7 +58,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index c21fb885f..bc5c595d8 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -147,7 +147,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -176,10 +175,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-8.2.ebuild 29488 SHA256 7161e0a30a2a97e9fe5285273220e62ed4726f046eb32c346c9e32ec7a76404e SHA512 abe27acafdd78e5ef444dbd303a85f9714c414f9c1d5ab719cb82a53b12ad7af6f37e8df81d3bb9de3d6181b6160db9e889fbbd2fe5d87e670e29c52e0d33fd9 WHIRLPOOL d74a419a364e00cdb722cf2a3640884d2efa57c797fb35b3e6ad569f5e70937df2a163908b0e7a70ef829334318e8e8f832333400171881a24bfede777bfef0f
-EBUILD netbeans-ide-9999_p20170307.ebuild 29530 SHA256 3c00b28611c8bb94d80ff2ed45141ae77295faa51e65cd7565d4c65a71c94b78 SHA512 26c1dbbe43f7d576c80687ecef9685de481878cad1e389a7c5f4319e2a010b86b6481f1a482a2eeda1d2782fb019468ca7348c381802368689f92443827d8fe4 WHIRLPOOL 62a4de643ec005595c7badb305cc617388065e17bbc4112d107e7b950e4070c17a170d3d2a84271846c471a43c5379307d3da6e7cdce30c0a19e1b82e2891d03
 EBUILD netbeans-ide-9999_p20170308.ebuild 29530 SHA256 b3ce29fd3a6e4a22de0fc71ca294b53bb161eb3e0cff568e409adc9b489cf2c6 SHA512 345efa170553c45985f75bdb416581e7d905a7d85ae1f222f5268876e901a54ba0f1020dc6d7ca030c41d3563bd9cb2e46f015612511ef9e0037a5d6fe35a9aa WHIRLPOOL 844da06a584b649d8bd24220d8e57ac2e9ed4de9322d7e27cfefb462eceb8f0092760ecb99cf7506d76cdb974a473fdd27920361bd178af0d82140855ae98f5d
 EBUILD netbeans-ide-9999_p20170309.ebuild 29530 SHA256 8599355556ae572b9f7e8a1c3dc5deca80942ebb5e8a41090a961d128cb32dc9 SHA512 27f76880128755006f140195a03090edc5b272b64fa73105e342d0ac7c59c092277466bb217ec59228b7548fbcf763ea7e370b1d51300ae87aedaa68a06de160 WHIRLPOOL db8b7cd4e6ad177ea2583933c7b4b669d91b31981b304cb98e0a6f49953c9caad4098897012062fd00532c9345f5489fff421923349e70c2b0cd82800d2d0f50
 EBUILD netbeans-ide-9999_p20170310.ebuild 29530 SHA256 d0123228b82f91e10b4fddd402d474c2a087d1701cfa27e9f83673385763063b SHA512 c1098a71d898a5e87be49757ca16499d91f830545d010efe995668dabb7aaaece4bef24c1b0854d7cf1f0ea6a3f82d6ad8933290b071689d9fa2d091acb25c0d WHIRLPOOL 299dc6643377c2262b5403d5d7216731bbb1951c3ffd2286fdf7e3b600fe435fc874911170054e5b75100b3a78b19accdc65364afc8baf342a8b259ea7184e74
@@ -208,4 +207,5 @@ EBUILD netbeans-ide-9999_p20170401.ebuild 29530 SHA256 2beb6e32676431e448702efa9
 EBUILD netbeans-ide-9999_p20170404.ebuild 29530 SHA256 d462b63a57b499e321db6df06f1cc5bf75dfdb616b1e6f245e9079c40be0614c SHA512 9b3dfb87c314aabc29e8ef7661f5aaaa500696e161eb9aa1f5e76d167d88f41af2128e9f9f4c9b13102b3addd0b9bfc0f52bf5be7fbec82cb2253eebe49115e7 WHIRLPOOL 18b67c920e499df69e707a6e5a8a06222985b4e1785e6cd1356ba4619ca40bcf1be9097abfae4103fa8b6bf70a2e73df52df2be589b0bb412dc64ac3f3fe76b7
 EBUILD netbeans-ide-9999_p20170405.ebuild 29521 SHA256 aadf330d7161020388872b734a0022d45423c4ac446450cd81310e395e16a081 SHA512 5320a3af90e36811bbf81713fd8cf128a14e292285d5a1c1caf1a44d628ce641a0d682ec4b5740eead97c7d562d9be0289095a3bf26aa339439a663d752d2b5d WHIRLPOOL f746bae04fc985e30e5a4266a6bbbba15678eaf5a1167d184055ba2b97f3218eba5cc7252cd504f3abbd782a0aca1671f658612317997369b060c0a414150d22
 EBUILD netbeans-ide-9999_p20170407.ebuild 29521 SHA256 f2a2a6e854f159df9e17d16e461acf73d0281438ba45f5d929ba551153dc791a SHA512 73e2e3e94d6b1879fba57126d780e0efb985e5c919633bd5d4a9bdbd3ae5a09e3fa96b7b51aa542eaf0ed4c61ddd98d794821de2b677c589225dd7971ffca4e9 WHIRLPOOL 66e54eb16c24affaa87e71dc51988c55292108b518daa1ec7c20515a061b1b0232ed56e553e0bd8b3c180ee54e25a9d4c2edf45c4dea6ad0e5b583595b646dcc
+EBUILD netbeans-ide-9999_p20170408.ebuild 29521 SHA256 47bc8b46dd908ad9a0218f7b0228276691e64fec055729a6fa154dd4965f6fc5 SHA512 f670797e21034a4b79fe6d1a34d4df63d156257710c3d6451cd60e09a960d59122f06b3cca3d570f4d33866a0ab100742a0b9cc8f02cf0b0accb4fdaeb362fc2 WHIRLPOOL 1188031aa79bca1c9c9ada04941e15b0ae094f68aa37c242c5d0230c0282bda13cde72deba908151aabfd5e51fbd02bfa32f37c23342527d21ac57efe616ed92
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20170307.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20170408.ebuild
index a20e80b8c..7d8874a60 100644
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20170307.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20170408.ebuild
@@ -8,19 +8,19 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans IDE Cluster"
 HOMEPAGE="http://netbeans.org/projects/ide"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
 	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
 	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
 	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
 	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/B71DE00508DCB078D2B24B5FA7E538636DE9B3DA-commons-net-3.6.jar
 	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
 	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
 	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/AD56136EB86DE2425C09134285FDAB458E6F6269-exechlp-1.0.zip
 	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
 	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
 	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
@@ -146,7 +146,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
@@ -154,11 +154,11 @@ src_unpack() {
 	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
 	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
 	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/B71DE00508DCB078D2B24B5FA7E538636DE9B3DA-commons-net-3.6.jar libs.commons_net/external/commons-net-3.6.jar || die
 	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
 	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
 	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/AD56136EB86DE2425C09134285FDAB458E6F6269-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
 	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
 	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
 	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
@@ -229,7 +229,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.54.jar
@@ -244,7 +244,7 @@ src_prepare() {
 	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
 	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
 	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna-4 jna.jar jna-4.2.2-stripped.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna-4 jna.jar jna-4.2.2.jar
 	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
 	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
 	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 07bf64630..f248608a3 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -59,7 +59,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -88,10 +87,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-8.2.ebuild 15289 SHA256 f6652db0195c9adede506bc3acfa8c7941364783cbb9641224f83ec4d939fe71 SHA512 cd7c1a99e1597c8577b00fc710806f0b4c8ef882d4af0c7da55de5af242751916949d853e24aafa463d6fe2a8a767315281542316776f833005e1294de8202c1 WHIRLPOOL c2beca3120c411a46fc48f6846af284c295832fee2b212fda90639101b06d08bf828276958afc5edae4f2382bbee91460cc3d555b26af68cb34b85057af5a87a
-EBUILD netbeans-java-9999_p20170307.ebuild 15652 SHA256 1a755223c5bd2806d740f3adc52351e36cbe6bddebc9ee54ec4c2c89c72c59fb SHA512 1d0c791c5202568038aa25a85772af48a240e7205d76cfc837726f835a6a7cf5f164872f3133c8f3861234d352e48427ac69a0f150970de619c35f0f680a178c WHIRLPOOL 0b453237e8441d8ac6223b59c4a90d1caed533e939da085533efa4ff76d3569342ca1d8bdad3405d8c901b4474e2fc2e6c16e25c33e0adf6054d9c13269408ab
 EBUILD netbeans-java-9999_p20170308.ebuild 15652 SHA256 3c55c65513aea266f0b2dd4ee9b000c138cfe2ddb813221301c93f8a33e732de SHA512 216bfd0ad070a81e74213482c558bff9287a28e950a7aa51d6b885627155dd1d11ca709a106353364e5c7266f2fdeb35decce9297c6ea7a7335f816dde5ea8ef WHIRLPOOL ecc3d2721aaf478bc4762cdc3b4a61c8606b47091fdf253e4429566011f1099244f044de8a8ad7e28548bdca736d69986d1183950bbc43168c2f4dc08c52423f
 EBUILD netbeans-java-9999_p20170309.ebuild 15652 SHA256 658697f88ea527314824bde115936e6f14eaa6ea7e01e9eac54ae8c1800d5936 SHA512 44a428adcd862baf7df7f0759c8f675375fdac66dba2b3f10cba37a0b8c38a4dbb6179997cea2d7ed937b1b94d46bfd52151ac2da6fcf90bddd4575019bc0d53 WHIRLPOOL d2f184938e705586eb17193fe3f84501d6b63355353d41a7981a5d82148baacc1421cb767f371d9b6542209ef73145135066fabe7ce2439872a031d7047751d3
 EBUILD netbeans-java-9999_p20170310.ebuild 15660 SHA256 74b7115366467613a594f508dfc4e89f183d5773f41c277e50cc23d2c8488978 SHA512 b5dfe5b45abd3cc02ea03238e2884fba1f647abe6640002ff3c506deb1b0f3a547f8c734d90951387817b4c3644c5c81736170c1a5d5ede808a2b466dde9e3d9 WHIRLPOOL c0c08a2603f90ca73ff1c6bb55046ee771aca30b4e393373361b478fad0d7a338c1a38978eb1eb8fe88b867ef17b7053788fced4acb9f20ee0b207b289f179c8
@@ -120,4 +119,5 @@ EBUILD netbeans-java-9999_p20170401.ebuild 15660 SHA256 3a8625b1340dd1bc5a730c94
 EBUILD netbeans-java-9999_p20170404.ebuild 15660 SHA256 3157b06280220c2a31dc6f2bf30b3ba8f76571d641b4115a80619f2161f28611 SHA512 db34cda5e4efb80656a712cf1054736fe55427793214e0e8e8ef3558ecfb48b59c2a46964c91e165cff1de4c263e277c7c9689734c56f615922e76cfa4651e74 WHIRLPOOL 67db3f15d9a8145702b74b855117a6ecdc36e06f135a4552cef2d6bf2640a27f46f8c885c85be3a63624e1d90597bd93bbb413d6d05cba87674622a991eed1af
 EBUILD netbeans-java-9999_p20170405.ebuild 15660 SHA256 c8b2e769e9d726a9b9c046ae2789840ef8d72f5903d04bf3af75c330cefb3d58 SHA512 0b3b74fa7cb3e197ef48f273ad159891063e93332fe735e6494d63e9b2806ff354b30e42f6ee14bc23308ea7c1e1aae107f1887f217d4ede57dc639806c49cd4 WHIRLPOOL 513fde7241c678961202b214c4448a7d0fba6bc0f8449fc9db0e4c00695316f66555ccff38a2cde3cb7edbd67f7521c51633d0e5cf265d818fbe8a66d1bf7ee2
 EBUILD netbeans-java-9999_p20170407.ebuild 15660 SHA256 565ac3a3134af677a82e180c373c79daf82564ee2f31d13722b051df6b69aa32 SHA512 91911ce2a854f59e1d32fbab689cc7bb6701e1ac28b9ecede2ecff28c49aa5f16f699f585ccd32f331119e1c2571b12f9c639c0420d891afbb5720802a3170fb WHIRLPOOL 397a0980e47e9258ba64b160e421f297088cce49e677659840d81ad1c308ca63d92f396874f2087600761721af5bd3c829378dc1c32cbea4dc39da5f83f6b446
+EBUILD netbeans-java-9999_p20170408.ebuild 15660 SHA256 9870f067646b925e22100dd898a3c0a87fd30e0cee158e2c03b54f9bcfa3a7e2 SHA512 608a72d78286233322f45f1c0579b00974c7ea49695af7398ace626aa6f5558c205c2394d6a78f065db5436b4c2d16acaff12437b6c8d0fc1a70fdc888a84b89 WHIRLPOOL 4f7ea73f7af06d3bd40eaf4971afcd4d5974f761ca8b36341b8fc6a09d3c020e81e9dbba13465bbb921d90423574f258b4188f3c4201d26dd1570ec350e090a6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20170307.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20170408.ebuild
index 9c1f4251b..34982a443 100644
--- a/dev-java/netbeans-java/netbeans-java-9999_p20170307.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20170408.ebuild
@@ -10,10 +10,10 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Java Cluster"
 HOMEPAGE="http://netbeans.org/projects/java"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 # jarjar-1.4 contains also asm libraries
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/E48292EAE5E14EC44978AA53DEBB1AF7DDD6DF93-aether-api-1.13.1.jar
 	http://hg.netbeans.org/binaries/2DDF9BB8C3B41BC2891832A6D6FC25F8BF41D77F-apache-maven-3.3.9-bin.zip
 	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
@@ -27,14 +27,14 @@ SRC_URI="${SOURCE_URL}
 	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/48EDC6778F1802BDCFC60033DC0AB0579850B633-jshell.jar
+	http://hg.netbeans.org/binaries/1CA9DE21C6E443E814CB56912BEE872EF7094C49-jshell.jar
 	http://hg.netbeans.org/binaries/CF734AB72813AF33DC1544CE61ABC5C17B9D35E9-lucene-analyzers-common-5.5.3.jar
 	http://hg.netbeans.org/binaries/20540C6347259F35A0D264605B22CE2A13917066-lucene-core-5.5.3.jar
 	http://hg.netbeans.org/binaries/D276E74D57C64ED5F9A09A48DA05B75555E8709A-lucene-highlighter-5.5.3.jar
 	http://hg.netbeans.org/binaries/E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53-lucene-queryparser-5.5.3.jar
 	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/FF6814FB24C19922016106F293D8A928C9EE3CEB-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/4DEEAF40D353A4055DD2E762A7D32E6E6A755329-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/A0D73583DB9546DBC57E88181135039369827B5B-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/26C45EF6DCF4F944EA6AF6C5FBBFAFE541A993C5-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
@@ -122,7 +122,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/E48292EAE5E14EC44978AA53DEBB1AF7DDD6DF93-aether-api-1.13.1.jar maven/external/aether-api-1.13.1.jar || die
@@ -138,14 +138,14 @@ src_unpack() {
 	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}"/48EDC6778F1802BDCFC60033DC0AB0579850B633-jshell.jar libs.jshell/external/jshell.jar || die
+	ln -s "${DISTDIR}"/1CA9DE21C6E443E814CB56912BEE872EF7094C49-jshell.jar libs.jshell.compile/external/jshell.jar || die
 	ln -s "${DISTDIR}"/CF734AB72813AF33DC1544CE61ABC5C17B9D35E9-lucene-analyzers-common-5.5.3.jar maven.indexer/external/lucene-analyzers-common-5.5.3.jar || die
 	ln -s "${DISTDIR}"/20540C6347259F35A0D264605B22CE2A13917066-lucene-core-5.5.3.jar maven.indexer/external/lucene-core-5.5.3.jar || die
 	ln -s "${DISTDIR}"/D276E74D57C64ED5F9A09A48DA05B75555E8709A-lucene-highlighter-5.5.3.jar maven.indexer/external/lucene-highlighter-5.5.3.jar || die
 	ln -s "${DISTDIR}"/E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53-lucene-queryparser-5.5.3.jar maven.indexer/external/lucene-queryparser-5.5.3.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}"/FF6814FB24C19922016106F293D8A928C9EE3CEB-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/4DEEAF40D353A4055DD2E762A7D32E6E6A755329-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/A0D73583DB9546DBC57E88181135039369827B5B-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/26C45EF6DCF4F944EA6AF6C5FBBFAFE541A993C5-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
@@ -162,7 +162,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index a05c0ec7f..c0b0c93f2 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -38,10 +37,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
 EBUILD netbeans-javacard-8.2.ebuild 4604 SHA256 f35859b4db08064ac877233b10c4b1e5758333ea2d52f53b4be552ba9d46722e SHA512 a93db45c440b95874ec10b69b3dc5abbc1a4efeadd52f63acf6576d11e589c91aa011ff7bf98579ed04444d2933d68fb50eb32693f713a6ea132ae47f49ed48d WHIRLPOOL a7a9324cfcb128645f94bb8ced7e6fcdeb9527bff0907b2874333471613aa40bbe829cfc4e0392b55d207e624fbfd02919e685315b3e3239f4aeaccbb5aa6cdf
-EBUILD netbeans-javacard-9999_p20170307.ebuild 4650 SHA256 70c7cb6284d7fb9288f995c0a07c8e3e9fb97dac3330f617c8aa08b70485444b SHA512 2f017fb78f78ee8bd1bdc880cac097553f73ee23f890eea3ab6e61141cd9c50343f6bdc69bc976b188809f3e7ea3e93e1c6884c09a9f8cb624b67e80be7ef52e WHIRLPOOL 89ef9eca646291a6b265f9359ebe82c4c129a83148a0b003cd246990ec09af0406f96bfcaa9418dabba3d919718e4814c61ba77b7577b1e2ef0c0ff7a57e3a6b
 EBUILD netbeans-javacard-9999_p20170308.ebuild 4650 SHA256 4a86db3f6424a3d4e05c91b1e9171eacf4577a0903898deb5c3652a4c5589f95 SHA512 fc14830033043823377a481f591ac38f90a4ac5f6d50860f0ce7abbc50d793c3dc3cd657a56f7a702f5a37a579d585db7bd96799f1ef4af27d6a8322d8b95b93 WHIRLPOOL 97b8b8ce7bb9de7124cdf0423244a6eb08b485b1fa4448c7870503e3795b683752ba74e8ece0a2fb461fcedc390b8a5e33cbe4ab5791416e61ca8f6a84385b1d
 EBUILD netbeans-javacard-9999_p20170309.ebuild 4650 SHA256 c28352cdadf4b60cf59398d4fe2490bb486846b59ea8d0f1a68a8914e62b836e SHA512 b22df6011922e1affe36ed5aa2ea6cc1c069a8af538e3f3880cc9f6b02cda0bb8772acbcbf20f823b778220d9499b4be9d248b649ff46467d220fc40081d3e20 WHIRLPOOL c3bde8029165dd47e9fe70a011048edd2764d9113c56d2f796e8ce4d146bb422bbb2d555adfa430d4eef53406320f362e09252b4e45c2e4729749a9513bc471b
 EBUILD netbeans-javacard-9999_p20170310.ebuild 4650 SHA256 aaade8b5c343902b38aadce84a1f5b24590e71404808b8e7594715cfa278ddfc SHA512 3b061e196d23e02151153b6c4784fa40b9c6be7d2ee621bd428ab6817dfb2161f63da3af0cf99cc14653ab4d101b5f8f33f25782f4f0f5c1b793c28fb6d8c41f WHIRLPOOL 982aaba7d96b409dbb8d2b4167b6d2adac7ad499092859fd09dc768d0c6f92582201b5cc26c270fba45061995d1fe07889384a5d2cc0bf24b84a257a21809d7a
@@ -70,4 +69,5 @@ EBUILD netbeans-javacard-9999_p20170401.ebuild 4650 SHA256 faf57726a2a008a681e33
 EBUILD netbeans-javacard-9999_p20170404.ebuild 4650 SHA256 3a8e21a0f45dcc47a7677ee73907d085a0fa3e0fe85d46bc2237d62b75bb5d49 SHA512 a8f92c27fd9a2a71335b18a543e451f526b139fe571b17dc8957a9f5caa03f349487e8f485f7a17f4c9d99767917a772e47f9d993e02557048884e08f6dff3fc WHIRLPOOL af8615ee3d28ec075719f7a3397b1089e5ebc134226501210168ac7dc1d0a9f7193cb90c79f7bab9eb9967e80f55fa3f993a76572dd07a3850cf4ec1739c35b9
 EBUILD netbeans-javacard-9999_p20170405.ebuild 4650 SHA256 75e0b43106189d8bb87ac086ca54897d6556023077d0116bd8eacfd0279ec55f SHA512 3ad3dcf17ee575d9231d25ce73cc7230a2c9768924064058fc597565a3794c2ac5dd013e94f24f004243cd433b398dc68613ddfb19cf48ad0ab11aedc1e177e3 WHIRLPOOL aa442dcfd597436535154c2968b1f67b1d758b2f36fd6eee466b700243f99755202208ee81645b5adbd8565e0f91328f970454b2c1960c0177d356ea9569ec57
 EBUILD netbeans-javacard-9999_p20170407.ebuild 4650 SHA256 1da5f6be0f8d73795d007fd06a2ca334308c8ea5d087dfd780e307aacb2ff9f4 SHA512 b62168e4168d4d53af0e701a5a775592fe241101de9ef62d8eb11245be71cca6922afe42547d4cd8ca7d475c5d1b7bd91aabcfdb7add9518607c2cef4c7241ae WHIRLPOOL 9428223024edb7eed4108c3995ab45029b88bd5443bf7a2172b51564c518bfbdccc47edb509d1af65f9db41e541068781178a7b35435f00592c6866b5dddd98b
+EBUILD netbeans-javacard-9999_p20170408.ebuild 4650 SHA256 808a7175e07cfecb5bf67243864c03d1816e98a2412147763cddd9fa6b6e270e SHA512 d67460921662f66cbf16776b35033334812dee19dcb845ed827b34a72c4453ab1699f6f02ca667aa50e3cb1da08c54f14bd151149f2733d06ec377ac8b53aed6 WHIRLPOOL 7fa5a1013bfdc31c4a26197b82275f4c887b4cbed201ac78bf7e37e0419d6491de4cb53d64e58a712d7d9b41dcdc4fd7e0c78f420de8d7c3902fcdbefc3b5770
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20170307.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20170408.ebuild
index a41bf681c..8eab490c9 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20170307.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans JavaCard Cluster"
 HOMEPAGE="http://netbeans.org/projects/javacard"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
 	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
 	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
@@ -50,7 +50,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
@@ -63,7 +63,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 05913331d..b6848f25d 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -38,10 +37,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-8.2.ebuild 5947 SHA256 1f1c2aab9b63d0e87c93339f5457515573248c09532f2596ad272001605d096a SHA512 d133bfe2588f9a766ef4d5f01f8f0aacd683813ee93815af11f4560b2a7a9d7c48e919d36f002e667aec6ac978f02e07bbaf67a26512b69cd965a8f238b2f60b WHIRLPOOL f5e83670d013e22d4448d70bfdf38ca28adf99b2418446aa3018a59b5fcb75d43ed932659e222e6383e75a56de2340b4f939066631efdfa98ab016e438bcfcd1
-EBUILD netbeans-javadoc-9999_p20170307.ebuild 5996 SHA256 442c7a6cbfb7008a02d934886476cb3f45daf4997ce63c352c7fb9c31c686685 SHA512 e972718afe1643903f8e13357770a7f30b07a354a362957f79fddbee52724dbb944dd85d72702b465c9c02242931c05bf75f434fa002fc6121bd3a04c367494c WHIRLPOOL cae79589131d8a2c960a93d92c217befed2c80a35c6cc706e66eb860f5e21ed4fac537ac000727a2f98f65a421d0d527fa7c54bfb605f57a354c56227faa7d1a
 EBUILD netbeans-javadoc-9999_p20170308.ebuild 5996 SHA256 7db6727b00f5a210ed74ecfd6ca3afc57faf20edca80a1a7f50a305b45fd78ce SHA512 ec7f92f02507425f784f4cdf5581759cb81052a678bf95662b015fc9491e4a5cb5baa61f6de8469be65c05c4c0bc37f369e274acbcf0f1249eac03d01c286694 WHIRLPOOL b74fcec139e20154a0040e9e232a80a76c2759b967e762b85b2b29ebdd9d90925404f0633e17fed3b83d961f673a9beb4f757165c5a19fbbd974c87ca312415b
 EBUILD netbeans-javadoc-9999_p20170309.ebuild 5996 SHA256 b16d8abb844a84ac9a582e56d2c1416a6c01af329c16bee57939277e555d55a2 SHA512 bd1dadf31c6d0992f11e191c6daad44d1b3f6880ab268a69a947a5d43e9f61e930dd7b0e60283bdc39fa366012110cb997121b9bb876a0ef8bbfbab4c59e5158 WHIRLPOOL 7d23484f86bd577cb75dfabe77df6c06c4290a2a860a3a23aa02f5f2ccbce154cad8a788a20c90f059186c66f3492ad65e6cd08d3d481946bfb5bc189d21d806
 EBUILD netbeans-javadoc-9999_p20170310.ebuild 5996 SHA256 109b209205639b7718218091ef66ae5974a0dd087d4ec3b27e5e95af2e727936 SHA512 e88537a53116a75b9b22ccb03212da3cf20c6ab70b5421e8f0b74e6a21f6878020565ef09de11041c8a40d322e1fbb894e3943c8f7561366553106d1d65207dc WHIRLPOOL 4e80808a041d7bba62e44cf30d33db54deb16f508905e99be3cb4ced4f7354b39636611fc9095a16a32b8ef5e44e8baf49b235c923caa449c1602686f493044f
@@ -70,4 +69,5 @@ EBUILD netbeans-javadoc-9999_p20170401.ebuild 5996 SHA256 e0eda5d41b320bfb44502c
 EBUILD netbeans-javadoc-9999_p20170404.ebuild 5996 SHA256 403eb91e83821785480ba6a94617cf9983941ccef8a5f331cf1ec64364797441 SHA512 6bc88b295e727382d56a316b47a41aca06551950ac7d4fdd957767e9a17250d09b22bda6501741c428ab60000407632a5997a23b5cdfaba7c2cde68b65845cbe WHIRLPOOL 378ade62417473dd18bf9519c32f58b7ce55d5887bf4e7b8b179e7d1508d4ec85946cf68034d9e2275c2c3061202a7fe00e80568182d419b83578e3b16804668
 EBUILD netbeans-javadoc-9999_p20170405.ebuild 5996 SHA256 70726c5dcf6ab1f9bb09b1132f737ec0a52e90bd1293f8e15834a3cd464982ed SHA512 bec24c5cf848c4a182b3ce122574cacf0d2e2fb11260a0bad71ca9faa75c776d68c25f25dbd3483148ac5198fb6f085f5647e6a44318e73bdf23bd4a107e693d WHIRLPOOL f5eb3a72df7ff6267d00528e31c6a245ee826737baa38d475a03f5d6b0013e74dc37fd68e3573ab2287a3cf8f8c92f2a89d9aa920106a67267185d42ab4489ff
 EBUILD netbeans-javadoc-9999_p20170407.ebuild 5996 SHA256 ce1b759c5ffbecf450dd16e177c128b0ce2055d965d1f338d963f9b82552ebf8 SHA512 ae7a4d261376519b329ba229117a40627ad2b6c15cedad0cb262cf073a1434be2ef07825356f4c56a0e42bd364431d1b0689a58446a0429ca0d2ee82391f013a WHIRLPOOL 48d45df60611f796e32da84f13892093921f2c8b0eca0354dc6cabfddd11db9d8402fb48f6e5c487a5674811ec5b05c57558992ae5acc01f2fb6bcdae06d7a73
+EBUILD netbeans-javadoc-9999_p20170408.ebuild 5996 SHA256 c0ef2aa66e9c3fe802274d17e2772b7f20e502d034fb6e1db202107890aaf316 SHA512 dd9aadfd3ca2d4049d0feb5066eee16ece46d0d1c22970d0a1552e7865f63f075eb272718735026fbcda373d02aa16115eeb0c06b575e357de79c1ef5cf0f041 WHIRLPOOL dbf82cfa31cb88a3743669f753451422c39c824cae83c0b834f6dacbce0774bc3e8866727a27c194e1994d968258ee3bf2cdb4833757895d7309aec3b7cda5cf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20170307.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20170408.ebuild
index aa483176d..3c074d2ca 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20170307.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans JavaDocs"
 HOMEPAGE="http://netbeans.org/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
@@ -52,7 +52,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip o.apache.tools.ant.module/external/ant-libs-1.10.1.zip || die
@@ -63,7 +63,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 3dc20a7ab..84a8138a0 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -16,7 +16,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -45,10 +44,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
 EBUILD netbeans-javafx-8.2.ebuild 4350 SHA256 7aee78ef805ae67f3aefb877324c1bf5a3960cecf20313c0321b22169697160a SHA512 630a527a37e8859fc9ac5d61d2f889772f78183148cb6d6ffd442d474457f9c88f1571f26bbfbaacb51d4cd9026e027abaaf6ffcc9453d7053e1294937cf2f4e WHIRLPOOL 7ffb6845136d9915070e30e9a0d2124caca8011ede61bead8d3415eea81625e235084dd5142ca7bd5f1297bf92adf32f9edfa8b12934f1762301486207aee547
-EBUILD netbeans-javafx-9999_p20170307.ebuild 4396 SHA256 76cfc297918aac89fb54c9a1772073667f0e7f84a10755250b33d6207716e3a0 SHA512 0128cffdb504d5e2c1fa4f98a2c7d595e1689a71ac680409021b98637d8951677bf8152e79357da4b840d285a22adbd1a52d622341c843b82c84ccfe4a8e103a WHIRLPOOL ecbfe24fe8bcb142d245bcf1550462bf2f68f98e192aa777f75b873e32788843134e22e4183d1da986a23f74f08cbae1a3f0811f264f397661de3de2be8d18af
 EBUILD netbeans-javafx-9999_p20170308.ebuild 4396 SHA256 026dbcf0be47894f39f596f9d7e82f6efd1ce657fa67fc201d314198e830ff26 SHA512 ca94084f3dc2eccf7dd9e718129d61c3f8ee381180c76a83a94258447552b37e40d5166e5fa47965d766a10fb6a79f3a2f1289227cf6f46ce7779b00b7274d19 WHIRLPOOL 28e0cf17f5a1815405ba20f4ef42cf61fcae40378893a9aece24e80375c6923d1505130a8de11b96e413963fb7ac1e9013d499bc8d0516f21e291272ee0f4599
 EBUILD netbeans-javafx-9999_p20170309.ebuild 4396 SHA256 ce77050a26aa47043c34f26405bb2b2f21db13292db95bf86d4e2572f728bd23 SHA512 b057ea5987d7f3d0e9a4b0b1e08e12c0ac39743ed73ba7d05169a3f661c225bccd47afa1d3c8c87483747e466c50011d3fb70bb01703295991343e00bdf730b9 WHIRLPOOL cf50e9c72ee2934c408ef056b57250bb4dcd1cbe11e19c61d88677564cf38edaf01a14348474da4203f5e3c26e7e867ce826f7430ebb5cf0b2658a73a66bbae6
 EBUILD netbeans-javafx-9999_p20170310.ebuild 4396 SHA256 036c4a08ad49d222694e40d51605d56a5919b74d06a27d8835e152ada2b23f6d SHA512 fe46f6565d3f4fc44748de73fe37d9812ae309a9a9e9e62819ce8b1197eac06815558124b923954e35ae674358ee7d1544b6d49b83647447cec637416073c3ee WHIRLPOOL 92a405e358aa6d91c0ddeb1b85d84ba9759df965d6ca8a403b96ff1fdc880c365e3c22a140ea89e7e9a59ccd7a0e3d256eff2fa107c35d131594c3cbe082aec3
@@ -77,4 +76,5 @@ EBUILD netbeans-javafx-9999_p20170401.ebuild 4396 SHA256 13a25015045aa88b2a20b95
 EBUILD netbeans-javafx-9999_p20170404.ebuild 4396 SHA256 9b3fec0fb24c2e363835b980ec764d4f175ae3c8a97019c7d60472044e3c6ef7 SHA512 9f58a8bda7b1f2a2808aa5f4e0d7bf8256d1cba8e82d5724e95649fca5eb00385a809ac641b36766f5c7a7082aa0b88bd7b7d7a44dd0f22efe71019303b0eba8 WHIRLPOOL be177da80c93694e261373ce3b21361a54d763de40d58bd808745db3f0c4861fb25cca843282a56d519ce618c4fc8d0ac051381294c763e2f539e5e1726ced7d
 EBUILD netbeans-javafx-9999_p20170405.ebuild 4396 SHA256 f1f5313a302207d84caedbb7d0cb84886843d7f6ce0f7b037a9e7326aa361dcc SHA512 93a3d6e30f3e6f7140edb85b8ccd758c64f54bc58b22abb4593f918d144008a19bc9b08aee6d06a2e21db572d3a9b28d368ce316876ca35a29eba3d91130b657 WHIRLPOOL ae9fa03e77d7b19bf657ad966dc8fdd495043afcb89e020f8861f6e34636dce15aaf3bf1020c6dc7e1e687566e74e80f641107369995585dad4dad860bd03a5e
 EBUILD netbeans-javafx-9999_p20170407.ebuild 4396 SHA256 d37b1668ba67a033ec6ac57f4ca528950cc621584fe82a32afdd1ddf576447ed SHA512 dd49f785284f0396b2f1a3496e2313e5e421e5513ce61c71eb0459e601f4652e7c44e7968169e706082debdd8492cce3d77111f5d244df8c3b5a04b5dfe2e0a9 WHIRLPOOL 5870589c7d66b390653577d9a1f58b053eb55335f9ce400996f9fe7b69dd3f5e0a502389116f04902982a0a6fa1582dce7539282caf43b34a5b79a181e28f03e
+EBUILD netbeans-javafx-9999_p20170408.ebuild 4396 SHA256 6919edf3daa8f6f43e6654d4704eab24f53c781ab272ebc2d942f63c4a7e5b41 SHA512 f7b9d5eef21409ee0d6d484ee7a94d2f16b915a35507c6d3bf62dacbe20c830908847507e456a256a4939e638344d29cb15da977f85594b120ae98e0a856f06a WHIRLPOOL d5a1fb737494fb9554089178fd06fda9d86c7f5ccd64cc0bc766bc4a2522d6c72c6ad982c09452c268eed4308270639679753a839f964cc1e7718c1be1bf90d9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20170307.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20170408.ebuild
index 198d0a20d..bd3131c9e 100644
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20170307.ebuild
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20170408.ebuild
@@ -8,15 +8,15 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans JavaFX Cluster"
 HOMEPAGE="http://netbeans.org/projects/javafx"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
 	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
 	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
 	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
 	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-	http://hg.netbeans.org/binaries/FF6814FB24C19922016106F293D8A928C9EE3CEB-nb-javac-api.jar"
+	http://hg.netbeans.org/binaries/A0D73583DB9546DBC57E88181135039369827B5B-nb-javac-api.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -47,7 +47,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
@@ -55,7 +55,7 @@ src_unpack() {
 	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
 	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
 	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	ln -s "${DISTDIR}"/FF6814FB24C19922016106F293D8A928C9EE3CEB-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/A0D73583DB9546DBC57E88181135039369827B5B-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
 	popd >/dev/null || die
 }
 
@@ -63,7 +63,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index d58af113d..830312360 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -35,10 +34,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
 EBUILD netbeans-mobility-8.2.ebuild 4045 SHA256 36e847b4827f272958bcb6c851ef5b15bd72fc4e1056f329c45dcdc98d3ca76b SHA512 f026fe68db43c5a85393366b8d5fc221ab97912b8a6f2fb9661a351bcafb1277602d5f965af2a142a6768adc3762467e08347ef971ce7ef5c32bb8cfad828712 WHIRLPOOL 0b57bbe148b43c6a2c8e224f6430b6ff207bcc60769f8fbbfe1dbfaf8da0ad9c04965143fff800f903f826b971bdf6c723c3dc5317238f679b5b69a63d536f5d
-EBUILD netbeans-mobility-9999_p20170307.ebuild 4091 SHA256 1b189d1ba6098cd9874e1ca7492277e9ea22706b9305215c2773bd21977045d2 SHA512 cb8f68974ef115ba46f1dcf9f32ede5d6b1bf3d72538e5284395532e2c6d58d8d7192db65bce1d786601f86873dc85d1afee34c6bd7f46ad3d5b23040b4071ac WHIRLPOOL 594bf40d6a7b0f6280e7fefc64d0acb61fbba91de397d86df599770ee8daa36b25cecfa8e2e1d85ef383bc78bc382a499deb4522be9b6df188e0fe2112f35212
 EBUILD netbeans-mobility-9999_p20170308.ebuild 4091 SHA256 02908364c1b39a4725cb90eb3d81ae507b0a6e8086816853f37e1ec3a2f0f487 SHA512 eb101d2304add998d00d54bc52ddeea51bd3d72221e17d67902b90746d3206f88067cce787a09ef78f690b56c55ffd91a479d0e1ddbb668eab56e107f5fae381 WHIRLPOOL 6dbb788ea0ad435daa65c1ce3cb41ef565ebcb36e83593da3b0403aa84c9f564f6d16cefff4d6f499f7b0e938c1dc9ca058c24084869ca0fd865293e6240ee19
 EBUILD netbeans-mobility-9999_p20170309.ebuild 4091 SHA256 6e778552060135771a1c6ca84e296cfde1fda720a25c14fac0f46f8ba6e656e7 SHA512 6ad5dd3bc7d6aede4a904836aa0d4362efea8863f49ffb031f2fa93201d954f92f491e2d921a7f78d79014ca8f4e3427668a0f96d38b09a436e94fe3d414720f WHIRLPOOL d9f1cbde886e708baa8aa1eb0ea8cc036b8e8fdfe756f06b274d2ee8f93be18e00f38a7bd85e4d76ee5b9904ddd21924e247396152b789d98c9bad1c46053ddb
 EBUILD netbeans-mobility-9999_p20170310.ebuild 4091 SHA256 cdbcad5b5aa656056cc02037ff09eed2913c7c28380dbd356564203688033820 SHA512 8cdcb53df1ebdd13ddcead21db72fc9d98d04896776eb85372003c67c44167bf0cb58335a0bf81204854edd7f08325ca65c7d712d66022115d298ef87c8e912e WHIRLPOOL ef73f72dbe69e5343506d79b69d54009b3f5e0ad5de15a49fb27a5f001c9c98b5042326472bf6253a8886858ddadb085a48e7b92b0900edd7793a0efc46b1ee8
@@ -67,4 +66,5 @@ EBUILD netbeans-mobility-9999_p20170401.ebuild 4091 SHA256 05aa901225a18bd1d22a7
 EBUILD netbeans-mobility-9999_p20170404.ebuild 4091 SHA256 4ccc5d07b3718f58cba9d52e11394dc4ce415e04abcee77d0c4854d1c6f6d386 SHA512 b7c9d012a476574c407974db6d6fcecd23dbff10f471b6650613f7b494c93fba05df95892506794ae7cacedcc32a02bd15e1f3c8a67def2d51d5e2149f65b235 WHIRLPOOL 2dcb1b7f2b0cfdb96e00683cec9e1ea468af9993363d223710b9c2d47331a1f09f60dc9f781ffee845f15ad8a2e9e5f7595e5c9c2c6d8e9d6e370ad03bcf7bdb
 EBUILD netbeans-mobility-9999_p20170405.ebuild 4091 SHA256 52fe243124160dac27aff38f74a8aaceae4e4a458f6e3702362342ae2bf8f6ec SHA512 29afa8d84b78c580abe057ab0c0ddfc2148b647440a6eeb3869ab83a31dbf6d47ef4bbc0e8d494cec8d4fdfa1b9efc54a3722a89997567c8ccb95a693b54c416 WHIRLPOOL 8816c25bd877fc66c4eaab9da30460a4ce8bb7c9a48e102d5169454ca32b98915feeeb88186059fb19113683a11c896a345a7626948736c0feef5324a1a60041
 EBUILD netbeans-mobility-9999_p20170407.ebuild 4091 SHA256 53088b29d3d45627c9c7aa8cc2f78ffc5674c42dabfb762e6aa80b558982d01a SHA512 d4d0a7bf1199769a9dfb10ed34955f88bc77c952eabfc3d31cdab568600c454ff2765c85dc0d7a3c3299bb697dfe8c21b8be9e6e90accc0c78b287ba6f4a851f WHIRLPOOL 001186b3ae7784237489008c6ec98e6120302d89640fc0a8ea917f1107e318184b46b16a4e7fd78c411bd688ee0a42f64fa613def21b9453cf7e95e7ae181433
+EBUILD netbeans-mobility-9999_p20170408.ebuild 4091 SHA256 1a29b382ad1b86df16bdc493618b05e488ec2751be9dcf2b9234cc3c354c85ec SHA512 5f677b6c92b85f3adacd08ef9021c9121cf5811f7d938cf76057428c3365a3bdbf67f04058be4e15a02591c9a857ab20f8dbe2221ca2e315c7b222104397d008 WHIRLPOOL 2f02ee07dbf4d95bd4e3d60cc8fd996a338e38155e874193c56bfa32ef17d2846c69e0c18f3713d6a01370fc1c54d7f4153e3970e334f033b5fc36a535c7ae87
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20170307.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20170408.ebuild
index a0d1a6482..e587ffbec 100644
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20170307.ebuild
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Mobility Cluster"
 HOMEPAGE="http://netbeans.org/features/platform/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2"
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -47,14 +47,14 @@ src_unpack() {
 		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
 		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 }
 
 src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 4a0864efa..05599cadb 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -38,10 +37,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
 EBUILD netbeans-nb-8.2.ebuild 3744 SHA256 ddc01ed44555245cc57ee96b73d05faf8876385bfd4baab178ef70e5898243e4 SHA512 06d039e85bd0a3465e90db05cf6471027329c7724a7496e748ac2a641e8a30811ec1a70c1d7cbd6bab5fdf4485d02ccd5645d2ee950dd214557b9b99b842b471 WHIRLPOOL 9f9547a45f2558fdd906cf9c3aecf08d470a02ad431d5b1cea60d025499bacf3ef4021b6299335a203555c077b55a5421f16ffefef401079b46c2c70b8265e7f
-EBUILD netbeans-nb-9999_p20170307.ebuild 3790 SHA256 89c899330fe808ca32e0fe73b33c9a4d166204b419c49edf6d72fc6323122492 SHA512 a746e8bb8a68b840d61af358c1d8a853b3cea733bd98f42240773d22fcad6e13b12428f3e113aa4e3ecc8a66f61869e4e13af97d6f8bdef16e9906e569d5a04c WHIRLPOOL 7e5d26859da48d681ab02813820d0a8e5fab4384fd6c9b9d743c29af1339e5c901309d98fd6fd4a6b675efdf42d7b09b7a086020819843920d8037cb3531088f
 EBUILD netbeans-nb-9999_p20170308.ebuild 3790 SHA256 85b1b200af4d41508dbb3d7acb2f6ead21288e161991990c645879b777fae8ca SHA512 7be0a760b3dcdde4cb615086fca0c6c2109dd561cbecb3e75b2362eb68540411f0db198810cff5dc01d535e9dcfb8f1fd872d347d578b6eceda0994b4e9611a1 WHIRLPOOL ec47181f4e4543ab9db4d5730d30dd2d1533f038ba6d8d4e35f6e5f80f46465ac436eb645b089798a1b1d3e6562bc278791153595107ae2b4abedcb3afd5eeec
 EBUILD netbeans-nb-9999_p20170309.ebuild 3790 SHA256 7be4b1bd84fdf44c101c35c6a5948850336dcdd80eb53c9fee1df5e36f52586b SHA512 3e7624e4e11422463844cc919e2cfe92cf343a6e3247b134817182f986ca6609f513bb19c5af4f65307ebfcba29c60e294d6f73d3edcd537e29b0614fc393f8b WHIRLPOOL 35a8dbd0928d4cb379858636f37be595b9b78cc88742ae4409db0c145b2f448515fbd77c1c6d4d5d19cc54a690d0da5ea8fcf1adec2fb9c6aa9c8ddc264aad97
 EBUILD netbeans-nb-9999_p20170310.ebuild 3790 SHA256 182d394100f18d08af88a764a471376c69b3391ec26b030170ec8ae05152cc32 SHA512 f2081696efab9b3317cb600edc84853af50624e2caa2fb6df5a98ead0c96bea833fac2ccc5deb6ac6d93be280cbd862387e6446dd04f95bdb98d4d5b94cdd7c2 WHIRLPOOL dd6fa6744a67e66855c95df87b6eb8ae2fc7575fccc2fd2886c5d50357af9bcafedb3f41bd0a475102e16c9022ff74d9bbbd34f433eb1a5a5be2e94541e6757b
@@ -70,4 +69,5 @@ EBUILD netbeans-nb-9999_p20170401.ebuild 3790 SHA256 7990342aef22b493b684642710e
 EBUILD netbeans-nb-9999_p20170404.ebuild 3790 SHA256 34cdee84a89635a3851bb75ef8e53766b55cef17a2fb8f1cc6cdb6e6b677897d SHA512 ad9782c44e9ac8d6fa0cb13118edf0eee98fe0fbe7e5fa981d99aec54e5bace85f247e1303ba2dd5a7c9991b0e74e9f04188adabe99d26d76cd8944892fa6ad4 WHIRLPOOL f484d9c2ae9f368d6b7b376aa2321883a50345e71ad6e67fe211ef7a6bf48854301fd6db124c909f75f7bf61c63660888c0f414179f05375aa90a71cca4fccad
 EBUILD netbeans-nb-9999_p20170405.ebuild 3790 SHA256 ca0ce01a5bbbee1a5ecbe79543f8d7a4a2711f4e6b608989c297057b089f918d SHA512 b6e85bbcdc239d29a047c94268e468194e8e4e77897159bb866e9094e69690066b63641ba9ba7cbabf188616e9d1b0883075f305533f59505ff4aba7282188ad WHIRLPOOL 92607493d97a7e154fae1ee922e502fae52c454d390638f0443d8b9316cd00807489fab4ee27cd060b4aa0013c60dc371ac4303f5b1438b56fff0a7c89b0e9b2
 EBUILD netbeans-nb-9999_p20170407.ebuild 3790 SHA256 6112950288dd0fcb962e236591f323152f85dd3fa2bbe5d55b51b85afa659e73 SHA512 3e204e39f376749968050a4a401c1f4ea5aad60b2aa23a21c27e7e66b29fb807b39075960b54b46554bf1e6c7956f9da89cd73e094d73ba1f77d94b5c382cadd WHIRLPOOL 59337f1dfb987f17b0682a712c44a4b41f68a134717d295b4407bc45ad4cc2c7f9721134c1bae2e68a9da2689354ef9359acbb37cc707418e208c4a1cd8aabbc
+EBUILD netbeans-nb-9999_p20170408.ebuild 3790 SHA256 5155ee76bfe73d81422dad7e4767c39624483bc0589522c2a57c4bb4b1929729 SHA512 34a53735e2eca2341cce8f4748221b9a60bc6e5ddaf5580b6c8ea218b883724e24eb0f623b6fe7cf9d649c5ca183ce7b6f1ab2297bd667bf129002589e20fccd WHIRLPOOL 02beaabcf4001f6c3136acbca325906ab68b366ab37195d2dbf03a7cf4a26a6a5fd57687807892d07f012700cdbf66b5ab7cc293753e87735e78377f4d8478ea
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20170307.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20170408.ebuild
index 960646391..356c7f93e 100644
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20170307.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans IDE Branding"
 HOMEPAGE="http://netbeans.org/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
@@ -40,14 +40,14 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 }
 
 src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 52ae6c040..cff2f636f 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -40,10 +39,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
 EBUILD netbeans-php-8.2.ebuild 4051 SHA256 3af2c31accb8d35a88262490cf7d0e964d4733cacf2daba90f0a39122c7fd24a SHA512 37ebae1efd6b7708cf0b7b12022a929f9eb08d3598a71c36e2d0448e4d62f9ef0451ed2c95df5032300a78a04dfb29cef010be312eb61c4dd8a5e7a09397873e WHIRLPOOL 6750b48324973e8fc4c30d14d5bebc4dae7e1e8b2fa550ef9088d3e77affb27808bbcbd1d73bc23ab62777d807d00037ee9d8a15b1ba0d05ea3b18178927d498
-EBUILD netbeans-php-9999_p20170307.ebuild 4097 SHA256 988283b7acf11034975e3b12fbf1ff6279cb398ff886995fcf70ef407eebfd78 SHA512 56032ae37e625fa9b30ac0cd4ecabe99b14b25bd999274cb151a84061b5e3a8d060e363fcaadf78fa77f994c06df0ea4b2575b616f85d65bb37285c822ae63a7 WHIRLPOOL 391edc291a85be0147bd02915ffceb6bbdebfcbf0047829aaa6930c942ddfb39dbeecefe0cbb91e31eefb8e384150514893343983f28b38b8893b11a1301c4bf
 EBUILD netbeans-php-9999_p20170308.ebuild 4097 SHA256 745e90c44fb2fa082fa05a6a8cf9b429923cafb6c9af03a672214098077564fb SHA512 e46a61c933a6be60d0a005f8952b4ee7296ff4e1a876e36ff5890673b538da7d7ff03bb55fb4b7b2ae158302917e384b0aec26939e4260ac55ce93846d4bab32 WHIRLPOOL 96c2ab1db2501eeb7acc671b10ac8ac0df1738d9a1a7777cced780f2b939fe317a5e7da5e9657f9954d67b5544016b80fe405dcd22a708e5d7a7007fa8fe9a10
 EBUILD netbeans-php-9999_p20170309.ebuild 4097 SHA256 5696e26476800752a2d42b94c0dce827be515eb5e8ee7a780a443ad21f4002c6 SHA512 78da842eff921ccf3c6d896b5159e6986b95c34b7f7a180470e6a67b9c998780043ef87fc9f961deb14dd06efa92782961f45a93ff75e662cd4aa07a751356fd WHIRLPOOL 5a188bccf1680846ced2887c434f27b1e584d24a95c46198bf746fba44a12b2ec17abd9173de1421785a54dd61500b6f4cc3f12f3de45f8bfa266fc1ef6078f9
 EBUILD netbeans-php-9999_p20170310.ebuild 4097 SHA256 cfbfe6a8f561516cd5f1db91300067e367c39671f9036d473ee0a02bf925ba26 SHA512 60e6f55ed0c600b35fa83b7789174e17665c191a4e5d9643485871d5ff6c2a6c6e86b2e2d4c11c4e8d90ae6ce09f9ce02b5d1d5f730f7b11969aac9f0b4e5bbc WHIRLPOOL 19f7e848b5224beb3a851f3861c940873d0022fb83399f55e6e6bc4496858eb3819e9d23990f2384c30a9882cc2d747ca6a472fcdbb17ac065c68c6ce7144b19
@@ -72,4 +71,5 @@ EBUILD netbeans-php-9999_p20170401.ebuild 4097 SHA256 ceadbcc81d81896afc053908f8
 EBUILD netbeans-php-9999_p20170404.ebuild 4097 SHA256 79a3157bbf4e87244e93258a6d304e2038992ee3386120e64b2b08b46203f656 SHA512 71dec3f6079ad03614127199ee3a501d27997bbe51f8aa80a9fe7843a0dd5d7f49d7980ef4011a500febe290ed4a99344fe51f259a43cf36562bce98f14139ba WHIRLPOOL ac922eb359543afa5cc0684da25c7bf75e8564682631c7383d2dc73e6752c3c6d76ef8e2146d66c33ca7e4994a5e5b8f26ec770bd6993ab443531b8cb17fc8bc
 EBUILD netbeans-php-9999_p20170405.ebuild 4097 SHA256 a077bf1b194b87d63179f60f354a52c3bcfb875cb413c75f9e5e5f6d2df37b02 SHA512 81f2c5a11d943fbb0c2ed975464fbed20fe60b0fbfdb98d4f7f4573a40e403de6bfe81c48b4f51a6c0cc23ec1dce1489449d131e60296a78ccff36ec4f904e79 WHIRLPOOL 318a58952bbee924d8ebe6a92505708d3bddf61cd6fdebfcdae8d323b0001c7349cd396209cb310e1942a4fe5b0025fdf5f2a32e0bada41bf5eba561de3a8b7a
 EBUILD netbeans-php-9999_p20170407.ebuild 4097 SHA256 7523b2fab0d02330c2651a3f41f745256605c8128bad0d2bdeda173a75f8a329 SHA512 93253399a6d5c2057bdd02b0593c1e88b64f68269575e7f765adb0d9ea3b2afb12edfc2418b174f6404646e408ec9100cbd140e9bf3c11d36befc015a8dce9ad WHIRLPOOL 18bc5cbd2a9c9efbaba90b54a9865045d1f7ac16c2495271ccbae6c3a23586ab5329f118ebc71eea2b4f07e35d8cd52fea579671775a16720509659c1dd963c0
+EBUILD netbeans-php-9999_p20170408.ebuild 4097 SHA256 aca8a3db8e5bbf85f730424dfe94d4749d5c49975662f8839f47f190d3837f4f SHA512 3c0881977f426db336a8e47dd029272f46dea9bdbea42ff8daf01b4eb2fb69425ee6ade1dfa1f37e6bb3fa2e3dcea7fb84f2b94aa95c348a143b094c9e456beb WHIRLPOOL 2b13003eb262a97872092756cffef1dca57dacca75f49fe0ec240a4874f92cdc565023e6061d35fb8a7d8f47ed21d5728a38a8a1f125fbfbcd661618a2009090
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20170307.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20170408.ebuild
index e289da88e..f36c0fe55 100644
--- a/dev-java/netbeans-php/netbeans-php-9999_p20170307.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans PHP Cluster"
 HOMEPAGE="http://netbeans.org/projects/php"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
 	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
 	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
@@ -45,7 +45,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
@@ -58,7 +58,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index ae32af12a..cad0fee98 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -41,7 +41,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -70,10 +69,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
 EBUILD netbeans-platform-8.2.ebuild 9172 SHA256 2147da6a5cda343194bab8c368bc71b1986e07f94128987c131c9f04f6943ccd SHA512 cbe52bf3848732fc45bc7bf404278bdd9d27d82e1df2e30f5f54eaef21b0d0b3c664167c804636523f4d18733b4084005f5696007e4c620a69da09837baada43 WHIRLPOOL 3f3f4516ba768e148522b5edcd1cc7b062a893733f5f644642cc4ab9164628d32bafc0a997d4debe9fbc201fa861f5a73fa3f8d9e6ea300a92af0707670acda3
-EBUILD netbeans-platform-9999_p20170307.ebuild 9255 SHA256 2947f848548a50842637a0a7a4541aa802af0f85628f205c04437ad11dc261b5 SHA512 d1b052209dd10646303b7baa1408ea8ad31ba80fbcb8855f21823d2ea92b714c81e4335ab1272e410a9a87af65f0e468cce44ad66c90996bea329acf1d8aaa7a WHIRLPOOL bb36af7629675c6b0e0b531e7cc8a43ad893e67a187def217a13cdc58ee77d9d65243b5e27d8e01293d940c53b54eac71232bbe9180e38f3e5bbe73546aa01e9
 EBUILD netbeans-platform-9999_p20170308.ebuild 9255 SHA256 3c0c8364803bbecc7f9a3b276242504f484938b000b74fd2cf24d2eb3bf4eb65 SHA512 286df753650decd17be6310368ac2f8ea2bc345ce452e6c31b480350265ea0a94672775aea2b315be9354f68be93a7429eca1aa42d4a5356ab181e765edbe763 WHIRLPOOL bf842c901ca374e77b96afa3e128830959ddd2330641cf42191c64c99ba216baf007d03f449bddaa3a6774c962bd0ccc3ba2d37750b31fb94f21a1fa406be9fc
 EBUILD netbeans-platform-9999_p20170309.ebuild 9255 SHA256 daef6748ba3371f0550b51ebb228c8eb9da0741d67cbfe7b3217e0789d2da531 SHA512 a915586390b5206f71d4aecb3078e71424f76ea6c39c11a3c9c9fff010045c070745a9cd9aff0a5fabe81e1fd72f56e5b4d8df8dc04ac6c59f56764354452101 WHIRLPOOL 84a7eef4c4f59e431df692ecda1f9f6a1dbd1d8dd6b896db3fee714df95607e67f2cbb7e4e1db4d19bbf0fa6c5095a38a17901513e41534c1a4ca2754d590f1d
 EBUILD netbeans-platform-9999_p20170310.ebuild 9255 SHA256 c8316436b6b135a5abe6ee2d5f9a8719838e11dbbb007df4844b62e4657732fc SHA512 5cd892b18b4887206f9562300835e30b08257dcf19621125effc67940cf64e42de24186a12b95e9e71118b214a2d27068a5cf9732e7fadb1913275a6a0b260c9 WHIRLPOOL ab7e37c7f2a01c74fd4b4a684323bd1c83f7dc4cb9efe9365fd6e766dccd7f829bf7c7dcd4c3bc7080ad8c15854f75cb809904889bc724f40e8f191d5f71d1c1
@@ -102,4 +101,5 @@ EBUILD netbeans-platform-9999_p20170401.ebuild 9255 SHA256 85c9e22f9413f0272b159
 EBUILD netbeans-platform-9999_p20170404.ebuild 9255 SHA256 f47b92704171392a609ce55056af2a0c824a1ebfe446c2da705d79686efc063d SHA512 a1e3eb4e90ac117c06bee56b10517861182b6e78651c25094a35b0f01f8781cac28185e99c3601a0b5a17861d02c11e203ec6d56c505f4aeb86925f069952954 WHIRLPOOL b4868bf3faf3c7ba259f67a7811696aeead9ddd721bce21e45d2461feefce591cdb26f6438ee6e61f0bef40dd34a80b8fd4303eb31e146ffab888af3adc25b08
 EBUILD netbeans-platform-9999_p20170405.ebuild 9228 SHA256 d3d19b9e2aac97ec51839c0bd762b836e678ab31c5778dcdbe36e313b97aa466 SHA512 a31daef70c03e35a299461d3eba43e0130457b989c6ef34f852204ca6f489f09c75ed376d4386f74100afc50c447e7bbe33156896b6b0560d349a86122c6331d WHIRLPOOL 81d8c440537f2e168c1098b1665979faf6f0628f199aee9685f21b14ebb228750a320c6a7866329f0394d4099514a525ff0ee81b112842178c0d87084944da8a
 EBUILD netbeans-platform-9999_p20170407.ebuild 9228 SHA256 5b48a7cacb80ec0ef461112daf44e59a93ac9c397e215237bc52410acc8384df SHA512 63990e285af356b222d1cddd9862f40fdcf7581709a85b59c51922a850be504cad80e886219367a3ba3c79248de750ba8b2186b7fc5fa8d8ee5c844a5595e229 WHIRLPOOL 5941c762d8513a572220e5831fb6aea3014219b48be506b5e613fd739584aed97d960b6e82204d1b6833f6b44061f495a5db284b0dee66f311f265062b58bf3c
+EBUILD netbeans-platform-9999_p20170408.ebuild 9228 SHA256 e9020f9bdd23c32487d5fe45c86c814dc0505647550eecc6fcb69c20ea6c83be SHA512 8c62d29c9d4d32074a3b26206afc7f50dd99106211750f918abbc40720f5de3e8f6e1d0728117134dca8ec6d6919a11cb44229e689ab8e5a25dceb868c8ad475 WHIRLPOOL 27a937085ef1f5521d880676b2248bc1e446229f7f9dd079a4ee9880300a46775ded70405cab44ff77db0e8715a61b25b1b35b9422644d02d5b1d8587c86c635
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20170307.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20170408.ebuild
index 6a842b8f7..992baeccd 100644
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20170307.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20170408.ebuild
@@ -8,24 +8,24 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Platform"
 HOMEPAGE="http://netbeans.org/features/platform/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
 	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
 	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
-	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
-	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
-	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
-	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
-	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
-	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
-	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
-	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
+	http://hg.netbeans.org/binaries/03800C0C31FD6828EA7D3F245B3A7C00E221AA22-ko4j-1.4.jar
+	http://hg.netbeans.org/binaries/F752490EC8F6CEC5B7E07947A1407CE8A8E63518-net.java.html-1.4.jar
+	http://hg.netbeans.org/binaries/DEABE58D6CDDD124BEA30E9B6E6BD48E90CD7AA1-net.java.html.boot-1.4.jar
+	http://hg.netbeans.org/binaries/A5ECB6F58BB276CF77FD0E18A07656508E7099B6-net.java.html.boot.fx-1.4.jar
+	http://hg.netbeans.org/binaries/5CC4FD2D576DEEC4F64E46BAA9097525BA4DF8D8-net.java.html.boot.script-1.4.jar
+	http://hg.netbeans.org/binaries/0C735D28C3C2F22A9EB86A1F682AAC38920A6356-net.java.html.geo-1.4.jar
+	http://hg.netbeans.org/binaries/CD15F35E44B6EC1CF8D7CC216870B70A71D88A1B-net.java.html.json-1.4.jar
+	http://hg.netbeans.org/binaries/D7902EF2C6C94BE1F8804B5DDF2084A07DE87EFE-net.java.html.sound-1.4.jar
 	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
 	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
 	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
+	http://hg.netbeans.org/binaries/BB25868BD6C724018FB0350688975EC3B53230EA-xhr4j-1.4.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -67,24 +67,24 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
 	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
 	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
-	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
-	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
-	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
-	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
-	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
-	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
-	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
-	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
+	ln -s "${DISTDIR}"/03800C0C31FD6828EA7D3F245B3A7C00E221AA22-ko4j-1.4.jar o.n.html.ko4j/external/ko4j-1.4.jar || die
+	ln -s "${DISTDIR}"/F752490EC8F6CEC5B7E07947A1407CE8A8E63518-net.java.html-1.4.jar net.java.html/external/net.java.html-1.4.jar || die
+	ln -s "${DISTDIR}"/DEABE58D6CDDD124BEA30E9B6E6BD48E90CD7AA1-net.java.html.boot-1.4.jar net.java.html.boot/external/net.java.html.boot-1.4.jar || die
+	ln -s "${DISTDIR}"/A5ECB6F58BB276CF77FD0E18A07656508E7099B6-net.java.html.boot.fx-1.4.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.4.jar || die
+	ln -s "${DISTDIR}"/5CC4FD2D576DEEC4F64E46BAA9097525BA4DF8D8-net.java.html.boot.script-1.4.jar net.java.html.boot.script/external/net.java.html.boot.script-1.4.jar || die
+	ln -s "${DISTDIR}"/0C735D28C3C2F22A9EB86A1F682AAC38920A6356-net.java.html.geo-1.4.jar net.java.html.geo/external/net.java.html.geo-1.4.jar || die
+	ln -s "${DISTDIR}"/CD15F35E44B6EC1CF8D7CC216870B70A71D88A1B-net.java.html.json-1.4.jar net.java.html.json/external/net.java.html.json-1.4.jar || die
+	ln -s "${DISTDIR}"/D7902EF2C6C94BE1F8804B5DDF2084A07DE87EFE-net.java.html.sound-1.4.jar net.java.html.sound/external/net.java.html.sound-1.4.jar || die
 	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
 	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
 	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
-	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
+	ln -s "${DISTDIR}"/BB25868BD6C724018FB0350688975EC3B53230EA-xhr4j-1.4.jar o.n.html.xhr4j/external/xhr4j-1.4.jar || die
 	popd >/dev/null || die
 }
 
@@ -93,12 +93,12 @@ src_prepare() {
 	find -name "*.class" -type f | xargs rm -vf
 
 	# upstream jna jar contains bundled binary libraries so we disable that feature
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
 	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.jna/external jna-4 jna.jar jna-4.2.2-stripped.jar
+	java-pkg_jar-from --into libs.jna/external jna-4 jna.jar jna-4.2.2.jar
 	java-pkg_jar-from --into libs.jna.platform/external jna-4 jna-platform.jar jna-platform-4.2.2.jar
 	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
 	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
@@ -142,7 +142,7 @@ src_install() {
 	pushd "${instdir}" >/dev/null || die
 	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
 	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.2.2-stripped.jar && java-pkg_jar-from --into "${instdir}" jna-4 jna.jar jna-4.2.2-stripped.jar
+	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna-4 jna.jar jna-4.2.2.jar
 	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna-4 jna-platform.jar jna-platform-4.2.2.jar
 	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
 	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 5b02ae198..2f5eb9a78 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -35,10 +34,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
 EBUILD netbeans-profiler-8.2.ebuild 3105 SHA256 ee465ebb88c7389fb5f3f60c9900221090bd4f7f6bdc40beec40b04a597f8dea SHA512 b2d6b4a0abf3ba9dee07308e7525aa670cdda92d222e43f32fb13db7040e92e578d30cbf7e55d9ed626b9b29e0ed00eb820e20d12d320140c947be7cafc58d9f WHIRLPOOL bf92da26b84f327673e68d7986b07fba89b3f8dee834679b68c66b31c2318052bbb370172be32a8287ab0d9bbb9011e8242c95bf9df1e22e8926890e18b1c96d
-EBUILD netbeans-profiler-9999_p20170307.ebuild 3151 SHA256 aa6761426541776fbc17e0843c8cf314d105e3ab1ed5d31da12005155bbb8f22 SHA512 3cf9c436acd9e20f12362eda3600f6d94f4b8479655cee986ecd474fab72de2133c76fd23e875be03576675911005cdd19aadec08c6a3eab464f3c708f94af53 WHIRLPOOL 00333ebae0aad0ce5a639577295ca0393c4eb9027233d66a4cd2061baa2d7a9d02fdb844a875f6941ca022dcda1ccc791d1be9431c0c9788c596d4f7c99beb89
 EBUILD netbeans-profiler-9999_p20170308.ebuild 3151 SHA256 311c616bfecf18f7b0875f065f2d4ea2d8c8252d7ae2901293792e60b5641de3 SHA512 5c81ba9d91181566966bbd2a5d44480a04bac0c7172879ce1313b4bf39af23cc6f078b90ad198f1f924b387687c3d4868dda3eb13ecca6b31ebf854f3cdd2e6b WHIRLPOOL 4ed6d386af8a4aac803a3db246f2b4c66fa0e8e917e9aab3ba4704b40e123e6719408e8ea45d5a99e6eaf7e1ab6e3ea1519e561c9cb7d2eca3ce2f33b5094095
 EBUILD netbeans-profiler-9999_p20170309.ebuild 3151 SHA256 31a577b9e812e0d3b21b0d2254956f7b82d670b6214d0f72d0b8bae722dc1f68 SHA512 20c26bc076f5396888b3ea703cfcb54f3c793b84de500d0da016daee2c8f779ef7f33196d71e3c181233413ae0bd69c30506019db30421a39b688421f5fcb30f WHIRLPOOL 539dccb0703570a329bbd9e4a02c912fafb99a5fd63a647c33b0df72b3ecbd4afc779f292397d68e083181c4e58d45865708c8417414abf39dd9038211a52d54
 EBUILD netbeans-profiler-9999_p20170310.ebuild 3151 SHA256 b9b598c491c77659a28705d667b1a58d10dfc3420a4195033491b221cfd4a002 SHA512 15dd5e9bc3b5882d58ac759e8934ff701b31ee437fb8e065a0da0a22900a95a1fa1a0eac8bc2af45c37a09490238ec69075f529a8ac48a789173dd6a056cec88 WHIRLPOOL 1fa89857c2fd338f62d8968bb1474c619ff1247b08bf7ffd49d2db8456a65828ce53c5b2c322dd6306b4b0e08b5018b56c69535ca000e81c92fcd20e91599260
@@ -67,4 +66,5 @@ EBUILD netbeans-profiler-9999_p20170401.ebuild 3151 SHA256 a17f555e001d7cb77e658
 EBUILD netbeans-profiler-9999_p20170404.ebuild 3151 SHA256 115b7de724882d795b48043cb3e0c329e59cdd25e660079a963b6f0d8782efb8 SHA512 b6213ff55ddaa8593e6260e4a395a0d6b8e3e812dbdeb38e0619880e607cc7a19e42aac12ca2b04d849b1f669b99b4fedb7893d74bee622934e9614d74b4b1e6 WHIRLPOOL db7a9acfb729bfad71f21839f8a928d38d003f9b3976358b67b5f8423ef0ff45c0f8ad797ff742a7e1ae29301f097ced93cad364bad15c4ae9a414d312255fff
 EBUILD netbeans-profiler-9999_p20170405.ebuild 3151 SHA256 77760033a6266bfe3604c244e91b2c0174bacd93c71e1cd4b8866e878b6139f9 SHA512 522a49b652817fd7ff807b6470b404d9c3f595417766cce2d4acb3db30d85547389194e63cd5d9ac44de448fbc221229e53a1481d7c6a1e2a54bab753693b72d WHIRLPOOL 08e8515fe1eab1862193aa835fc1e9a83bd5fb74c4116768e87c3fa6dadcf9deaa284c5754702c0a37a1b506cfe4a6e33a8e7f1c310f91be90f9ef5559830953
 EBUILD netbeans-profiler-9999_p20170407.ebuild 3151 SHA256 72ed9e23cd0a86073645aaca88ed78a3172d55555edd16bfadb40e395c9c4147 SHA512 eb74fde64d44537da7d0a8e528f4899703c521a95a4ba65a53dfb24a512a016da226afbb8f791429a733f6e79b0b646dfd10d944c95cdbeef8e04becda6d14a3 WHIRLPOOL 04992ffcfd27827f2ba5e042e7e53d6572faaa452104ffaa868e56732b6e46b03cc8714c796e3a6b596e542ea10145eb0a1a02049503714c486590ad8a825b5b
+EBUILD netbeans-profiler-9999_p20170408.ebuild 3151 SHA256 9f0a124bd492b9b34819c8530a66708f98066cd4ca627405cbcd8b98ae4dde3e SHA512 733a10d9f7aaa792b2a6b8792ee8bf998e4e598f13b8f61c908bd0d3da9e0efb235c67ef334b7b6b1a746a4fc879914591e1f496b0b4758943aea6d2fe8bdb49 WHIRLPOOL 80dda88ba3ceaa1db3e2e8a66b135ffc83d2801efdba58528cb16fbad4ee2ee090c4f235747d824801f9fa332a6b33bab048287acf8ac626d04e6a009df86938
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20170307.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20170408.ebuild
index 39584aa54..42f8422eb 100644
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20170307.ebuild
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Profiler Cluster"
 HOMEPAGE="http://netbeans.org/projects/profiler"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2"
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -43,14 +43,14 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 }
 
 src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 4b7919e80..b6f147e10 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -25,7 +25,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -54,10 +53,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
 EBUILD netbeans-webcommon-8.2.ebuild 5875 SHA256 7100cb7ff4959392765a1a19b69dd14a3b02b103c2df2544cb9ed820dff573cb SHA512 0dba8ea006d5945d6359c66296a8caacbc3b333a64e385703f3e68f0589433faf39d771542be5f268e8002fea4a3142e36c33726f3cfb8f85a16181e5cc42e91 WHIRLPOOL 53aaf9956e181f9dfa9e41e5aa82f1f56cf34397d1db9b6b54d709961345b7780c3efe49b51fb2a28b7065e3b1b5bd0f178c5819b374bf4cf8ef901b9a498e13
-EBUILD netbeans-webcommon-9999_p20170307.ebuild 5932 SHA256 75404ec0fcd1ef01d9dfad4e876c10650ec7f959d777209fc5ace8f5dac85348 SHA512 4d3124cda2ba7fc50fb7939d818931eaaf10b6e7426c159c700b756940b18a87383ac6c12ab438ab4e9b6fd8a1f4c86ed41fa08c78e580172b92e96d7c86dd34 WHIRLPOOL b2646127bb237b0b5d015bd10c36c7b835e4a74877501173fd8f0951a76dc84e17a8cb652427226fdbf95c3ab4a1c8b5463fb26a07c70adfb6b0d268716b9648
 EBUILD netbeans-webcommon-9999_p20170308.ebuild 5932 SHA256 fd744c3cc6dab407b4464120176d31f53f2ec4e992a636a2a03f52ca2026f192 SHA512 212f2970ef68919335c25ad5bd27a23181fcfd6938f28e2294cd2e177875f7f0c7daeb8e157981717ed28cb3c5f656f536746f329468a73bd443491c91f888e6 WHIRLPOOL 79717c0bcc4b68742de9abdb968df8d25374913070eb370267a322d7edbdaee9c94a93c15ced5d9ca127925eb2ea1ae206b0ddf8f2417efbabf49e087d818fe0
 EBUILD netbeans-webcommon-9999_p20170309.ebuild 5932 SHA256 4c59fb502e730ddf6d5abc6d7d55bf3b446f70c38a0879afbdf3fcf053a91fdb SHA512 b618f5a3b0ae30036608e4ff1f40c74861d030d0a52bfb219bf59c1f84c76fde9e52731c33a8bc77c389c7712f7ae16f69648709d3b8506db7b0ef9cbfa5f673 WHIRLPOOL 243cb939ab8286c5119fa226071d4ec0901761e27d0080216e621d83522258ad810d345bb8fc745c093e5c5092d3d97c4e78e1a02423078f34fd4a6eb7961800
 EBUILD netbeans-webcommon-9999_p20170310.ebuild 5932 SHA256 4e56198d31f960d23f8c8ef27526b3d8961a1659e2d0d20c1f8e85df87cd683f SHA512 32294b8441c0d578f8bff90b5614359135cf25a9727b7d5f586c344010a1b5039f16856746caaa19a899f8bd47d8a846c39850481fa0701df71412e86d1f04e2 WHIRLPOOL f45f4f96b58277619dc22aadfd45127ce2fc7c43f429641d9d7df6d25cfb443292e2f191688069a92078aa5bee2e1a513bc12482189dd0248175100859df25a9
@@ -86,4 +85,5 @@ EBUILD netbeans-webcommon-9999_p20170401.ebuild 5932 SHA256 28cb2cbb57dd9ca241ab
 EBUILD netbeans-webcommon-9999_p20170404.ebuild 5932 SHA256 517d150a5cfd03e13b98a061c796c486ce00214c22ecd1b90a452b5223960f45 SHA512 833c484ec76eeccc3d43a9f8c7671dd82880445416cd19e4e82af8e4ff98f819cad89e4b059f468a676aa816248233f7903bc0112dc0f31b025e72b72321dfb7 WHIRLPOOL e38f16895c9cd7afb2e2e5ce84cb6835f56cf8882aa7b4a92d1846ef4736cf60eb357ae6d6f85cc4af59245f84ceff62fee8631c712bf81f2b26e1b3d3e7d896
 EBUILD netbeans-webcommon-9999_p20170405.ebuild 5923 SHA256 80e160061e8b6b5e69c39e94e4b59d63232a766da986713ad5667270bce03fd1 SHA512 50cedd2a373c10587d529034694675ab973aa7c4bf0e97057c07a75c168b6362375c12f64193825d76ce9dc3b11e207f5d9d9b083b967635c5884e773da07297 WHIRLPOOL f3b277c8f340fa9a1297090f2398e9e4b99384c1cb015ccb5ee353030e9d096cacdf2c43857dc63dbcb3b9e5d0e7b3582ecc16010c4fcbe75fc46036e41bd6c0
 EBUILD netbeans-webcommon-9999_p20170407.ebuild 5923 SHA256 8b0f6c68d11795f2cf71280a0478f7ca6d7204e4daa56e7f708288bf00787ec6 SHA512 b006de55a1ba2b3516fc8b6dcf751e94e19158fac736d79b6fd6f7d87cae85589bdfcf10400a2d03e6422d64b9d47de2cc7a62cee847f32cd8bfb4312a770e75 WHIRLPOOL f86dd74f65b253083c68f90d093cd30b3e66394ca3704d09897180aa6069042a6e420324397b60a597de4b509372bbe07645fd413916b77331818902d2e12e76
+EBUILD netbeans-webcommon-9999_p20170408.ebuild 5923 SHA256 a5ed2342ab2beb06c0cce51a8a6c98a63d990848c708a0ed00fb8385a5e8b27b SHA512 22ff1f67128292c97a07a6a04ae2b453e2885b5d6aa2ef0f2d27288c54568853bc7440a03e77d81b95a4719e725835d51ed9f0933807a3c8291b8e8e501303ff WHIRLPOOL 930f147fbb33ebf45b89a4b3b4e760045a75345cef2549c47e3dcdbf4782f8af985cf3ded2c0c647bdf7d2e85ee3d97aa56a36057185513f37c7194dc36cbd62
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20170307.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20170408.ebuild
index 86d38af58..7f4124aca 100644
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20170307.ebuild
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Web Services Cluster"
 HOMEPAGE="http://netbeans.org/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar
 	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
 	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
@@ -54,7 +54,7 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
@@ -78,11 +78,11 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	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 --build-only --into libs.jna/external jna-4 jna.jar jna-4.2.2-stripped.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna-4 jna.jar jna-4.2.2.jar
 
 	einfo "Linking in other clusters..."
 	mkdir "${S}"/nbbuild/netbeans || die
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index a71b47ab6..f5dc2be2f 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
 DIST netbeans-9999-r18-build.xml.patch.bz2 2681 SHA256 202a5c5225f98870368b1427f4912b73637170670613c431c2440138a71ab378 SHA512 59289d177b8ba9f937b94f9224474287f32f2aceae3f077cfaa6a9c4d618b8d8ef2c3b8739e44648b264900fac1ff4590ac8bf4c97dcea2e4280a64a8e93a3fe WHIRLPOOL c5cb065e47f0b29611f6b3ea6469fb980ff9c9881e4b86139240497812a74c0f2fe441e8dfa7126849bbe5187ad171953f39a48436ee8b59bab75a6b03881f36
-DIST netbeans-trunk-nightly-201703070002-src.zip 219249509 SHA256 ed8cdf227e181cf52768995f03b53f40e9c51ae7884d153102c3c2b44b4d2bc3 SHA512 6be86eeb9f74c886fdad595c81bca7da1433344fd9c5fc64ce641df54038780be5f3e4971b0a2b337cce0adfbadfde5ac259af7659d735fe39aafc0cb4c708d5 WHIRLPOOL 6dcffa8fabfb2f6a899fb2e3b9e51681c51cc6ff9a34aa18187cc0f81a5d184cf4aff93c4bc29adfef88356300c9f0204ad7efe89cdc2e6a4cdb23634f078aba
 DIST netbeans-trunk-nightly-201703080002-src.zip 219250450 SHA256 7a0595bb1ce690135a2a45ccf052b6d6ace5969e9bb1462ca251aaf26a4db501 SHA512 e5862d9ab31fdd27c11ec659a09730ad501234b148a8ea2bcba130a22382fba2d8614a23d322fd269faca1651a1d6a9f8d98531f078888846ca112b00efc41da WHIRLPOOL df25cf0e766a91eb2dca9309ce68acca7caff84e7b15a83bfd9c921cbf2eebbfdff415416281bb822dadbc8dbc628887b5aab73da4b4eaa5f39194ed009dc173
 DIST netbeans-trunk-nightly-201703090002-src.zip 219250450 SHA256 e32bc8e1670016f3e99a821ebb85a5923cc01ed7e5833f127e91d18bbb772fee SHA512 ad5d09fd4691ae4a9da350d6aa789f32722b433e17e99453fb7aa42caa1f5f07ec59f63a03b4f1c095c7fd0a0152cbb882fce98db5ed7dfb244134d8f37609f0 WHIRLPOOL 39c3d214dd51e673087250e27c9936d468e436027775ad9f196e12ef82cffc5e2e7c1c09324511b552545349414110b1d6c7ae322c075d03f1db1b762a108ea9
 DIST netbeans-trunk-nightly-201703100002-src.zip 219605914 SHA256 c1ea3c49b279cde123464fded2c7a6e8e71cc8b849efef2f25b4242d7d1f6797 SHA512 ffb611a71040429af09fc264f9698b0ab2971f889cf67735d46bf0d944bc031769aade76bbae29d3b35294abf6ae30e91e56ead6bd40d8130b5d808dea06a332 WHIRLPOOL 57cad5bd2535bd78d608cad0e9e01a71e5142855ba5eb39fc9b82a73b066acf03e19fc33b800b4a0e98bae5377ca82fe4c1de5453a09830a2f7affbb647823f6
@@ -35,10 +34,10 @@ DIST netbeans-trunk-nightly-201704010002-src.zip 220004084 SHA256 8ee4f7aa116879
 DIST netbeans-trunk-nightly-201704040002-src.zip 220041810 SHA256 5320097f96614cf1ee85d7058902d868bd8fad932d5ea9a4e5b2c6fea3124d12 SHA512 37ca13bcda2eabcf59db776f761a81837e5275376bb312906020f0693ac4195ea756cfbe37477cc7a119cea0889b8e33359a1c956ffc97ab0d230507a0ef369a WHIRLPOOL f4e95c34f1d1b2fcd8496dbe9c138afbcfbf13f7c3b68ad59e0abf95716776b35583a55f3c0163c666a0a63630aef7853b5f256aa0607f02fc44eaf258b5a854
 DIST netbeans-trunk-nightly-201704050002-src.zip 220043273 SHA256 de4b78cf69424a0041023762c960613746757b7acfc1482634647430e180ca88 SHA512 f2ee65e09b7ca4610167fcc984b844a170b6dfdd1f5b4e7b669920159a3397f89cf05e11a30754dae403e1c28711702f6575e7edbe34942a08dbc79f2199a081 WHIRLPOOL 00962605956a18e66b2b261ed369ae024762614758043a6303bd1989b9f44cf6d129c336de62cdc7b9a15e4481cae7f7919349d7a52d9078daae92b2bf02ab78
 DIST netbeans-trunk-nightly-201704070002-src.zip 220049672 SHA256 8de065e66b484e5975906f54f67aca4175812f66f53dd66ab5d943e48504585b SHA512 9d6b174fb914aafcd2d463f9b100207d1b0ff9d08ba054a96f4cb09ee758a9b04cf0b502fcf609b34b7aa21589ae13722125df1fc3d7b3ced33b941a89c4d820 WHIRLPOOL 22e1f8f939a4527f3b9bce485f4dce4d38ba1f8ccc53611bc81cd598c696150198206fed33087ffdd26b3b3e199467902316b10cea66af3560a918ab1982b30c
+DIST netbeans-trunk-nightly-201704080002-src.zip 220557185 SHA256 1dd7ec261d93e550a2a4c5e748d678718626d9482232892db2307ae1b4c7f653 SHA512 42d6ed00b65dba4989560ecc6a934bd6023c5667023c214b55b773141110609b90be36aac997677844b659699c2724381a69d5b16e8a3c3ae5db8f7bd2110cc0 WHIRLPOOL 3d47fe0b28221f75e2e36ecfc5f92cf82095a16e6ce86f6cbcea2c4d7db9e8a1e1eb5d827469a6b6a58083a6c946994acf3cc4504cc4482a2f4839520e87ef50
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
 EBUILD netbeans-websvccommon-8.2.ebuild 2354 SHA256 f99bc2ba483a8f29f6f5803fb8672fc2ce57253cc4ca19f6f7ee6da6476140fd SHA512 96465fad9eeef1044eef125386bf35641393fdf4781d07f745411d8a73f06a436dfd0a574820c99775d853091cf24bd5b53637e77b4cda412e77bdfe8d6b1bcd WHIRLPOOL dcb283e5435d2bbd713354a37e84e0b126e73930288d14753bbd62592dd090b489d7a0c712ca73a2a9fad81221855f0679134cc520d8f852660d9ec559aa4d49
-EBUILD netbeans-websvccommon-9999_p20170307.ebuild 2400 SHA256 8c1e142653a3c71dd980e93b238c8fde1189cd8afa390855d310651355735940 SHA512 1188c71022ae827525037cc856f68ad930f178024b5f37128cb3e6a454f401aeb47ba00a0ec30c1c83bf18a872bd1a8d0d05dbb57fc55a87844d27fe0445f721 WHIRLPOOL da637e8dcd5ea74bb0f8f80450aff12cd0f46ffbc2870cc36d3be448d3276d7692f18f857355767d0fce606048fc36b9bbc9a2336dce63918dc5defebe530d77
 EBUILD netbeans-websvccommon-9999_p20170308.ebuild 2400 SHA256 9adb914250b67a4f3c2cd0a3bdb3f9fdced1b75892ffa14eabec9ddecf8ede83 SHA512 bea05de0d12885f356bd2d1b07dc0ba54725d3852422676e6b4324d6e24b649222d6efcb4aefe531da5f4f7b5f98761bf453fe848e2290a9db9e57de240c18fc WHIRLPOOL 311adb88bf34061d3c41e3c01ea128730370f366f384f27501a0783b23f11dd59430e16f706068824a8b93f3c3240fe3e1233ad7902a648405f0f539b953ceb8
 EBUILD netbeans-websvccommon-9999_p20170309.ebuild 2400 SHA256 512cb6301db6ed384c632d948fd5648b9d53d2ad9d2ba962ebcef01fdbde9532 SHA512 ece7a1b6ee6df1b1c8c9241a2422768a6d924f1662bd7483e5126c03309ee6dcda72ac8738b88ae6bcd9e1a342b53182bda54d8caac8911f15045931a5376bd1 WHIRLPOOL 4272c5802a2ee249099a1fd1cd3c87fc6eec119658fca80eaa942e82c50dab1f8ba8ca4d3f693744aa6517a9c62b859354a1a1230f1f7dbd38c596b556376661
 EBUILD netbeans-websvccommon-9999_p20170310.ebuild 2400 SHA256 a80d3c854f8cc44110ab8a678660eb3319597b1ddd1a04343e0d8e5ce6a5e3bd SHA512 6742e54f3865d371e1294d16dcd6f1d7b753eeaabbec4ae2e327cd3c3af489d9fd2cf2c518fb90f88f90aeed791e5283cb3bde32e6544cd8378152e04f9be499 WHIRLPOOL 7dfec799c8789db2059c5e3a0007b17af8994f797ab6f52282fb034b64a2fc9e001a39e12221a698475e5195eae72a2ad1ec5fc539181ddb490cd0b165cff9b6
@@ -67,4 +66,5 @@ EBUILD netbeans-websvccommon-9999_p20170401.ebuild 2400 SHA256 9f03c92d3aae2f792
 EBUILD netbeans-websvccommon-9999_p20170404.ebuild 2400 SHA256 f1484b8e9c25dd46ffc0baab18a350c709aed95fad323c5caa0ee55372a77cdd SHA512 9d806922dac11c991b5f26634170cfdfe4eef14d97d39a0db99e7e7bc6b43381892dd31c17ddf90f2927fc96e36d7032b740b9118eaf6838b07991364b1a9b9e WHIRLPOOL 8d91fb6a995ad8081042fd87a8820794e01e88862f93bb61f4c02a80dd99557f93108191a46961b5ac5748231fcb9a6f45df63a5aa889cd30677678bd1bb4105
 EBUILD netbeans-websvccommon-9999_p20170405.ebuild 2400 SHA256 7b3d786fe59e13e5d0b5c669b1b3485d8b649affc13fee31fbe9fa53a40892da SHA512 df44eb65514600bd4aecb6870b84ae224982b1e4273195e372beb1069694cc24d9fbe20ee9e06e40a9297207687cd0da6aabc534261654cefdbb78fbf6c971d7 WHIRLPOOL 7dce14eed846fb3656c514a5c59eac3bd4b363029101cc8bf7028b374e59f4e1191c891e70b4ad4d765d5ef93e3490bdc2ed113d723278adaf9368e2b5b7e17a
 EBUILD netbeans-websvccommon-9999_p20170407.ebuild 2400 SHA256 b4ef869c776286386fd13c5df2c680e0f293084544762f1ed842506a30268aad SHA512 5834479079b3adbe8e722d5c099dffb6c1ab1e5cbc6cbd82ddc50d8342a5e01ef3dee39b0d53ebe10800e9e38fa30c0ca7b5bea7e6e7d526553d59e6a60ee71d WHIRLPOOL 5870a477761d9dd11c1293c62d176106a25e94053c31ff0ee31b7d1fabd0c671624eeb07bc036d5e42a004164ded10ecae4d74e86b3cc8b837011f4398778dfd
+EBUILD netbeans-websvccommon-9999_p20170408.ebuild 2400 SHA256 91624dd62e1170e0021a8e799ef62dbcea2657ca320ef7bf84b0d1b8ae9e7871 SHA512 815b3863d026092cb19e7026655997d4557ce521e1df13ae475437199ecbff866ada602a02480598d3001ff067d6ab28b2c0cde8f15c6e881f84b43a443e82ca WHIRLPOOL 9f72cbec740c7a519dc56a29e08db4e72bf9af5921daa0c5cf43a30515cb32ca92526b8ee57af9e3eb72bbe9a306566bcb5f8d9b488944f512dd7115444bb876
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20170307.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20170408.ebuild
index 9d2268570..79c006e50 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20170307.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20170408.ebuild
@@ -8,9 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Web Services Common Cluster"
 HOMEPAGE="http://netbeans.org/"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-03-07_00-02-00/zip/netbeans-trunk-nightly-201703070002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2017-04-08_00-02-00/zip/netbeans-trunk-nightly-201704080002-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2"
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r18-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -38,14 +38,14 @@ src_unpack() {
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-9999-r17-build.xml.patch.bz2
+	unpack netbeans-9999-r18-build.xml.patch.bz2
 }
 
 src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-9999-r17-build.xml.patch
+	epatch netbeans-9999-r18-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar