gentoo resync : 27.10.2021

2 files changed, 92 insertions, 0 deletions

diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index bd9b096f5a2c..0ed33d311541 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,4 +1,10 @@
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
+DIST common-8.0.1.jar 435506 BLAKE2B e3c0db1691c9f27d39b5d0cad18707cd27e708d74d0db17a13b0ee4ddcc1d96cdd7455a8f5c69d01675434e2789fdb1870d87fffc8eae1776b396cf38c50c723 SHA512 0ee73534f08349c07a0c4c8654526030e634a3aee3175ff3986ad4e37dba0ea3b7d760582c8b612d316cf72f455596c1c50f08e6ddb2d175dc4bb12feba65b22
+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.tar.gz 37175908 BLAKE2B 2bc435b09af9061122eb62a8de4b4b9ce47bb8cc2b7e2bfba57767bee380f6db041ec758a54f5a90e21d9ee3a5e6db5af8c0f89fc347d8e49322caeb07db4233 SHA512 ae662df96224a366c54210b85d6a859fd7412ea6ebbbb4d6a5e6b1a75c04a8060ac08a524d8e58aa9a037ecebf7ada142d9633db389cd5332742a21d26e5ed17
+EBUILD visualvm-2.1.1.ebuild 3011 BLAKE2B 3da7cf81910a072dc9a280d6836815c4f9c00b15657be9db325b4b7e9286bb3ed44f6847054065f0498f1347d921938aac2e22e7abc063d6071df0596439c0a1 SHA512 b4aa0966b24274b65e4f1068b9e780665f215a0f8706dbd678402a34fc78f8462da6d13e67cdbab556efa5a93219531468f692d5c8ee548676a35ad4d69ec056
 EBUILD visualvm-2.1.ebuild 2346 BLAKE2B 83c206de83fb911a40a8a9178d58c29fd2e46d71e7d3e3c005a4c741f8289f0c93c43e55faf4ba1c92d4bf1810a6e5962cc847fd870588670b7cfe8bb63a1395 SHA512 13b79c21cea9f1f5ed0d269604924544b77711b0d0bc597c4d8894b02140b58e9b01498a41c5e603b0fcc521c91fe846eb3526e3e5dd9cad84288910f88aaf07
 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
new file mode 100644
index 000000000000..545104da79b9
--- /dev/null
+++ b/dev-util/visualvm/visualvm-2.1.1.ebuild
@@ -0,0 +1,86 @@
+# 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;"
+}