dev-util/netbeans: removed old, updated jdk deps

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

5 files changed, 6 insertions, 246 deletions

diff --git a/dev-util/netbeans-standalone/Manifest b/dev-util/netbeans-standalone/Manifest
index 87092e281..17da13344 100644
--- a/dev-util/netbeans-standalone/Manifest
+++ b/dev-util/netbeans-standalone/Manifest
@@ -1,9 +1,5 @@
 AUX fix-private-debugger-access.patch 1621 BLAKE2B f3124edee73f31445a6093129a1de8a614991115dc5df39b794fbaad09ec64f7b7114faf4057906da4a0b5a17911e30ab774e6e49e14a3ee46dccbed13735f57 SHA512 b2fe14770733c5b9c53f18fdc5c001add901ff1b28755ae960ffb72ae6106fd930a832f2857e00e96c88f58d3339223b0321ee6474507b6c3c3b3739a807df19
-DIST netbeans-standalone-11.3.tar.gz 79161879 BLAKE2B d0c6e4e16fba5df2094d1b6f42439f477568afeffeecc8860bba458023021688e047912bdb9cc3c6b493690df385fa617fb31ccc54dad87e7e11a2c28a660e6c SHA512 635afc0681cf7108ffe12d5b1d96a864c3378b2abced9ea10811680268451dbd374e87807bcd36b1824415ea32f2e6b7bbabbdca818e50207a28beec5b6d4239
-DIST netbeans-standalone-12.0.tar.gz 79474926 BLAKE2B c51533550af203f8944a8b0344062e23c8f936aba1abc44039fce394fd1abe6f690e39be5f8607c5ea6572237f49c562991afeb49c36631fdc8398f09bf77ce7 SHA512 2b1c4acaf4bd8cb6069f712800a20619da63af89eb9ee99cc56ab1157ba8f5f4784c540e592b7996f52cdcef32b4ea20c5adbbcd261050351984d3c4198f8175
 DIST netbeans-standalone-12.0_p1.tar.gz 79470446 BLAKE2B 1fe8cf1700d3e3d71c8377d930fadf2969b5b5c87180449c9d2795e5450827ca450dfa5037459cdafc12888e429e1ba31a24a86dac562c2fc14137b3ee68c339 SHA512 75d0d947d53378a6ac816776a313c3b712d1beabd4c3c5cd09b8ad7771589f32a664f1e2b72865a72eb6416cd8f28888a44eeeb8e8a0ce27e495889ce6374dc5
-EBUILD netbeans-standalone-11.3.ebuild 5249 BLAKE2B 52e7365acd38ca3f449fd2002330613f83610c331c7bcf0d63bdfdd3bf4d4c56687308b52e9d8c64068a21e387c5f77035e55eae37692ed0a089d79874d5a0fe SHA512 880d04974b224e774711d01877bf7240a8b96c67f9d787b1eb2978563e2d572b17c90c1173cb20994251c0ab3406e8c366e63cf14835b140763f239b1a9904f7
-EBUILD netbeans-standalone-12.0.ebuild 5249 BLAKE2B 52e7365acd38ca3f449fd2002330613f83610c331c7bcf0d63bdfdd3bf4d4c56687308b52e9d8c64068a21e387c5f77035e55eae37692ed0a089d79874d5a0fe SHA512 880d04974b224e774711d01877bf7240a8b96c67f9d787b1eb2978563e2d572b17c90c1173cb20994251c0ab3406e8c366e63cf14835b140763f239b1a9904f7
-EBUILD netbeans-standalone-12.0_p1.ebuild 5249 BLAKE2B 52e7365acd38ca3f449fd2002330613f83610c331c7bcf0d63bdfdd3bf4d4c56687308b52e9d8c64068a21e387c5f77035e55eae37692ed0a089d79874d5a0fe SHA512 880d04974b224e774711d01877bf7240a8b96c67f9d787b1eb2978563e2d572b17c90c1173cb20994251c0ab3406e8c366e63cf14835b140763f239b1a9904f7
-EBUILD netbeans-standalone-9999.ebuild 5249 BLAKE2B 52e7365acd38ca3f449fd2002330613f83610c331c7bcf0d63bdfdd3bf4d4c56687308b52e9d8c64068a21e387c5f77035e55eae37692ed0a089d79874d5a0fe SHA512 880d04974b224e774711d01877bf7240a8b96c67f9d787b1eb2978563e2d572b17c90c1173cb20994251c0ab3406e8c366e63cf14835b140763f239b1a9904f7
+EBUILD netbeans-standalone-12.0_p1.ebuild 5239 BLAKE2B b023417ecb6acc33020a155a8d079a2d2c32cc726e4acfd535af68d9a4020735d2d50171a7c27646da5b6ba10eec00a344161a8e90df36016a2ee0e14aece1d0 SHA512 86545748f542330edce5744958ec322953d3c80be9dfeeed9eaeca2efda3bc300c3f92ae70ece3d6344c2f0ad1f02b58fdb564793b398291327b729f9a656ab9
+EBUILD netbeans-standalone-9999.ebuild 5249 BLAKE2B aafd562842c4260d8f0f8e1554c5d7675c0c43cb3a52fc390fd73242ea664e7f7176cdfaabd8b454ebc8dc181518d6e17153b561d31c1be63370bc46eccb268e SHA512 e2374746451d698df470703b4eb5bfb75bb95879eb9455936363636534cb01c47e71b3d4817a3bd5f7128c792ccba18f8e347a3345563e2861ab040baa245e8c
 MISC metadata.xml 338 BLAKE2B 25922d9e4c7c4cd111db8b96e1dcb3cf026d9262b9d0861a4bcd49009303fc8535afd370e301d3f51f3127516c3b2561d6d6f56de0433a835f85fa15d1ab5012 SHA512 b7525dac3a4947550c33f096550e82644ed8a790e915a66ee627f81727f58fcbf0a055f298f8b45ee8d08da747fec79a8276a96ce0dcc43b847341166fbea4e9
