gentoo resync : 25.08.2020

6 files changed, 8 insertions, 130 deletions

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 9423b24a6b62..d7696e4071e6 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.5.12.tgz 46771916 BLAKE2B cb22c3a1548d2e01b309375ef3e422faa1a1603cf0205318fc18553e6ad92842c9d38db51fa4739f0b7ba969ce535d91d6c7bc79af954da61bd628cab15701ff SHA512 22c47324a259b98fc28a5f7b8061952b46bd628f2d41f7c9a0952c5d31517584b580284218743da841a8bf17ceb03ad87e1a31495bbcff7cdaac563ac2ef56de
-DIST moodle-3.6.10.tgz 47830177 BLAKE2B f28ce1b32cc4cec2eb256a9a3ad37f224e637e5e4720af4914dff80eec07cdfe738546545e9fc3db7a88517b0c10fc16a942515b3aa011d4d7588fbc2c26fffe SHA512 1ac374b1805f3a2be253279384f81c11d717eb6d9598c42490254912fe3720cba22c31525f3435785d270eda5a4340c79db43070973ebac3059549a322cfdbce
-DIST moodle-3.7.6.tgz 45867618 BLAKE2B 901a0d953e1a3329c817c032610ad797a34458fa9716ab9dcb51775faebdd30593596694ed72cbb0b0a45bb19eeee69a373f4792edce3aa530b3aeeb3cb551a3 SHA512 eaf8eeed256e9a942a5003f24bdd56ec3378d02fd33a4807b06fe2df083c5fe343014bda19d49791d20d038dbc3bc2a86e20a2e2f9fc25b45b3c00d8728c6ff1
-DIST moodle-3.8.3.tgz 53221103 BLAKE2B 7bf36c7affbe71eab027954e6690eb45137a49bad136511efe90f843de00d31b94071cac37a8ddc3f22565df960454047b42f5839ef58177b18d2737317b9c84 SHA512 d68f99717e7283f95a050d39879bffec8fe210f83d970fd5b14655be6546bf0848b75fd44bca3376b1bb7aba274c05a58b0b01d430cfbffebc02355c4a2b3759
-DIST moodle-3.9.tgz 56958303 BLAKE2B 81b4a2adab014d9e67d2a400592db56777dcecf7b16f7495f941472a8a49af74acd732d4198f2821910a1771995c85d998e1fe58ba4d6db7fc3dd4e1892cda41 SHA512 693a77fdd66ecfa9e1418e01c543d575aa8468b267de0a1dcfb6df369adc5b73223c959e57947cb56fafa94d269fbd36fd652ddf0b84ed8d5397702501a86e01
-EBUILD moodle-3.5.12.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
-EBUILD moodle-3.6.10.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
-EBUILD moodle-3.7.6.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
-EBUILD moodle-3.8.3.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
-EBUILD moodle-3.9.ebuild 2809 BLAKE2B 9dffc324aa9b154d95215344eec2c4ed22b197adb34b5d38eee3d4b54970f89f61beb3c64bf8751e8c6adb0c52660bed373c9edbd149ef4aa41ae24e0c3fc976 SHA512 6206687130349734f1731a74ec00419f20c6c34828b76c2b33cc2385a4b09a26efa172b023608252b815de014bd1d7c732d92f52268073e5c357275dc954a437
+DIST moodle-3.5.13.tgz 46770141 BLAKE2B 4e09eb7252b416d9649d698ab231ee0a13b9381b21cb62c04d59c246ce6c7014dfbe05df638fd5b4b01906e30f5fc0a3f8b2d9d4caef19e14865231320d9f65f SHA512 39988c64e86f055368373119d89cdce81308872f885918f57c96bfe76c4eb1a80407ce23d9e95404d1026a1db56794e7a8324354eb3abf614b2e8b20226fec66
+DIST moodle-3.7.7.tgz 45868976 BLAKE2B 060030e7c728f430a3062a3e033bf956fb90ea9b9ec8a43475497db06a4fad756becedc713126d3dff8410c47d83093c6d0a53dfaef5bd8a5ebb5ca7e0fa37da SHA512 5ed1b267f322681fe5895a127566ea0047afdc5799a4de084bfe752a387b4f61bbb7a105d714de2ef37f11762ed57783a1b8958c52231b02817a8205de8fb825
+DIST moodle-3.8.4.tgz 53237580 BLAKE2B e8538edda772bd092d0374676ddb99aca46c35148a8e7704ed25c5e4c641d3618674c354241bedc0a3a06c40e0e4f4ac3e5af20b8b6003df385f17469b6f2de5 SHA512 efcca1091b4ece1eb216955dc407894a31bccad276944caede8392cbfc2b29cc6bf37006e2e3c4ad6267bc24c3307c50da27f49c07496b14ab1790b7ce287191
+DIST moodle-3.9.1.tgz 56964609 BLAKE2B 576477c2b818d27f9e57cca730e2ad127b00b92729421304e3a6b7ff097ab65a2b6f94f760b233df7f8e9a89786b7f71e0f9aab3fa533362a2f1893b792d2509 SHA512 cdb07d92ca56c0a64810a881b8206111885fad9e1d1fb86649ae1bd85f2cb8670362f973447ff2a69a5420d5a56a5184beeb7d6b835c6b8624823f143380e6c2
+EBUILD moodle-3.5.13.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
+EBUILD moodle-3.7.7.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
+EBUILD moodle-3.8.4.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
+EBUILD moodle-3.9.1.ebuild 2809 BLAKE2B 9dffc324aa9b154d95215344eec2c4ed22b197adb34b5d38eee3d4b54970f89f61beb3c64bf8751e8c6adb0c52660bed373c9edbd149ef4aa41ae24e0c3fc976 SHA512 6206687130349734f1731a74ec00419f20c6c34828b76c2b33cc2385a4b09a26efa172b023608252b815de014bd1d7c732d92f52268073e5c357275dc954a437
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.5.12.ebuild b/www-apps/moodle/moodle-3.5.13.ebuild
index 8b94917f96cc..8b94917f96cc 100644
--- a/www-apps/moodle/moodle-3.5.12.ebuild
+++ b/www-apps/moodle/moodle-3.5.13.ebuild
diff --git a/www-apps/moodle/moodle-3.6.10.ebuild b/www-apps/moodle/moodle-3.6.10.ebuild
deleted file mode 100644
index 8b94917f96cc..000000000000
--- a/www-apps/moodle/moodle-3.6.10.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.0[${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.6.ebuild b/www-apps/moodle/moodle-3.7.7.ebuild
index 53ac6f44ea4e..53ac6f44ea4e 100644
--- a/www-apps/moodle/moodle-3.7.6.ebuild
+++ b/www-apps/moodle/moodle-3.7.7.ebuild
diff --git a/www-apps/moodle/moodle-3.8.3.ebuild b/www-apps/moodle/moodle-3.8.4.ebuild
index 53ac6f44ea4e..53ac6f44ea4e 100644
--- a/www-apps/moodle/moodle-3.8.3.ebuild
+++ b/www-apps/moodle/moodle-3.8.4.ebuild
diff --git a/www-apps/moodle/moodle-3.9.ebuild b/www-apps/moodle/moodle-3.9.1.ebuild
index 1012b291cbc9..1012b291cbc9 100644
--- a/www-apps/moodle/moodle-3.9.ebuild
+++ b/www-apps/moodle/moodle-3.9.1.ebuild