gentoo resync : 15.12.2019

5 files changed, 158 insertions, 45 deletions

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 4ef0b41df177..76246eb2bf36 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -5,7 +5,9 @@ AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd
 DIST moodle-3.5.9.tgz 46748268 BLAKE2B 41c1b9f47f088438fddaa3bbf913091610d8b5aece8413944d79ba67381a50c510c257eab56c8a41f755335417549107c4e349134f3d0c39579329efd04cee34 SHA512 262449f3c424655d86746c13548187e412575ba4abe5d4bac2bcd64aa8f2ce4ea3fd3663bba8a61c10c9bd9192d5fb1ee19d75484340972a909284bc5d923a2c
 DIST moodle-3.6.7.tgz 47805595 BLAKE2B 567d179d3f2c600960c979dc54a92de9bf95e0710de20f6dcb304d8d6a528d929b60183f56e707a3254a2c98060c2c3ced62272360912716d8a1cf2fa7bd3b98 SHA512 b406fccb8ea572cf14cb8c06e746778b1ce92a170537ed4cd17e1a0977d30e5b8711a7cb36f7d845acc1af31a348faf7cf3b8beca815c1caa8ac0b2c2cf48ae4
 DIST moodle-3.7.3.tgz 45782119 BLAKE2B 2732e0269d65f213b71e32231f7fff8ba06f2456466f8fa00f9e7f204f0f7160b3552763c555f952a35cbb9344c9494e7122bd9a6f9ecea8b9ca18a8a9d90e07 SHA512 e9cb7d633be57ed9a66f54f33d2b2827a0ee18d3e7d48f463e8526b817e470d9d1930dbef557f84d94c1dc20a2543874e3bbbae4ac89eeda62217ac2bbddb14d
-EBUILD moodle-3.5.9.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
-EBUILD moodle-3.6.7.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
-EBUILD moodle-3.7.3.ebuild 2949 BLAKE2B cb6e624bb0c83c5e8a3e7d9a541cb61dcf93dd6b06bdbf417ac96631444665a08bfdb5d1366636c0452421faf6350d4b886d08d6a9a07b8676f45cdcb040ffa8 SHA512 593727dc584922aa6a0074c01ab6d31bf738c7e198d4901ce2766c2dbda9eae26b0f2ccb4360d117da3d8fb76f34b656b6f777d2e1aa992401bc8bd627774c67
+DIST moodle-3.8.tgz 53109307 BLAKE2B 833160d06cb1068eda5474a4bba5bfb05a80b857c32a92eea2c92eb1bd6fec91fd1098f7172d643a9f0a8a7c567afda395f91d884446ff8c5113eac1d441e79a SHA512 c67803b62d25d3031ea58afea8820d746da144b0ef5c41f659fe0d9a99aeef5f287c4582b3766ec28452495bea03aed78509acd71a203edf990328d31f185bf3
+EBUILD moodle-3.5.9.ebuild 2804 BLAKE2B 0e176684ae1e2682448bbeb4f3d11f4888b5cda74eb2399839199e629ea01d35b1296450b90003a4ec78ba94bdddefccd982b8afaf79e8f5c0eb2ee5ad13475d SHA512 261e6dcf491af3a2d04d28a1a8d45e634b88f0a20d2510e0928a9a8c22824f5cfe2065fcc24e42cd918492a62e638e65bcaf7ef75de2ff0bbb1cf66ee9996f4f
+EBUILD moodle-3.6.7.ebuild 2804 BLAKE2B 0e176684ae1e2682448bbeb4f3d11f4888b5cda74eb2399839199e629ea01d35b1296450b90003a4ec78ba94bdddefccd982b8afaf79e8f5c0eb2ee5ad13475d SHA512 261e6dcf491af3a2d04d28a1a8d45e634b88f0a20d2510e0928a9a8c22824f5cfe2065fcc24e42cd918492a62e638e65bcaf7ef75de2ff0bbb1cf66ee9996f4f
+EBUILD moodle-3.7.3.ebuild 2804 BLAKE2B 985d48d4fa7a008d1175ad60d47f9212eb486017bace234589cd444e615b2df4d17b2bd00945d2ccbf66cd2c83a0c3ccce4cea9227f68ffd6dd6b2dcb6ccb2a6 SHA512 f370c9419da9ac3fd4bcdf92025ca7ae3998be18bb1be73b9fd26edb00c95d690c885d7fcf4d17532f222dd029224826a3a319864603471ec57642e640384430
+EBUILD moodle-3.8.ebuild 2804 BLAKE2B 985d48d4fa7a008d1175ad60d47f9212eb486017bace234589cd444e615b2df4d17b2bd00945d2ccbf66cd2c83a0c3ccce4cea9227f68ffd6dd6b2dcb6ccb2a6 SHA512 f370c9419da9ac3fd4bcdf92025ca7ae3998be18bb1be73b9fd26edb00c95d690c885d7fcf4d17532f222dd029224826a3a319864603471ec57642e640384430
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.5.9.ebuild b/www-apps/moodle/moodle-3.5.9.ebuild
index 1c5e865ec67c..07dbb6d2bb56 100644
--- a/www-apps/moodle/moodle-3.5.9.ebuild
+++ b/www-apps/moodle/moodle-3.5.9.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit versionator webapp
+inherit webapp
 
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+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-2"
+LICENSE="GPL-3+"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 #SLOT empty due to webapp
 
@@ -30,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mssql? - lives on a windows server
@@ -58,14 +56,13 @@ pkg_setup() {
 		fi
 	done
 
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#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} -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=""
diff --git a/www-apps/moodle/moodle-3.6.7.ebuild b/www-apps/moodle/moodle-3.6.7.ebuild
index 1c5e865ec67c..07dbb6d2bb56 100644
--- a/www-apps/moodle/moodle-3.6.7.ebuild
+++ b/www-apps/moodle/moodle-3.6.7.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit versionator webapp
+inherit webapp
 
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+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-2"
+LICENSE="GPL-3+"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 #SLOT empty due to webapp
 
@@ -30,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mssql? - lives on a windows server
@@ -58,14 +56,13 @@ pkg_setup() {
 		fi
 	done
 
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#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} -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=""
diff --git a/www-apps/moodle/moodle-3.7.3.ebuild b/www-apps/moodle/moodle-3.7.3.ebuild
index 02e7fab65927..f9ed8bfdb6fd 100644
--- a/www-apps/moodle/moodle-3.7.3.ebuild
+++ b/www-apps/moodle/moodle-3.7.3.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit versionator webapp
+inherit webapp
 
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+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-2"
+LICENSE="GPL-3+"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 #SLOT empty due to webapp
 
@@ -30,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mssql? - lives on a windows server
@@ -58,14 +56,13 @@ pkg_setup() {
 		fi
 	done
 
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#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} -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=""
diff --git a/www-apps/moodle/moodle-3.8.ebuild b/www-apps/moodle/moodle-3.8.ebuild
new file mode 100644
index 000000000000..f9ed8bfdb6fd
--- /dev/null
+++ b/www-apps/moodle/moodle-3.8.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 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 ~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
+}