[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-ide/

[Miroslav Šulc]

commit:     930f5add0f15aff901f8b8ce408c49bc115b9d30
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  6 14:44:44 2017 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Oct  6 14:45:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930f5add

dev-java/netbeans-ide: fixed issue with renamed sun-jaf jar library

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild                | 2 +-
 ...{netbeans-ide-8.0.2-r2.ebuild => netbeans-ide-8.0.2-r3.ebuild} | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild 
b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
index c226d0f5e03..6701b86eb04 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
@@ -107,7 +107,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.0.2-r2.ebuild 
b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r3.ebuild
similarity index 99%
copy from dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
copy to dev-java/netbeans-ide/netbeans-ide-8.0.2-r3.ebuild
index c226d0f5e03..5afe31b62f1 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r3.ebuild
@@ -86,7 +86,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-classpath-exception )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
@@ -107,7 +107,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
@@ -358,7 +358,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