| 1 |
commit: 6071a565acf3ebc659fd28ca3f48c4f821485ee6 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 16 13:52:49 2015 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 16 13:53:19 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6071a565 |
| 7 |
|
| 8 |
dev-java/netbeans-java: fixed issue with jtidy jar being renamed (bug #568288) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
.../{netbeans-java-8.1-r1.ebuild => netbeans-java-8.1-r2.ebuild} | 5 +++-- |
| 13 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-java/netbeans-java/netbeans-java-8.1-r1.ebuild b/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild |
| 16 |
similarity index 98% |
| 17 |
rename from dev-java/netbeans-java/netbeans-java-8.1-r1.ebuild |
| 18 |
rename to dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild |
| 19 |
index d8e8daa..f977c58 100644 |
| 20 |
--- a/dev-java/netbeans-java/netbeans-java-8.1-r1.ebuild |
| 21 |
+++ b/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild |
| 22 |
@@ -70,7 +70,7 @@ RDEPEND=">=virtual/jdk-1.7 |
| 23 |
dev-java/jboss-logging:0 |
| 24 |
dev-java/jsr67:0 |
| 25 |
dev-java/jsr181:0 |
| 26 |
- dev-java/jtidy:0 |
| 27 |
+ >=dev-java/jtidy-1:0 |
| 28 |
dev-java/log4j:0 |
| 29 |
dev-java/mimepull:0 |
| 30 |
dev-java/oracle-javamail:0 |
| 31 |
@@ -231,6 +231,7 @@ src_install() { |
| 32 |
popd >/dev/null || die |
| 33 |
|
| 34 |
local instdir=${INSTALL_DIR}/modules/ext/hibernate4 |
| 35 |
+ local dinstdir="${D}/${instdir}" |
| 36 |
pushd "${D}"/${instdir} >/dev/null || die |
| 37 |
rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die |
| 38 |
rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die |
| 39 |
@@ -240,7 +241,7 @@ src_install() { |
| 40 |
rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die |
| 41 |
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 |
| 42 |
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 |
| 43 |
- rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die |
| 44 |
+ rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar |
| 45 |
rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die |
| 46 |
rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die |
| 47 |
rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die |
Archives