diff options
Diffstat (limited to 'dev-util/visualvm')
| -rw-r--r-- | dev-util/visualvm/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/visualvm/visualvm-2.1.8.ebuild (renamed from dev-util/visualvm/visualvm-2.1.7-r1.ebuild) | 27 |
2 files changed, 21 insertions, 11 deletions
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest index af563b04004c..caec3f4cb377 100644 --- a/dev-util/visualvm/Manifest +++ b/dev-util/visualvm/Manifest @@ -1,2 +1,3 @@ -DIST nb140_platform_20230511.zip 25886135 BLAKE2B 1b40f39dcb3d89cc91d2e90b5df87d393344606fb97f073630a7d160ab5ed35ba31966c4960ff3c657a75375b518f1667e2fca597626192e8cdc1dabfec1a63d SHA512 9781af27d4492dc84d65b9bc8bbda0ad42c22e32c29e14c6a55c4d94650d20798ee7a7fccf83150c88e7c428b8626c1767b21a1af230bc035496e65512d36442 -DIST visualvm-2.1.7.tar.gz 11617370 BLAKE2B 3a6bdffbbfa63de2290551a285c78f28239367163b71ffa8d8b9660cc149463c2aa85fdad028f35c25da640e8d2374aee56a8a572bdc90116e14bdad95b24e58 SHA512 3164021ecb4f65a0d263f76f9644e0563c97903bc1cb046bd5c9a99ee3b6fc6a0adeb048b65ff7f7599cd13c8744aa927622f3c28cb1db815af22bc99272d22c +DIST nashorn-core-15.4.jar 2167292 BLAKE2B f40349e9f369eed1bb3795622ffe9353c98f35df1d5c2f5f3845d8f1fd5ecea553e11da15d17b9083f6ae2efa4485df131a9a9216499f1c7d440ca4b1d772a2b SHA512 3b560e1ae67d5d5d19250849dee3f813d2c801e56ba85d90439a067378a47f95020910da85b7c8afb6675ea2e25cd274953483efd07e89097656aadc804c8020 +DIST nb190_platform_20231030.zip 26056691 BLAKE2B 7815c08ad60515e8018336452e24c2fb0743d1ef48c58ffd80d371000fa664f8f0053a4c1d56a012b9e50f6714a44c300a915061afebd586f9438abae7867447 SHA512 779256d678c9a13dde4314a5771480c450ae86c49e80ac99eb90a4e9e32e3bc5759128f60a610aecc3ce9e7dbce56b0076b528c8f18a682ebac2dd74cb5a6eea +DIST visualvm-2.1.8.tar.gz 11630256 BLAKE2B 503866654d969ef127455ce6d3c5d087c7543e100cb8bd8712d15dc3d0530ee3fd31ee571837be9dfe99cb01cbf0ebf7a29084cb16b80d9ebbf5ebc2654f945b SHA512 34329db8be5ab6727d1500e4a7bb07af704c6f815912418bd5fa0a872671f53237054c8fc13129124e5bb8c953bc31a47bb7c857962aa9ed080f16d2b6965331 diff --git a/dev-util/visualvm/visualvm-2.1.7-r1.ebuild b/dev-util/visualvm/visualvm-2.1.8.ebuild index 79f02f1b0841..8f7769ac553c 100644 --- a/dev-util/visualvm/visualvm-2.1.7-r1.ebuild +++ b/dev-util/visualvm/visualvm-2.1.8.ebuild @@ -1,19 +1,23 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -NBV=140 -NBT=20230511 +NBV=190 +NBT=20231030 NBZ=nb${NBV}_platform_${NBT}.zip -FLIGHT_RECORDER_VERSION="8.3.0" +ASM_UTIL_VERSION="9.5" +ASM_UTIL_FILE="asm-util-${ASM_UTIL_VERSION}.jar" +FLIGHT_RECORDER_VERSION="8.3.1" FLIGHT_RECORDER_FILE="flightrecorder-${FLIGHT_RECORDER_VERSION}.jar" -COMMON_VERSION="8.3.0" +COMMON_VERSION="8.3.1" COMMON_FILE="common-${COMMON_VERSION}.jar" ENCODER_VERSION="1.2.3" ENCODER_FILE="encoder-${ENCODER_VERSION}.jar" LZ4_JAVA_VERSION="1.8.0" LZ4_JAVA_FILE="lz4-java-${LZ4_JAVA_VERSION}.jar" +NASHORN_CORE_VERSION="15.4" +NASHORN_CORE_FILE="nashorn-core-${NASHORN_CORE_VERSION}.jar" inherit java-pkg-2 java-ant-2 desktop @@ -21,7 +25,9 @@ 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/${PV}/${NBZ}" + https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ} + https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/${NASHORN_CORE_VERSION}/${NASHORN_CORE_FILE}" +S="${WORKDIR}/${P}/${PN}" LICENSE="GPL-2-with-linking-exception" SLOT="7" @@ -51,11 +57,10 @@ DEPEND=" BDEPEND="app-arch/unzip" -S="${WORKDIR}/${P}/${PN}" - QA_PREBUILT=" /usr/share/visualvm/cluster/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so /usr/share/visualvm/cluster/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so + /usr/share/visualvm/platform/modules/lib/libflatlaf-linux-x86_64.so /usr/share/visualvm/platform/modules/lib/aarch64/linux/libjnidispatch-nb.so /usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so /usr/share/visualvm/platform/modules/lib/riscv64/linux/libjnidispatch-nb.so @@ -81,6 +86,9 @@ src_prepare() { -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die # link in external libraries + ln -s "${DISTDIR}/${NASHORN_CORE_FILE}" nashorn.jdk15/external || die "Failed to link nashorn core jar" + java-pkg_jar-from --into nashorn.jdk15/external asm-9 asm-util.jar ${ASM_UTIL_FILE} \ + || die "Failed to link asm util jar" java-pkg_jar-from --into jfr.generic/external jmc jmc-common.jar ${COMMON_FILE} \ || die "Failed to link jmc common jar" java-pkg_jar-from --into jfr.generic/external jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} \ @@ -109,7 +117,7 @@ src_install() { # replace bundled stuff pushd "${ED}/${INSTALL_DIR}/platform/core" > /dev/null || die for name in asm{,-commons,-tree}; do - rm ${name}-9.2.jar && java-pkg_jar-from asm-9 ${name}.jar ${name}-9.2.jar || die + rm ${name}-9.5.jar && java-pkg_jar-from asm-9 ${name}.jar ${name}-9.2.jar || die done popd > /dev/null @@ -127,6 +135,7 @@ src_install() { popd > /dev/null pushd "${ED}/${INSTALL_DIR}/cluster/modules/ext" > /dev/null || die + rm ${ASM_UTIL_FILE} && java-pkg_jar-from asm-9 asm-util.jar ${ASM_UTIL_FILE} || die rm ${COMMON_FILE} && java-pkg_jar-from jmc jmc-common.jar ${COMMON_FILE} || die rm ${FLIGHT_RECORDER_FILE} && java-pkg_jar-from jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} || die rm ${LZ4_JAVA_FILE} && java-pkg_jar-from lz4-java lz4-java.jar ${LZ4_JAVA_FILE} || die |