From 43864555e2ea6175dda89c422382d93faa932c6f Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Mon, 14 Aug 2023 15:10:50 +0000
Subject: [PATCH] www-apps/moodle: 3.11.16, 4.0.10, 4.1.5, 4.2.2

Closes: https://bugs.gentoo.org/887739
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---
 www-apps/moodle/Manifest                                  | 8 ++++----
 .../{moodle-3.11.15.ebuild => moodle-3.11.16.ebuild}      | 6 +++---
 .../moodle/{moodle-4.0.9.ebuild => moodle-4.0.10.ebuild}  | 4 ++--
 .../moodle/{moodle-4.1.4.ebuild => moodle-4.1.5.ebuild}   | 4 ++--
 .../moodle/{moodle-4.2.1.ebuild => moodle-4.2.2.ebuild}   | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename www-apps/moodle/{moodle-3.11.15.ebuild => moodle-3.11.16.ebuild} (93%)
 rename www-apps/moodle/{moodle-4.0.9.ebuild => moodle-4.0.10.ebuild} (95%)
 rename www-apps/moodle/{moodle-4.1.4.ebuild => moodle-4.1.5.ebuild} (95%)
 rename www-apps/moodle/{moodle-4.2.1.ebuild => moodle-4.2.2.ebuild} (95%)

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 70b394ab10387..cc16e5d7aa77f 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,4 +1,4 @@
-DIST moodle-3.11.15.tgz 60470865 BLAKE2B 426d59a1746764e3a61765914a4812db066a9bf6521587139e5e47da6c7007cf5b2374e6e2816f72e9d25ec3de44521947cccbb30469eb55a10aa66ba1b0c92c SHA512 e2b9b6563520f679066fbaead614fd9f8e66fc9b2b983bfe224f1e0b11a6973e3b4d783ea4af31ce095e5192deb7a62550d18bf7ee1e4218b58328a97fd027d6
-DIST moodle-4.0.9.tgz 62185523 BLAKE2B 92b9ffb5507b65da0e5fc11bb868eaf1d0c99d790866be6e57278d139a51dfc8a5701b40242d0c909c0808c9b9c9e18fa8794f903f7f0e210a9b6e002c21cae9 SHA512 016a221bcb20781f8f6e897b2c342af73b79570b056765a7d78fa2c8a93ab35821e4edecc3823cd5ed34dfe81936bd17392f94cbd91c3ea2eee273e43b1b018e
-DIST moodle-4.1.4.tgz 64817301 BLAKE2B f9f629afaec55cdc0e345263e210613747b402cbed90f07bce235fad232640ac03b21dad99eee7401ea2c3e6aab50f7a33a78b7ace693643bf81e74c94a01a5b SHA512 84747b725a82f993819864d3dae608d6a2075a6fcd903b3eec1653cb80fbfad7fe3be356088c8b6d41179dac28e24c96af8de04d592b1f9483ecb3355e375722
-DIST moodle-4.2.1.tgz 65290894 BLAKE2B cf1f8ff01e5938990eca27b3bc0392526be40cf0b905ce9713c8b020a349ca126e590719e1ec153a0ad4b0387c9573811582e11d320c3f9d4d2b95ec5a99afb8 SHA512 bf960540c8ffac082970498379fe449b201b408335fb41dbcca7da645c060164e174c83549522ab35b23d2265c6ab4db810a20a637978c41a82a3b024b593712
+DIST moodle-3.11.16.tgz 60509432 BLAKE2B 2a48ca1b1fe6e998f472815eac58364a0b4fb0649c4bec0ea2963d4dcf696d515882a5555567ffb6ba071548a74f8aa21499ec1c1122e93a7dc0be119e63e809 SHA512 b0021826169dcea40b3bd4bac1b13506671b8925d7e2de64137089a7f0cea4e076dba5685864309991b80b0882a0fdb4db58eab0bb20e0243e551a3418500111
+DIST moodle-4.0.10.tgz 62193443 BLAKE2B 268993e3f1ac7de23a8b4c897e340edf603f92ba2fd1dbc9e33f07b8984e51e9054a870e252a1c0bc112f0644399ed019969291622797d363c147cebcc735db9 SHA512 b8d9b2b8f326e1460f85f60b0c659ac8e15e26670a0f9eda86453fd7b3d5c25cc1eca4b27f53bfa0ef3a613fabf70d4b97ad64d75509ec9762e6c751b2aa34f6
+DIST moodle-4.1.5.tgz 64870562 BLAKE2B 162aac932a826378daed6fca40d74c41cc0e1f7bd5732bffba14d10999f5a60074b62d8b3961705504ed6d5bc821d77eb818a320d3a32b3261be587f4ad1b176 SHA512 c8860c4988099a5c425ed16bc27439f4ff471ec21b2de606417d46ec8669939e274b8b5ad6db47a4c5864ee31d660c3c6b7b3770a3897d3119cf6578474c82e1
+DIST moodle-4.2.2.tgz 65324589 BLAKE2B d11a64482dc9f2ac2acf995883fa1fe3c5b9f611e49324957c5857a4be5deb32fbf78880f12e653816ada4ebf629d3f5587567448b466a475763cd92b0e4d6c9 SHA512 b0302a12b90249dd61159cfa552cbf87b7fc7288c5a4c0a1cda657c07e1e988b7c569b2e5c8ce88a5517ac97fd52b20e4c5a1cb37cfd6e94a91edb8d26e51ecd
diff --git a/www-apps/moodle/moodle-3.11.15.ebuild b/www-apps/moodle/moodle-3.11.16.ebuild
similarity index 93%
rename from www-apps/moodle/moodle-3.11.15.ebuild
rename to www-apps/moodle/moodle-3.11.16.ebuild
index 20e7fd2624129..cafeedef2f5b0 100644
--- a/www-apps/moodle/moodle-3.11.15.ebuild
+++ b/www-apps/moodle/moodle-3.11.16.ebuild
@@ -9,7 +9,7 @@ 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"
+SRC_URI="https://download.moodle.org/download.php/direct/${MY_BRANCH}/${P}.tgz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-3+"
@@ -25,7 +25,7 @@ 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_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
@@ -39,7 +39,7 @@ IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
 # and the moodle documentation for other possibilities.
 DEPEND=""
 RDEPEND="
-	dev-lang/php:7.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	dev-lang/php:8.0[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
 	virtual/httpd-php
 	virtual/cron"
 
diff --git a/www-apps/moodle/moodle-4.0.9.ebuild b/www-apps/moodle/moodle-4.0.10.ebuild
similarity index 95%
rename from www-apps/moodle/moodle-4.0.9.ebuild
rename to www-apps/moodle/moodle-4.0.10.ebuild
index 84bcff7453607..6132ad557e0c9 100644
--- a/www-apps/moodle/moodle-4.0.9.ebuild
+++ b/www-apps/moodle/moodle-4.0.10.ebuild
@@ -26,7 +26,7 @@ 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_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
@@ -40,7 +40,7 @@ IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
 # and the moodle documentation for other possibilities.
 DEPEND=""
 RDEPEND="
-	dev-lang/php:7.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	dev-lang/php:8.0[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
 	virtual/httpd-php
 	virtual/cron"
 
diff --git a/www-apps/moodle/moodle-4.1.4.ebuild b/www-apps/moodle/moodle-4.1.5.ebuild
similarity index 95%
rename from www-apps/moodle/moodle-4.1.4.ebuild
rename to www-apps/moodle/moodle-4.1.5.ebuild
index 0557b7cafcb2c..a92c23129f718 100644
--- a/www-apps/moodle/moodle-4.1.4.ebuild
+++ b/www-apps/moodle/moodle-4.1.5.ebuild
@@ -25,7 +25,7 @@ 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_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
@@ -39,7 +39,7 @@ IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
 # and the moodle documentation for other possibilities.
 DEPEND=""
 RDEPEND="
-	dev-lang/php:7.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	dev-lang/php:8.1[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
 	virtual/httpd-php
 	virtual/cron"
 
diff --git a/www-apps/moodle/moodle-4.2.1.ebuild b/www-apps/moodle/moodle-4.2.2.ebuild
similarity index 95%
rename from www-apps/moodle/moodle-4.2.1.ebuild
rename to www-apps/moodle/moodle-4.2.2.ebuild
index 0557b7cafcb2c..a92c23129f718 100644
--- a/www-apps/moodle/moodle-4.2.1.ebuild
+++ b/www-apps/moodle/moodle-4.2.2.ebuild
@@ -25,7 +25,7 @@ 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_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
@@ -39,7 +39,7 @@ IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
 # and the moodle documentation for other possibilities.
 DEPEND=""
 RDEPEND="
-	dev-lang/php:7.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	dev-lang/php:8.1[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
 	virtual/httpd-php
 	virtual/cron"