| 1 |
commit: f54cae2e7d7ed8496f07ea4a7513948fe3665658 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 26 19:15:57 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 26 19:15:57 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54cae2e |
| 7 |
|
| 8 |
dev-java/netbeans-java: Fix broken jtidy symlink in 8.0, bug #578748 |
| 9 |
|
| 10 |
This was already fixed in 8.1. Straight to stable because it won't |
| 11 |
even start at the moment. |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.28 |
| 14 |
|
| 15 |
.../{netbeans-java-8.0.2-r4.ebuild => netbeans-java-8.0.2-r5.ebuild} | 5 +++-- |
| 16 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild |
| 19 |
similarity index 98% |
| 20 |
rename from dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild |
| 21 |
rename to dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild |
| 22 |
index 71d61ba..d3e5583 100644 |
| 23 |
--- a/dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild |
| 24 |
+++ b/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild |
| 25 |
@@ -66,7 +66,7 @@ RDEPEND=">=virtual/jdk-1.7 |
| 26 |
dev-java/jboss-logging:0 |
| 27 |
dev-java/jsr67:0 |
| 28 |
dev-java/jsr181:0 |
| 29 |
- dev-java/jtidy:0 |
| 30 |
+ >=dev-java/jtidy-1:0 |
| 31 |
dev-java/log4j:0 |
| 32 |
dev-java/mimepull:0 |
| 33 |
dev-java/saaj:0 |
| 34 |
@@ -215,6 +215,7 @@ src_install() { |
| 35 |
popd >/dev/null || die |
| 36 |
|
| 37 |
local instdir=${INSTALL_DIR}/modules/ext/hibernate4 |
| 38 |
+ local dinstdir="${D}/${instdir}" |
| 39 |
pushd "${D}"/${instdir} >/dev/null || die |
| 40 |
rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die |
| 41 |
rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die |
| 42 |
@@ -224,7 +225,7 @@ src_install() { |
| 43 |
rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die |
| 44 |
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 |
| 45 |
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 |
| 46 |
- rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die |
| 47 |
+ rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${dinstdir}" jtidy jtidy.jar jtidy-r8-20060801.jar |
| 48 |
rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die |
| 49 |
popd >/dev/null || die |
Archives