| 1 |
commit: ae2bcd8ddd98872123a4f2e7de47a5348a83613e |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 2 12:38:43 2016 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 2 12:38:43 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=ae2bcd8d |
| 7 |
|
| 8 |
dev-java/netbeans-ide: fixed problem with renamed iso-relax jar |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
dev-java/netbeans-ide/Manifest | 4 ++-- |
| 13 |
...{netbeans-ide-8.0.2-r1.ebuild => netbeans-ide-8.0.2-r2.ebuild} | 8 ++++---- |
| 14 |
.../{netbeans-ide-8.1-r1.ebuild => netbeans-ide-8.1-r2.ebuild} | 8 ++++---- |
| 15 |
3 files changed, 10 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest |
| 18 |
index c231d99..0f0a8b7 100644 |
| 19 |
--- a/dev-java/netbeans-ide/Manifest |
| 20 |
+++ b/dev-java/netbeans-ide/Manifest |
| 21 |
@@ -162,8 +162,8 @@ DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748 |
| 22 |
DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569 |
| 23 |
DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9 |
| 24 |
DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7 |
| 25 |
-EBUILD netbeans-ide-8.0.2-r1.ebuild 29314 SHA256 365d4077009861319e587dd898eed753e66756aaabaf114a5af2028342928bd8 SHA512 2a186b6ec5591f59f825dc27a6440ffeb1b96f35fcaed0a9783218d867b5a9f95378ec095b8697927fb244280c039b2afdc71d2bce2da0d7af2b06ebe1ce5cd9 WHIRLPOOL bf9a36b20188c86f70b4bd84ab6fdd7a5fcb25bf0d4793f0b8e44c10538c05ce085a29fa44673a3d78424d2276c2de6dca345e38b51887098c13a8929dc30634 |
| 26 |
-EBUILD netbeans-ide-8.1-r1.ebuild 30285 SHA256 6e42dd3e0e8d546d3187f2e894244951f93f2060b187f156ed7b97d7d23b9b9e SHA512 6219b1d4d6ffb0183cfa781b87d34c01cdff4f73d09811218c5390879ccf9281b23fa7c9c884da8877a3fb8181f660130687de942782db600da90fb7b709772d WHIRLPOOL e8ec3da7e2ee059b912094f704e1abfdec936117cf34beaaee1be9fd1659727c0c5330123dc33c959cbe08e45248f82b8418afa9ffcc18a0f3ca044f997ccbe1 |
| 27 |
+EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d |
| 28 |
+EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9 |
| 29 |
EBUILD netbeans-ide-9999_p20160131.ebuild 30238 SHA256 5767b7d8fb6e6d9c9bdee95789f1f46e48655be007aef2a277c8b5ecd5814539 SHA512 7b77ca43f29e52944d72a26a47d1ad763c940a385a3d6ee72193309448783cf5bd556ce3d7f82b90149f4f37a177c9c64710ea387871607f99bcb6b0b368a3ac WHIRLPOOL e1745f191603cf5ad95a9698e68cf24744c2dd810007d264346618495effe0ef0efbe558d3c24992fc66ee3e749d1d4ccaaa4ec94a7d6e0d16d965020da8e07d |
| 30 |
EBUILD netbeans-ide-9999_p20160201.ebuild 30238 SHA256 7b432d436cdc5e49c0ef9df25059e0ff1fcfce826dce433a4791dc96cedf52b2 SHA512 68f1a508eba13eec6cec3329fc3e623a8cedb4db5cfefaf00a6205cbb5409a7308dcf3026c9a176d4ed4ea41b54c9c6d03a47adb9882fcba071e176bbaf480e7 WHIRLPOOL 9fa9eb244c6e136f34e949d34785cc47f3154b8218b51d4594750b6e028a7cf944e08524dffaccd3249c3c306f6780cae0764f50663e31a1aa459a1244313966 |
| 31 |
EBUILD netbeans-ide-9999_p20160202.ebuild 30238 SHA256 cddccda31e664f611582c30cb2333489191928ff17a4d6c769e372a4ddfeffc7 SHA512 be3dbee1610ae08957a07d00de7d2072a739318a5d2eef138edd828b0c5d9237d74113582f8471576e2fef60bd6b9d8addf954c4a3081c39b67b6765c95ab7d3 WHIRLPOOL 206a639b7b96acaed1a2530ae5cdcd2f5615e754699c0aff46b3674bd75e805110d42b94f927522a78164fd826d867a9bcf649c9ea1ef476a59b2b8fbb4c0eeb |
| 32 |
|
| 33 |
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild |
| 34 |
similarity index 99% |
| 35 |
rename from dev-java/netbeans-ide/netbeans-ide-8.0.2-r1.ebuild |
| 36 |
rename to dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild |
| 37 |
index 9781d8b..a241ae7 100644 |
| 38 |
--- a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r1.ebuild |
| 39 |
+++ b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild |
| 40 |
@@ -1,4 +1,4 @@ |
| 41 |
-# Copyright 1999-2015 Gentoo Foundation |
| 42 |
+# Copyright 1999-2016 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
# $Id$ |
| 45 |
|
| 46 |
@@ -97,7 +97,7 @@ CDEPEND="~dev-java/netbeans-harness-${PV} |
| 47 |
dev-java/commons-lang:2.1 |
| 48 |
dev-java/commons-logging:0 |
| 49 |
dev-java/icu4j:55 |
| 50 |
- dev-java/iso-relax:0 |
| 51 |
+ >=dev-java/iso-relax-20050331-r4:0 |
| 52 |
dev-java/jdbc-mysql:0 |
| 53 |
dev-java/jdbc-postgresql:0 |
| 54 |
>=dev-java/json-simple-1.1:0 |
| 55 |
@@ -273,7 +273,7 @@ src_prepare() { |
| 56 |
java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar |
| 57 |
java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar |
| 58 |
java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar |
| 59 |
- java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar |
| 60 |
+ java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar |
| 61 |
java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar |
| 62 |
java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar |
| 63 |
# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar |
| 64 |
@@ -342,7 +342,7 @@ src_install() { |
| 65 |
pushd "${D}"/${instdir} >/dev/null || die |
| 66 |
# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die |
| 67 |
rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die |
| 68 |
- rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die |
| 69 |
+ rm isorelax.jar && dosym /usr/share/iso-relax/lib/iso-relax.jar ${instdir}/isorelax.jar || die |
| 70 |
rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die |
| 71 |
rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die |
| 72 |
rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die |
| 73 |
|
| 74 |
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.1-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild |
| 75 |
similarity index 99% |
| 76 |
rename from dev-java/netbeans-ide/netbeans-ide-8.1-r1.ebuild |
| 77 |
rename to dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild |
| 78 |
index 74dad77..294aead 100644 |
| 79 |
--- a/dev-java/netbeans-ide/netbeans-ide-8.1-r1.ebuild |
| 80 |
+++ b/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild |
| 81 |
@@ -1,4 +1,4 @@ |
| 82 |
-# Copyright 1999-2015 Gentoo Foundation |
| 83 |
+# Copyright 1999-2016 Gentoo Foundation |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
# $Id$ |
| 86 |
|
| 87 |
@@ -97,7 +97,7 @@ CDEPEND="~dev-java/netbeans-harness-${PV} |
| 88 |
dev-java/commons-lang:2.1 |
| 89 |
dev-java/commons-logging:0 |
| 90 |
dev-java/icu4j:55 |
| 91 |
- dev-java/iso-relax:0 |
| 92 |
+ >=dev-java/iso-relax-20050331-r4:0 |
| 93 |
dev-java/jdbc-mysql:0 |
| 94 |
dev-java/jdbc-postgresql:0 |
| 95 |
>=dev-java/jsch-0.1.46:0 |
| 96 |
@@ -273,7 +273,7 @@ src_prepare() { |
| 97 |
java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar |
| 98 |
java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar |
| 99 |
java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar |
| 100 |
- java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar |
| 101 |
+ java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar |
| 102 |
java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar |
| 103 |
java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar |
| 104 |
# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar |
| 105 |
@@ -348,7 +348,7 @@ src_install() { |
| 106 |
pushd "${D}"/${instdir} >/dev/null || die |
| 107 |
# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die |
| 108 |
rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die |
| 109 |
- rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die |
| 110 |
+ rm isorelax.jar && dosym /usr/share/iso-relax/lib/iso-relax.jar ${instdir}/isorelax.jar || die |
| 111 |
rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die |
| 112 |
rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die |
| 113 |
rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die |
Archives