From d490c619d9f9ee244cbe7083743a8118508e197e Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Tue, 4 Jun 2024 12:06:57 +0200 Subject: dev-util/netbeans-standalone: bump to 22, dropped 20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Šulc --- dev-util/netbeans-standalone/Manifest | 4 +- .../netbeans-standalone-20.ebuild | 116 --------------------- .../netbeans-standalone-22.ebuild | 116 +++++++++++++++++++++ .../netbeans-standalone-9999.ebuild | 10 +- 4 files changed, 123 insertions(+), 123 deletions(-) delete mode 100644 dev-util/netbeans-standalone/netbeans-standalone-20.ebuild create mode 100644 dev-util/netbeans-standalone/netbeans-standalone-22.ebuild diff --git a/dev-util/netbeans-standalone/Manifest b/dev-util/netbeans-standalone/Manifest index 471b0a980..f379563af 100644 --- a/dev-util/netbeans-standalone/Manifest +++ b/dev-util/netbeans-standalone/Manifest @@ -1,7 +1,7 @@ AUX fix-private-debugger-access.patch 1621 BLAKE2B f3124edee73f31445a6093129a1de8a614991115dc5df39b794fbaad09ec64f7b7114faf4057906da4a0b5a17911e30ab774e6e49e14a3ee46dccbed13735f57 SHA512 b2fe14770733c5b9c53f18fdc5c001add901ff1b28755ae960ffb72ae6106fd930a832f2857e00e96c88f58d3339223b0321ee6474507b6c3c3b3739a807df19 -DIST netbeans-20-source.zip 149519565 BLAKE2B 12958288ca89e2c2ce29e76f82f31afebe5c8000aba7d47aab8c5dd7435b1d3b53c33eaefd5dc559aaf122f4bc3e6cd429924686b111dce4f952e0b24ac65d96 SHA512 e795875918022541354213b03d7c4515db81c384f43d0b87029666583064e3093ca1a6ebe8f6ffa633c62d02a551be8df52703dfefb830efb8654558ddec5f28 DIST netbeans-21-source.zip 151092333 BLAKE2B 27e3e73000a3ccbd396bea6e7484d919e0d90a7afc5bc8c3b737f998c41dae2fafc115311ea59ea98ed787866f0ea32455906a493e7ff2372ce725969775a040 SHA512 60533839fe9513e7e4b6f0f8ced77f076a28b89aa3fcc4ea4487a633263d906b8c32b11e8ad4470a820c3a66e795eeb42fb0eda10645414424739a408312bfe5 -EBUILD netbeans-standalone-20.ebuild 5156 BLAKE2B 3b5f2f268228ffe018e2b8ba95947530c95bc378c70f31dc538dc4a646a6d1de56af7a7de0f610aa5f7aee5dcbb2e5b6a58fe35ca62a5ed718408949faaa4ebf SHA512 b24c365b03e097fe0cf990e06db3fb2bd82fa097c2e6235d79d36681f11de765d0443e0be116bc3026cf5be6db7380ecdfa1221b3146c2cca0ce05b92d9dc67b +DIST netbeans-standalone-22.tar.gz 85819504 BLAKE2B 565ab8c6ce48d0a5ad57e75bd0bf2c023d7a36a0a416abfd7d8b2d18e0dc02817775aeec3420426409db8f66fa7ce48a7f756cb2e59196b426f0bf5f43a03242 SHA512 c12bb5cff6b1c52cd1bc978cf2e2d9877113c0e0ef3675c1924d27ac8c389e294737132320b7699a5238da39f9410bc1e1420471f61f36ee8d87af2579d2f597 EBUILD netbeans-standalone-21.ebuild 5156 BLAKE2B 3b5f2f268228ffe018e2b8ba95947530c95bc378c70f31dc538dc4a646a6d1de56af7a7de0f610aa5f7aee5dcbb2e5b6a58fe35ca62a5ed718408949faaa4ebf SHA512 b24c365b03e097fe0cf990e06db3fb2bd82fa097c2e6235d79d36681f11de765d0443e0be116bc3026cf5be6db7380ecdfa1221b3146c2cca0ce05b92d9dc67b +EBUILD netbeans-standalone-22.ebuild 5186 BLAKE2B bfbd9521c95967d23b9c73beabbc964a74ba73d1b854c0578e6634da3142ecf896e63b0e36e46c618b862328075a14f85ba5599116369784a2ee9db8a60a4a49 SHA512 868805294d22cd036e03a0a4d44dc66b0286ad85efa02bf37a09f93663016b7e42089729c845926e5f31ca3314d58bb77805ae52da9b12b2238770ed366b4d0d EBUILD netbeans-standalone-9999.ebuild 5130 BLAKE2B 0fb45764b1315ea198ed8c3011d3a525eba2d81f6f833a68ab74858505973c793c57fc5660c53d3a834d3b9b1bf48f7b52fff656bbbf6712f57b9891123e7bf4 SHA512 b862802398dd1cd09df6121ec7e409f158a1eb8aab716a115f6cb8994ca60571483a3f85723c5250ae2db25dac4815c5354d1a26b0411b4da1f196e9a089160c MISC metadata.xml 338 BLAKE2B 25922d9e4c7c4cd111db8b96e1dcb3cf026d9262b9d0861a4bcd49009303fc8535afd370e301d3f51f3127516c3b2561d6d6f56de0433a835f85fa15d1ab5012 SHA512 b7525dac3a4947550c33f096550e82644ed8a790e915a66ee627f81727f58fcbf0a055f298f8b45ee8d08da747fec79a8276a96ce0dcc43b847341166fbea4e9 diff --git a/dev-util/netbeans-standalone/netbeans-standalone-20.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-20.ebuild deleted file mode 100644 index 62a5375f8..000000000 --- a/dev-util/netbeans-standalone/netbeans-standalone-20.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [ ${PV} = "9999" ]; then - EGIT_REPO_URI="https://github.com/apache/netbeans.git" -else - KEYWORDS="~amd64" - SRC_URI="mirror://apache/netbeans/netbeans/${PV}/netbeans-${PV}-source.zip" - S="${WORKDIR}" -fi - -inherit java-pkg-2 java-ant-2 desktop xdg $([[ ${PV} = "9999" ]] && echo git-r3) - -DESCRIPTION="Apache Netbeans IDE" -HOMEPAGE="https://netbeans.apache.org/" -LICENSE="Apache-2.0" -SLOT="$(ver_cut 1-1)" -IUSE="" - -DEPEND=" - dev-java/ant[bsf] - >=virtual/jdk-11:* -" -RDEPEND=">=virtual/jdk-11" - -JAVA_PKG_BSFIX="off" -INSTALL_DIR=/usr/share/${PN}-${SLOT} - -pkg_pretend() { - if has network-sandbox ${FEATURES}; then - eerror - eerror "Netbeans downloads a lot of dependencies during the build" - eerror "process, so you need to disable network-sandbox feature" - eerror "to make this ebuild proceed (FEATURES=-network-sandbox)." - eerror "You can also use package.env to disable this feature" - eerror "for the package, see:" - eerror - eerror " https://wiki.gentoo.org/wiki//etc/portage/package.env" - eerror - die "network-sandbox is enabled, disable it to proceed"; - fi -} - -src_prepare() { - default -} - -src_compile() { - GRADLE_USER_HOME="${HOME}/.gradle" eant -Dcluster.config=full -Dpermit.jdk9.builds=true -Dbinaries.cache="${S}"/.hgexternalcache || die "Failed to compile" -} - -QA_PREBUILT=" - usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/process_start - usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/stat - usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/pty_open - usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/sigqueue - usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/unbuffer.so - usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/killall - usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/pty - usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so - usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so - usr/share/netbeans-standalone-11/profiler/lib/deployed/cvm/linux/libprofilerinterface_g.so - usr/share/netbeans-standalone-11/profiler/lib/deployed/cvm/linux/libprofilerinterface.so - usr/share/netbeans-standalone-11/platform/modules/lib/amd64/linux/libjnidispatch-440.so - usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so -" - -src_install() { - pushd nbbuild/netbeans >/dev/null || die - - insinto ${INSTALL_DIR} - doins -r . - - rm -fr "${ED}"/${INSTALL_DIR}/ide/bin/nativeexecution/{Linux-{sparc_64,x86},MacOSX-{x86_64,x86},SunOS-{sparc,sparc_64,x86,x86_64},Windows-{x86,x86_64}} || die "Failed to remove unused binaries" - find "${ED}"/${INSTALL_DIR}/ \( -name *.exe -o -name *.cmd -o -name *.bat \) -type f -exec rm {} + || die "Failed to remove unused binaries" - rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/jdk15/{hpux-pa_risc2.0{,w},linux,mac,solaris-{amd64,i386,sparc{,v9}},windows{,-amd64}} || die "Failed to remove unused libraries" - rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/jdk16/{hpux-pa_risc2.0{,w},linux{,-arm,-arm-vfp-hflt},mac,solaris-{amd64,i386,sparc{,v9}},windows{,-amd64}} || die "Failed to remove unused libraries" - rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/cvm/windows || die "Failed to remove unused libraries" - rm -fr "${ED}"/${INSTALL_DIR}/platform/modules/lib/{i386,x86} || die "Failed to remove unused libraries" - find "${ED}"/${INSTALL_DIR}/ -name *.dll -type f -exec rm {} + || die "Failed to remove unused libraries" - - find "${ED}/${INSTALL_DIR}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed" - exeinto ${INSTALL_DIR}/ide/bin/nativeexecution/Linux-x86_64/ - doexe ide/bin/nativeexecution/Linux-x86_64/{process_start,stat,pty_open,sigqueue,killall,pty} - exeinto ${INSTALL_DIR}/java/maven/bin - doexe java/maven/bin/mvn{,Debug,yjp} - exeinto ${INSTALL_DIR}/extide/ant/bin - doexe extide/ant/bin/{ant{,Run,Run.pl},complete-ant-cmd.pl,runant.{pl,py}} - - dodoc DEPENDENCIES NOTICE - dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/${PN}-${SLOT} - fperms 755 ${INSTALL_DIR}/bin/netbeans - - insinto /etc/${PN}-${SLOT} - doins etc/* - rm -fr "${ED}"/${INSTALL_DIR}/etc - dosym ../../../../etc/${PN}-${SLOT} ${INSTALL_DIR}/etc - sed -i -e "s/#netbeans_jdkhome.*/netbeans_jdkhome=\$\(java-config -O\)/g" "${ED}"/etc/${PN}-${SLOT}/netbeans.conf || die "Failed to set set Netbeans JDK home" - - if [[ -e "${ED}"/${INSTALL_DIR}/bin/netbeans ]]; then - sed -i -e "s:\"\$progdir\"/../etc/:/etc/${PN}-${SLOT}/:" "${ED}"/${INSTALL_DIR}/bin/netbeans - sed -i -e "s:\"\${userdir}\"/etc/:/etc/${PN}-${SLOT}/:" "${ED}"/${INSTALL_DIR}/bin/netbeans - fi - - dodir /usr/share/icons/hicolor/32x32/apps - dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/${PN}-${SLOT}.png - - popd >/dev/null || die - - make_desktop_entry ${PN}-${SLOT} "Netbeans ${PV}" ${PN}-${SLOT} Development - - mkdir -p "${ED}"/${INSTALL_DIR}/nb/config || die - echo "NBGNT" > "${ED}"/${INSTALL_DIR}/nb/config/productid || die -} diff --git a/dev-util/netbeans-standalone/netbeans-standalone-22.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-22.ebuild new file mode 100644 index 000000000..58f822b85 --- /dev/null +++ b/dev-util/netbeans-standalone/netbeans-standalone-22.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [ ${PV} = "9999" ]; then + EGIT_REPO_URI="https://github.com/apache/netbeans.git" +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/apache/netbeans/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/netbeans-${PV}" +fi + +inherit java-pkg-2 java-ant-2 desktop xdg $([[ ${PV} = "9999" ]] && echo git-r3) + +DESCRIPTION="Apache Netbeans IDE" +HOMEPAGE="https://netbeans.apache.org/" +LICENSE="Apache-2.0" +SLOT="$(ver_cut 1-1)" +IUSE="" + +DEPEND=" + dev-java/ant[bsf] + >=virtual/jdk-11:* +" +RDEPEND=">=virtual/jdk-11" + +JAVA_PKG_BSFIX="off" +INSTALL_DIR=/usr/share/${PN}-${SLOT} + +pkg_pretend() { + if has network-sandbox ${FEATURES}; then + eerror + eerror "Netbeans downloads a lot of dependencies during the build" + eerror "process, so you need to disable network-sandbox feature" + eerror "to make this ebuild proceed (FEATURES=-network-sandbox)." + eerror "You can also use package.env to disable this feature" + eerror "for the package, see:" + eerror + eerror " https://wiki.gentoo.org/wiki//etc/portage/package.env" + eerror + die "network-sandbox is enabled, disable it to proceed"; + fi +} + +src_prepare() { + default +} + +src_compile() { + GRADLE_USER_HOME="${HOME}/.gradle" eant -Dcluster.config=full -Dpermit.jdk9.builds=true -Dbinaries.cache="${S}"/.hgexternalcache || die "Failed to compile" +} + +QA_PREBUILT=" + usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/process_start + usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/stat + usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/pty_open + usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/sigqueue + usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/unbuffer.so + usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/killall + usr/share/netbeans-standalone-11/ide/bin/nativeexecution/Linux-x86_64/pty + usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so + usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so + usr/share/netbeans-standalone-11/profiler/lib/deployed/cvm/linux/libprofilerinterface_g.so + usr/share/netbeans-standalone-11/profiler/lib/deployed/cvm/linux/libprofilerinterface.so + usr/share/netbeans-standalone-11/platform/modules/lib/amd64/linux/libjnidispatch-440.so + usr/share/netbeans-standalone-11/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so +" + +src_install() { + pushd nbbuild/netbeans >/dev/null || die + + insinto ${INSTALL_DIR} + doins -r . + + rm -fr "${ED}"/${INSTALL_DIR}/ide/bin/nativeexecution/{Linux-{sparc_64,x86},MacOSX-{x86_64,x86},SunOS-{sparc,sparc_64,x86,x86_64},Windows-{x86,x86_64}} || die "Failed to remove unused binaries" + find "${ED}"/${INSTALL_DIR}/ \( -name *.exe -o -name *.cmd -o -name *.bat \) -type f -exec rm {} + || die "Failed to remove unused binaries" + rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/jdk15/{hpux-pa_risc2.0{,w},linux,mac,solaris-{amd64,i386,sparc{,v9}},windows{,-amd64}} || die "Failed to remove unused libraries" + rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/jdk16/{hpux-pa_risc2.0{,w},linux{,-arm,-arm-vfp-hflt},mac,solaris-{amd64,i386,sparc{,v9}},windows{,-amd64}} || die "Failed to remove unused libraries" + rm -fr "${ED}"/${INSTALL_DIR}/profiler/lib/deployed/cvm/windows || die "Failed to remove unused libraries" + rm -fr "${ED}"/${INSTALL_DIR}/platform/modules/lib/{i386,x86} || die "Failed to remove unused libraries" + find "${ED}"/${INSTALL_DIR}/ -name *.dll -type f -exec rm {} + || die "Failed to remove unused libraries" + + find "${ED}/${INSTALL_DIR}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed" + exeinto ${INSTALL_DIR}/ide/bin/nativeexecution/Linux-x86_64/ + doexe ide/bin/nativeexecution/Linux-x86_64/{process_start,stat,pty_open,sigqueue,killall,pty} + exeinto ${INSTALL_DIR}/java/maven/bin + doexe java/maven/bin/mvn{,Debug,yjp} + exeinto ${INSTALL_DIR}/extide/ant/bin + doexe extide/ant/bin/{ant{,Run,Run.pl},complete-ant-cmd.pl,runant.{pl,py}} + + dodoc DEPENDENCIES NOTICE + dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/${PN}-${SLOT} + fperms 755 ${INSTALL_DIR}/bin/netbeans + + insinto /etc/${PN}-${SLOT} + doins etc/* + rm -fr "${ED}"/${INSTALL_DIR}/etc + dosym ../../../../etc/${PN}-${SLOT} ${INSTALL_DIR}/etc + sed -i -e "s/#netbeans_jdkhome.*/netbeans_jdkhome=\$\(java-config -O\)/g" "${ED}"/etc/${PN}-${SLOT}/netbeans.conf || die "Failed to set set Netbeans JDK home" + + if [[ -e "${ED}"/${INSTALL_DIR}/bin/netbeans ]]; then + sed -i -e "s:\"\$progdir\"/../etc/:/etc/${PN}-${SLOT}/:" "${ED}"/${INSTALL_DIR}/bin/netbeans + sed -i -e "s:\"\${userdir}\"/etc/:/etc/${PN}-${SLOT}/:" "${ED}"/${INSTALL_DIR}/bin/netbeans + fi + + dodir /usr/share/icons/hicolor/32x32/apps + dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/${PN}-${SLOT}.png + + popd >/dev/null || die + + make_desktop_entry ${PN}-${SLOT} "Netbeans ${PV}" ${PN}-${SLOT} Development + + mkdir -p "${ED}"/${INSTALL_DIR}/nb/config || die + echo "NBGNT" > "${ED}"/${INSTALL_DIR}/nb/config/productid || die +} diff --git a/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild b/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild index d96ffa7c9..58f822b85 100644 --- a/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild +++ b/dev-util/netbeans-standalone/netbeans-standalone-9999.ebuild @@ -7,8 +7,8 @@ if [ ${PV} = "9999" ]; then EGIT_REPO_URI="https://github.com/apache/netbeans.git" else KEYWORDS="~amd64" - SRC_URI="mirror://apache/netbeans/netbeans/${PV}/netbeans-${PV}-source.zip" - S="${WORKDIR}" + SRC_URI="https://github.com/apache/netbeans/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/netbeans-${PV}" fi inherit java-pkg-2 java-ant-2 desktop xdg $([[ ${PV} = "9999" ]] && echo git-r3) @@ -21,9 +21,9 @@ IUSE="" DEPEND=" dev-java/ant[bsf] - >=virtual/jdk-17:* + >=virtual/jdk-11:* " -RDEPEND=">=virtual/jdk-17" +RDEPEND=">=virtual/jdk-11" JAVA_PKG_BSFIX="off" INSTALL_DIR=/usr/share/${PN}-${SLOT} @@ -48,7 +48,7 @@ src_prepare() { } src_compile() { - GRADLE_USER_HOME="${HOME}/.gradle" eant -Dcluster.config=full -Dbinaries.cache="${S}"/.hgexternalcache || die "Failed to compile" + GRADLE_USER_HOME="${HOME}/.gradle" eant -Dcluster.config=full -Dpermit.jdk9.builds=true -Dbinaries.cache="${S}"/.hgexternalcache || die "Failed to compile" } QA_PREBUILT=" -- cgit v1.2.3-65-gdbad