commit: 7a722d558d5410d0ee29d13228f37611cf774eb2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Fri Oct 6 15:11:01 2017 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Oct 6 15:11:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a722d55
dev-java/netbeans-ide: fixed issue with renamed sun-jaf jar library also for slot 8.1 and 8.2 Package-Manager: Portage-2.3.11, Repoman-2.3.3 dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild | 2 +- .../{netbeans-ide-8.1-r2.ebuild => netbeans-ide-8.1-r3.ebuild} | 6 +++--- .../{netbeans-ide-8.2.ebuild => netbeans-ide-8.2-r1.ebuild} | 8 ++++---- dev-java/netbeans-ide/netbeans-ide-8.2.ebuild | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild index 7066b4e6445..0c09ad11c39 100644 --- a/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild +++ b/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild @@ -109,7 +109,7 @@ CDEPEND="~dev-java/netbeans-harness-${PV} dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 - dev-java/sun-jaf:0 + <=dev-java/sun-jaf-1.1.1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2" diff --git a/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.1-r3.ebuild similarity index 99% copy from dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild copy to dev-java/netbeans-ide/netbeans-ide-8.1-r3.ebuild index 7066b4e6445..1fb8cd97836 100644 --- a/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild +++ b/dev-java/netbeans-ide/netbeans-ide-8.1-r3.ebuild @@ -109,7 +109,7 @@ CDEPEND="~dev-java/netbeans-harness-${PV} dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 - dev-java/sun-jaf:0 + >=dev-java/sun-jaf-1.1.1-r1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2" @@ -288,7 +288,7 @@ src_prepare() { java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar - java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar + java-pkg_jar-from --into xml.jaxb.api/external sun-jaf sun-jaf.jar activation.jar java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar java-pkg-2_src_prepare @@ -364,7 +364,7 @@ src_install() { 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 + rm activation.jar && dosym /usr/share/sun-jaf/lib/sun-jaf.jar ${instdir}/activation.jar || die popd >/dev/null || die local instdir=${INSTALL_DIR}/modules/ext/jaxb/api diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild similarity index 99% copy from dev-java/netbeans-ide/netbeans-ide-8.2.ebuild copy to dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild index 033ea5ddf15..0fb63f1ef94 100644 --- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild +++ b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild @@ -82,7 +82,7 @@ SRC_URI="${SOURCE_URL} http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar" LICENSE="|| ( CDDL GPL-2-with-linking-exception )" -KEYWORDS="amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="" S="${WORKDIR}" @@ -106,7 +106,7 @@ CDEPEND="virtual/jdk:1.8 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 - dev-java/sun-jaf:0 + >=dev-java/sun-jaf-1.1.1-r1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2" @@ -256,7 +256,7 @@ src_prepare() { java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar - java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar + java-pkg_jar-from --into xml.jaxb.api/external sun-jaf sun-jaf.jar activation.jar java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar einfo "Linking in other clusters..." @@ -348,7 +348,7 @@ src_install() { 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 + rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf sun-jaf.jar activation.jar popd >/dev/null || die local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild index 033ea5ddf15..6d5de68c9f5 100644 --- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild +++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild @@ -106,7 +106,7 @@ CDEPEND="virtual/jdk:1.8 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 - dev-java/sun-jaf:0 + <=dev-java/sun-jaf-1.1.1:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2"