dev-util/netbeans-standalone: updated to changes in dev-java/ant

Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

4 files changed, 15 insertions, 18 deletions

diff --git a/dev-util/netbeans-standalone/Manifest b/dev-util/netbeans-standalone/Manifest
index f7ab935e3..9505ad444 100644
--- a/dev-util/netbeans-standalone/Manifest
+++ b/dev-util/netbeans-standalone/Manifest
@@ -1,7 +1,7 @@
 AUX fix-private-debugger-access.patch 1621 BLAKE2B f3124edee73f31445a6093129a1de8a614991115dc5df39b794fbaad09ec64f7b7114faf4057906da4a0b5a17911e30ab774e6e49e14a3ee46dccbed13735f57 SHA512 b2fe14770733c5b9c53f18fdc5c001add901ff1b28755ae960ffb72ae6106fd930a832f2857e00e96c88f58d3339223b0321ee6474507b6c3c3b3739a807df19
 DIST netbeans-20-source.zip 149519565 BLAKE2B 12958288ca89e2c2ce29e76f82f31afebe5c8000aba7d47aab8c5dd7435b1d3b53c33eaefd5dc559aaf122f4bc3e6cd429924686b111dce4f952e0b24ac65d96 SHA512 e795875918022541354213b03d7c4515db81c384f43d0b87029666583064e3093ca1a6ebe8f6ffa633c62d02a551be8df52703dfefb830efb8654558ddec5f28
 DIST netbeans-21-source.zip 151092333 BLAKE2B 27e3e73000a3ccbd396bea6e7484d919e0d90a7afc5bc8c3b737f998c41dae2fafc115311ea59ea98ed787866f0ea32455906a493e7ff2372ce725969775a040 SHA512 60533839fe9513e7e4b6f0f8ced77f076a28b89aa3fcc4ea4487a633263d906b8c32b11e8ad4470a820c3a66e795eeb42fb0eda10645414424739a408312bfe5
-EBUILD netbeans-standalone-20.ebuild 5306 BLAKE2B ed64592a08e96889c521df389158abe908ca6deba3a743eb17312ac0652216083928f3a55341966eef85845854afaadee7b3e5342be2d756d3af0436adcdcec1 SHA512 8db722589ae6b13f554a4683af097770f0d4e237ff1a3145525589d5a2801e177fa3491489ad961eb49e3ce0ec96e806066c1a3f0c09a0c452499b013d490474
-EBUILD netbeans-standalone-21.ebuild 5306 BLAKE2B ed64592a08e96889c521df389158abe908ca6deba3a743eb17312ac0652216083928f3a55341966eef85845854afaadee7b3e5342be2d756d3af0436adcdcec1 SHA512 8db722589ae6b13f554a4683af097770f0d4e237ff1a3145525589d5a2801e177fa3491489ad961eb49e3ce0ec96e806066c1a3f0c09a0c452499b013d490474
-EBUILD netbeans-standalone-9999.ebuild 5162 BLAKE2B a948e6a720783af503ad252ec2c1fc2bf1a607a7fd2ceeea0d536031f812278ff755903dc0bc00b0431491026d69f9816a80a76ab3f32ec7d51e571d49343c9e SHA512 007fb456ccc98af81c3a1b7135f6c5e49945dca68ce7cd810a5c0af5cfa365975afd7bcd772152eff414bdada562a3957a2f785248ce638fa4d76a7591bb36e5
+EBUILD netbeans-standalone-20.ebuild 5156 BLAKE2B 3b5f2f268228ffe018e2b8ba95947530c95bc378c70f31dc538dc4a646a6d1de56af7a7de0f610aa5f7aee5dcbb2e5b6a58fe35ca62a5ed718408949faaa4ebf SHA512 b24c365b03e097fe0cf990e06db3fb2bd82fa097c2e6235d79d36681f11de765d0443e0be116bc3026cf5be6db7380ecdfa1221b3146c2cca0ce05b92d9dc67b
+EBUILD netbeans-standalone-21.ebuild 5156 BLAKE2B 3b5f2f268228ffe018e2b8ba95947530c95bc378c70f31dc538dc4a646a6d1de56af7a7de0f610aa5f7aee5dcbb2e5b6a58fe35ca62a5ed718408949faaa4ebf SHA512 b24c365b03e097fe0cf990e06db3fb2bd82fa097c2e6235d79d36681f11de765d0443e0be116bc3026cf5be6db7380ecdfa1221b3146c2cca0ce05b92d9dc67b
+EBUILD netbeans-standalone-9999.ebuild 5156 BLAKE2B 3b5f2f268228ffe018e2b8ba95947530c95bc378c70f31dc538dc4a646a6d1de56af7a7de0f610aa5f7aee5dcbb2e5b6a58fe35ca62a5ed718408949faaa4ebf SHA512 b24c365b03e097fe0cf990e06db3fb2bd82fa097c2e6235d79d36681f11de765d0443e0be116bc3026cf5be6db7380ecdfa1221b3146c2cca0ce05b92d9dc67b
 MISC metadata.xml 338 BLAKE2B 25922d9e4c7c4cd111db8b96e1dcb3cf026d9262b9d0861a4bcd49009303fc8535afd370e301d3f51f3127516c3b2561d6d6f56de0433a835f85fa15d1ab5012 SHA512 b7525dac3a4947550c33f096550e82644ed8a790e915a66ee627f81727f58fcbf0a055f298f8b45ee8d08da747fec79a8276a96ce0dcc43b847341166fbea4e9
