gentoo resync : 29.06.2021

5 files changed, 4 insertions, 248 deletions

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 55b62d8ed928..473c9ef4bbc2 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,14 +2,10 @@ 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.3.tgz 57483053 BLAKE2B a5129f45c4fdf101df7c96885a8c5cec7cad797a545d5a3fae621f5868cafcf3e9f1cdf06f16e689ccfe0e2bcab6fabd65a5fd45ef178f313176ca5e23350cd9 SHA512 934d42b6fc29c2c9ebcddf788c3e983c3bade77f5d2dbb28a612b17d263a67fd08c0f2a5983bbc1a87054d965cabc3c7257a940febec73f1df72bc7e586cd321
+DIST moodle-3.10.4.tgz 57525833 BLAKE2B c95ec10571d6841059f59f311e7d003b7b5d1b54f08c76bb90edc4efa9abda96b826064e80d5ec86bbdb9299148d8b261bd6183b49d47e69a586165e759da962 SHA512 c524f1940f9b0631f3cd53d1a8f1c43ac05e98e9293ffac649603b9665f3ac78db96152d23b3f8350ebd9ab6264bd544fbf69c164f93d9374a2f0f81af075660
 DIST moodle-3.11.tgz 59365522 BLAKE2B f9a2f77dd851efd740b924e51de6b882955101834ca4201bf2fd243ddd8dbe403d1054dcebb5c3022e941fe9f7d119b285d6e955cdb871288cb3b0e40eb9de07 SHA512 69509d57990bf9cca7a262b78f6beb0d90d89e5d93018fd306f662d32303dd39cc0a14b2eee0d58e8f420766cf0acbeeaf6e1f7d43de6b99d0999747b438ee5a
-DIST moodle-3.5.18.tgz 46812954 BLAKE2B fc13835e9d40236b2d572f344870999cd9ea60d11a043428acacc34362fbf114c2253083a6165dc800bca9c5cbb9cefeb4f7f76111a880348bf7b0988cdda8c7 SHA512 8336ba4dd638410e0697e1ee0c9715f166d934ae1325079e5b14e6e7959e32426103bb1af1e1e80ced3764e5c49ccea254de590f729762e417b21dab3f1b849c
-DIST moodle-3.8.9.tgz 53320016 BLAKE2B 5c0c54f5a57eea97c591d75088fe89e8e12df1e233f99c7025fb4e3720a27aa8133ccd25b25876faf2335497827ca748579607dbb2d52c01043fd59854f6dba4 SHA512 ec0bc22d82ae2afb69d491df75011568dba771cc2cbab988dbfe9bc1c4daa6d5e947ca8b9d71acabecd9c57d25202d79321abf1cdda6908ad32511db6c107289
-DIST moodle-3.9.6.tgz 57105713 BLAKE2B 26b5334eda2fac641020459b8471db692f7202acc62b72e11a43fdb3893dadcf2150af7c82659c408ab9ee4660b766498c2c3005f8b43ed980ecefd60263e581 SHA512 0c66070f9cf422a6ed11ac6ff067aba294bc7f4d4b5a17f729c4e4fbb060b59ee232a4a87996557afaa7c6646bfcc3c14736ff4cb18b20a8a31386cc40a61d7f
-EBUILD moodle-3.10.3-r1.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
+DIST moodle-3.9.7.tgz 57157463 BLAKE2B 359d93fdfe62e1470fd7036d2c1d778ce7643c90e70e48a70033bf341833616b8909e6b36d54ddd8f63d38239bfffb709b6fdb50800440c9fc86329132e54f6f SHA512 71caf4408237ae59a5c70be7cbcc245580ed8eb382f03fb4d5284d946f1190fc48aa6562486fa9538c374b760fd05a0bdb95cac5ae182e7787d2e379e51caad6
+EBUILD moodle-3.10.4.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
 EBUILD moodle-3.11-r1.ebuild 2812 BLAKE2B 5626350ca51dfca177261d5f89f59c6eb59e736f0992851f1adda51abe91b40b067106402586aeaf128035299a33792d8cda0b77980c17293804ee1edcecec70 SHA512 79c8aeb215fec8dbdd2e7fd0747b8c48a277713532a38f671596590799d3d8100ac4b502670798168b3bd8d9bcf0c20f4cedeb430fa8cd3cc9108004afca021a
-EBUILD moodle-3.5.18-r1.ebuild 2812 BLAKE2B 65351b8543b9c37dc27704e382e2f119a19663cec96f7c14a1033e45d8d9545f067ac9ed53309c059bdc36b3c562846e4fb029ce8226fd4f6778526f625ea536 SHA512 578811288ea98e0c6cd947e3d2afffd9035331a91d61012ae4eb5d495f15bf192f35043958ef09d25196987923705aa69f2e46ea9ea514f8c52459774e26e93d
-EBUILD moodle-3.8.9-r1.ebuild 2812 BLAKE2B 6e9289a67923bef5b438fda61d7e0ed30ef4ef68827998fca42faa922bc60affc8eae9ed537a06f7f9ef706f5cc270d70ac0bc9592786bb3e8a32c8fc0eae221 SHA512 ab201a998a35488e760fd0ce54e3dd398e16fa9856f267b0826f4ed7ec38d70e7ce4c7e6ee1b5ee454b60a88b783d7c00e9c33db78e0b9064146b4cd7a865fd1
-EBUILD moodle-3.9.6-r1.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
+EBUILD moodle-3.9.7.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
 MISC metadata.xml 387 BLAKE2B c94976408768e98849655b8679935062d448bd3c9a2b65f165c005556d0a7230717c23577216e61d1d529e2172ad4c19d51223aaf7db07731cf2e1e92b858efe SHA512 bc5bc14f985ea4eba911fb4e411c5caafca175a1859f2535abe5b8fa3ebe45e05ecb9085ffa4dc33bd9f88bc220fbf42f7b1615553f352b742ffb524c482e49a
diff --git a/www-apps/moodle/moodle-3.10.3-r1.ebuild b/www-apps/moodle/moodle-3.10.4.ebuild
index c6650ea73158..c6650ea73158 100644
--- a/www-apps/moodle/moodle-3.10.3-r1.ebuild
+++ b/www-apps/moodle/moodle-3.10.4.ebuild
diff --git a/www-apps/moodle/moodle-3.5.18-r1.ebuild b/www-apps/moodle/moodle-3.5.18-r1.ebuild
deleted file mode 100644
index 0e98b0c6fc9b..000000000000
--- a/www-apps/moodle/moodle-3.5.18-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 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.8.9-r1.ebuild b/www-apps/moodle/moodle-3.8.9-r1.ebuild
deleted file mode 100644
index 8b7fe571d395..000000000000
--- a/www-apps/moodle/moodle-3.8.9-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 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.9.6-r1.ebuild b/www-apps/moodle/moodle-3.9.7.ebuild
index c6650ea73158..c6650ea73158 100644
--- a/www-apps/moodle/moodle-3.9.6-r1.ebuild
+++ b/www-apps/moodle/moodle-3.9.7.ebuild