From 89a07a5de3b7928115e3d580b3604629ad54052a Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Tue, 1 Nov 2011 10:33:03 +0000 Subject: dev-util/netbeans: added missing call to overriden pkg_setup Package-Manager: portage-2.1.10.32/cvs/Linux x86_64 --- dev-util/netbeans/ChangeLog | 8 +- dev-util/netbeans/Manifest | 4 +- dev-util/netbeans/netbeans-7.0.1-r1.ebuild | 250 ---------------------------- dev-util/netbeans/netbeans-7.0.1-r2.ebuild | 252 +++++++++++++++++++++++++++++ 4 files changed, 261 insertions(+), 253 deletions(-) delete mode 100644 dev-util/netbeans/netbeans-7.0.1-r1.ebuild create mode 100644 dev-util/netbeans/netbeans-7.0.1-r2.ebuild (limited to 'dev-util/netbeans') diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index 80805be518f8..74d46858ce8b 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/netbeans # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.159 2011/10/24 23:49:04 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.160 2011/11/01 10:33:03 fordfrog Exp $ + +*netbeans-7.0.1-r2 (01 Nov 2011) + + 01 Nov 2011; Miroslav Šulc -netbeans-7.0.1-r1.ebuild, + +netbeans-7.0.1-r2.ebuild: + Added missing call to overriden pkg_setup (thanks sera) 24 Oct 2011; Miroslav Šulc -files/6.5/all-visualweb.insync.JspxSerializer.java.patch, diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest index 7794ac406fcc..e0b50c176c5f 100644 --- a/dev-util/netbeans/Manifest +++ b/dev-util/netbeans/Manifest @@ -6,6 +6,6 @@ DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa DIST netbeans-l10n-7.0.1-20110930.tar.bz2 13491185 RMD160 1db97d282a59bbee490fa06046e12c5bc8fb3437 SHA1 fcbe2052e0ee4c9e85ec4819e3c723c53dd0a01d SHA256 ba1b83dd4a543918b7147304d8bba6e35d39fe4e567432766e4749b100c9b2a3 EBUILD netbeans-6.8-r1.ebuild 43136 RMD160 1ed63a12ce46beb4838913c8f65690aaec9d2a3a SHA1 bf2af027925686c64e58a34d60bbe7fada2cac4a SHA256 5b34a9b43e28cefa7518645f2850f480e25701e09b9cbb4afb304cdb893d3d80 -EBUILD netbeans-7.0.1-r1.ebuild 6819 RMD160 b132953151a95878e8853447df3f2d6464525440 SHA1 12aff87b58ca5298d3bc47399e7ccfa59971d30d SHA256 1a5f1d075b0ce4f17cbdb502b6ee159953dc75374cb9b59eedbf5bae442272fd -MISC ChangeLog 30276 RMD160 62e9317484f7f0194d011bce488a8be79c58b58e SHA1 ab178b68573832a2183102901e274e94f77bd7c5 SHA256 45011a2f3b209193e045bf650001eb506fa63aaa7d1e6d92a3f30341194d9173 +EBUILD netbeans-7.0.1-r2.ebuild 6842 RMD160 0cd4f3008e0188fce526463083ca518e2008e529 SHA1 b8b2cb5805b3f6a68db9845f1aae99b582ee11df SHA256 9342c08914553a40cdd4aa54c82a40340885569ef6c9b39166021e5474da7a67 +MISC ChangeLog 30477 RMD160 44b4d6b0ef9062e48144450cb16425da24210a5e SHA1 294e6b71bfd86717a48e23438b5b64fc43c215ac SHA256 a7900dabfec44e535942e2adf5d7fe29f2f55f76666f0f45c93e696c0c8d435b MISC metadata.xml 1222 RMD160 a5a0ca131ea1c52fa8c3efa9a3fecbddb918a0cc SHA1 44874856f49f4789a19962595493d50260333fb1 SHA256 08bcc20abdc5d2499dedd8695247221c667747bb19a75e77034ed34edbceb9b9 diff --git a/dev-util/netbeans/netbeans-7.0.1-r1.ebuild b/dev-util/netbeans/netbeans-7.0.1-r1.ebuild deleted file mode 100644 index b293598ba892..000000000000 --- a/dev-util/netbeans/netbeans-7.0.1-r1.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-7.0.1-r1.ebuild,v 1.1 2011/10/03 21:52:22 fordfrog Exp $ - -EAPI="4" -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Netbeans IDE" -HOMEPAGE="http://netbeans.org/" -SLOT="7.0" -SOURCE_URL="http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip" -PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2" -L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2" -ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}" -SRC_URI="linguas_af? ( ${ALL_URLS} ) - linguas_ar? ( ${ALL_URLS} ) - linguas_ca? ( ${ALL_URLS} ) - linguas_cs? ( ${ALL_URLS} ) - linguas_de? ( ${ALL_URLS} ) - linguas_el? ( ${ALL_URLS} ) - linguas_es? ( ${ALL_URLS} ) - linguas_fr? ( ${ALL_URLS} ) - linguas_gl? ( ${ALL_URLS} ) - linguas_hi_IN? ( ${ALL_URLS} ) - linguas_id? ( ${ALL_URLS} ) - linguas_it? ( ${ALL_URLS} ) - linguas_ja? ( ${ALL_URLS} ) - linguas_ko? ( ${ALL_URLS} ) - linguas_lt? ( ${ALL_URLS} ) - linguas_nl? ( ${ALL_URLS} ) - linguas_pl? ( ${ALL_URLS} ) - linguas_pt_BR? ( ${ALL_URLS} ) - linguas_pt_PT? ( ${ALL_URLS} ) - linguas_ro? ( ${ALL_URLS} ) - linguas_ru? ( ${ALL_URLS} ) - linguas_sq? ( ${ALL_URLS} ) - linguas_sr? ( ${ALL_URLS} ) - linguas_sv? ( ${ALL_URLS} ) - linguas_tl? ( ${ALL_URLS} ) - linguas_tr? ( ${ALL_URLS} ) - linguas_vi? ( ${ALL_URLS} ) - linguas_zh_CN? ( ${ALL_URLS} ) - linguas_zh_TW? ( ${ALL_URLS} ) -" -LICENSE="|| ( CDDL GPL-2-with-linking-exception )" -KEYWORDS="~amd64 ~x86" -IUSE_NETBEANS_MODULES=" - +netbeans_modules_apisupport - netbeans_modules_cnd - netbeans_modules_dlight - netbeans_modules_enterprise - netbeans_modules_ergonomics - netbeans_modules_groovy - +netbeans_modules_java - netbeans_modules_javacard - netbeans_modules_mobility - netbeans_modules_php - netbeans_modules_profiler - +netbeans_modules_websvccommon" -IUSE_LINGUAS=" - linguas_af - linguas_ar - linguas_ca - linguas_cs - linguas_de - linguas_el - linguas_es - linguas_fr - linguas_gl - linguas_hi_IN - linguas_id - linguas_it - linguas_ja - linguas_ko - linguas_lt - linguas_nl - linguas_pl - linguas_pt_BR - linguas_pt_PT - linguas_ro - linguas_ru - linguas_sq - linguas_sr - linguas_sv - linguas_tl - linguas_tr - linguas_vi - linguas_zh_CN - linguas_zh_TW" -IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}" -S="${WORKDIR}" - -DEPEND="virtual/jdk:1.6 - dev-java/javahelp:0" -RDEPEND=">=virtual/jdk-1.6 - ~dev-java/netbeans-harness-${PV} - ~dev-java/netbeans-ide-${PV} - ~dev-java/netbeans-nb-${PV} - ~dev-java/netbeans-platform-${PV} - netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} ) - netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} ) - netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} ) - netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} ) - netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} ) - netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} ) - netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} ) - netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} ) - netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} ) - netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} ) - netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} ) - netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} ) - doc? ( ~dev-java/netbeans-javadoc-${PV} )" -JAVA_PKG_BSFIX="off" -NBLOCALES="" - -pkg_setup() { - for lingua in ${IUSE_LINGUAS} ; do - local lang=${lingua/linguas_/} - - if [[ "${lang}" = "ar" ]] ; then - lang="ar_EG,ar_SA" - elif [[ "${lang}" = "es" ]] ; then - lang="es,es_CO" - elif [[ "${lang}" = "gl" ]] ; then - lang="gl_ES" - elif [[ "${lang}" = "id" ]] ; then - lang="in_ID" - elif [[ "${lang}" = "nl" ]] ; then - lang="nl_BE,nl_NL" - elif [[ "${lang}" = "tl" ]] ; then - lang="fil_PH" - fi - - if use ${lingua} ; then - if [ -z "${NBLOCALES}" ] ; then - NBLOCALES="${lang}" - else - NBLOCALES="${NBLOCALES},${lang}" - fi - fi - done -} - -src_unpack() { - if [ -n "${NBLOCALES}" ] ; then - unpack $(basename ${SOURCE_URL}) - unpack $(basename ${L10N_URL}) - - einfo "Deleting bundled jars..." - find -name "*.jar" -type f -delete - - unpack netbeans-7.0-build.xml-r1.patch.bz2 - fi -} - -src_prepare() { - if [ -n "${NBLOCALES}" ] ; then - einfo "Deleting bundled class files..." - find -name "*.class" -type f | xargs rm -vf - - epatch netbeans-7.0-build.xml-r1.patch - - # 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 - fi - - java-pkg-2_src_prepare -} - -src_compile() { - if [ -n "${NBLOCALES}" ] ; then - einfo "Compiling support for locales: ${NBLOCALES}" - eant -f nbbuild/build.xml bootstrap || die - eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \ - -f l10n/build.xml build || die - fi -} - -src_install() { - if [ -n "${NBLOCALES}" ] ; then - pushd "${S}"/nbbuild/netbeans >/dev/null || die - - for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard mobility php platform profiler websvccommon ; do - if [ -d "${cluster}" ] ; then - insinto /usr/share/netbeans-${cluster}-${SLOT} - doins -r ${cluster}/* - fi - done - - if [ -d nb ] ; then - insinto /usr/share/netbeans-nb-${SLOT}/nb - doins -r nb/* - fi - - popd >/dev/null || die - fi -} - -pkg_postinst() { - if [ -n "${NBLOCALES}" ] ; then - einfo "Netbeans automatically starts with the locale you have set in your user profile, if" - einfo "the locale is built for Netbeans." - einfo "If you want to force specific locale, use --locale argument, for example:" - einfo "${PN}-${SLOT} --locale de" - einfo "${PN}-${SLOT} --locale pt:BR" - fi - - if use linguas_ar ; then - einfo - einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant." - fi - - if use linguas_es ; then - einfo - einfo "You selected Spanish locale so you can choose either es or es:CO variant." - fi - - if use linguas_gl ; then - einfo - einfo "You selected Galician locale which has locale code gl:ES in Netbeans." - fi - - if use linguas_id ; then - einfo - einfo "You selected Indonesian locale which has locale code in:ID in Netbeans." - fi - - if use linguas_nl ; then - einfo - einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant." - fi - - if use linguas_tl ; then - einfo - einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans." - fi -} diff --git a/dev-util/netbeans/netbeans-7.0.1-r2.ebuild b/dev-util/netbeans/netbeans-7.0.1-r2.ebuild new file mode 100644 index 000000000000..1eea8180e910 --- /dev/null +++ b/dev-util/netbeans/netbeans-7.0.1-r2.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-7.0.1-r2.ebuild,v 1.1 2011/11/01 10:33:03 fordfrog Exp $ + +EAPI="4" +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Netbeans IDE" +HOMEPAGE="http://netbeans.org/" +SLOT="7.0" +SOURCE_URL="http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip" +PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2" +L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2" +ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}" +SRC_URI="linguas_af? ( ${ALL_URLS} ) + linguas_ar? ( ${ALL_URLS} ) + linguas_ca? ( ${ALL_URLS} ) + linguas_cs? ( ${ALL_URLS} ) + linguas_de? ( ${ALL_URLS} ) + linguas_el? ( ${ALL_URLS} ) + linguas_es? ( ${ALL_URLS} ) + linguas_fr? ( ${ALL_URLS} ) + linguas_gl? ( ${ALL_URLS} ) + linguas_hi_IN? ( ${ALL_URLS} ) + linguas_id? ( ${ALL_URLS} ) + linguas_it? ( ${ALL_URLS} ) + linguas_ja? ( ${ALL_URLS} ) + linguas_ko? ( ${ALL_URLS} ) + linguas_lt? ( ${ALL_URLS} ) + linguas_nl? ( ${ALL_URLS} ) + linguas_pl? ( ${ALL_URLS} ) + linguas_pt_BR? ( ${ALL_URLS} ) + linguas_pt_PT? ( ${ALL_URLS} ) + linguas_ro? ( ${ALL_URLS} ) + linguas_ru? ( ${ALL_URLS} ) + linguas_sq? ( ${ALL_URLS} ) + linguas_sr? ( ${ALL_URLS} ) + linguas_sv? ( ${ALL_URLS} ) + linguas_tl? ( ${ALL_URLS} ) + linguas_tr? ( ${ALL_URLS} ) + linguas_vi? ( ${ALL_URLS} ) + linguas_zh_CN? ( ${ALL_URLS} ) + linguas_zh_TW? ( ${ALL_URLS} ) +" +LICENSE="|| ( CDDL GPL-2-with-linking-exception )" +KEYWORDS="~amd64 ~x86" +IUSE_NETBEANS_MODULES=" + +netbeans_modules_apisupport + netbeans_modules_cnd + netbeans_modules_dlight + netbeans_modules_enterprise + netbeans_modules_ergonomics + netbeans_modules_groovy + +netbeans_modules_java + netbeans_modules_javacard + netbeans_modules_mobility + netbeans_modules_php + netbeans_modules_profiler + +netbeans_modules_websvccommon" +IUSE_LINGUAS=" + linguas_af + linguas_ar + linguas_ca + linguas_cs + linguas_de + linguas_el + linguas_es + linguas_fr + linguas_gl + linguas_hi_IN + linguas_id + linguas_it + linguas_ja + linguas_ko + linguas_lt + linguas_nl + linguas_pl + linguas_pt_BR + linguas_pt_PT + linguas_ro + linguas_ru + linguas_sq + linguas_sr + linguas_sv + linguas_tl + linguas_tr + linguas_vi + linguas_zh_CN + linguas_zh_TW" +IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}" +S="${WORKDIR}" + +DEPEND="virtual/jdk:1.6 + dev-java/javahelp:0" +RDEPEND=">=virtual/jdk-1.6 + ~dev-java/netbeans-harness-${PV} + ~dev-java/netbeans-ide-${PV} + ~dev-java/netbeans-nb-${PV} + ~dev-java/netbeans-platform-${PV} + netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} ) + netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} ) + netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} ) + netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} ) + netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} ) + netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} ) + netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} ) + netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} ) + netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} ) + netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} ) + netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} ) + netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} ) + doc? ( ~dev-java/netbeans-javadoc-${PV} )" +JAVA_PKG_BSFIX="off" +NBLOCALES="" + +pkg_setup() { + for lingua in ${IUSE_LINGUAS} ; do + local lang=${lingua/linguas_/} + + if [[ "${lang}" = "ar" ]] ; then + lang="ar_EG,ar_SA" + elif [[ "${lang}" = "es" ]] ; then + lang="es,es_CO" + elif [[ "${lang}" = "gl" ]] ; then + lang="gl_ES" + elif [[ "${lang}" = "id" ]] ; then + lang="in_ID" + elif [[ "${lang}" = "nl" ]] ; then + lang="nl_BE,nl_NL" + elif [[ "${lang}" = "tl" ]] ; then + lang="fil_PH" + fi + + if use ${lingua} ; then + if [ -z "${NBLOCALES}" ] ; then + NBLOCALES="${lang}" + else + NBLOCALES="${NBLOCALES},${lang}" + fi + fi + done + + java-pkg-2_pkg_setup +} + +src_unpack() { + if [ -n "${NBLOCALES}" ] ; then + unpack $(basename ${SOURCE_URL}) + unpack $(basename ${L10N_URL}) + + einfo "Deleting bundled jars..." + find -name "*.jar" -type f -delete + + unpack netbeans-7.0-build.xml-r1.patch.bz2 + fi +} + +src_prepare() { + if [ -n "${NBLOCALES}" ] ; then + einfo "Deleting bundled class files..." + find -name "*.class" -type f | xargs rm -vf + + epatch netbeans-7.0-build.xml-r1.patch + + # 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 + fi + + java-pkg-2_src_prepare +} + +src_compile() { + if [ -n "${NBLOCALES}" ] ; then + einfo "Compiling support for locales: ${NBLOCALES}" + eant -f nbbuild/build.xml bootstrap || die + eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \ + -f l10n/build.xml build || die + fi +} + +src_install() { + if [ -n "${NBLOCALES}" ] ; then + pushd "${S}"/nbbuild/netbeans >/dev/null || die + + for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard mobility php platform profiler websvccommon ; do + if [ -d "${cluster}" ] ; then + insinto /usr/share/netbeans-${cluster}-${SLOT} + doins -r ${cluster}/* + fi + done + + if [ -d nb ] ; then + insinto /usr/share/netbeans-nb-${SLOT}/nb + doins -r nb/* + fi + + popd >/dev/null || die + fi +} + +pkg_postinst() { + if [ -n "${NBLOCALES}" ] ; then + einfo "Netbeans automatically starts with the locale you have set in your user profile, if" + einfo "the locale is built for Netbeans." + einfo "If you want to force specific locale, use --locale argument, for example:" + einfo "${PN}-${SLOT} --locale de" + einfo "${PN}-${SLOT} --locale pt:BR" + fi + + if use linguas_ar ; then + einfo + einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant." + fi + + if use linguas_es ; then + einfo + einfo "You selected Spanish locale so you can choose either es or es:CO variant." + fi + + if use linguas_gl ; then + einfo + einfo "You selected Galician locale which has locale code gl:ES in Netbeans." + fi + + if use linguas_id ; then + einfo + einfo "You selected Indonesian locale which has locale code in:ID in Netbeans." + fi + + if use linguas_nl ; then + einfo + einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant." + fi + + if use linguas_tl ; then + einfo + einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans." + fi +} -- cgit v1.2.3-65-gdbad