gentoo auto-resync : 10:06:2023 - 09:50:45

3 files changed, 10 insertions, 98 deletions

diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index c4708cb74586..eaca1362c5c2 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,14 +1,8 @@
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
-DIST common-8.0.1.jar 435506 BLAKE2B e3c0db1691c9f27d39b5d0cad18707cd27e708d74d0db17a13b0ee4ddcc1d96cdd7455a8f5c69d01675434e2789fdb1870d87fffc8eae1776b396cf38c50c723 SHA512 0ee73534f08349c07a0c4c8654526030e634a3aee3175ff3986ad4e37dba0ea3b7d760582c8b612d316cf72f455596c1c50f08e6ddb2d175dc4bb12feba65b22
 DIST common-8.3.0.jar 438403 BLAKE2B 56d76e8115bd0022afcdd95a62a7419d1ea1f5a1aa426b8313f5d22d9458c0d30276b13fb616d1a1d19ffd322b86fef5f0fc4b3ce673deadfcbad1ba473ccbcf SHA512 58378deca55362f97dbf7313633012f40871aee5fecf9792b0284952466e7a1ee0e96f2d948c81564ba0cf92a7e16b6d164a535e89f2da732ef9231876cb4b0b
-DIST encoder-1.2.2.jar 37529 BLAKE2B 0e61c679db8c559005de726c8fc358cc5f04ab51b357fe53889cb585c8d006a77a3e24cb51043912ea9be11739ffa14de86f22d3dc4663aefee8bc75b9ff6862 SHA512 eed5529b326a9fd493032539dd50c7d60439fed0743cd567d348aa334e837d412ac10b220fd5099edcf9098fc7c684fba98b92916b9ef79831395686fd83b7dc
 DIST encoder-1.2.3.jar 37931 BLAKE2B b416d455424b3fd87c94f7f963c819d3a8d76e763c112947718514e2bc1b67b40c6cd9cc051c5cfae6b2aa1cbc92961d1bcc3565ba3dcf3bf58395d543c5aae9 SHA512 ba7887259007272c533228cec1e2c5caebd639ef05b7b8925be6a0b5a7da5859e82489af4d462153e64bf2ce1234a8d6caa606fc6e42675a41cf7a067cfc5f6b
-DIST flightrecorder-8.0.1.jar 500815 BLAKE2B af9f024e7199e7f577e75b3d40f40a3e65f8e98be768415e5832aa6e1ffcfc9ecc391ef4d3fa515411d6d3ed051f35579656bae8cf8e1aea2023d54b072c84a0 SHA512 08c98ed3444b396e6e1ae0f909378c56e2ce04741f7b7ee83e39ae8a0699802709a5419f29c3a7bd44a11caba984071ef4f0554183fd5260ed28741edd191809
 DIST flightrecorder-8.3.0.jar 532387 BLAKE2B 9ef286c53427292beea222ab75d7b8b3e36e44fed5e084d3db6a2910627e67abcdcdab18a175a43c57afc30795dcfa8059f7b0189db45371da6c2b5e635c6447 SHA512 98f4ac4799756e560f0ebf2998985ca07ffe826d925651633763358d2ced757780689b3e64d78af54851a93c270a60f226a285372cb783c978fb3543fed898eb
-DIST lz4-java-1.7.1.jar 649950 BLAKE2B caed7593dad078fcaf3853a4dffbd540d7e5a3298b13092dee4b82a70359494584b9901da600239d65e9930e7a769adf1a45eac85033f8ca0cfcaef6a3b09544 SHA512 ff48daeca92c5a7657aa9c7fe41c5ae75a5fa0aad05c655bacb64a40acfe93ffd3d40bef16544614ce8a38db3e1df177023101773f6f7c1d32031413270e42d2
 DIST nb140_platform_20220908.zip 25886909 BLAKE2B 28cf8180eddd81fcfee513faf19e4a9ec2f3b7c35ad1ee23fe89bf6b5611432c3f41e9376b733ec5504fce1258e7dd27e0c229d291a5fbed3755df7fe0e99421 SHA512 cc2b320caa8fa0b4dbc5469e44453f1a586b6713af3bca799a654c7d1223741eab3a463fe53c955fb5639ec580f73ed93a7cc0ac26ce5dd84d55c418e024523e
