From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-ide/
Date: Fri, 6 Oct 2017 15:11:28 +0000 (UTC) [thread overview]
Message-ID: <1507302661.7a722d558d5410d0ee29d13228f37611cf774eb2.fordfrog@gentoo> (raw)
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"
next reply other threads:[~2017-10-06 15:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-06 15:11 Miroslav Šulc [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-05-13 17:57 [gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-ide/ Aaron Bauman
2019-03-18 23:48 Patrice Clement
2018-04-14 21:04 Patrice Clement
2017-10-06 14:45 Miroslav Šulc
2017-09-06 20:52 Michał Górny
2016-11-23 11:30 Miroslav Šulc
2016-11-10 15:49 Miroslav Šulc
2016-10-07 17:32 Miroslav Šulc
2016-10-06 9:11 Miroslav Šulc
2016-10-05 12:57 Miroslav Šulc
2016-08-03 21:52 Austin English
2016-03-15 7:06 James Le Cuirot
2016-03-15 7:06 James Le Cuirot
2016-03-02 12:35 Miroslav Šulc
2016-02-23 16:27 Miroslav Šulc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507302661.7a722d558d5410d0ee29d13228f37611cf774eb2.fordfrog@gentoo \
--to=fordfrog@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox