public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-java/netbeans-javacard/, dev-java/netbeans-harness/, ...
@ 2015-12-16 15:32 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2015-12-16 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     482c63ef4a2fa9ede9d8ca8abe71b33cb9bb6013
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 15:32:05 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 15:32:05 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=482c63ef

netbeans: switched from dosym to java-pkg_jar-from in src_install

Package-Manager: portage-2.2.26

 dev-java/netbeans-enterprise/Manifest              |  2 +-
 .../netbeans-enterprise-9999_p20151216.ebuild      | 76 ++++++++++-----------
 dev-java/netbeans-harness/Manifest                 |  2 +-
 .../netbeans-harness-9999_p20151216.ebuild         |  6 +-
 dev-java/netbeans-ide/Manifest                     |  2 +-
 .../netbeans-ide-9999_p20151216.ebuild             | 50 +++++++-------
 dev-java/netbeans-java/Manifest                    |  2 +-
 .../netbeans-java-9999_p20151216.ebuild            | 79 +++++++++++-----------
 dev-java/netbeans-javacard/Manifest                |  2 +-
 .../netbeans-javacard-9999_p20151216.ebuild        | 18 ++---
 dev-java/netbeans-php/Manifest                     |  2 +-
 .../netbeans-php-9999_p20151216.ebuild             |  6 +-
 dev-java/netbeans-platform/Manifest                |  2 +-
 .../netbeans-platform-9999_p20151216.ebuild        | 22 +++---
 14 files changed, 135 insertions(+), 136 deletions(-)

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index de8c6e5..c67411a 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -94,5 +94,5 @@ EBUILD netbeans-enterprise-9999_p20151211.ebuild 15936 SHA256 e48b74ef239579e559
 EBUILD netbeans-enterprise-9999_p20151213.ebuild 15936 SHA256 700ba22578766ad22616c3f91031f12454476d0d010121230a805ab879c9fb1b SHA512 d250fc5918f6b503e1cd46e504c813cc2e98150da0dedeee78c45d22f7d781e0a849d3c9e3cb28d9f90b482495b6e076128aefd0ee3f14f718967dba5399b63f WHIRLPOOL 417350c8710a3d1c406aa238c1c8fbf0984ac5fdd46fb6309b209bd1d837ad326437615cc1027713fe20cb21cc63dd2b5fdccf6da89789fefb1926238cae8fb5
 EBUILD netbeans-enterprise-9999_p20151214.ebuild 15936 SHA256 69288856bdeca83c673d2c5534658784d25198db8a322fc3a53faa8605a8ccd5 SHA512 00978f535d5175f2a8e359f4584269d9fbc7ae7972f4e48f81578517b607a9ae9cba405b349c9f3146ae273f2e2286e7ca96eab7a40bb774f276c8c68a097d2a WHIRLPOOL 188e2c74ffedda87563fd3f96f051a6244b4e0cf4049dfebe0a19fa19f245ccbb3f71cbd1c381d4e326eeb4dfd414737661cc43b73aaafe272b980812e8fdf7c
 EBUILD netbeans-enterprise-9999_p20151215.ebuild 15936 SHA256 80104fbcd1ccc20bf71a20050fa707704bfebd1d0a4d0616e268ae6fe21e7a16 SHA512 0b9fb15ba63a73b2ee4f46c97261fe0f4456525213765c0e741623a8ab311c5314d86cbc1623840eabcf8f3647782f100b5e40bce6f64b38571645bd43eed4a1 WHIRLPOOL 061f17705e0d447ee6f19a72ab06237e2c7498be2fde4ad07a9baaaf96d92cbfedd56929e332f1ccbd8d206970cdce157d3b437182cf0bb9ea19b00ec6e310d8