-DIST visualvm-2.1.2.tar.gz 36393559 BLAKE2B ba925ddacfb1474f47d0ab393c7f8f14d18e12ef25aef82efd59a273eb8464d8758e0cc82cf41238b0356546dd03fed319b8c04366c4037fa99251d358f5e1c2 SHA512 f324bdec570f050c3df3d047cf9ab9e8565ed95150d1bcb5d86166aa221d0a3c55a2c3cdb345ddbf42b9cef35cb6a21033ed24fd203c0dbb67d2f8dc2b5f2960
 DIST visualvm-2.1.6.tar.gz 11610216 BLAKE2B 60e87e1219cd1f39bd8d86ec35d07f4298f8378f3c16354570c8f3422cf7e4a3ed42d0a88d8d33290d226a8d92ec9eea3cf85713281c826aafb7610b1e0b42ca SHA512 3257b1890aab185aa28e226679bc78858f154022d49c8a4dd2ee2a5ec04afc4a5ac9633248f1aa1abcb8a457f5e612f223f4a03fdd54e6b8beb329c79dd0574c
-EBUILD visualvm-2.1.2.ebuild 3010 BLAKE2B 2908c91fd3f7e577e009114e102e193a6fd16ff626814f7afe1286d8e0af9d1696fe44c612bfc6300fb9aacef911aa2372221ba776294dd6f0d052671d4d4dc9 SHA512 5acaa9e212caf5066f25aed0b2a15fe5152c6fb440320ecd9bc89d963db59d88b107e6cb37ff6c72a1eb763951c5d06070b62e4749d94b56f98541b656045d81
-EBUILD visualvm-2.1.6.ebuild 4694 BLAKE2B d0da6458ca3f511338fab9d1b599351b2ee6ab9d8c8cb3c0cd82604fe6f1946672ab3b25de2e9f6f84ac26b21cf2d014dc448da34d3e73235e20211ea7c58377 SHA512 9a777785d88a6c74f11abefd3d2f10ce1269e9068627cdf2b5f32e2b96c5c7753333c21dfe7f69ec282e3bacce6789245ddbe63b1bafbc4d886350960d2143be
+EBUILD visualvm-2.1.6.ebuild 4721 BLAKE2B ee94c9db901f6e429373d196dfbdec6dd2af060a30af02e6a8331f4073eff18567ca0f17df2fcc44fe0339a68f2fcd01dc2b5ef200117bc1de16817811aaee18 SHA512 e32b9fae1a17669d38c7f75c24ad324b93bb47fa1c05781271ea62364a0c5b5d5a285f2d61e83eb35643938740a4e8a529c2703ff746e3a0a3126e7f17ff0e8e
 MISC metadata.xml 317 BLAKE2B e5f32379a40e3c2180df4f3ac4e7ea03a7dbfe69b1cb6537c1693262cc06e6334959abfb68f888c588fa933f60e85f137355bb57ff769107dfe805595d1a3ad1 SHA512 605d7206793c3d865547b69f9715305d46d433d18096b886b362d2d86adf4eda894c23af1819b6af95423fbe2a37781d1d100a9df9f15a01942f66c73dc2fa2c
diff --git a/dev-util/visualvm/visualvm-2.1.2.ebuild b/dev-util/visualvm/visualvm-2.1.2.ebuild
deleted file mode 100644
index b05bacf59f27..000000000000
--- a/dev-util/visualvm/visualvm-2.1.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 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.6.ebuild b/dev-util/visualvm/visualvm-2.1.6.ebuild
index 2724f40cf8be..084537d66f3d 100644
--- a/dev-util/visualvm/visualvm-2.1.6.ebuild
+++ b/dev-util/visualvm/visualvm-2.1.6.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
 HOMEPAGE="https://visualvm.github.io"
 
 SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/oracle/${PN}/releases/download/2.1.5/${NBZ}
+	https://github.com/oracle/${PN}/releases/download/$(ver_cut 1-2).5/${NBZ}
 	https://repo1.maven.org/maven2/org/openjdk/jmc/flightrecorder/${FLIGHT_RECORDER_VERSION}/${FLIGHT_RECORDER_FILE}
 	https://repo1.maven.org/maven2/org/openjdk/jmc/common/${COMMON_VERSION}/${COMMON_FILE}
 	https://repo1.maven.org/maven2/org/owasp/encoder/encoder/${ENCODER_VERSION}/${ENCODER_FILE}"
@@ -85,7 +85,8 @@ src_prepare() {
 		ln -s "${DISTDIR}/${file}" jfr.generic/external/ || die "Failed to link file ${file}"
 	done
 
-	java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} || die "Failed to link lz4 java jar"
+	java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} \
+		|| die "Failed to link lz4 java jar"
 }
 
 src_install() {
@@ -96,9 +97,12 @@ src_install() {
 	# 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"
+	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"
 
 	# replace bundled stuff
 	pushd "${ED}/${INSTALL_DIR}/platform/core" > /dev/null || die