dev-java/netbeans-ide: fixed problem with renamed iso-relax jar

Package-Manager: portage-2.2.27
johu · Mar 2, 2016 · 500a095 · 500a095
1 parent 5dfc738
commit 500a095
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 385 deletions.
diff --git a/...netbeans-ide/netbeans-ide-8.0.2-r1.ebuild → ...netbeans-ide/netbeans-ide-8.0.2-r2.ebuild b/...netbeans-ide/netbeans-ide-8.0.2-r1.ebuild → ...netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
@@ -97,7 +97,7 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
 	dev-java/commons-lang:2.1
 	dev-java/commons-logging:0
 	dev-java/icu4j:55
-	dev-java/iso-relax:0
+	>=dev-java/iso-relax-20050331-r4:0
 	dev-java/jdbc-mysql:0
 	dev-java/jdbc-postgresql:0
 	>=dev-java/json-simple-1.1:0
@@ -273,7 +273,7 @@ src_prepare() {
 	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
 	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
 	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
 	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
 	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
 	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
@@ -342,7 +342,7 @@ src_install() {
 	pushd "${D}"/${instdir} >/dev/null || die
 	# 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-55/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 isorelax.jar && dosym /usr/share/iso-relax/lib/iso-relax.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.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
 	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die

diff --git a/dev-java/netbeans-ide/netbeans-ide-8.0.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -97,7 +97,7 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
 	dev-java/commons-lang:2.1
 	dev-java/commons-logging:0
 	dev-java/icu4j:4.4
-	dev-java/iso-relax:0
+	<=dev-java/iso-relax-20050331-r3:0
 	dev-java/jdbc-mysql:0
 	dev-java/jdbc-postgresql:0
 	>=dev-java/json-simple-1.1:0

diff --git a/...a/netbeans-ide/netbeans-ide-8.1-r1.ebuild → ...a/netbeans-ide/netbeans-ide-8.1-r2.ebuild b/...a/netbeans-ide/netbeans-ide-8.1-r1.ebuild → ...a/netbeans-ide/netbeans-ide-8.1-r2.ebuild
@@ -97,7 +97,7 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
 	dev-java/commons-lang:2.1
 	dev-java/commons-logging:0
 	dev-java/icu4j:55
-	dev-java/iso-relax:0
+	>=dev-java/iso-relax-20050331-r4:0
 	dev-java/jdbc-mysql:0
 	dev-java/jdbc-postgresql:0
 	>=dev-java/jsch-0.1.46:0
@@ -273,7 +273,7 @@ src_prepare() {
 	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
 	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
 	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
 	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
 	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
 	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
@@ -348,7 +348,7 @@ src_install() {
 	pushd "${D}"/${instdir} >/dev/null || die
 	# 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-55/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 isorelax.jar && dosym /usr/share/iso-relax/lib/iso-relax.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