gentoo resync : 20.03.2022

3 files changed, 2 insertions, 90 deletions

diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index da6b0103f590..ee43db69a83b 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -3,8 +3,6 @@ DIST common-8.0.1.jar 435506 BLAKE2B e3c0db1691c9f27d39b5d0cad18707cd27e708d74d0
 DIST encoder-1.2.2.jar 37529 BLAKE2B 0e61c679db8c559005de726c8fc358cc5f04ab51b357fe53889cb585c8d006a77a3e24cb51043912ea9be11739ffa14de86f22d3dc4663aefee8bc75b9ff6862 SHA512 eed5529b326a9fd493032539dd50c7d60439fed0743cd567d348aa334e837d412ac10b220fd5099edcf9098fc7c684fba98b92916b9ef79831395686fd83b7dc
 DIST flightrecorder-8.0.1.jar 500815 BLAKE2B af9f024e7199e7f577e75b3d40f40a3e65f8e98be768415e5832aa6e1ffcfc9ecc391ef4d3fa515411d6d3ed051f35579656bae8cf8e1aea2023d54b072c84a0 SHA512 08c98ed3444b396e6e1ae0f909378c56e2ce04741f7b7ee83e39ae8a0699802709a5419f29c3a7bd44a11caba984071ef4f0554183fd5260ed28741edd191809
 DIST lz4-java-1.7.1.jar 649950 BLAKE2B caed7593dad078fcaf3853a4dffbd540d7e5a3298b13092dee4b82a70359494584b9901da600239d65e9930e7a769adf1a45eac85033f8ca0cfcaef6a3b09544 SHA512 ff48daeca92c5a7657aa9c7fe41c5ae75a5fa0aad05c655bacb64a40acfe93ffd3d40bef16544614ce8a38db3e1df177023101773f6f7c1d32031413270e42d2
-DIST visualvm-2.1.1.tar.gz 36390828 BLAKE2B 127d4bec9fe47e66950485f5349c3c46c0e4f9576498cf4afb2459617223839a2c553267e2bda8137322dfcca8282c090a13ca2adde026eda4fd8038b05e5b10 SHA512 dd9879c2ed5c62cfd60f58355fe580526757db002feea9a013df1095b119931f7951ac25f08000300b6c3e7f4f27772e57b2ca30721fde70e70ca663456da2dd
 DIST visualvm-2.1.2.tar.gz 36393559 BLAKE2B ba925ddacfb1474f47d0ab393c7f8f14d18e12ef25aef82efd59a273eb8464d8758e0cc82cf41238b0356546dd03fed319b8c04366c4037fa99251d358f5e1c2 SHA512 f324bdec570f050c3df3d047cf9ab9e8565ed95150d1bcb5d86166aa221d0a3c55a2c3cdb345ddbf42b9cef35cb6a21033ed24fd203c0dbb67d2f8dc2b5f2960
-EBUILD visualvm-2.1.1.ebuild 3010 BLAKE2B bbe02f4a2aad1d5176513c4457d805d3641a2856679fdc5eccc46be29dddeddb6ffe7d694c14f61905cb797a6802afd921ede5791cb1fa03d579696afaed23db SHA512 a0b4f16743f33526e9e95903174a244a03a4681ed1c898fa6584cc538b0086dcc00cb9fc649a27068c23cb0e4cbfc6593bef4c1ffebee3e89da3aaa82429aada
-EBUILD visualvm-2.1.2.ebuild 3011 BLAKE2B e507a0d44fff3d4e28e1cadc706455d241c7588fb88e40f338fb3900fc2ee4c83d5d4ca4bb59f566c446be3e3169a270414db9fbbd5968fde95d9c93fa78123f SHA512 0dae4f799b2732c277eac4662190d8e2c888ef9a3ac2fac0bd0bf4ee9a6b36ed2addc472e6f07703db1845f3dff5133b331d247ff6b43e4a3f8236241b86c803
+EBUILD visualvm-2.1.2.ebuild 3010 BLAKE2B 2908c91fd3f7e577e009114e102e193a6fd16ff626814f7afe1286d8e0af9d1696fe44c612bfc6300fb9aacef911aa2372221ba776294dd6f0d052671d4d4dc9 SHA512 5acaa9e212caf5066f25aed0b2a15fe5152c6fb440320ecd9bc89d963db59d88b107e6cb37ff6c72a1eb763951c5d06070b62e4749d94b56f98541b656045d81
 MISC metadata.xml 317 BLAKE2B e5f32379a40e3c2180df4f3ac4e7ea03a7dbfe69b1cb6537c1693262cc06e6334959abfb68f888c588fa933f60e85f137355bb57ff769107dfe805595d1a3ad1 SHA512 605d7206793c3d865547b69f9715305d46d433d18096b886b362d2d86adf4eda894c23af1819b6af95423fbe2a37781d1d100a9df9f15a01942f66c73dc2fa2c
diff --git a/dev-util/visualvm/visualvm-2.1.1.ebuild b/dev-util/visualvm/visualvm-2.1.1.ebuild
deleted file mode 100644
index 4335a1808c08..000000000000
--- a/dev-util/visualvm/visualvm-2.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-NBV=124
-NBT=21062021
-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}"
-# The extra jar files are not present in gentoo atm so bundling them
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://repo1.maven.org/maven2/org/openjdk/jmc/flightrecorder/8.0.1/flightrecorder-8.0.1.jar
-	https://repo1.maven.org/maven2/org/openjdk/jmc/common/8.0.1/common-8.0.1.jar
-	https://repo1.maven.org/maven2/org/lz4/lz4-java/1.7.1/lz4-java-1.7.1.jar
-	https://repo1.maven.org/maven2/org/owasp/encoder/encoder/1.2.2/encoder-1.2.2.jar"
-
-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
-EANT_EXTRA_ARGS="-Dext.binaries.downloaded=true"
-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
-
-	# link in downloaded jars
-	for file in flightrecorder-8.0.1.jar common-8.0.1.jar lz4-java-1.7.1.jar encoder-1.2.2.jar; do
-		ln -s "${DISTDIR}/${file}" jfr.generic/external/ || die "Failed to link file ${file}"
-	done
-}
-
-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 launcher/visualvm.conf ${PN}.conf
-	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update userdir"
-	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update cachedir"
-	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" || die "Failed to set jdk detection"
-
-	# 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.2.ebuild b/dev-util/visualvm/visualvm-2.1.2.ebuild
index cc0781758a8d..b05bacf59f27 100644
--- a/dev-util/visualvm/visualvm-2.1.2.ebuild
+++ b/dev-util/visualvm/visualvm-2.1.2.ebuild
@@ -24,7 +24,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:*"