[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-apisupport/, profiles/
commit: c7d77af1b1580b15f1750d0b1cbd2fba2dfb2800
Author: Michał Górny gentoo org>
AuthorDate: Sat Sep 14 15:31:53 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Sep 14 15:37:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7d77af1
dev-java/netbeans-apisupport: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/netbeans-apisupport/Manifest | 2 -
dev-java/netbeans-apisupport/metadata.xml | 12 ---
.../netbeans-apisupport-8.2.ebuild | 97 --
profiles/package.mask | 1 -
4 files changed, 112 deletions(-)
diff --git a/dev-java/netbeans-apisupport/Manifest
b/dev-java/netbeans-apisupport/Manifest
deleted file mode 100644
index c78bb23cacf..000
--- a/dev-java/netbeans-apisupport/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B
0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9
SHA512
d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B
abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4
SHA512
a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
diff --git a/dev-java/netbeans-apisupport/metadata.xml
b/dev-java/netbeans-apisupport/metadata.xml
deleted file mode 100644
index 85f4d904aad..000
--- a/dev-java/netbeans-apisupport/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
- fordf...@gentoo.org
- Miroslav Šulc
-
-
- j...@gentoo.org
- Java
-
-
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
deleted file mode 100644
index b257afbdc47..000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="https://netbeans.org/projects/apisupport;
-SLOT="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip;
-SRC_URI="${SOURCE_URL}
-
https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2;
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
- ~dev-java/netbeans-extide-${PV}
- ~dev-java/netbeans-harness-${PV}
- ~dev-java/netbeans-ide-${PV}
- ~dev-java/netbeans-java-${PV}
- ~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
- app-arch/unzip
- dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport
-Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
- unpack $(basename ${SOURCE_URL})
-
- einfo "Deleting bundled jars..."
- find -name "*.jar" -type f -delete
-
- unpack netbeans-8.2-build.xml.patch.bz2
-}
-
-src_prepare() {
- einfo "Deleting bundled class files..."
- find -name "*.class" -type f | xargs rm -vf
-
- eapply netbeans-8.2-build.xml.patch
-
- einfo "Symlinking external libraries..."
- java-pkg_jar-from --build-only --into javahelp/external javahelp
jhall.jar jhall-2.0_05.jar
-
- einfo "Linking in other clusters..."
- mkdir "${S}"/nbbuild/netbeans || die
- pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
- ln -s /usr/share/netbeans-extide-${SLOT} extide || die
- cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >>
moduleCluster.properties || die
- touch nb.cluster.extide.built
-
- ln -s /usr/share/netbeans-harness-${SLOT} harness || die
- cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >>
moduleCluster.properties || die
- touch nb.cluster.harness.built
-
- ln -s /usr/share/netbeans-ide-${SLOT} ide || die
- cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >>
moduleCluster.properties || die
- touch nb.cluster.ide.built
-
- ln -s /usr/share/netbeans-java-${SLOT} java || die
- cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >>
moduleCluster.properties || die
- touch nb.cluster.java.built
-
- ln -s /usr/share/netbeans-platform-${SLOT} platform || die
- cat
[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-apisupport/
commit: 202bac0e7868eb074e03626d55daa0c9f9468f9e
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun May 5 11:41:33 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon May 13 17:55:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202bac0e
dev-java/netbeans-apisupport: use HTTPS
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Aaron Bauman gentoo.org>
dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
index 73f3a4ebf16..b257afbdc47 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="http://netbeans.org/projects/apisupport;
+HOMEPAGE="https://netbeans.org/projects/apisupport;
SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip;
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip;
SRC_URI="${SOURCE_URL}
https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2;
LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-apisupport/
commit: f37bf8cae2c35e0bf915c72941e3c312dddc45a6
Author: Marty E. Plummer startmail com>
AuthorDate: Tue Apr 10 22:19:18 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Apr 14 21:03:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37bf8ca
dev-java/netbeans-apisupport: epatch->eapply.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
index 787e88b67f4..73f3a4ebf16 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -47,7 +47,7 @@ src_prepare() {
einfo "Deleting bundled class files..."
find -name "*.class" -type f | xargs rm -vf
- epatch netbeans-8.2-build.xml.patch
+ eapply netbeans-8.2-build.xml.patch
einfo "Symlinking external libraries..."
java-pkg_jar-from --build-only --into javahelp/external javahelp
jhall.jar jhall-2.0_05.jar
[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-apisupport/
commit: 7604821587009ff3ba7d1fc16a64ddd9930f4dd0
Author: Miroslav Šulc gentoo org>
AuthorDate: Wed Nov 23 11:27:37 2016 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Nov 23 11:27:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76048215
dev-java/netbeans-apisupport: stabilized slot 8.2 (to be able to remove
previous versions of netbeans and java 7)
Package-Manager: portage-2.3.2
dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
index 0ee1d02..7651503 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -12,7 +12,7 @@
SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201
SRC_URI="${SOURCE_URL}
http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2;
LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
S="${WORKDIR}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-apisupport/
commit: 8c1fbcf877afaa0e978c0f465313469d84a812e3
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Nov 10 15:45:18 2016 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Nov 10 15:48:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1fbcf8
dev-java/netbeans-apisupport: restricted to jdk 1.8 in netbeans slot 8.2
Package-Manager: portage-2.3.2
dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
index 63cf273..0ee1d02 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -16,17 +16,16 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
S="${WORKDIR}"
-CDEPEND="~dev-java/netbeans-extide-${PV}
+CDEPEND="virtual/jdk:1.8
+ ~dev-java/netbeans-extide-${PV}
~dev-java/netbeans-harness-${PV}
~dev-java/netbeans-ide-${PV}
~dev-java/netbeans-java-${PV}
~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
+DEPEND="${CDEPEND}
app-arch/unzip
- ${CDEPEND}
dev-java/javahelp:0"
-RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
- ${CDEPEND}"
+RDEPEND="${CDEPEND}"
INSTALL_DIR="/usr/share/${PN}-${SLOT}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-apisupport/
commit: 1202f01b056cb49e85d46dad1f1f3fc989104c25
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Oct 6 09:08:35 2016 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Oct 6 09:08:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1202f01b
dev-java/netbeans-apisupport: fixed eapi 6 issue
Package-Manager: portage-2.3.1
.../netbeans-apisupport/netbeans-apisupport-8.2.ebuild | 14 +-
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
index 75cd721..63cf273 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -51,19 +51,6 @@ src_prepare() {
epatch netbeans-8.2-build.xml.patch
- # Support for custom patches
- if [ -n "${NETBEANS_PATCHES_DIR}" -a -d
"${NETBEANS_PATCHES_DIR}" ] ; then
- local files=`find "${NETBEANS_PATCHES_DIR}" -type f`
-
- if [ -n "${files}" ] ; then
- einfo "Applying custom patches:"
-
- for file in ${files} ; do
- epatch "${file}"
- done
- fi
- fi
-
einfo "Symlinking external libraries..."
java-pkg_jar-from --build-only --into javahelp/external javahelp
jhall.jar jhall-2.0_05.jar
@@ -94,6 +81,7 @@ src_prepare() {
popd >/dev/null || die
java-pkg-2_src_prepare
+ default
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-apisupport/
commit: 7f06c850340809e417b89c1087dcbb7b5c4a9cad
Author: Miroslav Šulc gentoo org>
AuthorDate: Wed Oct 5 12:51:45 2016 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Oct 5 12:56:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f06c850
dev-java/netbeans-apisupport: version bump to version 8.2
Package-Manager: portage-2.3.1
dev-java/netbeans-apisupport/Manifest | 2 +
.../netbeans-apisupport-8.2.ebuild | 111 +
2 files changed, 113 insertions(+)
diff --git a/dev-java/netbeans-apisupport/Manifest
b/dev-java/netbeans-apisupport/Manifest
index 45fc43a..9003fbb 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -2,3 +2,5 @@ DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256
581f80d3c2e8d87a0f007d
DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256
cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512
b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7
WHIRLPOOL
fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
DIST netbeans-8.1-20151001-src.zip 208692973 SHA256
e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512
c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285
WHIRLPOOL
7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256
b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512
1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915
WHIRLPOOL
c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
+DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256
5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512
d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
WHIRLPOOL
378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
+DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256
d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512
a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
WHIRLPOOL
0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
new file mode 100644
index ..75cd721
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport;
+SLOT="8.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip;
+SRC_URI="${SOURCE_URL}
+
http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2;
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+ ~dev-java/netbeans-harness-${PV}
+ ~dev-java/netbeans-ide-${PV}
+ ~dev-java/netbeans-java-${PV}
+ ~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+ app-arch/unzip
+ ${CDEPEND}
+ dev-java/javahelp:0"
+RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
+ ${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport
-Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+ unpack $(basename ${SOURCE_URL})
+
+ einfo "Deleting bundled jars..."
+ find -name "*.jar" -type f -delete
+
+ unpack netbeans-8.2-build.xml.patch.bz2
+}
+
+src_prepare() {
+ einfo "Deleting bundled class files..."
+ find -name "*.class" -type f | xargs rm -vf
+
+ epatch netbeans-8.2-build.xml.patch
+
+ # Support for custom patches
+ if [ -n "${NETBEANS_PATCHES_DIR}" -a -d
"${NETBEANS_PATCHES_DIR}" ] ; then
+ local files=`find "${NETBEANS_PATCHES_DIR}" -type f`
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-apisupport/
commit: daaa1d6f6c3decb7040b549757d5a72f5caa9805
Author: Austin English gentoo org>
AuthorDate: Wed Aug 3 21:48:14 2016 +
Commit: Austin English gentoo org>
CommitDate: Wed Aug 3 21:52:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daaa1d6f
dev-java/netbeans-apisupport: license should be GPL-2-with-classpath-exception,
not GPL-2-with-linking-exception
dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild | 2 +-
dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
b/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
index 7ea74d4..edb 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
@@ -11,7 +11,7 @@ SLOT="8.0"
SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip;
SRC_URI="${SOURCE_URL}
https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2;
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
KEYWORDS="amd64 x86"
IUSE=""
S="${WORKDIR}"
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
b/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
index a24e3ad..b4ea089 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
@@ -11,7 +11,7 @@ SLOT="8.1"
SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-20151001-src.zip;
SRC_URI="${SOURCE_URL}
http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2;
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
KEYWORDS="~amd64 ~x86"
IUSE=""
S="${WORKDIR}"