-EBUILD netbeans-enterprise-9999_p20151216.ebuild 15936 SHA256 4fa614d3725a8e1d96574a2e2791bc97984345ba66830a430625c20c3a913277 SHA512 4ab56e3623de83402d4af904c07b1ed0ec9cc81494d933881b043f615432948c91bb80033f3f585b9c2cfb5b34d9c9092cce7f1032389520ec58d786d95a451e WHIRLPOOL 571c1e7e6f8c1035d6104a2362913939daf2e8ea887e312a47a5808a5abdfb43ef923a7c86cc5537d31865fa6055befd9b320904877c1ede559dd46f38a5a61b
+EBUILD netbeans-enterprise-9999_p20151216.ebuild 15825 SHA256 a26094146a386542967794500e9427359c05c272a909d435b29fa9fd70cc1025 SHA512 96294b912d5638a6bd62d0b4405bd4bd6699ff2f015b2ff82a4896699a0081ee503076b016e034ae68f0309e6cca679b2fa03bee186391bcc877c5ac0366f4f9 WHIRLPOOL c7d27f20cbba15a954f8344a71d3ea08c952d913affc7719b321bec18c1152899c670101b448f37130f345e975a3f7570b6b2711ffc34120bcdfcc51521d5a3a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151216.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151216.ebuild
index 5f6aa26..58ab87f 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151216.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151216.ebuild
@@ -58,12 +58,12 @@ CDEPEND="~dev-java/netbeans-ide-${PV}
 	dev-java/commons-codec:0
 	dev-java/commons-fileupload:0
 	dev-java/commons-logging:0
-	dev-java/glassfish-deployment-api:1.2"
+	dev-java/glassfish-deployment-api:1.2
+	dev-java/jsr181:0"
 DEPEND=">=virtual/jdk-1.7
 	app-arch/unzip
 	${CDEPEND}
 	dev-java/javahelp:0
-	dev-java/jsr181:0
 	>=dev-java/junit-4.4:4
 	dev-java/tomcat-servlet-api:2.3"
 RDEPEND=">=virtual/jdk-1.7
