public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/, dev-java/netbeans-websvccommon/, dev-java/netbeans-nb/, ...
@ 2016-10-06  9:03 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-10-06  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     718128f8cc10fadbf69f380f50b0015f1039af83
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 09:02:50 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 09:02:50 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=718128f8

netbeans: fixed 8.2 ebuilds

Package-Manager: portage-2.3.1

 dev-java/netbeans-apisupport/Manifest              |  2 +-
 .../netbeans-apisupport-8.2.ebuild                 | 14 +---
 dev-java/netbeans-cnd/Manifest                     |  2 +-
 dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild      | 14 +---
 dev-java/netbeans-dlight/Manifest                  |  2 +-
 .../netbeans-dlight/netbeans-dlight-8.2.ebuild     | 14 +---
 dev-java/netbeans-enterprise/Manifest              |  2 +-
 .../netbeans-enterprise-8.2.ebuild                 | 14 +---
 dev-java/netbeans-ergonomics/Manifest              |  2 +-
 .../netbeans-ergonomics-8.2.ebuild                 | 14 +---
 dev-java/netbeans-extide/Manifest                  |  2 +-
 .../netbeans-extide/netbeans-extide-8.2.ebuild     | 14 +---
 dev-java/netbeans-groovy/Manifest                  |  2 +-
 .../netbeans-groovy/netbeans-groovy-8.2.ebuild     | 14 +---
 dev-java/netbeans-harness/Manifest                 |  2 +-
 .../netbeans-harness/netbeans-harness-8.2.ebuild   | 14 +---
 dev-java/netbeans-ide/Manifest                     |  2 +-
 dev-java/netbeans-ide/netbeans-ide-8.2.ebuild      | 14 +---
 dev-java/netbeans-java/Manifest                    |  2 +-
 dev-java/netbeans-java/netbeans-java-8.2.ebuild    | 18 +----
 dev-java/netbeans-javacard/Manifest                |  2 +-
 .../netbeans-javacard/netbeans-javacard-8.2.ebuild | 14 +---
 dev-java/netbeans-javadoc/Manifest                 |  2 +-
 .../netbeans-javadoc/netbeans-javadoc-8.2.ebuild   | 14 +---
 dev-java/netbeans-javafx/Manifest                  |  2 +-
 .../netbeans-javafx/netbeans-javafx-8.2.ebuild     | 14 +---
 dev-java/netbeans-mobility/Manifest                |  2 +-
 .../netbeans-mobility/netbeans-mobility-8.2.ebuild | 14 +---
 dev-java/netbeans-nb/Manifest                      |  2 +-
 dev-java/netbeans-nb/netbeans-nb-8.2.ebuild        | 14 +---
 dev-java/netbeans-php/Manifest                     |  2 +-
 dev-java/netbeans-php/netbeans-php-8.2.ebuild      | 14 +---
 dev-java/netbeans-platform/Manifest                |  2 +-
 .../netbeans-platform/netbeans-platform-8.2.ebuild | 14 +---
 dev-java/netbeans-profiler/Manifest                |  2 +-
 .../netbeans-profiler/netbeans-profiler-8.2.ebuild | 14 +---
 dev-java/netbeans-webcommon/Manifest               |  2 +-
 .../netbeans-webcommon-8.2.ebuild                  | 14 +---
 dev-java/netbeans-websvccommon/Manifest            |  2 +-
 .../netbeans-websvccommon-8.2.ebuild               | 14 +---
 dev-util/netbeans/Manifest                         |  2 +-
 dev-util/netbeans/netbeans-8.2.ebuild              | 93 +++++++++-------------
 42 files changed, 81 insertions(+), 338 deletions(-)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 33c0164..d9ec3de 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -37,7 +37,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 3359 SHA256 43725f011ccccb65488a1a9e5f25965d818df25bcad278a9b3453d945c6736dc SHA512 4cface820ad78195197baed3b788d9317200198295ce455beadf6699f6b121fdfe273d4a8a0f1b514186e77343abd9a1877421853db12821e5e1319498768bb6 WHIRLPOOL 623fba6046b28a1de71ee820bf6194519ea76141c6d4a50421ba87691f0ad5faa278e076f4deeb3c913f5b82788aa3afacc4931775fb6e9fcc7361855e0d8d50
+EBUILD netbeans-apisupport-8.2.ebuild 3059 SHA256 605b99cf2fe6fd30b28053ef3a3e6dfbed6189f97c20728c41e00ae08b766edd SHA512 876916d7591bc518c9ba63d8335391a41bbb89809828dfb44c3eb4edefddf7393c143825e8731de2b8cf6e6a1aafdbe274ac1d7456a982d3846b43a2d16adc8f WHIRLPOOL 329046fd8eb19229567f85d19e6fef0f0636bc6efb5ad1b84c102c3dc7119ea8672a8f4ad7937f837b4a43537725cea7e137d88ea01ea9fafb34cbebb9b0ec56
 EBUILD netbeans-apisupport-9999_p20160905.ebuild 3384 SHA256 940320ca183288746b9bb0162d40ff88119ac4a213e26218a704e2325ed1edcc SHA512 1f548572f2661e143bc02686ab0a416bb44bb19421ed11a6c235454dcafdb4e4b754fc6756948466025a54c49cecc1f8bfb68606e175008456cd020483eb6832 WHIRLPOOL 9743e0f307a3a983537d15792fcb5c4d97d7f9e26fe83da8e9d237837382c3c4295464f6dde18cc8ac0422f9ebcaf5c47354cd752754a1bf9b5a7eac49eff51a
 EBUILD netbeans-apisupport-9999_p20160906.ebuild 3384 SHA256 8d0e81d418ee32f736fad8f429e9f4a20ed2413bd04aacb5c87e9d9f74eb572b SHA512 9aa1e3e628c6e6c2a323cf0061f0665fde03f112ce798144e23ddc4291ab04b82e9d54e34b6d710e7a7c75373196c07d904c18b0bc249adc2e8efb18b258a973 WHIRLPOOL 6153bad851527aad249ee806b90eb4d6dc7346aad3784422df5a861a89c609b2446b1c4e10f84ef9bec5adcc8030876151f0f661263f5cdabda924a89cb8d0c2
 EBUILD netbeans-apisupport-9999_p20160907.ebuild 3384 SHA256 b9c38b1f824155f31b9d34d2c45bd7c577bdd337d403988beb6634542a9dc354 SHA512 1be4bf8e5056a11dbcf38c84ad7ff30f6abdcb629bf6b8d0741a5e1a38d0fdc35f46f53018c10d0043fff1828251007564ab34cc03eab0a67d6a4126c0c99403 WHIRLPOOL b4f7139c59a0713c5544cd363a6b9574b71776d0f381d2ef2e1d5a9b3dce09711e49f93344d3af2836b38332e06b9acb3acbdecd94fd98869a7207bd37865a6a

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
index 75cd721..63cf273 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -51,19 +51,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -94,6 +81,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index f7e79db..9e5addb 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -51,7 +51,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 4765 SHA256 ea96bb104315ad9114e5f24368989af82cb3bc9e61d1f8356d80a4c72e498fa4 SHA512 29938bb22c25eb48cbb69b3da635b2bba8ad80b033a4a35baebe9860ba2e72cbdb15e871f2776e1fedbb1b4a85d00a68edb1caaa2932a6ebb2ba1eb7eda60a8d WHIRLPOOL 15b3111838b826feef9a0baee2b48af6990e292fcd07d09716ac4ea93fab51d7d1a169804b9a6f9d97c53e0b1098d6b2beb6c8e521c0026b93ddf830fa51fc2c
+EBUILD netbeans-cnd-8.2.ebuild 4465 SHA256 e5268b1872a0ba3f39dfbd8d49fddd9938900bbbc96e432fa1807ee0b6c36fbb SHA512 6c30daf1aea9d0d598d16903facbbc4a02660821dd6ab5b98c940305adc3dbe41d5410bfad7c1afe4adb33b45056730c95eb9fe2462b5fff26449a7814202bce WHIRLPOOL f60d88d6cd35594ff406fbef4e181abb02a3699d442450f19da173e802576fbad7c891efeff236e3d02d7a217f4685650bd2d57aa6ea17e29f550ede9ac13d06
 EBUILD netbeans-cnd-9999_p20160905.ebuild 4790 SHA256 46a1077ed41954253f2ebf5088d1d1eecc564954c07bbdc62a76b18c4cd8515b SHA512 e3bbf1dc68af1294a69724ca5fec54b5ccec0a737aacae8daf3eb91a3d4f977f766f037a35f60f13e1c54818c6b29f44f78230d479ae1d919e8caf53f768f415 WHIRLPOOL 9b193d4f5b316297245a44def25cdba2ab2ed633626af480d58b5045f234cb9b287f6e99d8c0368ead350adf77079a1c6cb3893a2db1180189165a4e5c858557
 EBUILD netbeans-cnd-9999_p20160906.ebuild 4790 SHA256 8e7d5da5c2f38b98a24d06b23beea3019ee8f49533ead00467b07e30b9f160c1 SHA512 a7f7e0ebccde3ca5b0252dea00517fbd4580bcf7eb1347eab86b28a25791765dc5800e6d45def8da8ad6a7754319a70b84a1cd10d954ddf47089a4d1ee1666c9 WHIRLPOOL 4a9ef6bc0e908dc9dfe893898d847e413866c7db737e81262d28eb72d7b1983ba308ef8b3787a207bdd79d7ac246243e14be57476bee27a4ab61c28a3f9b5eb1
 EBUILD netbeans-cnd-9999_p20160907.ebuild 4790 SHA256 32088ffd9e93afcd59d035c01b2821be9c1ce198f43f0afafaf0dafbb406d623 SHA512 09f7e3c641e9988a20fcf365122066c603305a68fbf680c145c4f3b7418d2c8a4ef7d1e17326e7d360b5df41d28491d8c6d5761ed460374deb9eedcb00667c04 WHIRLPOOL ad67fc91976703778902975a4493cf2bd0922d3fc55d4304097cb24deb453cfb4e5d4dc11fc6311d44595f1d37804e81499b802cc8f78f39ab1b156e0fc2f9aa

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
index 8fcd895..696f47a 100644
--- a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
@@ -69,19 +69,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
@@ -109,6 +96,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 07d635e..ffbe631 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -41,7 +41,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 2943 SHA256 cb9b660d6eacdef291ab38c2880e288860e03c3cddfb96bcc7045690a15648a5 SHA512 ae5c5d51727582621ace5333dbf54de87e5e1054b5080b75ecd290b6e0af39ddf93d365111682e64a7c0029971efd5126a6b15aac40788d967de7fb942a0ebb2 WHIRLPOOL 6d56edce6c187f17db89130f998fb639d16fb75e1238deb2eb1ef71977cfa7fa2becd4197d0c9b8265ea1491a5df3c853d703191131f5f33ec90d958387d1779
+EBUILD netbeans-dlight-8.2.ebuild 2643 SHA256 0608962b0d5b55245c0197d9d3611dce2abbda380cce67c72c5df8922367658c SHA512 fc46e711046fd751f358771c5fa08050bbd9fe51d81fc7f696c3ff7d597b5401a06fc1395c77baf33f8b8d5271e3f8dacf91a94f3a223af383a5596b227d9736 WHIRLPOOL 7a9d758015d16fb389b9a0e3e2a666508fa7079ddcf3fe36d967aeac73f5078f90ae72a90ddf28587337a1906b458034cd648cf75b71ef1a0fef52d168fa5192
 EBUILD netbeans-dlight-9999_p20160905.ebuild 2968 SHA256 886d74ee2340f93575e0a55bce898406047f4cd7d0682bf9a42e56a17e84fd97 SHA512 66fe71534b1039329a6bc4c9b87848a3f85727366c4202a52fdf0fb56b3e992cee02a3a270d1d905f899bedae23c65d12be00d3ca7f22859abc8b866219e5981 WHIRLPOOL c24035ff6879e8f757a9d09c5c227df5d9e657527efa9af3b04433642786b12b8bc9b6a40a55b5de3276899f54b4f5225bfa5dd39f81cf8605f52ba59647e84c
 EBUILD netbeans-dlight-9999_p20160906.ebuild 2968 SHA256 63afe1e6a26971351e6f14588e20a6959b3a99a186c2ca5056f95396b90417e8 SHA512 39f37ba5b0f45c70897a5cfe671a2af4a22008646f8b79babae2715d02ac0450683ddeae5ce7137cd32a74ce7bbfe1850935075f97b10e56ad4319c0dd0e0722 WHIRLPOOL 094592e37225ab992ff0ffe61ad08f958a221e94967043aa491c5be0489d0b90bdfe8065eb94e5fbaf5eae8eba4e70d36b5d2dae9553751851fceec03f3f6a2e
 EBUILD netbeans-dlight-9999_p20160907.ebuild 2968 SHA256 4a605bf1232703ec2588a8df4be527cca4d561df8d5beaa425457b35622da13f SHA512 10cb4dc4c46a26860550d6a50274b50fae129d2d9ae93d2967854f5301c3974fd9ed6489a2e26bf694cc97ac7000b0bc4735ce54b9b1f9920f0863e1aa47d75a WHIRLPOOL dea041f9e9c736404be3eeb084ef79427142b862807b45e0e9e3dd4e04f08e287dadab69383c3c7f8e8348ffb2425bcaee60f7c60356597762558cfd93446615

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
index cc85044..6b09b84 100644
--- a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
@@ -53,19 +53,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -84,6 +71,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 156af4a..a88cbe4 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -69,7 +69,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
-EBUILD netbeans-enterprise-8.2.ebuild 15800 SHA256 5ee32c4eac34e289026abf0e8742bf2da773a7974541d79b9666ad05b7804b34 SHA512 6ece642638f82a980b1c8da82d6c62225230eab26cc3889554b8b4219f061cd6845aa9ced518fd919439c6447821bcb592c89a166f76c8f13a2c12736d7c125f WHIRLPOOL 084b7fe773ac98531d9019100aa4ca36fb7d1477cf6bf68573986f5c0c54e18ba626a212cd515b729a97471faa4ed25496df63e130474651e8ea858a78eeeff8
+EBUILD netbeans-enterprise-8.2.ebuild 15500 SHA256 c873137315dbae5c4e106ebb8e45c4f0f393b827c1f780c7b0bb8b1fb9acaf1b SHA512 b5c42aef845bc6095652f0fdc0cc09decd06603d7564de0b579018719127df108632f7c123b17477985adc5e06f53711221f62a50845f1e1163df5a8b5489cff WHIRLPOOL 802f4dbbfb9f49bcd3f82203612e5fee8ed41974f8d879388239fa019ad9336ac58c98620f2482d0de8e9fb19989ff77ff93130ae2b0b4c027fc3e4073704cf8
 EBUILD netbeans-enterprise-9999_p20160905.ebuild 15825 SHA256 3e3bfa5fa4f6a4ba06cdc590c16441bb910adb112febf3d8888be3e8067f1e66 SHA512 80e873d64c28e54445c05d77f8306d06e26bc2f0913764fce08c626ee87736e93c4c27a13b0549d77059e99efe17b77c898c4fd91db7e30bbba21b004c9db149 WHIRLPOOL 2cabbd20151e443db5113c9842646f59b149b71af9cca7c15f53fc0c599ffd4591e8c34bff140ba09f90c9313e8deb5b3fd698d6b050cb61e7ecc3e8ea0fca92
 EBUILD netbeans-enterprise-9999_p20160906.ebuild 15825 SHA256 5a77aa9802643256f958e91e0a98b0ea684f7cef7118d40f9adf92aa51873a52 SHA512 101a73fb97c6c489b359dea70636bf79fb608da12074197e10d0a531badea9b45f4a5d1d12129f4670cfe13b1a75d87fd25c55a7a3c055172643e42b963c719c WHIRLPOOL 565ea2f056a080a1173cf48ba45299b524f92b290ee3ea07dc72f1043114c931b49603fdd5076ce993d0900bca3b80713a015d07b8c1b75f6add0d137ba20875
 EBUILD netbeans-enterprise-9999_p20160907.ebuild 15825 SHA256 0fa63d9dc6697891f5cb1ac55fd3b24339e11613897dfbe78a07d9d8f4bd311f SHA512 65c0adb15fc0a1a98897262c143540a2a3fb1a525d5bcc8f1642599a33475298bd7e224ef87836ef017828ee308798ec7a64b57c79287acc9b2c6d70d1ed5517 WHIRLPOOL fb0c4e22c02086629a940512c4f06cb400926ad13843cea06517bf3e36392de93c5ab3850cafa26cb34f2ad520df2e41aef30526886ef04162349ef56b6230b5

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
index 1990ecf..5af83e3 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
@@ -140,19 +140,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
@@ -202,6 +189,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index a22e811..a140874 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -37,7 +37,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 2888 SHA256 73a3323408c5ea7f5bfb2432c59b350395f96bb52ac4fbdda9fe7cdef9540a44 SHA512 f24e93d6bbe4088610b2e308f443e44decf1bdc75762275bb209fcd183a64489e0a633596e9374c338b8351222c11417e3e7d708dd7069b8c7119b8422dc0644 WHIRLPOOL f075437231db088e5b8f3b81c501cb8ffc752c8b2dfc2dd96983b77c8a4a5c774d7b855af63a1e8ea5ae6ced158ef1debec8a7df79a2887e0520d8dd7ea42104
+EBUILD netbeans-ergonomics-8.2.ebuild 2588 SHA256 68db901e9ef42508812495dd42af7afc5c85398b3b6a4585dea23c5423ea9c50 SHA512 f79370f1568ce6125e366d023f008799036a0b4c4b6e97ab4fd0e52270d0526710edfe0a979e703dd668796c56e4d9a8ea32fcccf9ca49993eca9a0f5fe5dd2f WHIRLPOOL 769da617620b71da2c5dac7901a352b76939fcdfc12e3d2d2014fe209e0e1c6666a01f185b9543ca800d4e201ad1467afc054e5dd1fd5a7187224b669547c834
 EBUILD netbeans-ergonomics-9999_p20160905.ebuild 2913 SHA256 3b0acfff369979aa9b8372770e76e42767d2ca982d7d63c45dffa8d68364089a SHA512 c20286d59cb3082824750cca4f9a80d4fc2478dc901ea8f5773a3e29eb64753bb5e33ed1295a3c13b9fa055fd898f45c7a6f31ae6429d485f749f73ef08c91dd WHIRLPOOL a7fdbf4e460942024f0d12bfde0eea3d235276ddd771715e2b62c3a05b566afa7b6e658004ca93e2ab65c970e21abd9124cc1e50e087f48299df3a48f18aeefd
 EBUILD netbeans-ergonomics-9999_p20160906.ebuild 2913 SHA256 a01491c9d0b532dafff7dfa6d4a07104cdb7b510bc6cb7977444cbe70ea933c2 SHA512 2e2b38070dd6af3652c0109c1de91d84d34ebe2108093498d8a3ca0ff31792e5b80bfd7a43bef28048753805eae54b398c89b345f29ae1c6c07a25f8bdcb153d WHIRLPOOL e32cd4f09054eba35fd4ad7bfa63cb2ed7a4abf9ebf1389450a8b570df44ef8c3ec62ef00980537079130f00fa8f5c5856eb510f81ecee5f9cce968ad26736d1
 EBUILD netbeans-ergonomics-9999_p20160907.ebuild 2913 SHA256 3a2221f208dfe87737794ffdbe56f157886cd6de37e2428a3573ac9ae7618db9 SHA512 ab8e5e31921dec44d76d960d01f1a3048f3f034551cfe0d4e4f4b159585616e592cce66b83f55726d21cdc4af9b347d4e33cfae2eb9c2c3728ed5a278d9fecf5 WHIRLPOOL fd51955b76f01b319275695b1646e39c957c00cd0678308b69b53a5ecfc6bacb231a4b3fa88f5f0cf2cf4340ac7b3d80ae16d8815236086d82d10b6f50881280

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
index c87f2ed..a77666e 100644
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
@@ -49,19 +49,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -84,6 +71,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 7db3ceb..283730c 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -41,7 +41,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 3352 SHA256 7b1ed39ca8d2d23cb510b3cd0c32875d1d635abb48a5830dad95c391b84cea9f SHA512 e157ca8a0468c4fd27995ff7a287f5dc57902fde615cb6995db18392a10e0a269c054c561770d421318b0913223ea54ef901cf2841838d6368adfb916efaa36e WHIRLPOOL ceb1b46733ef1bed29ce9d5851a2dd3294defa7423b0d6f85bc308575239d2720903ece19c2c631cb2b47c9c8b93b9697b0889491ef444c966b4758970ab0a1f
+EBUILD netbeans-extide-8.2.ebuild 3052 SHA256 f02128c23e03f164a7dae35617012088d766fb7300808f0283916a95df8599fd SHA512 02b2646836ada4d32ba11d6acca442a9b261f27d1d2cbc0996b046bc6a9b32399a3a826bffaab1c1e688d0c96fce4e02499337fb02beb6a9be67cce0b80039e4 WHIRLPOOL 75ba6170663f260e5e8b67b1a1a2df6aa56db67674c84c64348acd0389647bdc1b310bd5202af9e2e280a442caf82aa64b9424a8d0830ac48f7a23665365bcd2
 EBUILD netbeans-extide-9999_p20160905.ebuild 3377 SHA256 413766360b98217363cd8ff844d77f769e0ff5894f39456627b281e5e475cb43 SHA512 2845b6b89e404754ffa94d2f30cec4072de312fb4f062c147a86c625a2924fac3b2c61cf4fc71d6a99d3967d5a4722a661bcb45f5a2e672694ea43aee2a58361 WHIRLPOOL 085bbe15bd2b46dc1cc4dcb0e89a38e1b67255cb8e0a48c28435c65a36b32ae8d0fcbf3a305d2efc1b6a070e908b2212caa33826dab70a7d507c2becc9960685
 EBUILD netbeans-extide-9999_p20160906.ebuild 3377 SHA256 edcf99fcf02a1f7727a6170045273ae1421661ae51de1c3f7e842459954941b4 SHA512 b8541619d91621f287e9c8936495e1f3bafcf7e8f4839ddc983c658de7bcdc39148711bb8460b0185abf0524cc55fdbb11125803589f33008dfed11821649163 WHIRLPOOL defb94aae7ecafe8af6c5c0ddd18efc68054d1edfb766a86d1e7ec181eb97c4f1008c226e06bc244523bf2132e3dca28f6cbfea2711103af3982673e379f966b
 EBUILD netbeans-extide-9999_p20160907.ebuild 3377 SHA256 37390f031dc148d2d00559256f8c6f174421b9cf9198a78b2271626d4877b727 SHA512 a1f2b5994fbaaa27a676545093c873f350f2a71ce25f9da2b9f9ac70df65ca809fac9fa9b2cdece24b7e8ea3483d7cb4d68d1b97cdb9b807dcb6aed8e05654db WHIRLPOOL 2415caf9b1436c5a777b24a563a08b4152ab27bf52fdf45cd4e82dbc02fb682ef036147498890abfa94ee57918b83d392c4dda2ad46d26e4c18e2e648f76e785

