From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/netbeans-nb/Manifest | 7 -- .../netbeans-nb/files/7.2/keychain-support.patch | 26 ----- .../netbeans-nb/files/8.0/keychain-support.patch | 26 ----- dev-java/netbeans-nb/metadata.xml | 12 --- dev-java/netbeans-nb/netbeans-nb-8.2.ebuild | 114 --------------------- 5 files changed, 185 deletions(-) delete mode 100644 dev-java/netbeans-nb/Manifest delete mode 100644 dev-java/netbeans-nb/files/7.2/keychain-support.patch delete mode 100644 dev-java/netbeans-nb/files/8.0/keychain-support.patch delete mode 100644 dev-java/netbeans-nb/metadata.xml delete mode 100644 dev-java/netbeans-nb/netbeans-nb-8.2.ebuild (limited to 'dev-java/netbeans-nb') diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest deleted file mode 100644 index c69bd78f4c52..000000000000 --- a/dev-java/netbeans-nb/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX 7.2/keychain-support.patch 872 BLAKE2B b03371474ee9153bd9d2d1008089e1c1730b393ecefd7a89747f1a5e4fef396d2a927cb64fb05512002ff2faa795d1055fb92cda969f5ec2041b07ca5ad9c5eb SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 -AUX 8.0/keychain-support.patch 872 BLAKE2B b03371474ee9153bd9d2d1008089e1c1730b393ecefd7a89747f1a5e4fef396d2a927cb64fb05512002ff2faa795d1055fb92cda969f5ec2041b07ca5ad9c5eb SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 -DIST netbeans-7.0.png 20011 BLAKE2B f502517c7495b888f4942ae0aa7ea5206205ecadf13ffb5abb7470abeaf27db84dd5a8ff39e540c3da701c3e56f6ba196933f00ba38aa13d022e5b4d0cc19eaf SHA512 67bc2673f3e770bbde10587e68890c3091ef38a850cdf48ca73e4c1a288246e1f757fd4ef1c7b052b6137f31fa6044c9bf3ea5a2a9e0ceaede132c106a746113 -DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 -DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 -EBUILD netbeans-nb-8.2.ebuild 3738 BLAKE2B 775f43c9e5ef5ecd71615e9ff5b13a2338a828b02e31d3fcf9d99176011d342c98f69e478e1235ebb830088b4e9d50b9c1866c398c04fb0f93d857a3a9ebb473 SHA512 729097b8a574ea971c8010adb3387aa3f4a54773f565fc735ed8ccaf6294cba8254f2c325734c7d7f9d1cf16cf1f9bc9d7ca5cb323294eb541b8f16442bdfb3c -MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 diff --git a/dev-java/netbeans-nb/files/7.2/keychain-support.patch b/dev-java/netbeans-nb/files/7.2/keychain-support.patch deleted file mode 100644 index 4e9c4878fbcc..000000000000 --- a/dev-java/netbeans-nb/files/7.2/keychain-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8 -diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans ---- a/ide/launcher/unix/netbeans Tue Nov 09 13:44:15 2010 +0100 -+++ b/ide/launcher/unix/netbeans Tue Nov 09 14:21:18 2010 +0100 -@@ -169,6 +169,20 @@ - then - sh=/bin/bash - fi -+ keychain=`which keychain` -+ if [ -n "$keychain" ]; then -+ $keychain -q -+ . $HOME/.keychain/$HOSTNAME-sh -+ if [ -e $userdir/keychain-keys.txt ]; then -+ for key in `cat $userdir/keychain-keys.txt`; do -+ SSH_ASKPASS=`which x11-ssh-askpass` -+ export SSH_ASKPASS -+ if [ -n "$key" ]; then -+ keychain $key -+ fi -+ done -+ fi -+ fi - if [ "${founduserdir}" = "yes" ]; then - exec $sh "$nbexec" "$@" - else diff --git a/dev-java/netbeans-nb/files/8.0/keychain-support.patch b/dev-java/netbeans-nb/files/8.0/keychain-support.patch deleted file mode 100644 index 4e9c4878fbcc..000000000000 --- a/dev-java/netbeans-nb/files/8.0/keychain-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8 -diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans ---- a/ide/launcher/unix/netbeans Tue Nov 09 13:44:15 2010 +0100 -+++ b/ide/launcher/unix/netbeans Tue Nov 09 14:21:18 2010 +0100 -@@ -169,6 +169,20 @@ - then - sh=/bin/bash - fi -+ keychain=`which keychain` -+ if [ -n "$keychain" ]; then -+ $keychain -q -+ . $HOME/.keychain/$HOSTNAME-sh -+ if [ -e $userdir/keychain-keys.txt ]; then -+ for key in `cat $userdir/keychain-keys.txt`; do -+ SSH_ASKPASS=`which x11-ssh-askpass` -+ export SSH_ASKPASS -+ if [ -n "$key" ]; then -+ keychain $key -+ fi -+ done -+ fi -+ fi - if [ "${founduserdir}" = "yes" ]; then - exec $sh "$nbexec" "$@" - else diff --git a/dev-java/netbeans-nb/metadata.xml b/dev-java/netbeans-nb/metadata.xml deleted file mode 100644 index 85f4d904aad0..000000000000 --- a/dev-java/netbeans-nb/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - fordfrog@gentoo.org - Miroslav Šulc - - - java@gentoo.org - Java - - diff --git a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild deleted file mode 100644 index 9025ef03d113..000000000000 --- a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Netbeans IDE Branding" -HOMEPAGE="http://netbeans.org/" -SLOT="8.2" -SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip" -SRC_URI="${SOURCE_URL} - https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 - https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png" -LICENSE="|| ( CDDL GPL-2-with-linking-exception )" -KEYWORDS="amd64 ~x86" -IUSE="" -S="${WORKDIR}" - -CDEPEND="virtual/jdk:1.8 - ~dev-java/netbeans-platform-${PV} - ~dev-java/netbeans-harness-${PV} - ~dev-java/netbeans-ide-${PV}" -DEPEND="${CDEPEND} - app-arch/unzip - dev-java/javahelp:0" -RDEPEND="${CDEPEND}" - -INSTALL_DIR="/usr/share/${PN}-${SLOT}" - -EANT_BUILD_XML="nbbuild/build.xml" -EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build" -EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true" -EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7" -JAVA_PKG_BSFIX="off" - -src_unpack() { - unpack $(basename ${SOURCE_URL}) - - einfo "Deleting bundled jars..." - find -name "*.jar" -type f -delete - - unpack netbeans-8.2-build.xml.patch.bz2 -} - -src_prepare() { - einfo "Deleting bundled class files..." - find -name "*.class" -type f | xargs rm -vf - - eapply netbeans-8.2-build.xml.patch - - einfo "Symlinking external libraries..." - java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar - - einfo "Linking in other clusters..." - mkdir "${S}"/nbbuild/netbeans || die - pushd "${S}"/nbbuild/netbeans >/dev/null || die - - ln -s /usr/share/netbeans-platform-${SLOT} platform || die - cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die - touch nb.cluster.platform.built - - ln -s /usr/share/netbeans-harness-${SLOT} harness || die - cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die - touch nb.cluster.harness.built - - ln -s /usr/share/netbeans-ide-${SLOT} ide || die - cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die - touch nb.cluster.ide.built - popd >/dev/null || die - - java-pkg-2_src_prepare - default -} - -src_install() { - pushd nbbuild/netbeans >/dev/null || die - - insinto ${INSTALL_DIR}/nb - - grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die - - insinto ${INSTALL_DIR} - doins -r nb - dodoc *.txt - dohtml *.html *.css - - insinto ${INSTALL_DIR}/bin - doins bin/netbeans - dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT} - fperms 755 ${INSTALL_DIR}/bin/netbeans - - insinto /etc/netbeans-${SLOT} - doins etc/* - dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc - - # fix paths per bug# 163483 - if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then - sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans - sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans - fi - - dodir /usr/share/icons/hicolor/32x32/apps - dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png - dodir /usr/share/icons/hicolor/128x128/apps - cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die - dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png - - popd >/dev/null || die - - make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development - - mkdir -p "${D}"/${INSTALL_DIR}/nb/config || die - echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die -} -- cgit v1.2.3