From e0f8795ef3882deb83feec4ea20ed3009b3f5b21 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Thu, 21 Apr 2011 10:28:10 +0000 Subject: dev-java/netbeans-cnd: bumped to latest version Package-Manager: portage-2.1.9.46/cvs/Linux x86_64 --- dev-java/netbeans-cnd/ChangeLog | 8 +- dev-java/netbeans-cnd/netbeans-cnd-7.0.ebuild | 123 ++++++++++++++++++++++ dev-java/netbeans-cnd/netbeans-cnd-7.0_rc2.ebuild | 123 ---------------------- dev-java/netbeans-java/Manifest | 6 +- 4 files changed, 133 insertions(+), 127 deletions(-) create mode 100644 dev-java/netbeans-cnd/netbeans-cnd-7.0.ebuild delete mode 100644 dev-java/netbeans-cnd/netbeans-cnd-7.0_rc2.ebuild diff --git a/dev-java/netbeans-cnd/ChangeLog b/dev-java/netbeans-cnd/ChangeLog index 191e6e27aa4e..832f4ed76ebb 100644 --- a/dev-java/netbeans-cnd/ChangeLog +++ b/dev-java/netbeans-cnd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/netbeans-cnd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-cnd/ChangeLog,v 1.2 2011/04/08 22:46:10 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-cnd/ChangeLog,v 1.3 2011/04/21 10:28:09 fordfrog Exp $ + +*netbeans-cnd-7.0 (21 Apr 2011) + + 21 Apr 2011; Miroslav Šulc + -netbeans-cnd-7.0_rc2.ebuild, +netbeans-cnd-7.0.ebuild: + Bumped to latest version *netbeans-cnd-7.0_rc2 (08 Apr 2011) diff --git a/dev-java/netbeans-cnd/netbeans-cnd-7.0.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-7.0.ebuild new file mode 100644 index 000000000000..218d7928f062 --- /dev/null +++ b/dev-java/netbeans-cnd/netbeans-cnd-7.0.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-cnd/netbeans-cnd-7.0.ebuild,v 1.1 2011/04/21 10:28:09 fordfrog Exp $ + +EAPI="4" +WANT_ANT_TASKS="ant-nodeps" +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Netbeans CND Cluster" +HOMEPAGE="http://netbeans.org/projects/cnd" +SLOT="7.0" +SOURCE_URL="http://download.netbeans.org/netbeans/7.0/final/zip/netbeans-7.0-201104080000-src.zip" +SRC_URI="${SOURCE_URL} + http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2 + http://hg.netbeans.org/binaries/1C4FB4BD3508F7A787270A3B65E74FBFC624C2CB-cnd-build-trace-1.0.zip + http://hg.netbeans.org/binaries/800BD16807CD1A4348AFD0554D920845134E5D55-cnd-rfs-1.0.zip + http://hg.netbeans.org/binaries/296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip" +LICENSE="|| ( CDDL GPL-2-with-linking-exception )" +KEYWORDS="~amd64 ~x86" +IUSE="" +S="${WORKDIR}" + +CDEPEND="~dev-java/netbeans-dlight-${PV} + ~dev-java/netbeans-harness-${PV} + ~dev-java/netbeans-ide-${PV} + ~dev-java/netbeans-platform-${PV}" +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND} + dev-java/antlr:0[java] + dev-java/antlr:3 + dev-java/javahelp:0 + dev-java/stringtemplate:0" +RDEPEND=">=virtual/jdk-1.6 + ${CDEPEND}" + +INSTALL_DIR="/usr/share/${PN}-${SLOT}" + +EANT_BUILD_XML="nbbuild/build.xml" +EANT_BUILD_TARGET="rebuild-cluster" +EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true" +JAVA_PKG_BSFIX="off" + +src_unpack() { + unpack $(basename ${SOURCE_URL}) + + einfo "Deleting bundled jars..." + find -name "*.jar" -type f -delete + + unpack netbeans-7.0-build.xml-r1.patch.bz2 + + pushd "${S}" >/dev/null || die + ln -s "${DISTDIR}"/1C4FB4BD3508F7A787270A3B65E74FBFC624C2CB-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die + ln -s "${DISTDIR}"/800BD16807CD1A4348AFD0554D920845134E5D55-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die + ln -s "${DISTDIR}"/296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die + popd >/dev/null || die +} + +src_prepare() { + einfo "Deleting bundled class files..." + find -name "*.class" -type f | xargs rm -vf + + epatch netbeans-7.0-build.xml-r1.patch + sed -i "s%%%" cnd.modelimpl/build.xml || die + + # Support for custom patches + if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then + local files=`find "${NETBEANS70_PATCHES_DIR}" -type f` + + if [ -n "${files}" ] ; then + einfo "Applying custom patches:" + + for file in ${files} ; do + epatch "${file}" + done + fi + fi + + einfo "Symlinking external libraries..." + java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar + java-pkg_jar-from --build-only --into libs.antlr3.devel/external antlr-3 antlr3.jar antlr-3.1.3.jar + java-pkg_jar-from --build-only --into libs.antlr3.devel/external antlr antlr.jar antlr-2.7.jar + java-pkg_jar-from --build-only --into libs.antlr3.devel/external stringtemplate stringtemplate.jar stringtemplate-3.2.jar + + einfo "Linking in other clusters..." + mkdir "${S}"/nbbuild/netbeans || die + pushd "${S}"/nbbuild/netbeans >/dev/null || die + + ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die + cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die + touch nb.cluster.dlight.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 + + 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 + + popd >/dev/null || die + + java-pkg-2_src_prepare +} + +src_install() { + pushd nbbuild/netbeans/cnd >/dev/null || die + + insinto ${INSTALL_DIR} + + grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die + + doins -r * + fperms 755 bin/dorun.sh + + popd >/dev/null || die + + dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd +} diff --git a/dev-java/netbeans-cnd/netbeans-cnd-7.0_rc2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-7.0_rc2.ebuild deleted file mode 100644 index a30179859f05..000000000000 --- a/dev-java/netbeans-cnd/netbeans-cnd-7.0_rc2.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-cnd/netbeans-cnd-7.0_rc2.ebuild,v 1.1 2011/04/08 22:46:10 fordfrog Exp $ - -EAPI="4" -WANT_ANT_TASKS="ant-nodeps" -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Netbeans CND Cluster" -HOMEPAGE="http://netbeans.org/projects/cnd" -SLOT="7.0" -SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/rc2/zip/netbeans-7.0rc2-201104070802-src.zip" -SRC_URI="${SOURCE_URL} - http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2 - http://hg.netbeans.org/binaries/1C4FB4BD3508F7A787270A3B65E74FBFC624C2CB-cnd-build-trace-1.0.zip - http://hg.netbeans.org/binaries/800BD16807CD1A4348AFD0554D920845134E5D55-cnd-rfs-1.0.zip - http://hg.netbeans.org/binaries/296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip" -LICENSE="|| ( CDDL GPL-2-with-linking-exception )" -KEYWORDS="~amd64 ~x86" -IUSE="" -S="${WORKDIR}" - -CDEPEND="~dev-java/netbeans-dlight-${PV} - ~dev-java/netbeans-harness-${PV} - ~dev-java/netbeans-ide-${PV} - ~dev-java/netbeans-platform-${PV}" -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - ${CDEPEND} - dev-java/antlr:0[java] - dev-java/antlr:3 - dev-java/javahelp:0 - dev-java/stringtemplate:0" -RDEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" - -INSTALL_DIR="/usr/share/${PN}-${SLOT}" - -EANT_BUILD_XML="nbbuild/build.xml" -EANT_BUILD_TARGET="rebuild-cluster" -EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true" -JAVA_PKG_BSFIX="off" - -src_unpack() { - unpack $(basename ${SOURCE_URL}) - - einfo "Deleting bundled jars..." - find -name "*.jar" -type f -delete - - unpack netbeans-7.0-build.xml-r1.patch.bz2 - - pushd "${S}" >/dev/null || die - ln -s "${DISTDIR}"/1C4FB4BD3508F7A787270A3B65E74FBFC624C2CB-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die - ln -s "${DISTDIR}"/800BD16807CD1A4348AFD0554D920845134E5D55-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die - ln -s "${DISTDIR}"/296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die - popd >/dev/null || die -} - -src_prepare() { - einfo "Deleting bundled class files..." - find -name "*.class" -type f | xargs rm -vf - - epatch netbeans-7.0-build.xml-r1.patch - sed -i "s%%%" cnd.modelimpl/build.xml || die - - # Support for custom patches - if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then - local files=`find "${NETBEANS70_PATCHES_DIR}" -type f` - - if [ -n "${files}" ] ; then - einfo "Applying custom patches:" - - for file in ${files} ; do - epatch "${file}" - done - fi - fi - - einfo "Symlinking external libraries..." - java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar - java-pkg_jar-from --build-only --into libs.antlr3.devel/external antlr-3 antlr3.jar antlr-3.1.3.jar - java-pkg_jar-from --build-only --into libs.antlr3.devel/external antlr antlr.jar antlr-2.7.jar - java-pkg_jar-from --build-only --into libs.antlr3.devel/external stringtemplate stringtemplate.jar stringtemplate-3.2.jar - - einfo "Linking in other clusters..." - mkdir "${S}"/nbbuild/netbeans || die - pushd "${S}"/nbbuild/netbeans >/dev/null || die - - ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die - cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die - touch nb.cluster.dlight.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 - - 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 - - popd >/dev/null || die - - java-pkg-2_src_prepare -} - -src_install() { - pushd nbbuild/netbeans/cnd >/dev/null || die - - insinto ${INSTALL_DIR} - - grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die - - doins -r * - fperms 755 bin/dorun.sh - - popd >/dev/null || die - - dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd -} diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest index 6120b847ad15..e6c38d4f58de 100644 --- a/dev-java/netbeans-java/Manifest +++ b/dev-java/netbeans-java/Manifest @@ -18,8 +18,8 @@ DIST C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip 5029407 RM DIST D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip 4054621 RMD160 8d410595e912d2a8d30a0bdfbdf83413692a4269 SHA1 d88a41174c5f85d1b791d6a8e0f8b8a1c459d6c0 SHA256 5901b2a23c80f2669016697aadf27fefd8350fdd5cc876f8e979d5aac92a857e DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 RMD160 7034dd5c48bcf6e44a1de417206f799c942b9f11 SHA1 f7bd95641780c2aae8cb9bed1686441a1ce5e749 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0 DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160 97e4e22e7d9a1c9731bac89252399a560d9c3dbf SHA1 ff23dbb427d09aaec3998b50d740c42b6a3fcd61 SHA256 4dea45582ff69620a906347fc1b085bb1cffb75e215cb55ec74181ae240a5be4 +DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f -DIST netbeans-7.0rc2-201104070802-src.zip 175506560 RMD160 177be805a1b8221a32699bcfeeb3f4fea93196a7 SHA1 52357e1db6f4a3828e7db1a989e0375618b84f0e SHA256 afd102c9ad247b3794d49bd22bdb0b8376dacff5605dd0b997fc354759a8259c -EBUILD netbeans-java-7.0_rc2.ebuild 15007 RMD160 66ef3a269ed5f7a35704a02d1622716eabe2d332 SHA1 6bed58cf5a4cb25722c3749346990672a4cb7116 SHA256 c83d43b58c88257efd688180d738228d69f999bf3e0f5c31b15544e9e4f9fd9f -MISC ChangeLog 548 RMD160 0f128bc52a221041caa04e5867c6c9cc38e3c2cf SHA1 befa1ba51b945c6a8bd52a6c89256592f3bd28c8 SHA256 99a6e9a1f03580d996d685221a0ecc6db1d6be98bf8f413fb8bc3a4e0ae168e6 +EBUILD netbeans-java-7.0.ebuild 14998 RMD160 49c2e5fbd8cc451d9afb433369dceedc24f97dcf SHA1 9d97398f46916a7cbf6915a957603cf58e20c8f9 SHA256 ddeb67955152c5b77ce1f85c4fd0b69d32f710c2efe2d660c7be57f84f3bd472 +MISC ChangeLog 722 RMD160 62cf5e0fa7d6fb58015dd98c00fd34d32ee7b65b SHA1 3855f6bae2b3ce95c5737b26a6431ce5d1cbdc49 SHA256 e44736c6bdd252b21e5ef26b8010bf6b5e0e8058535d6a1740adc19a133ea06e MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 -- cgit v1.2.3-65-gdbad