gentoo resync : 29.01.2021

6 files changed, 12 insertions, 134 deletions

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 9277e3a828b7..fc11a0186374 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,14 +2,12 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-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
-EBUILD moodle-3.10.ebuild 2809 BLAKE2B 9dffc324aa9b154d95215344eec2c4ed22b197adb34b5d38eee3d4b54970f89f61beb3c64bf8751e8c6adb0c52660bed373c9edbd149ef4aa41ae24e0c3fc976 SHA512 6206687130349734f1731a74ec00419f20c6c34828b76c2b33cc2385a4b09a26efa172b023608252b815de014bd1d7c732d92f52268073e5c357275dc954a437
-EBUILD moodle-3.5.15.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
-EBUILD moodle-3.7.9.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
-EBUILD moodle-3.8.6.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
-EBUILD moodle-3.9.3.ebuild 2809 BLAKE2B 9dffc324aa9b154d95215344eec2c4ed22b197adb34b5d38eee3d4b54970f89f61beb3c64bf8751e8c6adb0c52660bed373c9edbd149ef4aa41ae24e0c3fc976 SHA512 6206687130349734f1731a74ec00419f20c6c34828b76c2b33cc2385a4b09a26efa172b023608252b815de014bd1d7c732d92f52268073e5c357275dc954a437
+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
+EBUILD moodle-3.10.1.ebuild 2809 BLAKE2B 1dcdba6d0f8c9dbcd6dc0697a9e516d1d3a362b44cc792d5cffb97efd6be25670b8263e55ccb2139c74166b164d0e0eb6d32052f51bb1f3e575045ec712d29b2 SHA512 8d5cd9354198ecfae246854cb25cc9b7ac56b6e6230d4f9d240a15a080cef74fabb92447d463644009a12fb0d679285d7348bb1f174cf5861a3ad05052ff5880
+EBUILD moodle-3.5.16.ebuild 2809 BLAKE2B c1c12d463986b66c67949f8a698d1d2b9f994a24c039037ace0e8f9e0cd9c5a154ac0f4506bcee1d9660d2802eae26086921270f235019712b98ca27196e6535 SHA512 1290aede300fdd6697bd4c1ece2cea96acff535542dffea0d4d6a824d879bfcdd85eb9e44c7d4e00f1addbffb11231fa60bacf69c567fa0ebef0c51abe011e82
+EBUILD moodle-3.8.7.ebuild 2809 BLAKE2B 80ceb10f90d8288baa2ebcc639f161e31a546c029f88cf8ada174f8bd097ab97a2afe974f09a9056cab6040a63bf7e7b7b103dc55787134aced82e3e0c3f0d06 SHA512 c3ea934d47623b55c317791542ad5ca09dff19645cc3f34e9edf4795de1e952d1e901523f239102b6896447a4eea0f19a67038227aa829e061f8fc0e2e1d3b11
+EBUILD moodle-3.9.4.ebuild 2809 BLAKE2B 1dcdba6d0f8c9dbcd6dc0697a9e516d1d3a362b44cc792d5cffb97efd6be25670b8263e55ccb2139c74166b164d0e0eb6d32052f51bb1f3e575045ec712d29b2 SHA512 8d5cd9354198ecfae246854cb25cc9b7ac56b6e6230d4f9d240a15a080cef74fabb92447d463644009a12fb0d679285d7348bb1f174cf5861a3ad05052ff5880
 MISC metadata.xml 387 BLAKE2B c94976408768e98849655b8679935062d448bd3c9a2b65f165c005556d0a7230717c23577216e61d1d529e2172ad4c19d51223aaf7db07731cf2e1e92b858efe SHA512 bc5bc14f985ea4eba911fb4e411c5caafca175a1859f2535abe5b8fa3ebe45e05ecb9085ffa4dc33bd9f88bc220fbf42f7b1615553f352b742ffb524c482e49a
diff --git a/www-apps/moodle/moodle-3.10.ebuild b/www-apps/moodle/moodle-3.10.1.ebuild
index 1012b291cbc9..35d47aa5db46 100644
--- a/www-apps/moodle/moodle-3.10.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
index 8b94917f96cc..5b538bc3be85 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.8.6.ebuild b/www-apps/moodle/moodle-3.8.6.ebuild
deleted file mode 100644
index 53ac6f44ea4e..000000000000
--- a/www-apps/moodle/moodle-3.8.6.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.7.9.ebuild b/www-apps/moodle/moodle-3.8.7.ebuild
index 53ac6f44ea4e..407eecf4f7f0 100644
--- a/www-apps/moodle/moodle-3.7.9.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.9.3.ebuild b/www-apps/moodle/moodle-3.9.4.ebuild
index 1012b291cbc9..35d47aa5db46 100644
--- a/www-apps/moodle/moodle-3.9.3.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"