diff --git a/dev-util/netbeans-standalone/netbeans-standalone-11.3.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-11.3.ebuild
deleted file mode 100644
index 3a25b5a1c..000000000
--- a/dev-util/netbeans-standalone/netbeans-standalone-11.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASKS="ant-apache-bsf"
-
-if [ ${PV} = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/apache/netbeans.git"
-else
-	MY_PV=${PV/_/-}
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/apache/netbeans/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/netbeans-${MY_PV}
-fi
-
-inherit java-pkg-2 java-ant-2 desktop xdg $([[ ${PV} = "9999" ]] && echo git-r3)
-
-DESCRIPTION="Apache Netbeans IDE"
-HOMEPAGE="https://netbeans.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1-1)"
-IUSE=""
-
-DEPEND="virtual/jdk:1.8"
-RDEPEND=">=virtual/jdk-1.8:*"
-
-PATCHES=( "${FILESDIR}"/fix-private-debugger-access.patch )
-
-JAVA_PKG_BSFIX="off"
-INSTALL_DIR=/usr/share/${PN}-${SLOT}
-
-pkg_pretend() {
-	if has network-sandbox ${FEATURES}; then
-		eerror
-		eerror "Netbeans downloads a lot of dependencies during the build"
-		eerror "process, so you need to disable network-sandbox feature"
-		eerror "to make this ebuild proceed (FEATURES=-network-sandbox)."
-		eerror "You can also use package.env to disable this feature"
-		eerror "for the package, see:"
-		eerror
-		eerror "    https://wiki.gentoo.org/wiki//etc/portage/package.env"
-		eerror
-		die "network-sandbox is enabled, disable it to proceed";
-	fi
-}
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	eant -Dcluster.config=full -Dpermit.jdk9.builds=true -Dbinaries.cache="${S}"/.hgexternalcache || die "Failed to compile"
-}
-
-QA_PREBUILT="
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/process_start
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/stat
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/pty_open
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/sigqueue
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/unbuffer.so
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/killall
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/pty
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/cvm/linux/libprofilerinterface_g.so
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/cvm/linux/libprofilerinterface.so
-	usr/share/netbeans-standalone-11/platform/modules/lib/amd64/linux/libjnidispatch-440.so
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
-"
-
-src_install() {
-	pushd nbbuild/netbeans >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	doins -r .
-
-	rm -fr "${ED}"/${INSTALL_DIR}/ide/bin/nativeexecution/{Linux-{sparc_64,x86},MacOSX-{x86_64,x86},SunOS-{sparc,sparc_64,x86,x86_64},Windows-{x86,x86_64}} || die "Failed to remove unused binaries"
-	find "${ED}"/${INSTALL_DIR}/ \( -name *.exe -o -name *.cmd -o -name *.bat \) -type f -exec rm {} + || die "Failed to remove unused binaries"
-	rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/jdk15/{hpux-pa_risc2.0{,w},linux,mac,solaris-{amd64,i386,sparc{,v9}},windows{,-amd64}} || die "Failed to remove unused libraries"
-	rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/jdk16/{hpux-pa_risc2.0{,w},linux{,-arm,-arm-vfp-hflt},mac,solaris-{amd64,i386,sparc{,v9}},windows{,-amd64}} || die "Failed to remove unused libraries"
-	rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/cvm/windows || die "Failed to remove unused libraries"
-	rm -fr "${ED}"/${INSTALL_DIR}/platform/modules/lib/{i386,x86} || die "Failed to remove unused libraries"
-	find "${ED}"/${INSTALL_DIR}/ -name *.dll -type f -exec rm {} + || die "Failed to remove unused libraries"
-
-	find "${ED}/${INSTALL_DIR}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed"
-	exeinto ${INSTALL_DIR}/ide/bin/nativeexecution/Linux-x86_64/
-	doexe ide/bin/nativeexecution/Linux-x86_64/{process_start,stat,pty_open,sigqueue,killall,pty}
-	exeinto ${INSTALL_DIR}/java/maven/bin
-	doexe java/maven/bin/mvn{,Debug,yjp}
-	exeinto ${INSTALL_DIR}/extide/ant/bin
-	doexe extide/ant/bin/{ant{,Run,Run.pl},complete-ant-cmd.pl,runant.{pl,py}}
-
-	dodoc DEPENDENCIES NOTICE
-	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/${PN}-${SLOT}
-	fperms 755 ${INSTALL_DIR}/bin/netbeans
-
-	insinto /etc/${PN}-${SLOT}
-	doins etc/*
-	rm -fr "${ED}"/${INSTALL_DIR}/etc
-	dosym ../../../../etc/${PN}-${SLOT} ${INSTALL_DIR}/etc
-	sed -i -e "s/#netbeans_jdkhome.*/netbeans_jdkhome=\$\(java-config -O\)/g" "${ED}"/etc/${PN}-${SLOT}/netbeans.conf || die "Failed to set set Netbeans JDK home"
-
-	if [[ -e "${ED}"/${INSTALL_DIR}/bin/netbeans ]]; then
-		sed -i -e "s:\"\$progdir\"/../etc/:/etc/${PN}-${SLOT}/:" "${ED}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e "s:\"\${userdir}\"/etc/:/etc/${PN}-${SLOT}/:" "${ED}"/${INSTALL_DIR}/bin/netbeans
-	fi
-
-	dodir /usr/share/icons/hicolor/32x32/apps
-	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/${PN}-${SLOT}.png
-
-	popd >/dev/null || die
-
-	make_desktop_entry ${PN}-${SLOT} "Netbeans ${PV}" ${PN}-${SLOT} Development
-
-	mkdir -p  "${ED}"/${INSTALL_DIR}/nb/config || die
-	echo "NBGNT" > "${ED}"/${INSTALL_DIR}/nb/config/productid || die
-}
diff --git a/dev-util/netbeans-standalone/netbeans-standalone-12.0.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-12.0.ebuild
deleted file mode 100644
index 3a25b5a1c..000000000
--- a/dev-util/netbeans-standalone/netbeans-standalone-12.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASKS="ant-apache-bsf"
-
-if [ ${PV} = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/apache/netbeans.git"
-else
-	MY_PV=${PV/_/-}
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/apache/netbeans/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/netbeans-${MY_PV}
-fi
-
-inherit java-pkg-2 java-ant-2 desktop xdg $([[ ${PV} = "9999" ]] && echo git-r3)
-
-DESCRIPTION="Apache Netbeans IDE"
-HOMEPAGE="https://netbeans.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1-1)"
-IUSE=""
-
-DEPEND="virtual/jdk:1.8"
-RDEPEND=">=virtual/jdk-1.8:*"
-
-PATCHES=( "${FILESDIR}"/fix-private-debugger-access.patch )
-
-JAVA_PKG_BSFIX="off"
-INSTALL_DIR=/usr/share/${PN}-${SLOT}
-
-pkg_pretend() {
-	if has network-sandbox ${FEATURES}; then
-		eerror
-		eerror "Netbeans downloads a lot of dependencies during the build"
-		eerror "process, so you need to disable network-sandbox feature"
-		eerror "to make this ebuild proceed (FEATURES=-network-sandbox)."
-		eerror "You can also use package.env to disable this feature"
-		eerror "for the package, see:"
-		eerror
-		eerror "    https://wiki.gentoo.org/wiki//etc/portage/package.env"
-		eerror
-		die "network-sandbox is enabled, disable it to proceed";
-	fi
-}
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	eant -Dcluster.config=full -Dpermit.jdk9.builds=true -Dbinaries.cache="${S}"/.hgexternalcache || die "Failed to compile"
-}
-
-QA_PREBUILT="
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/process_start
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/stat
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/pty_open
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/sigqueue
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/unbuffer.so
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/killall
-	usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/pty
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/cvm/linux/libprofilerinterface_g.so
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/cvm/linux/libprofilerinterface.so
-	usr/share/netbeans-standalone-11/platform/modules/lib/amd64/linux/libjnidispatch-440.so
-	usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
-"
-
-src_install() {
-	pushd nbbuild/netbeans >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	doins -r .
-
-	rm -fr "${ED}"/${INSTALL_DIR}/ide/bin/nativeexecution/{Linux-{sparc_64,x86},MacOSX-{x86_64,x86},SunOS-{sparc,sparc_64,x86,x86_64},Windows-{x86,x86_64}} || die "Failed to remove unused binaries"
-	find "${ED}"/${INSTALL_DIR}/ \( -name *.exe -o -name *.cmd -o -name *.bat \) -type f -exec rm {} + || die "Failed to remove unused binaries"
-	rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/jdk15/{hpux-pa_risc2.0{,w},linux,mac,solaris-{amd64,i386,sparc{,v9}},windows{,-amd64}} || die "Failed to remove unused libraries"
-	rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/jdk16/{hpux-pa_risc2.0{,w},linux{,-arm,-arm-vfp-hflt},mac,solaris-{amd64,i386,sparc{,v9}},windows{,-amd64}} || die "Failed to remove unused libraries"
-	rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/cvm/windows || die "Failed to remove unused libraries"
-	rm -fr "${ED}"/${INSTALL_DIR}/platform/modules/lib/{i386,x86} || die "Failed to remove unused libraries"
-	find "${ED}"/${INSTALL_DIR}/ -name *.dll -type f -exec rm {} + || die "Failed to remove unused libraries"
-
-	find "${ED}/${INSTALL_DIR}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed"
-	exeinto ${INSTALL_DIR}/ide/bin/nativeexecution/Linux-x86_64/
-	doexe ide/bin/nativeexecution/Linux-x86_64/{process_start,stat,pty_open,sigqueue,killall,pty}
-	exeinto ${INSTALL_DIR}/java/maven/bin
-	doexe java/maven/bin/mvn{,Debug,yjp}
-	exeinto ${INSTALL_DIR}/extide/ant/bin
-	doexe extide/ant/bin/{ant{,Run,Run.pl},complete-ant-cmd.pl,runant.{pl,py}}
-
-	dodoc DEPENDENCIES NOTICE
-	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/${PN}-${SLOT}
-	fperms 755 ${INSTALL_DIR}/bin/netbeans
-
-	insinto /etc/${PN}-${SLOT}
-	doins etc/*
-	rm -fr "${ED}"/${INSTALL_DIR}/etc
-	dosym ../../../../etc/${PN}-${SLOT} ${INSTALL_DIR}/etc
-	sed -i -e "s/#netbeans_jdkhome.*/netbeans_jdkhome=\$\(java-config -O\)/g" "${ED}"/etc/${PN}-${SLOT}/netbeans.conf || die "Failed to set set Netbeans JDK home"
-
-	if [[ -e "${ED}"/${INSTALL_DIR}/bin/netbeans ]]; then
-		sed -i -e "s:\"\$progdir\"/../etc/:/etc/${PN}-${SLOT}/:" "${ED}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e "s:\"\${userdir}\"/etc/:/etc/${PN}-${SLOT}/:" "${ED}"/${INSTALL_DIR}/bin/netbeans
-	fi
-
-	dodir /usr/share/icons/hicolor/32x32/apps
-	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/${PN}-${SLOT}.png
-
-	popd >/dev/null || die
-
-	make_desktop_entry ${PN}-${SLOT} "Netbeans ${PV}" ${PN}-${SLOT} Development
-
-	mkdir -p  "${ED}"/${INSTALL_DIR}/nb/config || die
-	echo "NBGNT" > "${ED}"/${INSTALL_DIR}/nb/config/productid || die
-}
diff --git a/dev-util/netbeans-standalone/netbeans-standalone-12.0_p1.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-12.0_p1.ebuild
index 8f727546d..d54493c34 100644
--- a/dev-util/netbeans-standalone/netbeans-standalone-12.0_p1.ebuild
+++ b/dev-util/netbeans-standalone/netbeans-standalone-12.0_p1.ebuild
@@ -23,8 +23,8 @@ LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1-1)"
 IUSE=""
 
-DEPEND="virtual/jdk:1.8"
-RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="virtual/jdk"
+RDEPEND="virtual/jdk:*"
 
 PATCHES=( "${FILESDIR}"/fix-private-debugger-access.patch )
 
diff --git a/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild
index 8f727546d..f6e32db2c 100644
--- a/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild
+++ b/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild
@@ -23,8 +23,8 @@ LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1-1)"
 IUSE=""
 
-DEPEND="virtual/jdk:1.8"
-RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11"
+RDEPEND=">=virtual/jdk-11:*"
 
 PATCHES=( "${FILESDIR}"/fix-private-debugger-access.patch )