diff --git a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
index 9af6be1..2bfb1a5 100644
--- a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
+++ b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
@@ -55,19 +55,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -86,6 +73,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_compile() {

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 2703d27..4a14650 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -39,7 +39,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 3391 SHA256 7e0843b06ea2f64af89c46e58515313724df5e68def321831a967b3ae90f3533 SHA512 a92811889c64eac1c728c3537778cfdd093ff756ec95d0c0c59c02114f876b73c1d06f632a55e29fba099c8d70c59c99692e8a94e952a26ee1251f47c4f524f2 WHIRLPOOL 1eba2454eb5acbfc505d0b4f8b340db86708d80d0a9efdd99bdf89a0ee789a5ae81ff030bf526c27c8c0b8601d700ab510b28dc71fa2cd9d69d3727c2251b03f
+EBUILD netbeans-groovy-8.2.ebuild 3091 SHA256 874191c03509577bc4a4bf7e54730eaa185a29620f09d1e44633fcddcefb08e1 SHA512 72d80927284126809760da993a3008cb7a45bb91f83781435c3199a51c5e2fbf5e85f39883322134c44dd1070d1b7274fa357b9187fd9ebc7cbcac98a5be925e WHIRLPOOL d12be4d592e12846bcd5e87e541170d0f27f4cb8fa21656dcc9294e4893cd0fe6bc4098ace1aed25bffa1faa5aaf260995395e29c3a2fc950c88727899337255
 EBUILD netbeans-groovy-9999_p20160905.ebuild 3416 SHA256 c0ecf028eb941f5fb61d8b2882c22e3bb204b790838e58dfa64929985353a4cf SHA512 2076a522b064261d25e81e9c12f4fd4bc4bd62da34880897ea8d3205a553f2d6fec9c30dbe2c7a45f16d5255aff34529e4e3a3379d746970a4a6c6c87990fc0b WHIRLPOOL 9a15a9827f7cc6d18877c4bdfd370918f6e1026d3065f6d454c7c2a070dcc87bb1b04dd4607122d230ec5965973d91550e03bcec268d279e247370069dc5e895
 EBUILD netbeans-groovy-9999_p20160906.ebuild 3416 SHA256 0652fd524cc063fac9b94d535395475dc0dcd3c23d3455c52fdf06f4a1517af2 SHA512 be379410edc7e152169ea3d29619855f2f9705a98f7f5dd02c3dadc04d644c2d6e91efa62c958b8985fcd7df0d8a72b702e10f97e9818d94d9783553a60d7468 WHIRLPOOL a37a7def873fefb08be822b3b18b6b33b02ce7f58e8ad6b8322e6d2bfd4cf8d7d20a941900528d15891d6a43a810304cb0c0c6d6de1d9952b88ada99de071459
 EBUILD netbeans-groovy-9999_p20160907.ebuild 3416 SHA256 98dcf419c4abcfb84740b85ae31e64b73906b99f87a6c81ac6ef3959919ab307 SHA512 8e70dd8cfdf3a369ef1b824af88d7afcf1ecb4e2df4244543e83656b731847d58570bf7a29d896247153b533465f96d2ef430b17d14bcf1c647295a713c5ee1e WHIRLPOOL 8e9873fa55e7c328cea5786cc1102db4e8e7c58445c41d24bd980b8bb3778d662912fbe32888ef30cd193582fe3ac957f2cf0a55be1071abc5ebdbd5da743028

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
index 348bbcf..83ab00d 100644
--- a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
@@ -55,19 +55,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -94,6 +81,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 63bbdd2..150ab54 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -42,7 +42,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 4101 SHA256 2035244819e51fcb0f6d425f06943760eb961c07c34937afb076732c44463dec SHA512 220328646f289c693614124c1dabff6317c34110a3359218689d18da35bf3771c6b5e840d1f0bf2cbc9d26f3288460be9b7f0df73c49c2d3766253b07a688463 WHIRLPOOL fa1823f151a2df29a79f063a406620be5bd786d5eb1f72698b40802fe5491174b09c159b0b899af0170d2f43a435ba1bc9450d7f4021fd247cfa49ac4b84a5f8
+EBUILD netbeans-harness-8.2.ebuild 3801 SHA256 fb8e3c76ee96cbe6d36c5dbabb49f4baf444dc3f879ac319c0bec693484684e2 SHA512 5ac59770e25f2ce3ebcd0af36c895060a1b1f3e38dfc2b8efbd8aa8d7d0cd09d9c88794a7d1a40bc69dc6afd2fa820f7add7fabc55e3cf064702bb8bf5903f3b WHIRLPOOL 7ac28d024972c33545f8163d3375d80defe3d1e6890a118e497a7fc6177b4d35e065a7283dcc7a04dda8a56687f18d55711018df168c302624800c80d68949fb
 EBUILD netbeans-harness-9999_p20160905.ebuild 4126 SHA256 259b85e15c6867400ce92caac3b9cc28d81ee0d79c7ab90a808a695bd86de6d3 SHA512 71ba5c7d1e1d18fe16a4e5378f9229261d559fbe57ec4eb14e720eafee6d291f743f1e64f86e304160e236a907a80f60b17456383989d136559aae0a49f416e0 WHIRLPOOL 1dbe215563a95e82508e8cddf6282716bf2a348e76a66fc9a37879157f2fb9af257686042df3da2a6d5ba1f6fe903cd25f626f99f69b70a4c404c0b2a226e0a8
 EBUILD netbeans-harness-9999_p20160906.ebuild 4126 SHA256 8b9e642fc22bd49cc7d8a080572eda52f4d1d469febc2469c3aca2bab9bbc113 SHA512 3fb70c3ce3548ae4b3b93b56ed4381728aa3c33c787e7225b744f6eacef6885dd14380f0c4c8dcf7149e7d81a277d34a66c93710b185ff03315075ac4ca9eb86 WHIRLPOOL d58ea024a50f07c5879932a3147382806850f152874baafacfe644134dede3a9aec24779986b799372aa1516101ae0f5d263c0dc9e4181754266f8b53e0d4590
 EBUILD netbeans-harness-9999_p20160907.ebuild 4126 SHA256 d270fe5a094e815a16a59c692dbbc19b6dd71a7173f5f906d8ffa37f521acdb8 SHA512 729f33afdbf355168fff087e080ad9897f466d27067afb4359568602e3ef045bde78c4a01bfcdb613cb7a302d302c33cbbc0fabe3a3e993f7d65e16d89d72daa WHIRLPOOL c725947e2076a3a1ed267c14d90798a2bbfa5a4a8848945aecfa4dfc87f303bed06be5a38f363e4ac550fa3a19aa11ae0ba75aa19d04d0108f1c0bfb6ff15c6c

diff --git a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
index f74b402..12e9020 100644
--- a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
@@ -61,19 +61,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
@@ -90,6 +77,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index ec8d8fe..5ba0ca9 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -176,7 +176,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 29824 SHA256 cc702f44c0f1e3919e764b0c5feae1bbf2e6798538c2a65e78c1058252815b04 SHA512 8b198b9c9e43876afbc172a6242dc8561114a050660472d58bd160478e7ed85388342070261c3808a4d2809db6d5475b606bc77eb66d6a301dcca666aa14c865 WHIRLPOOL 962e2f5d3edd333d03ce67f436179823589aca9ac3592adddc763ab3ac76533ca771d1299d99fef9715e55b184ee26bec0a5e0523a51a27c627c9c944551d87b
+EBUILD netbeans-ide-8.2.ebuild 29524 SHA256 7e4c7dacab0363a0c3966a3c8004737f80405dc39bf7948fa9c06291527277e8 SHA512 1be3123690f9dd1a6fc1b21ab383ff6b3e39e43e32982bcccc41dfea25db9203dca09832eb016ad60a90e1360cfa12e2a85d2c5d644ba1206816b6c1df633d1b WHIRLPOOL 1e69d13e029b656b95fab996956f8349275caa90e1ed05205aaad0a9ea4df9c1e535d6e98adc30313c96ae8706b3ecf75e449ed16941e434c9f98fef339f9002
 EBUILD netbeans-ide-9999_p20160905.ebuild 29849 SHA256 4f730fdab22fcbf8bf2351cb63a00e84ea6c1d235f27d93f6538f66622eca59e SHA512 d149a9572d0860f67cb0cdfad17c9d7105b698d1a40b9cbac5640e2e23a71ce012b315764af73cd344940679405cdc6d78017450c83dcf5c7bf8af2ea5272f18 WHIRLPOOL d3a1ebe9e05aef3e75cd0a686773db83bf4df399777bf8ed24befee145502ac6196a8a6ffd5ac5471166fc0942d7462e011e0317a48e744520ba08dd6f63e769
 EBUILD netbeans-ide-9999_p20160906.ebuild 29849 SHA256 6b91e01f642e7065420b26a32807dad0ae75c323c2d6a01727da14ceb4209e38 SHA512 9dacb0a91adc2438389b7caad57963b4e3e8834125fe3da803dd177850580a6d5ea2c20f99b68bc87322f3db5e517bf023f83244e74e11664be48b5f192444ae WHIRLPOOL 1c5dd6f9d79abdaee1d741b49c15d9a4efd4b958c08dac17e82d9e77572109c183984e77a2545c536465735f0df7c513aad5c93ae8d142e7fb056aba5d69a068
 EBUILD netbeans-ide-9999_p20160907.ebuild 29849 SHA256 3f65161dfbae804db283fce06df3b1f11f9a836f6e558271592892f5789d4f59 SHA512 61205e77ae67327b7cbe2670951c85058f28a5dc782fbefa0a041d62315327c7e89359f0385a1658ebfc310a3f47737b465fa92150c5a55cbb23f6ad25355a17 WHIRLPOOL 3d6ccd1edeaf94500e96c7d0afb585dd74cd1919fb684d20c11a1623258b6e1cc668be4ef5d25f34d01fa291c52a3802274577cbc9662c636f611ba707e1ba20

diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
index 4cccc57..bd42cc2 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
@@ -232,19 +232,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
 	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
@@ -289,6 +276,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_compile() {

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 96f5662..6c2dfd3 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -72,7 +72,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 15631 SHA256 26703214fdb4695b55d82f5e79bbb61cef095e46a9b1ae1552a1fba981db31a1 SHA512 74178fb52ab2ec91b3619d00f027e381b2a1b29e8cfbdaacb1cd02d3124fd6fec3d942c8e3641cd5197c0941eb98c02dea618e8f02bd28ea068e0d36c3598aae WHIRLPOOL f659e62e7b0119c5974e28649556094969133a17d62b5b2a8676eb214c1699a3bff7e57639934a1ed3732278cbea5402497b79121a60e65f925be0ea847e5483
+EBUILD netbeans-java-8.2.ebuild 15331 SHA256 c35725f6dee4e634e4de474617a307e2aaa6434a9569bffd9566304501adc9d5 SHA512 259c16a255409df4d0519bf7bddd4200ccaefdcbae4436fb321c33b215b757910c8cd807c8f142e8ae42ab4bd59478436ecee8c4d3d38615e8bbf110c265e950 WHIRLPOOL 07b86ee0c402eaed18f3a640ec5a447bbb781154e477db93ca51ee8034b991be39d8203c88ed0119bd785091cd82ae41367477e902dfb96ad41ca97410f5f41d
 EBUILD netbeans-java-9999_p20160905.ebuild 15656 SHA256 9c9a689a861efce80f75e8278ef3f82a15e52638700e88be2648c606c57ae099 SHA512 f8d643848c451da01ab2242e4b67b174b23f3d27b0b97200b8e11bd1b3093dcbeceef52bcbebace6da0d53b1bdcb2b21da8d93a43c6d63e6c299ceb7cd98e183 WHIRLPOOL 7141d134c1665fdd25337dd27416e655d9f9c72153bd9aea78ae527c1895c645304abe1962844bc6a8f094b7c1c2c4ed33f4107b518a9888f174ca4f7e4ec582
 EBUILD netbeans-java-9999_p20160906.ebuild 15656 SHA256 2c43ad176ef2d350fbe3f5a8efe70b7c67b17eb15dd4d03783ee104d207bf4e0 SHA512 04f547ea84389da28658af936a44921af91733e98e342b0b8ab8e2838250e7acea0abfc021a828c8bbd8baab79f46e251cfcf6d37d091f8f98a80f102ec8d8bd WHIRLPOOL 70f08254e0dd699c2ee42993a9d518c9f92401fbb1a994f6fc636bd4a2dbdd5d5acd63fccfe54f1de4d188e5d9824eb3b300e88d237582cf210f7f90e5385470
 EBUILD netbeans-java-9999_p20160907.ebuild 15656 SHA256 029d9007610e32cff119af3293e992acb071026078adc7023877b3ef76c533be SHA512 7d0be2f8ae976cb378e1fb23131fa138822e9606403b130baec660f2dc1d66a46ef72d4c95f6ec47d344d58ede21a12ce51216160929a4a5538837ee6aaa9c6c WHIRLPOOL 44d5293820583e538e100c508d2c768eecc0998bddca7cbe5eef91e69d2902f554a626b22840fa14cb214c72829ad48e8372c4eb21ab047f95e992bc4a3bcb7b

diff --git a/dev-java/netbeans-java/netbeans-java-8.2.ebuild b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
index 875bf5c..5395ea6 100644
--- a/dev-java/netbeans-java/netbeans-java-8.2.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
@@ -53,13 +53,13 @@ CDEPEND="~dev-java/netbeans-platform-${PV}
 	dev-java/beansbinding:0
 	dev-java/cglib:3
 	dev-java/jdom:0"
-DEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
+DEPEND=">=virtual/jdk-1.7
 	app-arch/unzip
 	${CDEPEND}
 	dev-java/javahelp:0
 	dev-java/json-simple:0
 	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
+RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
 	${CDEPEND}
 	dev-java/absolutelayout:0
 	>=dev-java/antlr-2.7.7-r7:0
@@ -163,19 +163,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
@@ -211,6 +198,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 590563e..4644b11 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -40,7 +40,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 4946 SHA256 4c8acd24dddc0686c80e64d7ece95e65497492796b2445be3b5bad8c0a2cab3d SHA512 4068f7f82dd8c99bcf3aa185d49c6222dec0deb2af017ec2073515fc744fb4133431d106e4eb19a63a0dba3edf3fbd251b563737548c063ff96cc7cc1da5c5cb WHIRLPOOL 777fa38a8be32f1b4cc7e34d2947632b9dde7321e059bb02b38d4805b401aa4b3ee9ba2fa48add3315728859c578fe2749195613fbaf1064a6ab480f9244f185
+EBUILD netbeans-javacard-8.2.ebuild 4646 SHA256 3eb779b4872b425a8f9ac0b2eb78984eba38c614d784be47af32a3fc90b8b2fc SHA512 361cb549efbb2835509d9a6aba409832173a4f3731e1ae31016a286faa9e8da94a206ec876109f1a1095fd1f7e9d73f3360c5c385802268314e93aed1f187218 WHIRLPOOL ff13272370d4782a140484c0d4967c3b2d16a2687c9fba444637577ac3560ac4cd23a67699debc539b884049a61feefe4cc91af842c3c0243ee9077a2b6b9c4f
 EBUILD netbeans-javacard-9999_p20160905.ebuild 4971 SHA256 0abfb313ae097e2e8d524cc6e48eab53e45080912036f7b7c827888330a2ed8f SHA512 14e21762f992a6d7a868be74a551cee82c971afbdfa3af6087cb6d04d2e0a1f146199e21e3e0fbdf561f770a68cee6aa868d2bbece69f1ad030f0bf44c9d3ae0 WHIRLPOOL daed7b0f70548c009b1bc68a39b3ca9a0ff00dba0d9efea4e688ea63b77932a311103b347148692cdaa2ce335d1acb659f43c1c00789e66b40cec5ec04f2b698
 EBUILD netbeans-javacard-9999_p20160906.ebuild 4971 SHA256 9215f4916537c0c679ed3f3ece828745e3c0e1b630cd5d7362eee98902cbcc29 SHA512 4233f224296b86433f77f7eddc19f9f4230a65f15948f4e6138ccea9ab48de1a210cc9dbc6dc9d12a39e9eb50756e0c6f21c0459b1a40f6e1fa2c619c33fd493 WHIRLPOOL 0a8ffcc9571405b654134ca1232efed0f4809b3927064cc7c2107ad135eb91fa54e842c46810a6aed7edf2de01d18b61108e80a85c56e0108917d95b3e0a106f
 EBUILD netbeans-javacard-9999_p20160907.ebuild 4971 SHA256 9bd49bea722d0d9a4bb00d24237894b228aaad55bc1e540535f87db7b2b7544a SHA512 9a59b17868d93e68276214f9803e467d6ae70f8cc4c61a358a3332f41af48ab746ad788bc7f7579f7c3c2668b77f6e8ec707d918f68f270e117a3cda6b349f14 WHIRLPOOL fa4e85d4e920c9f6bc56665577bbdf5527bdce39551a1dfb684c69f6d762db854991687374b7a8a0fee372af6b34e9074c6970c0408a0c966974d0996274b464

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
index e63773c..920df0a 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
@@ -66,19 +66,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -105,6 +92,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index de16e26..3e2131f 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -39,7 +39,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 6247 SHA256 305336d634a2072768fae37bbdff581e861e57a6f2dfe8401acc17f3d8224b0c SHA512 1f8bd99b91e008aff64a6119a6977ae3809a116c643e194a2b01a6ecfe47b3ff1e9a5001962284a9978e39a8c2cf5d3b84d6b682e6e5180af2f81340cf4d05fa WHIRLPOOL fa411b431648071fd463cc9caa51e3c6ed56d9cd383b85986a3a3dfaf58ef83b52ae1d819694970f7c86506d0af46dd8e9f54f65fe2a7ca9f45666d471b48774
+EBUILD netbeans-javadoc-8.2.ebuild 5947 SHA256 1f1c2aab9b63d0e87c93339f5457515573248c09532f2596ad272001605d096a SHA512 d133bfe2588f9a766ef4d5f01f8f0aacd683813ee93815af11f4560b2a7a9d7c48e919d36f002e667aec6ac978f02e07bbaf67a26512b69cd965a8f238b2f60b WHIRLPOOL f5e83670d013e22d4448d70bfdf38ca28adf99b2418446aa3018a59b5fcb75d43ed932659e222e6383e75a56de2340b4f939066631efdfa98ab016e438bcfcd1
 EBUILD netbeans-javadoc-9999_p20160905.ebuild 6293 SHA256 d4631898dc2f403c198ee0109326438e43c38e2ac1ef539f0d16c8217e2e0d33 SHA512 739b001f9fda89f3d2f6101ccde78ae202a1c608d7007ebdb7ab4d8512e62ca2e98aa7805d0cc518dc96df0d73178b84b64bedc82131333ad3366eb25d5b0d03 WHIRLPOOL 8e6c589f783bae378fb4d4c4e8bbfb0d5cb9ea10f759fb51b4fd5177416219ede419aea2365b5e7ffaf081eae1f906334472340a91693433790aaa55f2bdcd90
 EBUILD netbeans-javadoc-9999_p20160906.ebuild 6293 SHA256 3d4fe4a08441195a5551182bfb6fa546013d9507fcd1725be86289f33183ba26 SHA512 52909bf6475eea862f0ac768420e1d6c85deb2b9900adb45c35178ba9c5b951f70eaac34c5c7e648266db64f928dac4e60e523dde2c4030c6319630751651d6f WHIRLPOOL 6fbe055a6070e5e3b2f04b8b243c66afc60a46ec7d3197b0ee19bb7ca6a4d19c5280539761f41f25302da5b2a303d1c142683d2c71b25fa44b171e4af92c6d32
 EBUILD netbeans-javadoc-9999_p20160907.ebuild 6293 SHA256 d3786b07bb30e22ed6deaa337f1f9c3c14bf05ca048c3e71e869a267fb151a9b SHA512 f1149906a46b7426c588fb6517e4ed900a27adf0d5577a7a9b8f802fbf92b10fd01fad765289fe000965d45ce2fab61ed78e7c41b10f7b28d6c83df4a618210e WHIRLPOOL 4ff141f891c487e2c0f7d5208dac0285d5beedae31dbeb125fe2ac415f254c6ec3a651bc6486d331c67de13b9e6aa477056512bcdf91db12db6b8c35ae16dd6b

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
index c16ae6a..173f50c 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
@@ -65,19 +65,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
@@ -155,6 +142,7 @@ src_prepare() {
 	touch nb.cluster.websvccommon.built
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_compile() {

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index ed965a2..b8f268d 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -45,7 +45,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 4692 SHA256 c686435fc11ca5968078f5769d6ce8876eb8731615d09574a4831d22418b9db6 SHA512 073803d7be4df460360dfd0a0ff00a13e81823d1879e13379e161c57f5660c4f6a76f66e5ece051de9e6ab8f6fbb38386b66af7e25e5faa3e8be641ddb6276c9 WHIRLPOOL 9a2b0778a9fd2ae5293752110ad1ac9e97035ddb5bf6d87ef55639324033bbbbb56b4ea76db840c6047b791f42d0cdf7bd5c1fa63d706624745fc88d09eb36c3
+EBUILD netbeans-javafx-8.2.ebuild 4392 SHA256 8f8d1cb51f4071d00fd550a3cbcf48df0e1f3ccc8906bb43d7c384adf3ac2764 SHA512 4b4f347d25f758fb8c3f9ece13f831ca2365e510b895f6cf71b8063213a8db6cbc83f4cc4c3173e3778a536e425e969e7810df79ceaa453ea57b502d5080b239 WHIRLPOOL 73f50442c2d03473d0e3075c6c90f6dde8900faea51ed19974445db7a6a2abba6f525511ddc58d9da03e011e851e5a58539b73fe6e1c5b408b3d000318ce5630
 EBUILD netbeans-javafx-9999_p20160905.ebuild 4717 SHA256 4b67f79e11cda5712e85bb8fd8415759b16e409dcbc45e51a1588f7a46f8db77 SHA512 70a3aa04e97592b828083c1617a17aadd905869be2b5915fe8dca5f5701d53010e999371cc43d46de85b9d7d20c50614e63706f3a9d596b53b8671ca73bdea72 WHIRLPOOL fc8d1ef8abc3c316f1b5a810a033d2de4859de15df9835954e41dfbdb6578b9d1b1e2214a62265d2c5b7a66be0c7332c04d783032987db991992c61f62a6198e
 EBUILD netbeans-javafx-9999_p20160906.ebuild 4717 SHA256 c9124e347862a261ca079da8676ef0b0a0d30ca47f5deb995bc345d8c56658df SHA512 5160e5aa75c25ce43ef10ce26a4af38f08e5dd92a3eb61c970eb31a1ce3a4625a1c24b3291d8be54e6879bb0692849069d3c5eca287ce0c9f40195c0f130856e WHIRLPOOL 07546f61d4137abc27dbede8e302680af5f678aa573f7813b0a24f894eeaf6aa4a430e4c1263fed8eb0fa2f34c1e754cf104f069eb2a7a5d44ca2cd27fa1b2df
 EBUILD netbeans-javafx-9999_p20160907.ebuild 4717 SHA256 3633ed9d2a433512946c0527e11178f89ab3f5bfa3f9d3266118c2c278881017 SHA512 028c733c9fc6c338ee25d8098aa11dc033f4624f2233c498676832fdce790f56fae54de1d813c32ffa6073b87b005cbcaee6729afdcf7e277b036601800b9a54 WHIRLPOOL 1185719fd735b64a2ac04ceec5ca9bfd87c9656c19b577d21c9cddbf2213363f1b21bf960c87d00ae65805397d0abbf5eccdc98d47739e877e8109bf891ef2e0

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
index 9ecf862..5f8010e 100644
--- a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
@@ -66,19 +66,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
@@ -107,6 +94,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 50e2a35..2f456f5 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -37,7 +37,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 4387 SHA256 70b4cb6d45a0c2082396fc23cc6a33ede2fc68ae458787a275eb5a442f9f9360 SHA512 7ad71d2521c02f683175f679b73e35f31e16aec2edaf12c93d8acbfaf7ca0ad189ecdb1a6ca3da36d977306b5a3d2bea66c3797910afa30e7da63d573f6581c5 WHIRLPOOL 00e76ba0a0346ccf9766849c15b776b9aedea8c2d10eb99c55281a626f529d5ade16a7eb733d89e1c92c172c4d79231f06b78a5c4c0217a737c0a77df4de5c4d
+EBUILD netbeans-mobility-8.2.ebuild 4087 SHA256 38f5fef1c2f2ff5030842622999f12ca02d8978eea528a38a6bb3c0705e46344 SHA512 2b6c00f2f2003b336e25f6c4a524be1835c2565302ed43f3eade9cfb251d368eb94ad5fed01578561684e8a1ed37f3368c78b0b9d00ea6c794abf200f007525d WHIRLPOOL b990976000d451d23144bbf1378365ad019252601e261558750fe38821abbf293fb40ccd5a966890a688162aa05bb34fe69b78519fa2b09fef0a539a482bd5dd
 EBUILD netbeans-mobility-9999_p20160905.ebuild 4412 SHA256 a0b6a824e0c7843048540b930eb8fd68615cd4f86eb633be76f4e77d77dd1cd5 SHA512 e4152150c6a6cf27275bcb52fd4aae96c475ec8651889463cbecdf06f9c53c9a27d80e1775005a8bd730d618c421a9165a2e3e30efccf8e9beb03873ea18a7fd WHIRLPOOL 02dfdc32d36b667abd33cccef7b4ff560d51aab1393a799da7fa485370a7146fe23bce9b29d5bd3b472408dda8657927d618f8d3be51cf929598ca1747489d17
 EBUILD netbeans-mobility-9999_p20160906.ebuild 4412 SHA256 128505705b010da833e68217be19cde99f9d26f7fde8cc2162885dcd3e94a6f0 SHA512 2aad46c5f0b66cf5cda28f7ec20aa2cdd4b885783f646edacd438295f475a458ee8c6aa91f2c130f7fdf80a14455405649f26c3eb87c5b97be93c4cbe2802909 WHIRLPOOL 898872c5ca225c7af7c523f46abd04bcd341223064592672dce1142017ff5622bf804c48482698b0a8c7150f085e0451920fc12ee70efe051771c57905923375
 EBUILD netbeans-mobility-9999_p20160907.ebuild 4412 SHA256 d4eb077cd0d3fac37225de96567b48a8c12d2c0790b596f108914a92eaf68b88 SHA512 947348fd3be9164b9d3d3139695ad378405145f023b720555753ec4def72204074d415f00441b074b69efda2c2fb264d5b6cd9e5629cd0499ab94754a570e446 WHIRLPOOL 1623bd5538f4316c10a441f9f7f29863573b00ce9cc63cb8de3506263cbeaa44b3e02c514ce84f9477facc56023c61d53e30323e14f579b3146bb93a1e2fec11

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
index 943c45e..7fd0f80 100644
--- a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
@@ -57,19 +57,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -108,6 +95,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index fc19058..4a73df2 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -40,7 +40,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 4086 SHA256 7c3268600d15d059bc87878a90ff34442c57eb5b2fc7fe2f32577432563d81f3 SHA512 d4442242ee0b4ead75f2781b3f04e20ef7ca78ce726283c77ee7290b95b5b567c1294ff6e03ab658139828ca542a9827112ff168420ddb3e0e28616cb4c7d3b2 WHIRLPOOL 4f1b732fad4835a9426536f6d2b6210a3c5f00cd64c0cbc60ea543ba573c3422eea175ca2d9f8d7792f43a05b4f2817b4855d6bd25d5df1780372dd15ed7b9e9
+EBUILD netbeans-nb-8.2.ebuild 3786 SHA256 52734d6772f8851119fd367429d69e4b2a1396cdaf0145cf5969a2532ecd2ec9 SHA512 52494c0b0b6988461d0ae2b730f2dce5a4ba7477851f3076637c4d4bba01525efa2ccd869db7f59827c201f47cdd933c25430fd441282bc6be41991f26af8370 WHIRLPOOL ca58b3abfe895c4c68b8b2bb60388924181fd9f44832281ec43d5561c36936ec13f189046bd9e6e12d17c80199a7692758ceabd903e839fd57c6776e3da21898
 EBUILD netbeans-nb-9999_p20160905.ebuild 4111 SHA256 980f6813116ab1f1f166cde38f3cdcbc3e10a06a03648812ab5a6169c4554081 SHA512 d009492dc4ab791d5b1e3d2b687ad52908deca74765915be781cb59609b67f7759396f7a25c855e4d75ef6eb3266d5f3f3b53aa8734e14b11c3a17e881017970 WHIRLPOOL 36179cc33a713606b33b7adbf3caaddbdb305c61b171a77bf820ecf4d5c0c173aa322a6ff24edc79594ce1fa788597c93ff0fcebd241239aab7475e1fc947f24
 EBUILD netbeans-nb-9999_p20160906.ebuild 4111 SHA256 ce6f7207d9614a8b5b10e3b7cb29db61b2b170733e4518db72d73bf2f5ef7b87 SHA512 0dd7b65da5d795be7f7043e3a01e7b054dda8f9ae28475709eed49bcfef8b9069a7625abe4a822eded75aa8aecb27f3ea7cea7f306d5f4bc1a962f87650e7d6e WHIRLPOOL 4de76c711aff23f54ffe10810ad8085300d151d9ce5fa90af79df1c7a2552bd4fa91a1ff0347a88eeb2f6b38cdcd72aa5c38309e8b6f8e4745298fadeb4a517d
 EBUILD netbeans-nb-9999_p20160907.ebuild 4111 SHA256 ffd2a344c525ddb53e32a6c38424668d48c8b2ba703175ae59bf07ad05d87385 SHA512 bf7003452969c44d4807a8c94040798c4032a6adc586a916f71e8f14253c04ee398b752d05591890863e054e80cb4f615f72abf7609a50200cf54588a6dd9bba WHIRLPOOL 1ef6ffadc4334844d0ce28e21d10ef32e408b9425fe8bef3d0146f279694b04cb7fe22d41c755595cdfc1173a45f3de094c5d9e94d9cd9dbde07bfced821fc55

diff --git a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
index 86e6513..18e2351 100644
--- a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
@@ -50,19 +50,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -84,6 +71,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 54e88d0..5b267ad 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -42,7 +42,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 4393 SHA256 bae91d08e705f4a0d8eacba551418b35fd1c37f19ca0e761b9cf973334abdd16 SHA512 7f2d6017f8406fc2ff33a05509f98f1ea83024d7a0bcb8620ba0c49d3daadf4002db85d4a88ad51ab64b75c54ec1ea2acba993db2ca3a0981126ec9ceaa368f4 WHIRLPOOL ceb66938cf55f479decb49e9889cab95d8dfc8a9d5269c60e7463b68dfe0f50229c3f7cafeca2ca046796a04c0025cf8e117538cbf4fe779f4b65a70f10afe50
+EBUILD netbeans-php-8.2.ebuild 4093 SHA256 849571671ca312e7c0f800927c355cc43497e2c1f0608ca59fc24a6e1c27700a SHA512 ce37abd91c8bed53c0ec17a71491c1ae734e973f1d537e8163e1ad49ef4ef7b7e26b9a5c8d58d9b43875f8d265e05664b9029841797e2207c9d8ff95467a573e WHIRLPOOL 3f1207f96c384836bd834ccc5287954b8767d8569cb1e0184d48da740de4c241d182d8016e53c6133f9c23788bdc168d4ce601141e88488329b299ce23e64e39
 EBUILD netbeans-php-9999_p20160905.ebuild 4418 SHA256 3ca31887e5dd68aecb056cad07a8c5f20c2fcfbce9e47758193a05422d46f4c0 SHA512 aade2d78e9783190da7409618327b18c4e618650784c40f63fd904ea5ba6722a203a4cae154c231636c3f6b192dba7b33139afb87bcc7993119a2d0ea66669bf WHIRLPOOL d04e8e1702b9bd1156e7d960576692a1aabec24628ba7c9a4cc41bdd6ce2ed1d3b51470befbb9eeeddab44674320bc1dfa35dfd9e17b3f931d1813e4d5f8daa4
 EBUILD netbeans-php-9999_p20160906.ebuild 4418 SHA256 10e4483d78ad6cb85bba46d349c6123a3cc493ada15c5b5d28f9d068eccbf16e SHA512 93052438556b5c401953791f8f8640443fb1b5213bde651762b042a7721dc474f00d8b766be9361eb232a07fa202666545579113eb759c6836b964aaf749f013 WHIRLPOOL fb0a013c616bbc8fb6a50e867a4349b0c4b1a242be1d7c73b2a45e8d7947a4a40ffce24a0d0ebf8a40de9e1493244184d86ba9552722c27783fced660b2c74ec
 EBUILD netbeans-php-9999_p20160907.ebuild 4418 SHA256 4aee4218cd6567d4b6d7876b5815be4f59181f613b746a69fa674fd3a0080dcb SHA512 f9cbb3c66e48027cd23371c456121e6bca3bc4096314bb960154f8d99463185ce3f7a885400d1e9523f815dd0db1b200f54ee5015468f89421b3276c8399b47c WHIRLPOOL 8214b1a47e4aec1134ce75acd5a4a5971947163952c16bf58f570a64aa06f625f8cb67c13c87f75842037259b3c47f6c10bf0b1adebe6e3ab75328d66b6c53cd

diff --git a/dev-java/netbeans-php/netbeans-php-8.2.ebuild b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
index ea75db6..55cad74 100644
--- a/dev-java/netbeans-php/netbeans-php-8.2.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
@@ -61,19 +61,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
@@ -105,6 +92,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index a7e7068..151916a 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -63,7 +63,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 9495 SHA256 abd72cefd9df569c179a84453a8d3c6bcf3ab2ec371d7f828501080ad81a162f SHA512 74b17d4572c4d92d8e9370f0c1c9331e5e217ecd7e9e7356961e37b5529df3524ca1bced979783f5a040455344a699ce45bfac97d98797b2c7e7cf0bd0c4d306 WHIRLPOOL d826af2d1dd0e2b4bac7d6d89988c3a181bce0764513c94088ebf94fc84608236af886f89b21bf72ded064ab4d7aef7da7d7d0c020ab7b371d2cd65a558aa44e
+EBUILD netbeans-platform-8.2.ebuild 9195 SHA256 6d0332d7983992e46c28840c56a9e2d2fd3fe7cde121f7b3b0fd861c2c2fe87b SHA512 3b62b7a2c35d6a4f124e17724a60145a673464d406d93925de616db07413d585b69a8dc6725c6c3e3ecb0f5ef89a9153c7d527b0d9e9c2922488f73f65123ae0 WHIRLPOOL dc00da4b290ae6148e7cd1636703207903688fc4f5a9d3593ed904aabf327358cac670b739e68ebf4514edf6d4d9ae5079082b84d3c11aafdbd586d5c15bc8d6
 EBUILD netbeans-platform-9999_p20160905.ebuild 9520 SHA256 6093cd3607b4a6e1a45bf2a8b12c343a7a5bbf5c477b6f7bbb683fb75aed1f47 SHA512 4c557649ec87f1ac1d9e5ecf6bd13d940051c86cd53f55385a973fd4d3a377e398924707a9d341b0c02d672fbe8e29924f5b7038898234dddb1e4c2995fa9521 WHIRLPOOL 1cc7f3339f6a90f16d7b0ca10916d438fee2a1a4152ee209e1b57dccf505f1f729299da567ac660c01ef35516b12982fe16ac0649324a031beb5cf26e3a10d9f
 EBUILD netbeans-platform-9999_p20160906.ebuild 9520 SHA256 711f31be5e9881947b9276ff53605878d4cc7fab0361088e9324709e595bfdd5 SHA512 c8abcc6b03c0af2ff99aae861b25bc484789174722d3b7ab94a6666be15d60e5debdb62167cdb2f01bb587e2e0f0e3848b9f8545a57502305a9d61c5200e0de1 WHIRLPOOL 2ee71940f8b3ca586a628d8dace19eb6c4cd5e0583b129852e42078b0ec566aaade9e76a653145fd7c6375b325ab5b553cd3cccd701fe049f1973afb41f9abea
 EBUILD netbeans-platform-9999_p20160907.ebuild 9520 SHA256 449cabb4137d1b00a1176e020451b78cf8e101353a3f87e2a1e1408e69cbe2b5 SHA512 f8181919af0c8e544c70f22333b19dc41f42e71e24f1ff1088a04ed6fab729c84af8b0208cfdce06bfbd74ea3e17efd6de1c062f96a701360fc828b7c038dcda WHIRLPOOL 9aa5297705f98a28742fe2c4ec7ea49918bf58dc2d61a23cf3ae0628579710c026c810a530f21eac77caf189c2855cd0f2eda5ae363edbb5e52eea5525871ae4

diff --git a/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
index 7fe470d..ead1a7a 100644
--- a/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
@@ -95,19 +95,6 @@ src_prepare() {
 	# upstream jna jar contains bundled binary libraries so we disable that feature
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --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
@@ -122,6 +109,7 @@ src_prepare() {
 	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_compile() {

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index fbe3d07..12632a8 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -37,7 +37,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 3447 SHA256 d72baffd8c47022d9a1cb9cab0ab1020f888c5bc4480d0946ff8d2ee0ded480c SHA512 96b165928f0a6af76b1401051deeffc0338197a47cd4d88b4c7b72707b143457e3170a7ed8fcabaa2b32973392352aabcdb6348374b90abd90ae1a57bf4acde7 WHIRLPOOL d43354d606b7d5d56e3ab6e2675717d1f9d53c35e43a32971e74235248786c710729d9d0a0cf5cf8b0bc5c7df3eaadc755ac0cf663955fa850cb087827e4e126
+EBUILD netbeans-profiler-8.2.ebuild 3147 SHA256 74556e56694578c6645cae3aa5257abe399a984e11d9982e49051731f1f1cf95 SHA512 3f4e0998aca161292f813d50e0e6420225b24e2020812011d5cb28e9465514855766bd9d4508b8739c9a38c9fb3d8cc652a69f722470bfeda968fae453183b10 WHIRLPOOL 3dc0441cb0fadae8cfc315c11826ae020d4242e0fa0901fa147a90777a9b2dc33c6081f2f251b5b2ac9f9fd32f03ad87cf999956dcdabe4fe339ee1b48976849
 EBUILD netbeans-profiler-9999_p20160905.ebuild 3472 SHA256 8ad143aa3dec8d99f6e9e82748d03b915182e09e15535b17d4172362616cb264 SHA512 f12c23df09746f4b7e717ec2ae65e7ff1e60e8934e50b13b51ea398fbc68fe7a714c7cf7715191ceebb97b66965971148c74ea8d2ae02f699169748190e8f23d WHIRLPOOL beae1ae6b3be798d5a5a509cef3f88a33be3cf1467ecad357c71aab1475783338531a7bdb4e4c595cb0fce8bac0849947127fc69328731ce42bb2c2493a69694
 EBUILD netbeans-profiler-9999_p20160906.ebuild 3472 SHA256 7836761662f25bdad080d9630b08fe0abd935cdb83b547ae5f738a9be8c1d185 SHA512 0f6313bdb806eb79923841a888442a9d24716d82cfb319200b5418fa34e30dab90a358baa84ce66c2d1982fbb5c2715b00e619196d21a05b6de35d42c052e4d9 WHIRLPOOL 432560705306073f24baaf938d1f3d904fc14fc8bb34c81d04550907a65a4a6a00321d56f3f8680c634d6577f20d057eb6bdccf7a2716a600902a2a87b8d87c2
 EBUILD netbeans-profiler-9999_p20160907.ebuild 3472 SHA256 655b2a683213c4983ff09db500ef0f53db7d6a0a425196bd24fb933b85f4b233 SHA512 bb1e1a8e1a1f45b256d4d5746bdff51235059a444cef332cd2b9b741cd8d28d4df1f3269af53a799f87a4e9501b5ff48d6520903851eeec994b929de913c537a WHIRLPOOL c713350499893d10a594336fe2db8c7a9c88d6103db54f2e4a223f47de094742bb33d5b47901002c457f7e4ebca6dd75251ee616206fc20620ec76f2d45a3f8f

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
index ca1a510..44376c3 100644
--- a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
@@ -53,19 +53,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -92,6 +79,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index d9dbf82..3a126ff 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -56,7 +56,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 6217 SHA256 7a650c0efdc957b580ba1c74037dca4c7406351106f9aff0384390edd065b15a SHA512 9d0e33f0373fc9f48ad94e8e957ea511ac158cbe13f875a820c0e4cb55afb9bb34903be9e14817ad5d6d3db889a785b287dc208410a2012eaba18f63c5695502 WHIRLPOOL 4c580d11229f25f52727eb8390f1e8c6fd3a50ff4b9ba4e68f0194aeba78f4d682daae0c3736cc410d4b1d767e1d1e2c5fbca2cbd9b94a8b957392978842c009
+EBUILD netbeans-webcommon-8.2.ebuild 5917 SHA256 c035b5efd55709fe58822548a97119768f99f33d025869d97da3d895c0e8e9a0 SHA512 5a5d6273239984590791ca40d4caaefee9f30c8ea44a4ec2d5abc07f087bcf4f4f35df444944badb7f7d80604d146f6768dcef5de911ac90b9b44891c6a02a9b WHIRLPOOL af8d1d6c692b206b90bbb81d54d839a486a9cbec1f38e6fb09b5745aef87a5c3de3961f0512f731e63abd8fc3fb54e03a70449034095173c2541ea7a12bdf389
 EBUILD netbeans-webcommon-9999_p20160905.ebuild 6242 SHA256 be6a0f3b9cf2e7040242779f71678a0e790056a1eb13eb591ad47d258991814b SHA512 865d8e59a8208ef9cb28ef177447b6c84fec422c3a23055864f59499733d53bf675b1c1ac9cec58f6d53b8a274d0bbb0404643cb27dc6fedcc9c12064ef34c38 WHIRLPOOL a36bb51268ba67153474d24537f6f0e7edd44933f492616f829ad485b0fd93512e09edd3d788b53c506fbc0cceb8f3316a977f1be74b0da5f9f00e240f4ce4b2
 EBUILD netbeans-webcommon-9999_p20160906.ebuild 6242 SHA256 01c36c291f798c8af7e787e423bf41c99e900c40cd8e07d7a74f9ece5d5f637f SHA512 b6725ceaa019df25892e0cd95ae181a1862186a890b517872e90f6a42a97964d3def086efd5bafdc392d02fca082767548de34ed2a2edf48cde08d3ac07e5635 WHIRLPOOL 3020cba4d6977c293e01c50bfec295637275d7711e279b531fb0c1b5d98d1fade3514092df7f89ed84297ab7893626c2a9b13c87a7e6a1d327cd15885698832c
 EBUILD netbeans-webcommon-9999_p20160907.ebuild 6242 SHA256 7b42af85378f7ef61b2a7f90052af83a3c5966e37ebdb90d36708c2672c1a915 SHA512 361fb6406465322a9c00bc340a61edec62f54a9c0bdbf6ccfa9aa9d1219704fe8c6a8422fc7a1cc2f5521f6df41ce51a3cdbdf7acecdc058c3c285b7a40ee6ff WHIRLPOOL 9c6f26e14f0325d2c492249c4d4a449c2f83295d9837548d791d69fe0e1c04738bd2c1c318f88e97ceb4d0f48e740ea3a0af1778a69d6b7dcb563b4daa316d31

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
index 03c7c47..928fecc 100644
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
@@ -81,19 +81,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
@@ -117,6 +104,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 6b18184..6956cd8 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -37,7 +37,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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 2696 SHA256 804a8ac57613a04f55b9723060477e476199b34095c450a93628ef993f191230 SHA512 2d3a64a19f23e8fd56540fa1a9583332a1fed9065337749a98a836214b7c634997b32c99fd40e89f938154bdc4c28acb806d4050df9dac69716e6d6e96379f1a WHIRLPOOL 95310f441f2e0f7546bf3423e13d162f2d1683ee6aaf9de956401320ec85ce2c8c0b1020a85fc8ae9a1f6dc79169e4e29d34b2b4d80c76d3b18f19477c5637e6
+EBUILD netbeans-websvccommon-8.2.ebuild 2396 SHA256 a015f50a9fcebf084d42a550d5a654e80129a5d92d2bec7cfd543d065a4c32e2 SHA512 cf4fd6fcb2ea088be645a79009205a84588c9c7f1b7e5ceeb9c95552ffba860d211e3d6b4fe95196e652f5c3c5665638ee95f1ca8f2f5b938d2b09100dc186aa WHIRLPOOL aa37154ee5fdb6ff7892e3bc1218c37b45fcbfc7a4da81c8cada6d9b50a1bbbc51c685b00389d1114f3d0ae84d5a06d9e10ba0e9101f385e6cb59358eef3e59c
 EBUILD netbeans-websvccommon-9999_p20160905.ebuild 2721 SHA256 80110f8d770ef3c988b57c631d6ff1fb062185e0d7504377724d6331c2766f85 SHA512 af5394f3f1b0349be875307395d52a5889cc26fe089afc3a3781c518ecd0571b6dc677fa25267672f72af361535164db702b6bc6a912736fbbce3532b281057b WHIRLPOOL 7c4c84d870fb496653978ce3c7b9e07d43ae2de6859c955d9130d476b4bc6325f42996c184899396156c9259d68853d3615dcba0f5ea697763d12dc2e7be9648
 EBUILD netbeans-websvccommon-9999_p20160906.ebuild 2721 SHA256 e424baafcee5c5fdd427d84d6d96b468c401117ecd7e448e994c08d1f58a1f7e SHA512 8270291863cf096434bb381c96efd0cadb5c08591fad631ad372ad9606a875d8fd7d466e6039f9bcdc305fe16a6cc6bd6c90b074be7bef7b2cb9e5946c2569cc WHIRLPOOL 34e0e882e8dab1896b486ef39769a296f49a8c930034742590b5e55d1f1c76d287fd007b33e1fea624180ee21b057ddc9b8b5602398d5770a1d6ec139d61e573
 EBUILD netbeans-websvccommon-9999_p20160907.ebuild 2721 SHA256 8d684bbb5115f085a605df9fc37fc8815a4dc87479616a9d5704f53acb3cae23 SHA512 94d56e6b948e28dc0bf62c3c2d9972b4ccefa0c02df18ce0d46a76928edeac17d14877216dc0e85d314578c66e895dba99d52451a2ebe048c1cdeb20a09df2c8 WHIRLPOOL ad19b22d872eaa6c1b5b3e69a8344ee82208d6e9a9fb5e4c66daa33c3f3a716862143bf36597135ca68463c69cbca016e58b3e7dd1ba9988c857b47fe7ec650f

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
index 8c858b9..5d77ffe 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
@@ -48,19 +48,6 @@ src_prepare() {
 
 	epatch netbeans-8.2-build.xml.patch
 
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 
@@ -79,6 +66,7 @@ src_prepare() {
 	popd >/dev/null || die
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_install() {

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 0910fd6..feab645 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -42,7 +42,7 @@ DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860a
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
-EBUILD netbeans-8.2.ebuild 6664 SHA256 e9379c0414f1c15d1a8750692cb3d8b9bfea789698c0dd382a02f1541593848a SHA512 aa5bf30160d0e917f874e9eef2a8302d47232cfbe18e86f892dc8eadd3f5575e185d76db58b5ef3019af9cb1463b0406a901bc7f790896adf32bb5e6bb272e78 WHIRLPOOL 6f2019949f087a602ffcbafd3d93e9fdd3fdf3de5b243ec9a7a43f85285af537d812d4d2352a8fb37d2b1c8314ee4658a2a3f80453f8cb6d9d9a98f418881aeb
+EBUILD netbeans-8.2.ebuild 6152 SHA256 ddb5db62422e635ff3aee1137e93bb45cdee59adf1d6444d3291659846810d0c SHA512 f20b5fce0a14233796ebf4bc2a6669bb6d9f429fecc05564bc2170a8577c1c7dd64c027a4c8f3ab929e12d1e258fc5718f073050efc6ecccb01b1bbc33f8903e WHIRLPOOL 017adf9ee69bc95e291a73419d2c043acb3d1c67ecbd73c8e2f924e408562c46b5c9eb0ef58a6f02562a879dd5aa0080ed84ac16bd5502f361c925d1db3aaac5
 EBUILD netbeans-9999_p20160905.ebuild 6939 SHA256 64ad7ad210ef13eb164859ca6a9edceb70431c254a21745b9d213b8b46f267b3 SHA512 a3b267469e0c856ec664a384f0dfa214733e0590c97fca7f9c00bbc66f4a0eade0a33eca380882349939415839cbf803838f625b55eec3b07ab12f2616eb5c0e WHIRLPOOL ae63bd9732e4253a2c5e6e7688e923ff93419495c59474bf0a3f0404daf55ee1e2e9d830fe879ba43717d7d2bd16aa57ce59d7ff655078bdce69c7fdcfe583cd
 EBUILD netbeans-9999_p20160906.ebuild 6939 SHA256 0c26d5b1fab0dfac6471f4c6867607644604c533373c89a592b7e3c9512fe3d8 SHA512 aec7ab254f37b2d88fd566a31737b9dde562d06b2a78a7fbf9a828a7a0ef638bca9a9a2c3e70d6705b7f9bd35476a28d77208bd5f6a17a04c86bd2727322ee4a WHIRLPOOL c6f44ed477b25a3e1d2dabc786859c5bd81c17bcc9eb68b1d0536974444f023d70d71c7a799bac9dbe50c1fdc5f311f5e4b27d82a84b0b79f4ed87a6de1f8434
 EBUILD netbeans-9999_p20160907.ebuild 6939 SHA256 564f7db43887b1c11be220e83c537723ea56e79efa2d4ea3aade85e74156e057 SHA512 d752f6604dd3c2733c643e4b617e603c1ba34062282e682478eee3ef96620fc5b6f8272c33968ed0f5aebd9d5ee9d45fc1bca8937f9fd0839476d8f7660648ef WHIRLPOOL 03703b41e774c202c1f72f74292191c22b4ff10d604269751f0b65aba6bfeb9f731275d353f52d3106aa7e69c863c2a625d81ffd8e65a290df0505b306012b0f

diff --git a/dev-util/netbeans/netbeans-8.2.ebuild b/dev-util/netbeans/netbeans-8.2.ebuild
index d68b665..c6b49d4 100644
--- a/dev-util/netbeans/netbeans-8.2.ebuild
+++ b/dev-util/netbeans/netbeans-8.2.ebuild
@@ -13,26 +13,23 @@ PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.pa
 L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2"
 ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
 SRC_URI="l10n_af? ( ${ALL_URLS} )
-	l10n_ar-EG? ( ${ALL_URLS} )
-	l10n_ar-SA? ( ${ALL_URLS} )
+	l10n_ar? ( ${ALL_URLS} )
 	l10n_bg? ( ${ALL_URLS} )
 	l10n_ca? ( ${ALL_URLS} )
 	l10n_cs? ( ${ALL_URLS} )
 	l10n_de? ( ${ALL_URLS} )
 	l10n_el? ( ${ALL_URLS} )
 	l10n_es? ( ${ALL_URLS} )
-	l10n_es-CO? ( ${ALL_URLS} )
-	l10n_fil-PH? ( ${ALL_URLS} )
+	l10n_fil? ( ${ALL_URLS} )
 	l10n_fr? ( ${ALL_URLS} )
-	l10n_gl-ES? ( ${ALL_URLS} )
-	l10n_hi-IN? ( ${ALL_URLS} )
-	l10n_id-ID? ( ${ALL_URLS} )
+	l10n_gl? ( ${ALL_URLS} )
+	l10n_hi? ( ${ALL_URLS} )
+	l10n_id? ( ${ALL_URLS} )
 	l10n_it? ( ${ALL_URLS} )
 	l10n_ja? ( ${ALL_URLS} )
 	l10n_ko? ( ${ALL_URLS} )
 	l10n_lt? ( ${ALL_URLS} )
-	l10n_nl-BE? ( ${ALL_URLS} )
-	l10n_nl-NL? ( ${ALL_URLS} )
+	l10n_nl? ( ${ALL_URLS} )
 	l10n_pl? ( ${ALL_URLS} )
 	l10n_pt-BR? ( ${ALL_URLS} )
 	l10n_pt-PT? ( ${ALL_URLS} )
@@ -42,7 +39,7 @@ SRC_URI="l10n_af? ( ${ALL_URLS} )
 	l10n_sq? ( ${ALL_URLS} )
 	l10n_sr? ( ${ALL_URLS} )
 	l10n_sv? ( ${ALL_URLS} )
-	l10n_ta-IN? ( ${ALL_URLS} )
+	l10n_ta? ( ${ALL_URLS} )
 	l10n_tr? ( ${ALL_URLS} )
 	l10n_vi? ( ${ALL_URLS} )
 	l10n_zh-CN? ( ${ALL_URLS} )
@@ -68,26 +65,23 @@ IUSE_NETBEANS_MODULES="
 	+netbeans_modules_websvccommon"
 IUSE_L10N="
 	l10n_af
-	l10n_ar-EG
-	l10n_ar-SA
+	l10n_ar
 	l10n_bg
 	l10n_ca
 	l10n_cs
 	l10n_de
 	l10n_el
 	l10n_es
-	l10n_es-CO
-	l10n_fil-PH
+	l10n_fil
 	l10n_fr
-	l10n_gl-ES
-	l10n_hi-IN
-	l10n_id-ID
+	l10n_gl
+	l10n_hi
+	l10n_id
 	l10n_it
 	l10n_ja
 	l10n_ko
 	l10n_lt
-	l10n_nl-BE
-	l10n_nl-NL
+	l10n_nl
 	l10n_pl
 	l10n_pt-BR
 	l10n_pt-PT
@@ -97,7 +91,7 @@ IUSE_L10N="
 	l10n_sq
 	l10n_sr
 	l10n_sv
-	l10n_ta-IN
+	l10n_ta
 	l10n_tr
 	l10n_vi
 	l10n_zh-CN
@@ -139,7 +133,14 @@ pkg_setup() {
 			lang=${lang/-/_}
 
 			case ${lang} in
-				id-ID)  lang="in_ID";;
+				ar)  lang="ar_EG,ar_SA" ;;
+				es)  lang="es,es_CO"    ;;
+				fil) lang="fil_PH"	;;
+				gl)  lang="gl_ES"	;;
+				hi)  lang="hi_IN"	;;
+				id)  lang="in_ID"	;;
+				nl)  lang="nl_BE,nl_NL" ;;
+				ta)  lang="ta_IN"	;;
 			esac
 
 			if [ -z "${NBLOCALES}" ] ; then
@@ -172,24 +173,12 @@ src_prepare() {
 
 		epatch netbeans-8.2-build.xml.patch
 
-		# Support for custom patches
-		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-			if [ -n "${files}" ] ; then
-				einfo "Applying custom patches:"
-
-				for file in ${files} ; do
-					epatch "${file}"
-				done
-			fi
-		fi
-
 		einfo "Symlinking external libraries..."
 		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
 	fi
 
 	java-pkg-2_src_prepare
+	default
 }
 
 src_compile() {
@@ -223,30 +212,24 @@ src_install() {
 
 		for lingua in ${IUSE_L10N}; do
 			if use ${lingua} ; then
-				local locale=${lingua/l10n_/}
-				locale=${locale/-/:}
-
-				case ${locale} in
-					id:ID)  lang="in:ID";;
+				local locales=${lingua/l10n_/}
+				locales=${locales/-/:}
+
+				case ${locales} in
+					ar)  lang="ar:EG ar:SA" ;;
+					es)  lang="es es:CO"    ;;
+					fil) lang="fil:PH"	;;
+					gl)  lang="gl:ES"	;;
+					hi)  lang="hi:IN"	;;
+					id)  lang="in:ID"	;;
+					nl)  lang="nl:BE nl:NL" ;;
+					ta)  lang="ta:IN"	;;
 				esac
 
-				make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
+				for locale in ${locales}; do
+					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
+				done
 			fi
 		done
 	fi
 }
-
-pkg_postinst() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
-		einfo "the locale is built for Netbeans."
-		einfo "If you want to force specific locale, use --locale argument, for example:"
-		einfo "${PN}-${SLOT} --locale de"
-		einfo "${PN}-${SLOT} --locale pt:BR"
-	fi
-
-	if use l10n_id_ID ; then
-		einfo
-		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
-	fi
-}


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-10-06  9:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-06  9:03 [gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/, dev-java/netbeans-websvccommon/, dev-java/netbeans-nb/, Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox