diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2008-12-04 12:15:51 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2008-12-04 12:15:51 +0000 |
| commit | acee7d72a3427b48ea0c2323cecb320136f0bf07 (patch) | |
| tree | 4fd62e6990796931bcc7457c671a1c20d4688c95 /dev-util | |
| parent | Rewritten checking of needed and not specified modules so it should be easier... (diff) | |
| download | historical-acee7d72a3427b48ea0c2323cecb320136f0bf07.tar.gz historical-acee7d72a3427b48ea0c2323cecb320136f0bf07.tar.bz2 historical-acee7d72a3427b48ea0c2323cecb320136f0bf07.zip | |
Fixed bug in checking of what netbeans modules need to be added
Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27-gentoo x86_64
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/netbeans/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/netbeans/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/netbeans/netbeans-6.5-r2.ebuild | 60 |
3 files changed, 28 insertions, 41 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index a9fd1a8eebe6..27262a678014 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.96 2008/12/04 11:57:27 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.97 2008/12/04 12:15:51 fordfrog Exp $ + + 04 Dec 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r2.ebuild: + Fixed bug in checking of what netbeans modules need to be added 04 Dec 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r2.ebuild: Rewritten checking of needed and not specified modules so it should be diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest index d9da0ddd4efb..607ca1b54601 100644 --- a/dev-util/netbeans/Manifest +++ b/dev-util/netbeans/Manifest @@ -20,6 +20,6 @@ DIST netbeans-c++-5_5_1-linux.bin 9247744 RMD160 56c91ab483207b1d90554049263a2f2 EBUILD netbeans-3.6-r1.ebuild 3140 RMD160 ccfc3af6a20cad06d1a41965ea607322ff123cd9 SHA1 26281fb533e287171dc8d9408e63b4e8d8b9a646 SHA256 94a9463eb85659b0a3d224a4e7e1d071125f55c2d361db6a32221391a46746bb EBUILD netbeans-5.5.1-r1.ebuild 15099 RMD160 04b79404ad0eaca06cbd4876303e4ab6e4075066 SHA1 6dba903332599c913458d58a75a1419a6bffa49f SHA256 461c16d7ca7227dfe90409c4fd15001b99dabaf66efa2b68e4b8a614d8c5885d EBUILD netbeans-5.5.1.ebuild 14760 RMD160 c64a8ece4df62f4463500ab18fc781af867cdc8c SHA1 fc06f712d63079157d66defba1c3f45f8f5cef81 SHA256 19315a7fae7d98583abc8373464d7d34fc1d34f4e09e8668bab6a7c021ab1757 -EBUILD netbeans-6.5-r2.ebuild 41216 RMD160 47fc192c971d013e2980076dd8a0c0b165e601b3 SHA1 3edf73e2aad62be6f8455235a064d39a5b0d4373 SHA256 0eb699a40d95b594d8db927569c20ccee777693f3faaacfc8a53880a4207e8e1 -MISC ChangeLog 17325 RMD160 7dfa50a992336ccac22fad0dd6a3e52ece30e423 SHA1 ec0350f5804e7685c9aa7db39db1056eec8e5041 SHA256 40766dc9c181c419a623e71a5b12187e48d8cc094b6ff7329c6fe76c3eaee6f3 +EBUILD netbeans-6.5-r2.ebuild 41182 RMD160 fd6e5ff23d311176b25712fb090afe3f39a0b41a SHA1 f31b9c38e11e1c2fbdcd51b16aec33523b71c6b3 SHA256 c38ec0a8d9bd4661f3c39b196aaeb63c070f44cd65201c34b527363ef98c54fb +MISC ChangeLog 17468 RMD160 36112dae1afb2eb6798b16346c5862ec0bbf0a7c SHA1 835698b902cc5b47fce94df547f53d974299c1ee SHA256 d9239251636f34033aef1bf36979ce27e510f0df7ea8d6e5166e181d5e8a76e6 MISC metadata.xml 1301 RMD160 963030ae8c98e8baeb1e6913a2c0569cc089c5cd SHA1 e99fd059abfb66933036184b2868af4de7c76240 SHA256 10553ba9aa39b0858b0cf4c14af24624fe682848165789e04ddabd748d988ada diff --git a/dev-util/netbeans/netbeans-6.5-r2.ebuild b/dev-util/netbeans/netbeans-6.5-r2.ebuild index 77ef6494e218..e8029b8fe29c 100644 --- a/dev-util/netbeans/netbeans-6.5-r2.ebuild +++ b/dev-util/netbeans/netbeans-6.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild,v 1.3 2008/12/04 11:57:27 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild,v 1.4 2008/12/04 12:15:51 fordfrog Exp $ EAPI="2" WANT_SPLIT_ANT="true" @@ -249,15 +249,15 @@ pkg_setup() { die fi - local need_apisupport="0" - local need_groovy="0" - local need_gsf="0" - local need_harness="0" - local need_ide="0" - local need_j2ee="0" - local need_java="0" - local need_websvccommon="0" - local need_xml="0" + local need_apisupport="" + local need_groovy="" + local need_gsf="" + local need_harness="" + local need_ide="" + local need_j2ee="" + local need_java="" + local need_websvccommon="" + local need_xml="" # direct deps: ide if use netbeans_modules_cnd ; then @@ -384,19 +384,20 @@ pkg_setup() { need_ide="1" fi - check_use_flag "apisupport" ${need_apisupport} - check_use_flag "groovy" ${need_groovy} - check_use_flag "gsf" ${need_gsf} - check_use_flag "harness" ${need_harness} - check_use_flag "ide" ${need_ide} - check_use_flag "j2ee" ${need_j2ee} - check_use_flag "java" ${need_java} - check_use_flag "websvccommon" ${need_websvccommon} - check_use_flag "xml" ${need_xml} + local missing="" + [ -n "$}need_apisupport}" ] && ! use netbeans_modules_apisupport && missing="${missing} apisupport" + [ -n "$}need_groovy}" ] && ! use netbeans_modules_groovy && missing="${missing} groovy" + [ -n "$}need_gsf}" ] && ! use netbeans_modules_gsf && missing="${missing} gsf" + [ -n "$}need_harness}" ] && ! use netbeans_modules_harness && missing="${missing} harness" + [ -n "$}need_ide}" ] && ! use netbeans_modules_ide && missing="${missing} ide" + [ -n "$}need_j2ee}" ] && ! use netbeans_modules_j2ee && missing="${missing} j2ee" + [ -n "$}need_java}" ] && ! use netbeans_modules_java && missing="${missing} java" + [ -n "$}need_websvccommon}" ] && ! use netbeans_modules_websvccommon && missing="${missing} websvccommon" + [ -n "$}need_xml}" ] && ! use netbeans_modules_xml && missing="${missing} xml" - if [ -n "${JAVA_PKG_NB_MISSING_USE_FLAGS}" ] ; then + if [ -n "${missing}" ] ; then eerror "You need to add these modules to NETBEANS_MODULES because they are needed by modules you have selected" - eerror " Missing NETBEANS_MODULES: ${JAVA_PKG_NB_MISSING_USE_FLAGS}" + eerror " Missing NETBEANS_MODULES: ${missing}" die "Missing NETBEANS_MODULES" fi @@ -1115,20 +1116,3 @@ compile_locale_support() { eant ${1} -Dlocales=${2} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \ -f l10n/build.xml build } - -# Checks whether USE flag should be set and outputs error if it is not set -# Arguments -# 1 - netbeans module -# 2 - required status (1 = required) -check_use_flag() { - local module=${1} - local required=${2} - - if [ "${required}" == "1" ] ; then - if [ -z "${JAVA_PKG_NB_MISSING_USE_FLAGS}" ] ; then - JAVA_PKG_NB_MISSING_USE_FLAGS="${module}" - else - JAVA_PKG_NB_MISSING_USE_FLAGS="${JAVA_PKG_NB_MISSING_USE_FLAGS} ${module}" - fi - fi -} |