@@ -159,7 +159,7 @@ src_prepare() {
 	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
 	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
 	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	java-pkg_jar-from --build-only --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
+	java-pkg_jar-from --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
 	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
 	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
 
@@ -215,51 +215,51 @@ src_install() {
 
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
-	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
-	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${instdir}" >/dev/null || die
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
-	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
-	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
-	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
-	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${instdir}" >/dev/null || die
+	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
+	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-14 guava.jar guava-14.0.1.jar
+	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
+	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
+	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
-	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
-	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
-	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${instdir}" >/dev/null || die
+	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
+	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
+	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
+	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/struts
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
-	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
-	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
-	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
-	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
-	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
-	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
-	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
-	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
+	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
+	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
+	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
+	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
+	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
+	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
+	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index ed9767d..0ea8a26 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -65,5 +65,5 @@ EBUILD netbeans-harness-9999_p20151211.ebuild 4125 SHA256 94ec5a23a2d3579d0bae62
 EBUILD netbeans-harness-9999_p20151213.ebuild 4125 SHA256 fb326b252eabb03a590e766ad105f4ade19436001dda681910a98b966422eed6 SHA512 2b167091930daecdd0ffadfee18c4da62e1fed837c6a2e7621222ea42c4233ff6823b296587998831dc939a55b505fb162f9b71c5f6b250883ce8d913f7c746e WHIRLPOOL 4089fd230392625026e42c1461045ac14bfcf2e025dad9fe838ca2682809edd1f0ea28781cdd1344ccaabfc79efffa3c2f0e548b97cd185a719a5e865052ea69
 EBUILD netbeans-harness-9999_p20151214.ebuild 4125 SHA256 c6c6d5594d210f2654fe1a732c37489a742db83368237af751d6eef5c0721b06 SHA512 1db678ab5e51bba0be32b283aceb45e1ea93319418077e9c13cc80514a13878fb206322934fb0ee52e66bf89208082e93f79a00a59779415d60b511a5beb8b7b WHIRLPOOL 5873a952ba2b87447257891db0d1fc6a23c556cf432312e218b5fcb88075da7ebeb12f8c87b2f43cb3a525161308bf155487c903bef0ad7251237e160769ba88
 EBUILD netbeans-harness-9999_p20151215.ebuild 4125 SHA256 752289da6d779402c0a9926a4c15db9902fd749f470bdeccd036cab028b134f8 SHA512 7ff229f5ece1e0ae38ce11e15502f13a641474eac0df067d6a8f1b60258a22407f8fa81e0f353f370b82fa92e5fa9546001e867452f4d7c7c47880b1109f89c2 WHIRLPOOL a43d851bf601fd6146103d78c6dfee13d90d686eea689e960162c26124f198ee4a41a2026bde8d439ffad6db4f98fdb6a2c467cb634cb35a82064fe95ec523e4
-EBUILD netbeans-harness-9999_p20151216.ebuild 4125 SHA256 018c63934de637b816533161e88230dc93597e17d1869fe2984e0ca535621a92 SHA512 051c3919066596ca764aa01edb3afbbead7726c8baeb7f786e627c57665227b9d5312116fd0e2647ea8ef459416c7008e1c591adf348b69c0fd7ccec5543f77e WHIRLPOOL 170ddcdb71dc60b27742bc0df37249ad57455c4e5f79424fd63a6454c93b68a0c01008ac56ba3d63c02bb35079ef28eb6067ae8c647748f626009c30da735bb7
+EBUILD netbeans-harness-9999_p20151216.ebuild 4126 SHA256 45a124ed8c92c9a3777a636065ba44568ec420cc0f01a214f59043d36039c186 SHA512 e3b49e7d522401cb579ad9a300fa6b0aab3949dc099cb68ddad092c4e27a633b54ed9e11f0a325376a1d35a3560be1b864e6197acd02fa5d76c4de9c72de7d94 WHIRLPOOL f58b30490d732580b76e31daa039a6008d1ec0e804238435d6504c85416f41137531f66ac1bfd690f3e27e2da967ea1bae99fa51648b5d1e3a1fb90d5d9bcc88
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151216.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151216.ebuild
index bdd350f..543c98f 100644
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20151216.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151216.ebuild
@@ -105,9 +105,9 @@ src_install() {
 
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/antlib
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/antlib
+	pushd "${instdir}" >/dev/null || die
+	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 12ee579..756342b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -191,5 +191,5 @@ EBUILD netbeans-ide-9999_p20151211.ebuild 30890 SHA256 c749f0fbd1dd8df6af7137355
 EBUILD netbeans-ide-9999_p20151213.ebuild 30890 SHA256 498a64a4db3e843bb2b820241672808c5978f27ac8422c0d3868739048c56f33 SHA512 479f1da58d720a74b33ce1a07e61ae8f98cda139f119831b8a3dc933740e410b4ff70c0109c5833c46e2134717915d0eaca95e55beb63eb6ed118919ee76c075 WHIRLPOOL 25a32c29d01dfdb7ef43bae32c0fbfc3121c5fdb338c41183b7aac79473da7d0d347e1e6a59c14d9138b0d5da128750cee77920c55980e79bb3c082065619f13
 EBUILD netbeans-ide-9999_p20151214.ebuild 30890 SHA256 b56450680bdbd182cb3a05d06875c0505cdc550e28a2bb810304a7c26e29eacb SHA512 014112956b1158900976329c821ad03b0c9f0d5174dc54f5aaff581070f879ebac109b529bb3a1a90e679083497c4f7402e6af3f05332db702f8da4f04a91824 WHIRLPOOL 43838adf1e07844d3d3962208eeabfe3f7beea0521764a27f10997eb7082e839596e8a98a5e336873cf849eb04dbc66454b33bb6119be051f175159b540a498d
 EBUILD netbeans-ide-9999_p20151215.ebuild 30890 SHA256 286b1a0c026583850a35a855a35cfa9a3b512fbf605c4082af2484be5e4d6a34 SHA512 84a3f6a170ab54a905419f4238a8585d4a6ecbc1fa188a972e4e40868ca7a6d95f6873a3a62455cc10d406c9e5e82d1f8dcf716c08f41f6254e352464bb740f8 WHIRLPOOL 856eee67f7d4dfae74a4c2ef518877301917973163b3dff4f90bc60d70e5b4e5beb8abc7366a2de43f875f388b59b95d445d25d1a1d7d48c6ab4d2faa57bd13d
-EBUILD netbeans-ide-9999_p20151216.ebuild 30890 SHA256 6ab2f1f799d66fbcbd5370f654b056e562c20a240628ea0279ecb1543904957c SHA512 faec2fd603dfb954b69d7bd9b2efd46060da15ab11078e2a818b6ad077f4e9c04f6d90dee6cce8700b1f4113411d8d5331e20d0889516ab73a98e46b0492ab22 WHIRLPOOL eedc6390a6a18fd75e562352308cd0ad67473dc5b37c9a374109b6da3d9b6c4b435dfdf5da264a75454ca5368cd4f6f6fc39eac20a5749b8346898efb77a6151
+EBUILD netbeans-ide-9999_p20151216.ebuild 30832 SHA256 31f8ad7534cf9819c8fa74a33be8ad91b78ad6485a5b11dc61643a840f3e5067 SHA512 3d887204e877b425f8d260489f62f575ec5c33ae5baf33e65dc054c1e54ca850e969aabc52aebd9f24d81cc9004894588d8c41b5f5cccdfb75fd0765e169fe8b WHIRLPOOL b071d968d0436defa4231785ff087670298d5148fa4be5dbc21be2d9827d3f70fe83ef3080860f38c46d56c6f13f1fa37b0118731d13a26504dc9951dba35ad6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151216.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151216.ebuild
index cd10adc..2f57103 100644
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20151216.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20151216.ebuild
@@ -345,39 +345,39 @@ src_install() {
 
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-compress-1.8.1.jar && dosym /usr/share/commons-compress/lib/commons-compress.jar ${instdir}/commons-compress-1.8.1.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
 	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
-	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
-	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
-	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
-	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
-	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
-	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
-	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
-	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
-	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
-	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
-	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
 	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
-	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index cc3e9a4..189e581 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -98,5 +98,5 @@ EBUILD netbeans-java-9999_p20151211.ebuild 14983 SHA256 f67bed8eed366dcec9820112
 EBUILD netbeans-java-9999_p20151213.ebuild 14983 SHA256 37c8da5f8681611a45b0d3a6893f22e04269f100acf0bf5f253dae11ae1c4bf0 SHA512 e9efaacbc5814be9c743555b0a0b1fd878985e47e0c0fafb1f3b6acb2550d8c18832376d81efc7476cee79975ae13af4fc0a2d919b4fcf325f14b54956d7d6f7 WHIRLPOOL 24e471622344e96c3767b0fea01d3d93cab7c74555d95e785c29ea92f68337aa819c7fd3ae6d65eb70ba2a923d47ff9d7d01b166c74433309b8c178253f73a77
 EBUILD netbeans-java-9999_p20151214.ebuild 14983 SHA256 25f3c402a0e2f2083b20dd569e1f367ea199d01a566fd1430ac35d444f63b638 SHA512 44ec4b3e59226b5b236b7a07f00c395bc79b08d221aa4b6fc9c07026c1777e39b06cac8b72a7ded99081b8afaae10c504205a71f0856ea0c66d5fec54572cd03 WHIRLPOOL 06af83dc5e639d9fd27e601728985b7d972d66fe1fcad3eef42aceb2182aed549ae3c6927d2dd5bea35188caee98785be9b4f9c669c9bbdb8b55ec226d086798
 EBUILD netbeans-java-9999_p20151215.ebuild 14983 SHA256 481955ba0d522521b6b9ca7453c71234bf8d3b164b86d42fa83ea61016baea6e SHA512 f0ffbd80e9105327692891625af3f3b9b8ba8b968c0c5e6f96608e83e7c04d992b7a491e607c4d5e380f1c87dc5d11c219019a36d4147df12db148290740586a WHIRLPOOL 7c9e8efb84c297119ca80ed9ec42f979c2f5f89ac7430d1e4c6e85b626b2dc8e9eb487de0caff68a6ea315bb6ab524c66c4c4d8630cbcdef5b88f2d6bd344ef5
-EBUILD netbeans-java-9999_p20151216.ebuild 15021 SHA256 6c7fa9c8f0b92595c1f157739f7ff38828d79e1a0015a4732e48f0d7111bd398 SHA512 48e7783a100cda46cd40e046f449ea25c377f9056b22d6f03cdd741efdac2b51d055b2c6d77ecf43f51946482da7d2bf2f9abf5cfc7a26e44f599cd4bc4377a0 WHIRLPOOL f2c226798250382f44bf94d0ad79870ee57957f0be9d00c4a3194c07ed8bf37d0f2eb3466800f5b8f647ba2337452516b8ae4e6da2ab9375bb3d0329a96c86c8
+EBUILD netbeans-java-9999_p20151216.ebuild 14930 SHA256 b2d06430f0af429c7d1307fed2b888bf71c211852dcba01cf9d8fb89508ff36b SHA512 4e3ffac4a5a92fb5c590dc5b479c4ae1a6b8a1c0084167ffa987e5e1f73bc84f2c388b07b22ba4bf15af046b4c5db0f0ab9bfa62256414349730e6d084a09b50 WHIRLPOOL 233bc9b1b589940fdb6baff044852e0ab878ebe29e470491ed8e8c267be9744fdf8f037abc23ac42f1770ad4141391c5bacd55cd6fc43061edbe8fe585ec2dab
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild
index 150a65e..94c9fa1 100644
--- a/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20151216.ebuild
@@ -219,56 +219,55 @@ src_install() {
 
 	popd >/dev/null || die
 
-	local instdir=/${INSTALL_DIR}/maven/lib
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/maven/lib
+	pushd "${instdir}" >/dev/null || die
+	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
 	popd >/dev/null || die
 
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
+	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
-	local dinstdir="${D}/${instdir}"
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
-	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
-	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
-	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
-	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
-	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
+	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
+	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
+	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
+	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
+	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
+	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
+	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
 	popd >/dev/null || die
 
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
-	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${instdir}" >/dev/null || die
+	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
+	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
+	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
+	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
+	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
+	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
+	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
+	pushd "${instdir}" >/dev/null || die
+	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index aa66c32..78edf7e 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -63,5 +63,5 @@ EBUILD netbeans-javacard-9999_p20151211.ebuild 4976 SHA256 791aec4c51c86f1fe8768
 EBUILD netbeans-javacard-9999_p20151213.ebuild 4976 SHA256 32e9e9596139810b58c3ba9a2b9f5a1104febe35c3b2d01367d5f4247f4f1f4a SHA512 8a31e5621b5b3f6c2b7b5e4e7a2c22f662dedd833090e298c6abac91fd4e6908af5d3384a9b3da03bee14fee392c642c06555e9320ca3a453111af1b4d970253 WHIRLPOOL 59eec3492a0587c70918e95d4d27f8b330d592228f0c454c879b8286462b32b7c6f82fd8d27baafdae437a8fcb78cf7bd9476d819802a7082f06d8fcc693ea0f
 EBUILD netbeans-javacard-9999_p20151214.ebuild 4976 SHA256 4ad805b853f72deb3e437247124050aacc7bee6d9b4c6e1b00762599c358e279 SHA512 6d91c140939e41352cb3200813b7448e3507b96eaeee117eaa14172b34e6f0a19d85abcc5994cf1b97db20d2344c188e09283892a76100f7ddee6e62ea73bcbc WHIRLPOOL d2f0f65aeaef7a7ce888c8e2bbaa4f3f9314e6ac8ac9076ba262ad94794040342dc6effe73e719bd148fe331b87698f767948f434858bc3b34f3166b88b4b6b3
 EBUILD netbeans-javacard-9999_p20151215.ebuild 4976 SHA256 4968b0373e8a1d2345dcf5d6cb79bf77e5a00e45a746e1f70a254e3c3571379f SHA512 12d3245eb4f7cfe295f9b9ce93bfb3dfc78aff272fb7126826045ddbe1ffaf82debe45539e79deb33900f624a4f14fb737ba6be3ea730181002eeaacfb083dfe WHIRLPOOL 60674544d157b9b4ea3b7fe32540213f479ae2835db7e15ba8cbe674cf73ad353633f66ec7b49715ea21a09a1f6553f69db9e8daabc3fab3852f20400feae823
-EBUILD netbeans-javacard-9999_p20151216.ebuild 4976 SHA256 e02fa308e7770cdfe34cd368f5c53dfe0c051eb3d20521deaf7a0039fe1145ed SHA512 349d151708191ef1ab7af7ce3288a70b89021ac09348998c9157bf5cce836cf251b930979974c7e011132373ac534304ced62758341f4b220bfd4af85cec2e0a WHIRLPOOL c603e60ad9c1a696d089e8fc714ffe7ecd25083385789cde90f02fe1ba25f931a1264740075c7f868a18a3e0ad8dd1b9b1284e8d98529d8c37f175f84c4d5d50
+EBUILD netbeans-javacard-9999_p20151216.ebuild 4971 SHA256 3419864bf36d8c3612cb8dca47352172ba044318e274aa03a1ad39a330527b9d SHA512 6ae58c974bc96f426777f196ab3cd067a7f83179f3b60e5db789beee49f6cb17c3838aa8469dac533e2080125c17afc4976ad29a766dc77bf76799006e83b711 WHIRLPOOL b57146062aa4273be720c7850eff85457c159a5fee6e7d5a7c35b8e54b6f089cbf2f1ba4ffbb0d8f47621843836fe587e50e917dc5aa52039742989241563ec2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151216.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151216.ebuild
index 393f038..0c0290e 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151216.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151216.ebuild
@@ -119,15 +119,15 @@ src_install() {
 
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
-	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
-	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
-	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
-	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
-	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
-	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${instdir}" >/dev/null || die
+	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
+	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
+	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
+	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index e801ec7..cb99698 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -64,5 +64,5 @@ EBUILD netbeans-php-9999_p20151211.ebuild 4417 SHA256 c554226c8f2d95ae1786b592ba
 EBUILD netbeans-php-9999_p20151213.ebuild 4417 SHA256 0862fa2ba1d7dada0389be0529b0aa6eaf72468b9b7b7aaa010b419c51034756 SHA512 0d39d58d1c1530dd0c7b3361981d4946f4ae29b15c85c9ba93bc3fe2ee34ff39631ae61d6608b02833ed88bc767fda47091ce7ea10de287a4dc01be76887a065 WHIRLPOOL 305475bf05ae59da34e2c65829e107c8a95ad9c0b83a93750c22f07de46cb58363b2700604fb2913f0d895c5e92cbf5a9409ee8e3709c592fbc2e2eec08705fe
 EBUILD netbeans-php-9999_p20151214.ebuild 4417 SHA256 4e150804dacdfb4fe0732578fe85f51f9159c8c6b8252524606185a58d5a7dbb SHA512 12176cb389a760ddeae75f5e3f0d9f5bd06cb45f62f8064762b2141814d059bb21166ff74439644b99798d9a8690450f169e0bcd6a6125cfa5decb292a8410e3 WHIRLPOOL 8966b9251a772dca5c6ec8ab031223e7498eaad4b9c7efaf088ddf5942df587ba7e29c1414670b06efc79c17f9deb666f63b81fa70969077dc3473c94077b56e
 EBUILD netbeans-php-9999_p20151215.ebuild 4417 SHA256 72e2299e4622c7601c41e0d95f3927c5fe8d9850de23124be4da3d47acdaba87 SHA512 f28c3e124b01e88d3dc0260b632ece88fc4c2a065870c1f243d1c59d5b45f9dfeeee7dff9e35fc13588558e86d3bc137813154b575cc7d6b87b02bd61782be77 WHIRLPOOL ebc21d072345690a156fd8b497b2df291d054132eeb2d81e85626837adc88c1bffa90985f4d59065c8040d2efc0a62383df79833359bd18bd552bc1e84b6495d
-EBUILD netbeans-php-9999_p20151216.ebuild 4417 SHA256 7b4c3f5ff55bafb1ac005a00377bf7a046b6caecc75961948d9d06b9d20cd23a SHA512 778ca395dc5c0d67764a6c36e8792f99e1fb4ce8106e84c56d128bd3e1bdbc0a6566620ecc67ebbe6ca707bd7c5e56026e54703cadd00ba9b75a0eafd9909d78 WHIRLPOOL f790b6fe6a1f26134d8983bb86e48d1374a939ea266ae4b0ff21d583fbe9a5d78a8118cf05ee8bd12806b777060275ad2f972883ae3594d37088caf713cbe65a
+EBUILD netbeans-php-9999_p20151216.ebuild 4418 SHA256 7eee557e337561a19b716120b7ad43f8e10517e0b020247528e64050ecbd318a SHA512 ea033dfdb95792b011531d1007112f81c71af9b7c3cb691082e289ab13c4a49112d9de2567d9019383b21267f501b9b51396be459b42cb7f96ddf1af0f8483e5 WHIRLPOOL bd69e18948e833b9be40a23a41d8480a9b5449fd7b151f401eb9029dec94df393dfe179bf1195dd649e1d7f9706dcd89122a373f4d7e268ad9480dd0e0db0508
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151216.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151216.ebuild
index e075ad5..7c3cb28 100644
--- a/dev-java/netbeans-php/netbeans-php-9999_p20151216.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151216.ebuild
@@ -118,9 +118,9 @@ src_install() {
 
 	popd >/dev/null || die
 
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 7d17c75..de54d06 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -77,5 +77,5 @@ EBUILD netbeans-platform-9999_p20151211.ebuild 9367 SHA256 e30cd7cce5fb060206185
 EBUILD netbeans-platform-9999_p20151213.ebuild 9367 SHA256 728a29d298f94f5cbae603e048e0eb872de518363ca81bc60d2e92a00e53cd38 SHA512 ae99336973f609581a09b2fc00467b29ed97b7af036165d583cfc9f27dd48d5b5e0d5ed21b16599a6de2a6fec24e264dc35ba360ef3955519ffde2823e3feb7c WHIRLPOOL 7164e332ebfc50b408d8cfad386c5db5afd2e0e91a5a280e4ae96d1a5a2af97a188b544b6989d6009b40048c67a179402ae50cba2b98b8db81e67083de11c197
 EBUILD netbeans-platform-9999_p20151214.ebuild 9367 SHA256 a328433bf4d179843f353cfe36f0345d6f38a8303d9e72ac70160e40117933ad SHA512 7e21967d36433cf368cc2c3be391371c737186c2290ef72f96d30c2197a285512ee4c1045ccbafda27860995ff2d37bc7e91b8207c7f48330c33333b735beff1 WHIRLPOOL fa5ba683e3b9dae5076b5bab97ebf76d406c775db023448ccbc3641163133fcb561714c11b398b547e7ae2f8b4fb7c35bf25d5a0e59196a53c1f2aa9e5c5e2df
 EBUILD netbeans-platform-9999_p20151215.ebuild 9367 SHA256 68fa135908414b8dc49cebe6ab4483fd60114a388aa5bea014278ddc265b9242 SHA512 80a1a659e4ea2a8fa6388de1e966d902eee8a59d12816868202b7fa6d81cf281769262e1e4b2be862046fbe673011a116e592d03f6bb28d38c31452045cd3602 WHIRLPOOL 48478dc5393719f0d748c0fc37022ca38f0795753a6872b4c9757bb15f5f17a495fe68ef14b9b4111d04a45589e5c90d056df6000f58beae7a2229b8ff0ba9d7
-EBUILD netbeans-platform-9999_p20151216.ebuild 9367 SHA256 c3c04b51df3b2fa268197ca6aa99bdb09f420dfe7a8ce83075e8b056e08c5bda SHA512 003842e65b1c7471bac10876415dac94993e08fea2a361c14d45993ea63534c0b0942df3629025a97c5a0729f378dd74978b0c18b9d969f9cefc1a72f4ecb45a WHIRLPOOL 9384cff9b40c9a6f6a0628b7cb276a934958ea821f9dbc5e9d950358ba181186c1c91db909a4d885b1bc6d416f8dfab8c754fb3d1fb74023142e26f29f9b67f9
+EBUILD netbeans-platform-9999_p20151216.ebuild 9360 SHA256 b1aba9c6afca2c5c9351d0f3267eb76cdcf9f2d54866e009d95b220712af4b9d SHA512 4335f21620595f657eaf73b2aec45ad9ccb882e6f7234be9f163791e17c3463e2a8841296e88348712613f3bcf488820fb5128aee8f5abdf743388cbb9999fd5 WHIRLPOOL 2d9b60c774a4d5165190ba6c1bfa798dce67da1d2c99051d3e5e71922acbd74d60b40d6a1816e0eb3f8b8506acf0ee7e94d71cb27f38f77665569eed28bc33d7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151216.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151216.ebuild
index 5f10173..bcab7b2 100644
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20151216.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151216.ebuild
@@ -148,17 +148,17 @@ src_install() {
 	fperms 775 ${INSTALL_DIR}/lib/nbexec
 	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
 
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
-	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
-	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
-	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
-	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
-	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.jar || die
-	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
-	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
-	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.jar || die
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
+	rm jna-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.jar
+	rm jna-platform-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.1.0.jar
+	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
+	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
 	popd >/dev/null || die
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform


^ permalink raw reply related	[flat|nested] only message in thread
only message in thread, other threads:[~2015-12-16 15:32 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-16 15:32 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-java/netbeans-javacard/, dev-java/netbeans-harness/, Miroslav Šulc

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