5 files changed, 7 insertions, 127 deletions
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index d6533516948c..43d073ff3c40 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,4 +1,3 @@
-DIST moodle-2.7.20.tgz 35012095 SHA256 c6bc904becc85ce8c8e9cf4ddd0237ac1503eac193f14870905a7a87ed2babe7 SHA512 0f3475d0e4ed9e8fbc6c05fabffd9cb0c2ae3e74370494cc08432abea1926735c2ae54fc18a068dae9d224979b4d7777936a36a447aa4a0705790f9dfc52889d WHIRLPOOL 56df05fb7aab4208ce712772ef71f868f280fe41ca26add4f58eea62aaadac17b7114a4826953a9062ff45567d159081102585fe9e7e9531dc59e29636f501f8
-DIST moodle-3.0.10.tgz 38221195 SHA256 2adc2bd6e457409923795b4bfb1c086aedfd0069322195f5590baa08c75c42e7 SHA512 9430e43dde69efd583b29ccdaf70c6abaa71285a09660b79827d836aefb868a9302fed5c806c63a1e8a557b18c096b8d058a38755f36b45e426b7ec9a7d4a378 WHIRLPOOL 8b52d217a1d0e5db57ada3a531eab112092a514a9feaaebf1126b4e1d06e3a7c1c09d525b25e9be41b01633cdf375a3d217e6dbffa9c8a5d4dd67e3d435636ed
-DIST moodle-3.1.6.tgz 37981129 SHA256 d00307f763dec6b0f2b9637b057079e730f0ffc85765848f111a39c0a05f510d SHA512 4a3dfaa8707b49c4f43d834c4927914e64344540916ce40d79486a03b9a9d03ff54ad5aef01afc058c54e5c5bc8152a054ad57e13a1aa4a1d96fb64634b15ec7 WHIRLPOOL a4ea07aef256d416ee121e40b06c347be9c963ee1879b82df6556150b3c315d3222438ce5092bbaddcdd5c49405f3c5ecac87324d6b0ca621dfb7c81778de0a6
-DIST moodle-3.2.3.tgz 39500908 SHA256 ce5c0e5fb670cea7b0a4f0692f88e0eaa2908ecac4f02a16c8b15b6860a909ff SHA512 80cb4c84ee5ac39f6d4331a86f19a74af42a66d06624b2a4b80c8ef0a711c44a95e6059aba2c9d22b253782e433215d744282e2766388e95f4f26ef9dbcc09ff WHIRLPOOL 1c15ecd963e6eeb0100fe4a405340a93715eb9ecc31ff8207b6ee6dcde9986a6e17a6ea914ce5f4e61ae832ee62db06ba9ca5b90a59f25428edc432be014d7e1
+DIST moodle-3.1.7.tgz 37982099 SHA256 927d41d070d6703ba98b312a261da84f603f16c8da4e8ac34c049c7785451284 SHA512 56786eb8b8921272c2afffaba393fac6b6bec2b1d07aa6806c726ee2f8cd3a7c7176e6b63d9a706697c6df86794d35a3d91cc0cbee04279fb8e5472f0f5c504c WHIRLPOOL 657bb2d107abf2e1f3a6333e4ba593ddac29751d829d230e888fd2b8b62ac5eb385670742b0708a26c44ceaff6a217670fe1a02f330667289556a10486e1cfee
+DIST moodle-3.2.4.tgz 39525148 SHA256 5f743bc389582bd8e0f5878d745cf23472fe97b9e7de459dfe42483844f42385 SHA512 153b66baf72fd1e6d0f453c76deb9155fa49cbba42a2383191adec1d31d7f8bddd75f95025fc29cee1a76bf6e9d748322e9c164a21fe330f366ab51905cd70e6 WHIRLPOOL 63ed248cfe47421203504aee5191435783d007a750f66d368c4c7b1a36e8a360adf5fd8c6a2fae2be02a2a45a6dc2d70d475d06ac17f8b2503c18f5e7282e568
+DIST moodle-3.3.1.tgz 43790252 SHA256 9c7069a4d46134972ae50f75bae4f25d60ea75603dfaff5fb5f1306fee70daf0 SHA512 e338e33886b1d76c045d34428be97baedf47e65e4baba8003e334bfca019611bfdcf3f6c68ff3235463bdef6b90734be2725c48202fca259e604456f4c1c0bf1 WHIRLPOOL 271cddd2187fd51332241a308c3b04662a0661f014b31e7a1a2391f15db515f4e3aeb1da02408db3215c4a972a279594e7d8f8c43970e7ffabc4ac9fbee5281a
diff --git a/www-apps/moodle/moodle-2.7.20.ebuild b/www-apps/moodle/moodle-2.7.20.ebuild
deleted file mode 100644
index 3f11998be437..000000000000
--- a/www-apps/moodle/moodle-2.7.20.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,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"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-5.4.4[${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
-
-	# 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} -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.php .
-
-	# Moodle expect postgres7, not postgres
-	MYDB=${MYDB/postgres/postgres7}
-
-	# Moodle expects mysql, not mysqli
-	MYDB=${MYDB/mysqli/mysql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-}
-
-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.0.10.ebuild b/www-apps/moodle/moodle-3.1.7.ebuild
index c64ab1ffbc71..c64ab1ffbc71 100644
--- a/www-apps/moodle/moodle-3.0.10.ebuild
+++ b/www-apps/moodle/moodle-3.1.7.ebuild
diff --git a/www-apps/moodle/moodle-3.2.3.ebuild b/www-apps/moodle/moodle-3.2.4.ebuild
index 37b176d93c22..37b176d93c22 100644
--- a/www-apps/moodle/moodle-3.2.3.ebuild
+++ b/www-apps/moodle/moodle-3.2.4.ebuild
diff --git a/www-apps/moodle/moodle-3.1.6.ebuild b/www-apps/moodle/moodle-3.3.1.ebuild
index c64ab1ffbc71..4c2d978ef8a6 100644
--- a/www-apps/moodle/moodle-3.1.6.ebuild
+++ b/www-apps/moodle/moodle-3.3.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit versionator webapp
 
@@ -41,7 +41,7 @@ REQUIRED_USE="|| ( ${DB_TYPES} )"
 # and the moodle documentation for other possibilities.
 DEPEND=""
 RDEPEND="
-	>=dev-lang/php-5.4.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	>=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
 	virtual/httpd-php
 	virtual/cron"
 
@@ -86,6 +86,8 @@ src_prepare() {
 	if [[ ${DB_COUNT} -eq 1 ]] ; then
 		sed -i -e "s|mydb|${MYDB}|" config.php
 	fi
+
+	eapply_user
 }
 
 src_install() {