commit: 45f8af881e01f34cd8cfb565f0dbc183603a7d8d Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Tue Dec 3 15:23:56 2019 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Tue Dec 3 15:23:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f8af88
www-apps/moodle: remove REQUIRED_USE Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> www-apps/moodle/moodle-3.5.9.ebuild | 16 +++++++--------- www-apps/moodle/moodle-3.6.7.ebuild | 16 +++++++--------- www-apps/moodle/moodle-3.7.3.ebuild | 16 +++++++--------- www-apps/moodle/moodle-3.8.ebuild | 16 +++++++--------- 4 files changed, 28 insertions(+), 36 deletions(-) diff --git a/www-apps/moodle/moodle-3.5.9.ebuild b/www-apps/moodle/moodle-3.5.9.ebuild index 39f86506435..07dbb6d2bb5 100644 --- a/www-apps/moodle/moodle-3.5.9.ebuild +++ b/www-apps/moodle/moodle-3.5.9.ebuild @@ -29,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc" PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}" IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts" -REQUIRED_USE="|| ( ${DB_TYPES} )" # No forced dependency on # mssql? - lives on a windows server @@ -57,14 +56,13 @@ pkg_setup() { fi done - # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero - #if [[ ${DB_COUNT} -eq 0 ]]; then - # eerror - # eerror "No database selected in your USE flags," - # eerror "You must select at least one." - # eerror - # die - #fi + if [[ ${DB_COUNT} -eq 0 ]]; then + eerror + eerror "No database selected in your USE flags," + eerror "You must select at least one." + eerror + die + fi if [[ ${DB_COUNT} -gt 1 ]]; then MYDB="" diff --git a/www-apps/moodle/moodle-3.6.7.ebuild b/www-apps/moodle/moodle-3.6.7.ebuild index 39f86506435..07dbb6d2bb5 100644 --- a/www-apps/moodle/moodle-3.6.7.ebuild +++ b/www-apps/moodle/moodle-3.6.7.ebuild @@ -29,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc" PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}" IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts" -REQUIRED_USE="|| ( ${DB_TYPES} )" # No forced dependency on # mssql? - lives on a windows server @@ -57,14 +56,13 @@ pkg_setup() { fi done - # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero - #if [[ ${DB_COUNT} -eq 0 ]]; then - # eerror - # eerror "No database selected in your USE flags," - # eerror "You must select at least one." - # eerror - # die - #fi + if [[ ${DB_COUNT} -eq 0 ]]; then + eerror + eerror "No database selected in your USE flags," + eerror "You must select at least one." + eerror + die + fi if [[ ${DB_COUNT} -gt 1 ]]; then MYDB="" diff --git a/www-apps/moodle/moodle-3.7.3.ebuild b/www-apps/moodle/moodle-3.7.3.ebuild index 8ced91e639b..f9ed8bfdb6f 100644 --- a/www-apps/moodle/moodle-3.7.3.ebuild +++ b/www-apps/moodle/moodle-3.7.3.ebuild @@ -29,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc" PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}" IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts" -REQUIRED_USE="|| ( ${DB_TYPES} )" # No forced dependency on # mssql? - lives on a windows server @@ -57,14 +56,13 @@ pkg_setup() { fi done - # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero - #if [[ ${DB_COUNT} -eq 0 ]]; then - # eerror - # eerror "No database selected in your USE flags," - # eerror "You must select at least one." - # eerror - # die - #fi + if [[ ${DB_COUNT} -eq 0 ]]; then + eerror + eerror "No database selected in your USE flags," + eerror "You must select at least one." + eerror + die + fi if [[ ${DB_COUNT} -gt 1 ]]; then MYDB="" diff --git a/www-apps/moodle/moodle-3.8.ebuild b/www-apps/moodle/moodle-3.8.ebuild index 8ced91e639b..f9ed8bfdb6f 100644 --- a/www-apps/moodle/moodle-3.8.ebuild +++ b/www-apps/moodle/moodle-3.8.ebuild @@ -29,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc" PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}" IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts" -REQUIRED_USE="|| ( ${DB_TYPES} )" # No forced dependency on # mssql? - lives on a windows server @@ -57,14 +56,13 @@ pkg_setup() { fi done - # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero - #if [[ ${DB_COUNT} -eq 0 ]]; then - # eerror - # eerror "No database selected in your USE flags," - # eerror "You must select at least one." - # eerror - # die - #fi + if [[ ${DB_COUNT} -eq 0 ]]; then + eerror + eerror "No database selected in your USE flags," + eerror "You must select at least one." + eerror + die + fi if [[ ${DB_COUNT} -gt 1 ]]; then MYDB=""