www-apps/moodle: version bumps, remove unsupported versions

Package-Manager: portage-2.2.28

5 files changed, 3 insertions, 132 deletions

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index d57e9d7eae0e..244869db8b4f 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,5 +1,4 @@
-DIST moodle-2.7.14.tgz 35005794 SHA256 c89250c9a2995f1f2a70ded150ca4dcb08413f8a69bc954b172a8aa89909fe63 SHA512 8be87397dabf757bb9778d46415b8f364559faf2f4d128bb7eb8206c8bfa203fab6d13c9cf9a31bc62579be3e47b53dd80456844906176916c7bda2e9ea02627 WHIRLPOOL c88fc53a8052b2c918afc7474be482cb2b19b518d412c11e29e7048cb33215aeb78cca5a4070f74047dedb9c9bb8154c4494ce9e371e0133df5384af9fcba75e
-DIST moodle-2.8.12.tgz 36000130 SHA256 05fa695ced738cc9638ac62144c3bbda30f919093a6ffc78fd04b418329b4101 SHA512 f934d0b86c7c8a6da2a1b2b6e6201832b978f4e971afb37116df28a784420054436b61557a9c0cec9c3d38a581e8f42c91e2b49b9411268011120891efe8fdde WHIRLPOOL 99e7fe059005dacc1fa41fe1b351b223ebdae5456feb848440d0fdf15ebc945a9492716f5c49cf58a50acf7e141414eb002744dd031e9eedc394d9b43b1a5ad4
-DIST moodle-2.9.6.tgz 36582260 SHA256 b5b17e869cc7f122d7f624a6ec3cf9fcfaa7166b3020e3c819c2135ae7327a15 SHA512 61021e7e57df18f26c95b7b3c38d5d25d2269110a5c623476a461f28bdfb2f7c6e2a61d558fa387e9a64627a9b71caf25bc357b95bd40335e415ad6a3804d9b5 WHIRLPOOL a4e783bfcb430c0ec48f23ea951745bf8db34ac058fed788497c04392ef3b0ded29de1389c25afd1d0db7a8c9da9f70675d86f80a50d10bf66c16efb2cab8e21
-DIST moodle-3.0.4.tgz 38110816 SHA256 27e3f58d2bc1e63163f5c7d27aaf5548c216a433e87be7bf429030aada43b469 SHA512 ceb41ce986c0e378753815367a649ce0c7404ca671c9f13fe00350bf7504584aa4d40badac6d4c2a9eedfae1f2c1b0a6e82f46ca84be1f1b043a11eaac11114b WHIRLPOOL 158db9bd7231cafd9bd32e318700bd53c3c4011e409330aba0d3c36f2390f6b1c2cb7ffd797fa80f29b63a387228d8f27f5fd8b87cd77614f110c3f7e7828c6f
+DIST moodle-2.7.15.tgz 35007649 SHA256 9c61c40996157be0498ad0d5004014b77a5fe34599510c76f7dc1ffc95c74400 SHA512 deb92e394bf0f0a06246c182d5411727f0fc07d6cd1defd2f8773362990dd45351bdf31fdf0494a0db95ffffb9c96c1120546891988252cf19671cf19177cf05 WHIRLPOOL 0feba4c7d49d9d2179674e0199c20547c841886e6b3f2b9a2917cd5829ab1a00c196c55e175e8e8300177592d6278d93af16094c90881dac1c6d0ac3cd392e59
+DIST moodle-2.9.7.tgz 36586018 SHA256 87261ce872ef7bab3c04a4ae28cc41168af2d5fdd1c35bab6aca02132e3725db SHA512 1be555fc1e8cd948180dc3cf055c998290821e4445d534461228ee6a51758992f0c0572b0068452f1dbdcde6fba405370f6f44818dd7759e75850abb73a83cb3 WHIRLPOOL dca9a276bd863aeb3a48636ed0bf575cd47ddc11396136b3bfb4c779845414026311f4caba71ba6792b433b1b92cf7c880931c63da9e1c9d602f82f2204586eb
+DIST moodle-3.0.5.tgz 38156153 SHA256 e8a6a3661e036b3cf0b6d89ed2a6af5da58561e1a94118512e92cab39071ca97 SHA512 c78f68b234889d811a7c69caab5c503fac30142f806f9863d45710d806b777440d5d99193cb105f56955ef3a78638af63b96e4bd764aee6e9cc5b43e1169cfc6 WHIRLPOOL e3f5c1dbf036a79afdb98723b6383490234c356088c358968be80075341c44e12e4f282a9d0887674b68bbf5c42cc83e6ec0d68e9b97b626dad9ec41c59531f3
 DIST moodle-3.1.tgz 37440572 SHA256 5debb77fe2a82f28b25505f1244cc9e641b1c0b20dfefe831917c605da74151c SHA512 a8ab1b275bcb75e233b4cb77c6afb7bfb268e9dd11add7120c420e9f6179146640ab3bad8f4b050eaa254a2adb01500b80e2fc47517f6c1a1e98c13ad8389354 WHIRLPOOL 635a9d7c545880e98904ec30348011aee4bcd47cecd463c576ca4c4f3ac5b2848601b359d44445282885151c89e0bac48881fbf132e2879f92218edbd1991623
diff --git a/www-apps/moodle/moodle-2.7.14.ebuild b/www-apps/moodle/moodle-2.7.15.ebuild
index 21a783e9c5ba..21a783e9c5ba 100644
--- a/www-apps/moodle/moodle-2.7.14.ebuild
+++ b/www-apps/moodle/moodle-2.7.15.ebuild
diff --git a/www-apps/moodle/moodle-2.8.12.ebuild b/www-apps/moodle/moodle-2.9.7.ebuild
index ccdb5ad52f4e..ccdb5ad52f4e 100644
--- a/www-apps/moodle/moodle-2.8.12.ebuild
+++ b/www-apps/moodle/moodle-2.9.7.ebuild
diff --git a/www-apps/moodle/moodle-3.0.4.ebuild b/www-apps/moodle/moodle-3.0.4.ebuild
deleted file mode 100644
index ccdb5ad52f4e..000000000000
--- a/www-apps/moodle/moodle-3.0.4.ebuild
+++ /dev/null
@@ -1,128 +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 "\033[1;31m**************************************************\033[00m"
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror "\033[1;31m**************************************************\033[00m"
-	#	eerror
-	#	die
-	#fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn "\033[1;33m**************************************************\033[00m"
-		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 "\033[1;32m**************************************************\033[00m"
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo "\033[1;32m**************************************************\033[00m"
-	einfo
-}
diff --git a/www-apps/moodle/moodle-2.9.6.ebuild b/www-apps/moodle/moodle-3.0.5.ebuild
index ccdb5ad52f4e..ccdb5ad52f4e 100644
--- a/www-apps/moodle/moodle-2.9.6.ebuild
+++ b/www-apps/moodle/moodle-3.0.5.ebuild