From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1245638-garchives=archives.gentoo.org@lists.gentoo.org>
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 050BF1382C5
	for <garchives@archives.gentoo.org>; Mon, 25 Jan 2021 21:04:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4E316E09DF;
	Mon, 25 Jan 2021 21:04:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 246F7E09DF
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jan 2021 21:04:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 785BD340FF6
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jan 2021 21:03:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id EBD4A48B
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jan 2021 21:03:57 +0000 (UTC)
From: "Anthony G. Basile" <blueness@gentoo.org>
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" <blueness@gentoo.org>
Message-ID: <1611608634.d7f5b5ff146f43acd20edccfb0147162485a4946.blueness@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/moodle/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-apps/moodle/Manifest www-apps/moodle/moodle-3.10.1.ebuild www-apps/moodle/moodle-3.10.ebuild www-apps/moodle/moodle-3.5.15.ebuild www-apps/moodle/moodle-3.5.16.ebuild www-apps/moodle/moodle-3.7.9.ebuild www-apps/moodle/moodle-3.8.6.ebuild www-apps/moodle/moodle-3.8.7.ebuild www-apps/moodle/moodle-3.9.3.ebuild www-apps/moodle/moodle-3.9.4.ebuild
X-VCS-Directories: www-apps/moodle/
X-VCS-Committer: blueness
X-VCS-Committer-Name: Anthony G. Basile
X-VCS-Revision: d7f5b5ff146f43acd20edccfb0147162485a4946
X-VCS-Branch: master
Date: Mon, 25 Jan 2021 21:03:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 08d46c99-dd47-49a3-89d0-eeb5408c6f9d
X-Archives-Hash: 321e4c930da90869366722dadf41fb6c

commit:     d7f5b5ff146f43acd20edccfb0147162485a4946
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 21:03:23 2021 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 21:03:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f5b5ff

www-apps/moodle: version bump to 3.10.1, 3.9.4, 3.8.7, 3.5.16

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 www-apps/moodle/Manifest                           |   9 +-
 .../{moodle-3.9.3.ebuild => moodle-3.10.1.ebuild}  |   2 +-
 .../{moodle-3.5.15.ebuild => moodle-3.5.16.ebuild} |   2 +-
 www-apps/moodle/moodle-3.7.9.ebuild                | 120 ---------------------
 .../{moodle-3.8.6.ebuild => moodle-3.8.7.ebuild}   |   2 +-
 .../{moodle-3.10.ebuild => moodle-3.9.4.ebuild}    |   2 +-
 6 files changed, 8 insertions(+), 129 deletions(-)

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index f2323453549..28e16377d74 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,5 +1,4 @@
-DIST moodle-3.10.tgz 57423153 BLAKE2B fe59ef50e28a0170ff7a158d0ab52d93e30e4739a6af61cc2c3f6c93e763c459ebef8e6bda138af2ac2c6000d7ed6ea718821c01d2417b7c55d9c1faaeff2afa SHA512 f0a55c5ed3636943a5193cadc3755cfd509619b1f85c003dffa6387c131f0579c02b40e825932b313d649d5e1e557f8e63569b5b51dada59f8aed5eac0474500
-DIST moodle-3.5.15.tgz 46781368 BLAKE2B 5d47fc9526122314a490ef9728e8b1c8fddc233539de406d8077d59e7c14c6920d887fc074c94f9f5ffe6d66df68a325d03ab652cf1b39dc4870e64a7a638de1 SHA512 283f2f059181c3ba79799cb0b474bf9c5b876c528f1779b72b86a4b4087bfa73afc875dca5f454d527d5b3f0bfb3cc59531b59830f60e426bd9ef7bc65302698
-DIST moodle-3.7.9.tgz 45879636 BLAKE2B d07f080ed7333c575a04c813c0ffe4fce26ded2f1df267fdf5a1c5b9b787859d9d0c8d688dc435dd51f9850335528edb15a07b5a37200acca097f15c522e94df SHA512 22452ea2b497aeedba6be739f573c8ca1d4dec3aca401f1ce6aac3fa96411f94fc72aeef895a5c35b97112fb6dd1d836b421fa26740a3dcb6936ae88d4267b9f
-DIST moodle-3.8.6.tgz 53308269 BLAKE2B 20e722bbcd1f4575fa4450b6d7cefd1d882322776975f47940f49300f6c6a4bb9b80dae9e936207c5168a8847ae5d77e535d722aed07b68c1c29bad472cc6b74 SHA512 c3e63d6872fc476391747af03f25f0153a51dcc8a8a81d0330bd368d8bef9703dac700bf975a1891e701faed28227dd4d26a5d61255ca4b5bb349f91db66f20e
-DIST moodle-3.9.3.tgz 57048773 BLAKE2B 21721718ae19c42c61ad4f0d971887e4bf545b88126ab12570d3a9b54e33821b0a99708adcbed78d49ed324d8525a2410db8988b614f76513b61067cb9e4ecc2 SHA512 830e81f28e54c8ebbb4528fe113c1b1b345bb47c80abc725b6afd8111d92315d5af4c82e4241d235bdd22a1b9324b1e63cc3a66bdfa352a768c4604adbec4bdc
+DIST moodle-3.10.1.tgz 57464025 BLAKE2B 55a7f1ba24fa516cdb5f67a936797a5e9450ddd279bd3ea67a3fe4b321019dddae57f928a816374282dd9c08e78281b4835879a1ff5843e1997f61cede1ed05f SHA512 3460857b5e0d524849d30d3d883fc35624cb2afe52184e85cb63477b7b17b8737338b91f6f8b5cd263fa1a3666288c85f8f3b10fcab3669cb5b1e68f6d8e5399
+DIST moodle-3.5.16.tgz 46790181 BLAKE2B 921026617cc435f481ef5533908ca2a809fc63c57365d3cc114acb51ea246ea035d37c63fc64b8cfc25b29250ac2a3e92cbb5c838dce53b6e62971901c73de19 SHA512 ae9b2689a232c48a6d682627271e83460d6d95154f58dd8d1e27a58faec49c1089680378d943b1b45c3ebfa8e1f6cd1b879108b0c79bd9f49aab44e9520690c6
+DIST moodle-3.8.7.tgz 53309020 BLAKE2B 6be85529dd7cd69631b1f2de0873ffb00bb1d50b8165d2198b3ee08a2ffbd34b4e9f3f2b97e956166ffc3617e7c234051c8f43e81838b1470caa7f6b9b2b91c6 SHA512 28cd050bcec988cf235776be8058f1f153a76e7720dd47db16f6c243dc4b542eac230a73e5fa86ca62dea056e9e6a1af71e4b485a7ccc6198b19670900871527
+DIST moodle-3.9.4.tgz 57068491 BLAKE2B 9a7f3c1d5eae206b063e1dc5d471a34f378f8dd5b3f227cd87b2fc2a9c6b7429fab5d803a09a1fe312cbd936b37696aaf4b92ce8cd06b675ad7c891ff03fd518 SHA512 1a5069005aed3f0e1b5620d6c091cb8e9ad9003f95ae9d66055eb52e892feaf54b150942baecdc27a8d2884a349e3b882e16b187a2188e03aca0146abbc75a7a

diff --git a/www-apps/moodle/moodle-3.9.3.ebuild b/www-apps/moodle/moodle-3.10.1.ebuild
similarity index 98%
rename from www-apps/moodle/moodle-3.9.3.ebuild
rename to www-apps/moodle/moodle-3.10.1.ebuild
index 1012b291cbc..35d47aa5db4 100644
--- a/www-apps/moodle/moodle-3.9.3.ebuild
+++ b/www-apps/moodle/moodle-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"

diff --git a/www-apps/moodle/moodle-3.5.15.ebuild b/www-apps/moodle/moodle-3.5.16.ebuild
similarity index 98%
rename from www-apps/moodle/moodle-3.5.15.ebuild
rename to www-apps/moodle/moodle-3.5.16.ebuild
index 8b94917f96c..5b538bc3be8 100644
--- a/www-apps/moodle/moodle-3.5.15.ebuild
+++ b/www-apps/moodle/moodle-3.5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"

diff --git a/www-apps/moodle/moodle-3.7.9.ebuild b/www-apps/moodle/moodle-3.7.9.ebuild
deleted file mode 100644
index 53ac6f44ea4..00000000000
--- a/www-apps/moodle/moodle-3.7.9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit webapp
-
-MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="https://moodle.org"
-SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3+"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-7.1[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	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=""
-		ewarn
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo
-}

diff --git a/www-apps/moodle/moodle-3.8.6.ebuild b/www-apps/moodle/moodle-3.8.7.ebuild
similarity index 98%
rename from www-apps/moodle/moodle-3.8.6.ebuild
rename to www-apps/moodle/moodle-3.8.7.ebuild
index 53ac6f44ea4..407eecf4f7f 100644
--- a/www-apps/moodle/moodle-3.8.6.ebuild
+++ b/www-apps/moodle/moodle-3.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"

diff --git a/www-apps/moodle/moodle-3.10.ebuild b/www-apps/moodle/moodle-3.9.4.ebuild
similarity index 98%
rename from www-apps/moodle/moodle-3.10.ebuild
rename to www-apps/moodle/moodle-3.9.4.ebuild
index 1012b291cbc..35d47aa5db4 100644
--- a/www-apps/moodle/moodle-3.10.ebuild
+++ b/www-apps/moodle/moodle-3.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"