From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4D234138334 for ; Tue, 3 Dec 2019 15:24:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E84AE0801; Tue, 3 Dec 2019 15:24:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E6CBE0801 for ; Tue, 3 Dec 2019 15:24:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD44934D73D for ; Tue, 3 Dec 2019 15:24:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EFC28AD for ; Tue, 3 Dec 2019 15:24:13 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1575386636.45f8af881e01f34cd8cfb565f0dbc183603a7d8d.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/moodle/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/moodle/moodle-3.5.9.ebuild www-apps/moodle/moodle-3.6.7.ebuild www-apps/moodle/moodle-3.7.3.ebuild www-apps/moodle/moodle-3.8.ebuild X-VCS-Directories: www-apps/moodle/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 45f8af881e01f34cd8cfb565f0dbc183603a7d8d X-VCS-Branch: master Date: Tue, 3 Dec 2019 15:24:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7b5151b6-4092-4f1d-8c21-f3d2de29dfac X-Archives-Hash: e3f63e17a101cb909ec5165495765cfc commit: 45f8af881e01f34cd8cfb565f0dbc183603a7d8d Author: Anthony G. Basile gentoo org> AuthorDate: Tue Dec 3 15:23:56 2019 +0000 Commit: Anthony G. Basile gentoo 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 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=""