Version bumps, remove older unsupported upstream

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 17 insertions, 136 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 33fb0caacf6d..6d7a6c0024c4 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/moodle
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.64 2014/11/10 13:21:17 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.65 2015/01/11 14:05:43 blueness Exp $
+
+*moodle-2.8.2 (11 Jan 2015)
+*moodle-2.7.4 (11 Jan 2015)
+*moodle-2.6.7 (11 Jan 2015)
+
+  11 Jan 2015; Anthony G. Basile <blueness@gentoo.org> +moodle-2.6.7.ebuild,
+  +moodle-2.7.4.ebuild, +moodle-2.8.2.ebuild, -moodle-2.5.9.ebuild,
+  -moodle-2.6.6.ebuild, -moodle-2.7.3.ebuild, -moodle-2.8.ebuild:
+  Version bumps, remove older unsupported upstream
 
 *moodle-2.8 (10 Nov 2014)
 
diff --git a/www-apps/moodle/moodle-2.6.6.ebuild b/www-apps/moodle/moodle-2.6.6.ebuild
deleted file mode 100644
index 39d8501df94b..000000000000
--- a/www-apps/moodle/moodle-2.6.6.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.6.6.ebuild,v 1.1 2014/11/09 14:12:19 blueness Exp $
-
-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.3.3[${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.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 "\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.5.9.ebuild b/www-apps/moodle/moodle-2.6.7.ebuild
index f0d87571f704..990d212c662e 100644
--- a/www-apps/moodle/moodle-2.5.9.ebuild
+++ b/www-apps/moodle/moodle-2.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.5.9.ebuild,v 1.1 2014/11/09 14:12:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.6.7.ebuild,v 1.1 2015/01/11 14:05:43 blueness Exp $
 
 EAPI="5"
 
diff --git a/www-apps/moodle/moodle-2.7.3.ebuild b/www-apps/moodle/moodle-2.7.4.ebuild
index 800573a5bfdf..78c09f1f75f7 100644
--- a/www-apps/moodle/moodle-2.7.3.ebuild
+++ b/www-apps/moodle/moodle-2.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.7.3.ebuild,v 1.1 2014/11/09 14:12:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.7.4.ebuild,v 1.1 2015/01/11 14:05:43 blueness Exp $
 
 EAPI="5"
 
diff --git a/www-apps/moodle/moodle-2.8.ebuild b/www-apps/moodle/moodle-2.8.2.ebuild
index e74095ae3e8a..246d07de4d65 100644
--- a/www-apps/moodle/moodle-2.8.ebuild
+++ b/www-apps/moodle/moodle-2.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.8.ebuild,v 1.1 2014/11/10 13:21:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.8.2.ebuild,v 1.1 2015/01/11 14:05:43 blueness Exp $
 
 EAPI="5"