gentoo resync : 26.08.2021

4 files changed, 2 insertions, 86 deletions

diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 4ae7e7afcde2..0e7776e157ef 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,7 +1,4 @@
-AUX visualvm-r2.conf 1243 BLAKE2B a1e97a1e1ee914620a29bd68580043654304b9cff29edbb700de02473113a7984f3ec910cbff674465ccab6f1deac4da5412ade9a8069918b4acae839ba8d731 SHA512 0f826859bba484e8eae20750e4c3f021ce129cd06dc6c19cf2724b0c2c3d4c68a4370788bdc5cf7e0859348197466382c877c885937c0a87c0e8467944160bf7
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
-DIST visualvm-2.0.7.tar.gz 39155599 BLAKE2B 8a460cb161357114d829d41a7e4b2306e9e0023a6995aceed89cc12fc0b54d5e05402bc1b8c72d4cb3caba5a4844bfbebb4734d7f7c5663343dfb3bd4470945a SHA512 d75217fb1b2a8c4d1c44b600dc42d488be8447fc569f78c10c59954c7c64f8e1ccdeef2e6a7936e7708b9392bbd7634d7149c6d6cc797df1f0036c6c473398ff
 DIST visualvm-2.1.tar.gz 37175908 BLAKE2B 2bc435b09af9061122eb62a8de4b4b9ce47bb8cc2b7e2bfba57767bee380f6db041ec758a54f5a90e21d9ee3a5e6db5af8c0f89fc347d8e49322caeb07db4233 SHA512 ae662df96224a366c54210b85d6a859fd7412ea6ebbbb4d6a5e6b1a75c04a8060ac08a524d8e58aa9a037ecebf7ada142d9633db389cd5332742a21d26e5ed17
-EBUILD visualvm-2.0.7.ebuild 1903 BLAKE2B 612e393a06c26225c1f0e76925dfc447d41e7843e63b26a0019126f674b4a09b418fa10dd7b1b8471000b1573fd211e8ea778b08fd55ac986cc48ea34eddc83e SHA512 8123f7999a45111a745f7e8e38fde858d7af3cea4032c8d72cd3e46e91d412c128b2541082960fb212f45592aaabfbdf08c9e14083b8c463f7b9635d6a85d0df
-EBUILD visualvm-2.1.ebuild 2347 BLAKE2B 8a095af10ab1e2020e23b95e09721e67afbcd33419387394c4155a50d0dc9dee5237082c2d2e6fe198c9325611ce8251cbf4fa8d9e63cc42bf639f459001220e SHA512 12bc18fad16a35bced42e2104a36975870d2efb79b689c127c7536a7d8e3aeb70963c019bcb59f70180dad5524e1c39ddb8fd783915cb4c2f9121ed9369fc0f9
+EBUILD visualvm-2.1.ebuild 2346 BLAKE2B 83c206de83fb911a40a8a9178d58c29fd2e46d71e7d3e3c005a4c741f8289f0c93c43e55faf4ba1c92d4bf1810a6e5962cc847fd870588670b7cfe8bb63a1395 SHA512 13b79c21cea9f1f5ed0d269604924544b77711b0d0bc597c4d8894b02140b58e9b01498a41c5e603b0fcc521c91fe846eb3526e3e5dd9cad84288910f88aaf07
 MISC metadata.xml 316 BLAKE2B ad191b52b75273728dec1af289e8df2ee7d538cde7dd30b2c8facd2623a6984de090356891a9e9f992d99da4bff9ae48be15bc7257987e8b6419fe8beaa979d9 SHA512 46972dae3e0d778f11af43101b50944f9edd850d1e7eecca9f5bf08c4db438dd53415348f61b85f37f788435410867e61bb516960d4ceb6edb8e88fde71cb243
diff --git a/dev-util/visualvm/files/visualvm-r2.conf b/dev-util/visualvm/files/visualvm-r2.conf
deleted file mode 100644
index 214cb55b8674..000000000000
--- a/dev-util/visualvm/files/visualvm-r2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default user directory
-visualvm_default_userdir="${HOME}/.visualvm"
-visualvm_default_cachedir="${HOME}/.cache/visualvm"
-
-# Default runtime options
-visualvm_default_options="-J-client -J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dnetbeans.importclass=org.graalvm.visualvm.modules.startup.ImportSettings -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
-
-# JDK home
-visualvm_jdkhome="$(java-config -O)"
diff --git a/dev-util/visualvm/visualvm-2.0.7.ebuild b/dev-util/visualvm/visualvm-2.0.7.ebuild
deleted file mode 100644
index 001ed43cc6e0..000000000000
--- a/dev-util/visualvm/visualvm-2.0.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-NBV=113
-NBT=27102020
-NBZ=nb${NBV}_platform_${NBT}.zip
-
-inherit java-pkg-2 java-ant-2 desktop
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io"
-
-# Netbeans plattform is already included in the main archive this time
-#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-# it does not compile with java 11
-DEPEND="
-	virtual/jdk:1.8"
-
-S="${WORKDIR}/${P}/${PN}"
-
-QA_PREBUILT="
-	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/cluster/lib/deployed/jdk1[56]/linux-amd64/libprofilerinterface.so
-"
-
-EANT_BUILD_TARGET=build
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	# unpack ${NBZ}
-	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
-}
-
-src_prepare() {
-	default
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
-		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{harness,platform}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-r2.conf ${PN}.conf
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-2.1.ebuild b/dev-util/visualvm/visualvm-2.1.ebuild
index d72289ba971a..a89ec0c061aa 100644
--- a/dev-util/visualvm/visualvm-2.1.ebuild
+++ b/dev-util/visualvm/visualvm-2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=virtual/jre-1.8:*"