6 files changed, 8 insertions, 131 deletions
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index ace85f2e86f0..6621d1d06707 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,5 +1,4 @@
-DIST moodle-2.7.17.tgz 35006140 SHA256 02ccedeca9e33d5ffb5554e12a5c85f0c44fbc853e619d6b9f7a4a1519aadda4 SHA512 3ec42f1d8e86536aa6044d87ac8721adca3216c74be25fffcda16ccdaf768f0db92de3860e17d3ee5be594aa2834c6a04ce42329ad6b78c0f0a36a7761f32cf1 WHIRLPOOL f13d716bfcb53a978da0b07359d559b66104168d80efed1a931f4b113f37a7756b7d3df2b18604b13d9e65b638c923877163c8b610eac1f03e30a3cdbe4efd70
-DIST moodle-2.9.9.tgz 36587881 SHA256 c7aab8387f88111923dd1063964e70c88f1a883b2820f28f273ff572634f5c3b SHA512 3dae5c35f5d1149288fb5f94509204910e66e288ab3f67d5fd93d098fc0d6ae5adda5340eef23ea907b397a4bde5bc8fe1d99b48b5358f2bf605f2c84bc566fb WHIRLPOOL 46ee8e6a2fa5ae878b6a29e68824432a1024420d92033f3055d9ed9cdd80b2d99e7420017541944acf3890819c7bf6a1f518a2ca1bb2bc2627fee615a228b86e
-DIST moodle-3.0.7.tgz 38213543 SHA256 6d4f97fd6f8431a8a79eb8d49bdaf54b197c667d7b6d6185c4d7e568d69092b0 SHA512 5182190ae2075a83a1e01b8f2a678a718741ebdcd76db8ee6b154fb9ead044f1e341f7ac52967796938b9dad3fc3dc45d3110fe1b30cb75487592c1dbab6a194 WHIRLPOOL 3e3349873ce11154633258a02a46ab491e53d8a99306b352c11ccab899349caf221beecb48835103c02a5e40a4282f697bd742a7ec30a04321281627f6c6b18d
-DIST moodle-3.1.3.tgz 37558330 SHA256 c0a4924ef66000fc1ac203276260789a43aab6a88283a45f1ce01002370a8ab2 SHA512 fe6d4a09ec1808d2e8b74a5a092417531cac82e644d9481b417944d8174c07d7aa573892ed6bb8c881eb4aee133dcd85b9f6ce0ff90aa86d183ec5dcd2796e76 WHIRLPOOL 5608a20b39faf6f7ca1e88036498818183f3995dc3e54c23adbf7b29d415d06fab6f5e1f883841e1152026a7ed44a40986db6cfdff922e4b85b8b9446680e3dc
-DIST moodle-3.2.tgz 38923254 SHA256 ae6dcfdc0d300bcba518f10be7978049f0c4e400b4f2e4420f3b31c011cbeb41 SHA512 6eca98c02cd42809dbb39b2a6197e984c6f110b33d1c15cb6399966af0bf7eeb0436f65f3ceb06e3bbf21a27551867ed5eaec6706fdf5624550d9aa96907cc58 WHIRLPOOL aa8ff0cff234875fec990d15a84b9ac229a772f65fcc7628ed3647cb5a436d8b13da1b4f35f2a7ef4453c465553e702c7be80f4e64d82387b74302b1c5feda92
+DIST moodle-2.7.18.tgz 35010056 SHA256 1de359ab1808fb8c29a39a6b094a291f5069708a5221cb25f1b7d0577b3dbf4c SHA512 6dc5a9b2db8c77123c0695f0b030988e85b43b3ab8ce69c4f966ab3ca788a4c84b41c72acbcc9d67fdffb1602b6535d1efe37a29e2f78b57b51ff4f964dfc11e WHIRLPOOL 7dda24bd08c2b6c22d4f4512abd2cad8ab8da50ac99d39693448db5f1e2b16e71f0838868d58ff93b1e45cceb9dbebf03491ef10df275654dc13288df3de1d80
+DIST moodle-3.0.8.tgz 38221696 SHA256 724ad047b9dd6d43df2bdb0f81e8e7d5a9bd7616ebd85ffb3fd533c9581d70bc SHA512 10f92b69bafcd0c550c4f7003a2c4a52b3423dcfc9dd50a38e9edfdbaafa01d68caa1028b6946d30223d195fdf0a37b221369445fc52506a21924678507eeb15 WHIRLPOOL 8a2f6a6104bd084cb176a7d5d9a4fab81e73e1e52f71ce1a7bcfb8dfaf71d9ecf5a744d4c9457e830b7c668e46c845e6d9dc77b915fbad8f6affe66072b78858
+DIST moodle-3.1.4.tgz 37568385 SHA256 4360de1bb13d28bc2e4e28fe36acdc40513948b06c9cdae4b2a7f18b07af5a60 SHA512 d8609d960615bfd5860420cd9f5253fc60fd3ca471fa5a6fa86c2c23249cb7005fa50ee8dd747d6db416a01d901c6b3214b06a98e4b4f20a36bc149de41010c7 WHIRLPOOL d75a10b129f9a858730ed29a7dc96e12b44b295326d49cf5bd61891ebe61567569bc95309a546143894dfe37524ab794716e37858ca423a212a4483c16823434
+DIST moodle-3.2.1.tgz 38940294 SHA256 c12afd72faf7505bdbe22a8bd056afc615517acea5c97ef8415357b25226fbed SHA512 2942e312dcaae9ac234424f04216bf4f832cc5a716cc9fec392f4d71c8ece725d7d0ea0d19b09aeefcd661c73928f282812f94ad8e3be844c6739cf4da5b359c WHIRLPOOL 82107b1dcd300b94592d1918aee36450228cbc595ea678803ea5506b28d48c376df1361acf3100b58ab4deb4d8a72324cd0d0728b93c2fa75d4e4e45ed839320
diff --git a/www-apps/moodle/moodle-2.7.17.ebuild b/www-apps/moodle/moodle-2.7.18.ebuild
index 5781d533483d..785e26cc30a5 100644
--- a/www-apps/moodle/moodle-2.7.17.ebuild
+++ b/www-apps/moodle/moodle-2.7.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/www-apps/moodle/moodle-2.9.9.ebuild b/www-apps/moodle/moodle-3.0.8.ebuild
index c0a369d8d66b..9dd4129a9730 100644
--- a/www-apps/moodle/moodle-2.9.9.ebuild
+++ b/www-apps/moodle/moodle-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/www-apps/moodle/moodle-3.1.3.ebuild b/www-apps/moodle/moodle-3.1.3.ebuild
deleted file mode 100644
index c0a369d8d66b..000000000000
--- a/www-apps/moodle/moodle-3.1.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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?,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"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# 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-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-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
-}
-
-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.7.ebuild b/www-apps/moodle/moodle-3.1.4.ebuild
index c0a369d8d66b..9dd4129a9730 100644
--- a/www-apps/moodle/moodle-3.0.7.ebuild
+++ b/www-apps/moodle/moodle-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/www-apps/moodle/moodle-3.2.ebuild b/www-apps/moodle/moodle-3.2.1.ebuild
index 916d01f341bc..d6b621988f52 100644
--- a/www-apps/moodle/moodle-3.2.ebuild
+++ b/www-apps/moodle/moodle-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$