Rewritten checking of needed and not specified modules so it should be easier for users to add the missing modules

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27-gentoo x86_64

3 files changed, 121 insertions, 100 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 60b5cc7bc59c..a9fd1a8eebe6 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,10 @@
 # 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.95 2008/12/04 10:43:17 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.96 2008/12/04 11:57:27 fordfrog Exp $
+
+  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
+  easier for users to add the missing modules
 
   04 Dec 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r2.ebuild:
   Filtered all ecj compilers
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 60af810603b3..d9da0ddd4efb 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 42199 RMD160 4c9b1ecd37de765ba10d177f3ed9484f537dc2a7 SHA1 03621ed89efba57ece83bbef980870d9736ce0b7 SHA256 c4a96c044d54e9dfaf978d189731772c87e03130e870c5ea384f9e709b96d043
-MISC ChangeLog 17129 RMD160 8b508a1286d4a8326037ff6917b1285d44e63392 SHA1 0d1a0a63c703a00eef56dbb98c495ecbb6304a44 SHA256 8b193c85a81b6df6843b8f89eb0cac6cde5d95e0ca17daf1ac91d46b3fa22640
+EBUILD netbeans-6.5-r2.ebuild 41216 RMD160 47fc192c971d013e2980076dd8a0c0b165e601b3 SHA1 3edf73e2aad62be6f8455235a064d39a5b0d4373 SHA256 0eb699a40d95b594d8db927569c20ccee777693f3faaacfc8a53880a4207e8e1
+MISC ChangeLog 17325 RMD160 7dfa50a992336ccac22fad0dd6a3e52ece30e423 SHA1 ec0350f5804e7685c9aa7db39db1056eec8e5041 SHA256 40766dc9c181c419a623e71a5b12187e48d8cc094b6ff7329c6fe76c3eaee6f3
 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 4e2409ebb53f..77ef6494e218 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.2 2008/12/04 10:43:17 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild,v 1.3 2008/12/04 11:57:27 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -249,57 +249,57 @@ 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"
+
 	# direct deps: ide
-	if use netbeans_modules_cnd && ! use netbeans_modules_ide ; then
-		eerror "'cnd' module requires 'ide' module"
-		die
+	if use netbeans_modules_cnd ; then
+		need_ide="1"
 	fi
 
 	# direct deps: gsf, ide, java
-	if use netbeans_modules_groovy && ! ( \
-		use netbeans_modules_gsf && \
-		use netbeans_modules_ide && \
-		use netbeans_modules_java && \
-		use netbeans_modules_websvccommon ) ; then
-		eerror "'groovy' module requires 'gsf', 'ide', 'java' and 'websvccommon' modules"
-		die
+	if use netbeans_modules_groovy ; then
+		need_gsf="1"
+		need_ide="1"
+		need_java="1"
+		need_websvccommon="1"
 	fi
 
 	# direct deps: ide
-	if use netbeans_modules_gsf && ! use netbeans_modules_ide ; then
-		eerror "'gsf' module requires 'ide' module"
-		die
+	if use netbeans_modules_gsf ; then
+		need_ide="1"
 	fi
 
 	# direct deps: gsf, ide, j2ee, java
-	if use netbeans_modules_identity && ! ( \
-		use netbeans_modules_groovy && \
-		use netbeans_modules_gsf && \
-		use netbeans_modules_ide && \
-		use netbeans_modules_j2ee && \
-		use netbeans_modules_java && \
-		use netbeans_modules_websvccommon ) ; then
-		eerror "'identity' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon'  modules"
-		die
+	if use netbeans_modules_identity ; then
+		need_groovy="1"
+		need_gsf="1"
+		need_ide="1"
+		need_j2ee="1"
+		need_java="1"
+		need_websvccommon="1"
 	fi
 
 	# direct deps: groovy, gsf, ide, java
-	if use netbeans_modules_j2ee && ! ( \
-		use netbeans_modules_groovy && \
-		use netbeans_modules_gsf && \
-		use netbeans_modules_ide && \
-		use netbeans_modules_java && \
-		use netbeans_modules_websvccommon ) ; then
-		eerror "'j2ee' module requires 'groovy', 'gsf', 'ide', 'java' and 'websvccommon' modules"
-		die
+	if use netbeans_modules_j2ee ; then
+		need_groovy="1"
+		need_gsf="1"
+		need_ide="1"
+		need_java="1"
+		need_websvccommon="1"
 	fi
 
 	# direct deps: ide, websvccommon
-	if use netbeans_modules_java && ! ( \
-		use netbeans_modules_ide && \
-		use netbeans_modules_websvccommon ) ; then
-		eerror "'java' module requires 'ide' and 'websvccommon' module"
-		die
+	if use netbeans_modules_java ; then
+		need_ide="1"
+		need_websvccommon="1"
 	fi
 
 	# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151535 'j2ee' cluster is also