diff --git a/dev-util/netbeans-standalone/netbeans-standalone-20.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-20.ebuild
index d526245a9..62a5375f8 100644
--- a/dev-util/netbeans-standalone/netbeans-standalone-20.ebuild
+++ b/dev-util/netbeans-standalone/netbeans-standalone-20.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-ANT_TASKS="ant-apache-bsf"
-
 if [ ${PV} = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/apache/netbeans.git"
 else
@@ -21,7 +19,10 @@ LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1-1)"
 IUSE=""
 
-DEPEND=">=virtual/jdk-11:*"
+DEPEND="
+	dev-java/ant[bsf]
+	>=virtual/jdk-11:*
+"
 RDEPEND=">=virtual/jdk-11"
 
 JAVA_PKG_BSFIX="off"
@@ -44,9 +45,6 @@ pkg_pretend() {
 
 src_prepare() {
 	default
-
-	# remove rust from the full list as there is no cluster provided in the tarball
-	sed -i /nb.cluster.rust,/d nbbuild/cluster.properties || die
 }
 
 src_compile() {
diff --git a/dev-util/netbeans-standalone/netbeans-standalone-21.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-21.ebuild
index d526245a9..62a5375f8 100644
--- a/dev-util/netbeans-standalone/netbeans-standalone-21.ebuild
+++ b/dev-util/netbeans-standalone/netbeans-standalone-21.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-ANT_TASKS="ant-apache-bsf"
-
 if [ ${PV} = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/apache/netbeans.git"
 else
@@ -21,7 +19,10 @@ LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1-1)"
 IUSE=""
 
-DEPEND=">=virtual/jdk-11:*"
+DEPEND="
+	dev-java/ant[bsf]
+	>=virtual/jdk-11:*
+"
 RDEPEND=">=virtual/jdk-11"
 
 JAVA_PKG_BSFIX="off"
@@ -44,9 +45,6 @@ pkg_pretend() {
 
 src_prepare() {
 	default
-
-	# remove rust from the full list as there is no cluster provided in the tarball
-	sed -i /nb.cluster.rust,/d nbbuild/cluster.properties || die
 }
 
 src_compile() {
diff --git a/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild
index 04d9c73ab..62a5375f8 100644
--- a/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild
+++ b/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-ANT_TASKS="ant-apache-bsf"
-
 if [ ${PV} = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/apache/netbeans.git"
 else
@@ -21,7 +19,10 @@ LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1-1)"
 IUSE=""
 
-DEPEND=">=virtual/jdk-11:*"
+DEPEND="
+	dev-java/ant[bsf]
+	>=virtual/jdk-11:*
+"
 RDEPEND=">=virtual/jdk-11"
 
 JAVA_PKG_BSFIX="off"