Use REQUIRED_USE so at least one backend db is provided, bug #432354

(Portage version: 2.1.11.9/cvs/Linux x86_64)

6 files changed, 66 insertions, 51 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 578bb486bdb8..db263822e77d 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/moodle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.28 2012/07/11 23:00:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.29 2012/08/24 10:22:46 blueness Exp $
+
+  24 Aug 2012; Anthony G. Basile <blueness@gentoo.org> moodle-1.9.19.ebuild,
+  moodle-2.0.10.ebuild, moodle-2.1.7.ebuild, moodle-2.2.4.ebuild,
+  moodle-2.3.1.ebuild:
+  Use REQUIRED_USE so at least one backend db is provided, bug #432354
 
   11 Jul 2012; Anthony G. Basile <blueness@gentoo.org> moodle-1.9.19.ebuild,
   moodle-2.0.10.ebuild, moodle-2.1.7.ebuild, moodle-2.2.4.ebuild,
diff --git a/www-apps/moodle/moodle-1.9.19.ebuild b/www-apps/moodle/moodle-1.9.19.ebuild
index b53fa1785934..3b1576b99acc 100644
--- a/www-apps/moodle/moodle-1.9.19.ebuild
+++ b/www-apps/moodle/moodle-1.9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
 
 EAPI="4"
 
@@ -29,6 +29,7 @@ AUTHMODES=${AUTHMODES//,/ }
 PHPFLAGS="ctype,curl,gd,iconv,session,ssl,tokenizer,xml,xmlrpc,zlib"
 
 IUSE="${DBTYPES} ${AUTHMODES} vhosts"
+REQUIRED_USE="|| ( ${DBTYPES} )"
 
 # No forced dependency on
 #  mysql? ( virtual/mysql )
@@ -53,15 +54,16 @@ pkg_setup() {
 		fi
 	done
 
-	if [[ ${DB_COUNT} -eq 0 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror
-		die
-	fi
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror
+	#	die
+	#fi
 
 	if [[ ${DB_COUNT} -gt 1 ]]; then
 		MYDB=""
diff --git a/www-apps/moodle/moodle-2.0.10.ebuild b/www-apps/moodle/moodle-2.0.10.ebuild
index 6b59e41e2f8c..a4f4d95ea0be 100644
--- a/www-apps/moodle/moodle-2.0.10.ebuild
+++ b/www-apps/moodle/moodle-2.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mysql? ( virtual/mysql )
@@ -55,15 +56,16 @@ pkg_setup() {
 		fi
 	done
 
-	if [[ ${DB_COUNT} -eq 0 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror
-		die
-	fi
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror
+	#	die
+	#fi
 
 	if [[ ${DB_COUNT} -gt 1 ]]; then
 		MYDB=""
diff --git a/www-apps/moodle/moodle-2.1.7.ebuild b/www-apps/moodle/moodle-2.1.7.ebuild
index 6a0429b6295d..d1b2ba28545f 100644
--- a/www-apps/moodle/moodle-2.1.7.ebuild
+++ b/www-apps/moodle/moodle-2.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mysql? ( virtual/mysql )
@@ -55,15 +56,16 @@ pkg_setup() {
 		fi
 	done
 
-	if [[ ${DB_COUNT} -eq 0 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror
-		die
-	fi
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror
+	#	die
+	#fi
 
 	if [[ ${DB_COUNT} -gt 1 ]]; then
 		MYDB=""
diff --git a/www-apps/moodle/moodle-2.2.4.ebuild b/www-apps/moodle/moodle-2.2.4.ebuild
index c1594d1ef066..a6729a8772c4 100644
--- a/www-apps/moodle/moodle-2.2.4.ebuild
+++ b/www-apps/moodle/moodle-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mysql? ( virtual/mysql )
@@ -55,15 +56,16 @@ pkg_setup() {
 		fi
 	done
 
-	if [[ ${DB_COUNT} -eq 0 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror
-		die
-	fi
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror
+	#	die
+	#fi
 
 	if [[ ${DB_COUNT} -gt 1 ]]; then
 		MYDB=""
diff --git a/www-apps/moodle/moodle-2.3.1.ebuild b/www-apps/moodle/moodle-2.3.1.ebuild
index f26b679880df..19fd0efcae82 100644
--- a/www-apps/moodle/moodle-2.3.1.ebuild
+++ b/www-apps/moodle/moodle-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mysql? ( virtual/mysql )
@@ -55,15 +56,16 @@ pkg_setup() {
 		fi
 	done
 
-	if [[ ${DB_COUNT} -eq 0 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror
-		die
-	fi
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror
+	#	die
+	#fi
 
 	if [[ ${DB_COUNT} -gt 1 ]]; then
 		MYDB=""