@@ -307,46 +307,38 @@ pkg_setup() {
 	# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151538 'apisupport' cluster is also
 	# needed to build 'mobility' cluster
 	# direct deps: apisupport, ide, j2ee, java
-	if use netbeans_modules_mobility && ! ( \
-		use netbeans_modules_apisupport && \
-		use netbeans_modules_groovy && \
-		use netbeans_modules_gsf && \
-		use netbeans_modules_harness && \
-		use netbeans_modules_ide && \
-		use netbeans_modules_j2ee && \
-		use netbeans_modules_java && \
-		use netbeans_modules_websvccommon ) ; then
-		eerror "'mobility' module requires 'apisupport', 'groovy', 'gsf', 'harness', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
-		die
+	if use netbeans_modules_mobility ; then
+		need_apisupport="1"
+		need_groovy="1"
+		need_gsf="1"
+		need_harness="1"
+		need_ide="1"
+		need_j2ee="1"
+		need_java="1"
+		need_websvccommon="1"
 	fi
 
 	# direct deps: harness, ide
-	if use netbeans_modules_nb && ! ( \
-		use netbeans_modules_harness && \
-		use netbeans_modules_ide ) ; then
-		eerror "'nb' module requires 'harness' and 'ide' module"
-		die
+	if use netbeans_modules_nb ; then
+		need_harness="1"
+		need_ide="1"
 	fi
 
 	# direct deps: gsf, ide, websvccommon
-	if use netbeans_modules_php && ! ( \
-		use netbeans_modules_gsf && \
-		use netbeans_modules_ide && \
-		use netbeans_modules_websvccommon ) ; then
-		eerror "'php' module requires 'gsf', 'ide' and 'websvccommon' modules"
-		die
+	if use netbeans_modules_php ; then
+		need_gsf="1"
+		need_ide="1"
+		need_websvccommon="1"
 	fi
 
 	# direct deps: gsf, ide, j2ee, java
-	if use netbeans_modules_profiler && ! ( \
-		use netbeans_modules_groovy && \
-		use netbeans_modules_gsf && \
-		use netbeans_modules_ide && \
-		use netbeans_modules_j2ee && \
-		use netbeans_modules_java && \
-		use netbeans_modules_websvccommon ) ; then
-		eerror "'profiler' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
-		die
+	if use netbeans_modules_profiler ; then
+		need_groovy="1"
+		need_gsf="1"
+		need_ide="1"
+		need_j2ee="1"
+		need_java="1"
+		need_websvccommon="1"
 	fi
 
 	# direct deps: gsf, ide
@@ -356,48 +348,56 @@ pkg_setup() {
 	#fi
 
 	# direct deps: gsf, ide, j2ee, java, xml
-	if use netbeans_modules_soa && ! ( \
-		use netbeans_modules_groovy && \
-		use netbeans_modules_gsf && \
-		use netbeans_modules_ide && \
-		use netbeans_modules_j2ee && \
-		use netbeans_modules_java && \
-		use netbeans_modules_websvccommon && \
-		use netbeans_modules_xml ) ; then
-		eerror "'soa' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java', 'websvccommon' and 'xml' modules"
-		die
+	if use netbeans_modules_soa ; then
+		need_groovy="1"
+		need_gsf="1"
+		need_ide="1"
+		need_j2ee="1"
+		need_java="1"
+		need_websvccommon="1"
+		need_xml="1"
 	fi
 
 	# direct deps: gsf, ide, j2ee, java
-	if use netbeans_modules_visualweb && ! ( \
-		use netbeans_modules_groovy && \
-		use netbeans_modules_gsf && \
-		use netbeans_modules_ide && \
-		use netbeans_modules_j2ee && \
-		use netbeans_modules_java && \
-		use netbeans_modules_websvccommon ) ; then
-		eerror "'visualweb' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
-		die
+	if use netbeans_modules_visualweb ; then
+		need_groovy="1"
+		need_gsf="1"
+		need_ide="1"
+		need_j2ee="1"
+		need_java="1"
+		need_websvccommon="1"
 	fi
 
 	# direct deps: gsf, ide
-	if use netbeans_modules_webcommon && ! ( \
-		use netbeans_modules_gsf && \
-		use netbeans_modules_ide ) ; then
-		eerror "'webcommon' module requires 'gsf' and 'ide' modules"
-		die
+	if use netbeans_modules_webcommon ; then
+		need_gsf="1"
+		need_ide="1"
 	fi
 
 	# direct deps: ide
-	if use netbeans_modules_websvccommon && ! use netbeans_modules_ide ; then
-		eerror "'websvccommon' module requires 'ide' module"
-		die
+	if use netbeans_modules_websvccommon ; then
+		need_ide="1"
 	fi
 
 	# direct deps: ide
-	if use netbeans_modules_xml && ! use netbeans_modules_ide ; then
-		eerror "'xml' module requires 'ide' module"
-		die
+	if use netbeans_modules_xml ; then
+		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}
+
+	if [ -n "${JAVA_PKG_NB_MISSING_USE_FLAGS}" ] ; 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}"
+		die "Missing NETBEANS_MODULES"
 	fi
 
 	if ! use netbeans_modules_nb ; then
@@ -1115,3 +1115,20 @@ 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
+}