Version bump, removed depcreated

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 14 insertions, 131 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 738b50f021c7..c6fa69e9199f 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/moodle
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.7 2011/05/11 19:14:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.8 2011/07/09 20:25:29 blueness Exp $
+
+*moodle-2.1 (09 Jul 2011)
+
+  09 Jul 2011; Anthony G. Basile <blueness@gentoo.org> -moodle-1.9.11.ebuild,
+  -moodle-2.0.2.ebuild, +moodle-2.1.ebuild:
+  Version bump, removed depcreated
 
 *moodle-2.0.3 (11 May 2011)
 *moodle-1.9.12 (11 May 2011)
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 76de79032c4f..0b928a86f5ae 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -4,20 +4,18 @@ Hash: SHA256
 AUX config.php 718 RMD160 9e4b97aafca65da8648466d11728c457fff439ab SHA1 d71fc86158e82f706ca2cdfe1efe2e8de62cc607 SHA256 c62a37c0d81043ee4ca7fc4d7610d19dc2df426d556eb3285d7b1fe367a44a8d
 AUX postinstall-en.txt 6524 RMD160 d3799bc5cdc283e787c1b5d08935a8d7851d0c8d SHA1 097744447c046848611bfe53d5191518465f1c6d SHA256 dad8831abc23179ebcd2c2431f11d83346c142175c59da47cf5f913c928de667
 AUX postinstall-nodb-en.txt 171 RMD160 88ff71d95c63f1b5d76e398c3566ada75954cdf4 SHA1 26748e5f24207ef5cb145e3668e1f17cdcddf699 SHA256 f39ff660a1cafbbd96ce18c46f056450ace04df5ac401eeccaf16441d54f3b6a
-DIST moodle-1.9.11.tgz 14045392 RMD160 d50216d4cf535533aed7ca7dcc9211cbbe2fb52f SHA1 0355999061bff37693e2cf8f55e11abcfc0a7744 SHA256 b21da3a8e73c061b2115242b73e5328d078f979b9ca86523a392857c4fc59531
 DIST moodle-1.9.12.tgz 14044589 RMD160 32054256881037026454c41e7dd4c3683cc361b2 SHA1 838d2fb9c17903c1835aee2154527158e5c7a83d SHA256 fc4fbe600102fc0fc878f6db423d5bac5ef9362aba8d97720939f1078f905f80
-DIST moodle-2.0.2.tgz 22270280 RMD160 957100de1ac3123911147ac5b00fe574b0cc0804 SHA1 c720e6dba716d21c6fa87cc88fbf939ab53c8320 SHA256 64c360b787e4bb099c328da09cf3b969d02c8ef57cc9d895598f0ddb4c7a44fe
 DIST moodle-2.0.3.tgz 22438221 RMD160 e204249cb439754ed7c484815b763a4515c14ff0 SHA1 3dc8b1a46f94b54442b907461daaf453b955d1e6 SHA256 91ffa120a2674d835a0f087d472c789ddeaac305181c80c8a0af33351d065945
-EBUILD moodle-1.9.11.ebuild 3019 RMD160 7559287aea41b0aa11b995908961df1ab048b829 SHA1 23327777e3748d7c8a4dbdcc4bc24afaef7129b1 SHA256 b6ac2685ee48b1332f929943dd559c4a2665e563d962aa08f116fd07411783ba
+DIST moodle-2.1.tgz 23128617 RMD160 ed0758ffd1534c907ff27f5b9c5d1b285e499239 SHA1 9d7830f7b16621c22813634f19baae56cd565315 SHA256 8739ab133be99736ae7d9f004b4163b332dfd135c064899f84b24b8867ea2810
 EBUILD moodle-1.9.12.ebuild 3019 RMD160 419bb9132bccb0438ca2ae679ff31e682df25128 SHA1 90dfedc8d380b128c65dfb9a8e36fc76c92e605f SHA256 ab1853e987b354ec598cfffde249cf62bdfcca0228e76abac18e82c915fb7728
-EBUILD moodle-2.0.2.ebuild 3582 RMD160 16b3e62dc3352dead9567133bc986f14a5c73cd0 SHA1 c2fd88bca8e7686ec689708623118481019083d7 SHA256 c1e610a0db8b0c0ef75c10449fe5423d69ff0afb1faf92f61fb91775844a1f2f
 EBUILD moodle-2.0.3.ebuild 3582 RMD160 1a8cf4d09c3ea6c68f1644e02be8d9d5d68a4690 SHA1 e61e0972e3d87fa74ebbb1632e5aa6be8dc36a54 SHA256 c5b2ec282ecb89b101d9a6c75839f95567736d6b3da66d48ff2e11a9ffe31947
-MISC ChangeLog 1613 RMD160 15eef2f47767858f811a1d5303f86ec3628bbd74 SHA1 147dd34eb4e176365594265bdd4d7e16ea805d95 SHA256 c3689bfc0e27b27bfa9514a26b5b907dfb25f5a8ceaa7e10bb200dc63dc18c55
+EBUILD moodle-2.1.ebuild 3580 RMD160 f1637fb26e29c8ce13ab42bb51c905ac5772b58a SHA1 25d1c4b3eb5ecd414cf227685819f16569562d2c SHA256 7b772962dab5ec2eb92b9148299290c52cbb2048d094fc4dc2053e043e46f09e
+MISC ChangeLog 1798 RMD160 77b471a3cd73d422264c4c2550fa04072bc91773 SHA1 1da01141d75dfdf5ef00ada252b0ae65031af46c SHA256 aead15ac1fd81e7e177fc0d55c1c1c2b590d447e530345fb862beeeefba927e4
 MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk3K4CkACgkQl5yvQNBFVTXPKQCfXyY1Bz4UcnfspLIJHXC89guQ
-3GQAnRDAQE5lauPwkpmHQcBVcftWP0Ig
-=nNpX
+iEYEAREIAAYFAk4YuUMACgkQl5yvQNBFVTWogwCfeGoWiTYh+oGcOsyF5OQiutw2
+nrsAnjTITi939/hSq9J4GFD/ioTaHcYS
+=ypKA
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moodle/moodle-1.9.11.ebuild b/www-apps/moodle/moodle-1.9.11.ebuild
deleted file mode 100644
index 12524881bc09..000000000000
--- a/www-apps/moodle/moodle-1.9.11.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.11.ebuild,v 1.1 2011/02/22 16:22:08 blueness Exp $
-
-EAPI="2"
-
-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 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DBFLAGS="mysql?,postgres?"
-DBTYPES=${DBFLAGS//\?/}
-DBTYPES=${DBTYPES//,/ }
-
-AUTHFLAGS="imap?,ldap?,odbc?"
-AUTHMODES=${AUTHFLAGS//\?/}
-AUTHMODES=${AUTHMODES//,/ }
-
-PHPFLAGS="ctype,curl,gd,iconv,ssl,tokenizer,xml,xmlrpc,zlib"
-
-IUSE="${DBTYPES} ${AUTHMODES} vhosts"
-
-# No forced dependency on
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND=">=dev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS}]
-	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=""
-	DBCOUNT=0
-	for db in ${DBTYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DBCOUNT=$(($DBCOUNT+1))
-		fi
-	done
-
-	if [[ ${DBCOUNT} -eq 0 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[1;31m"
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror "\033[1;31m**************************************************\033[1;31m"
-		eerror
-		die
-	fi
-
-	if [[ ${DBCOUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[1;33m"
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn "\033[1;33m**************************************************\033[1;33m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config.php .
-
-	#
-	# Moodle expect postgres7, not postgres
-	#
-	MYDB=${MYDB/postgres/postgres7}
-	if [[ ${DBCOUNT} -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} || die "Unable to insinto ${MOODLEROOT}"
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DBCOUNT} -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[1;32m"
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo "\033[1;32m**************************************************\033[1;32m"
-	einfo
-}
diff --git a/www-apps/moodle/moodle-2.0.2.ebuild b/www-apps/moodle/moodle-2.1.ebuild
index 4612daa7648d..17d0aeabaf44 100644
--- a/www-apps/moodle/moodle-2.0.2.ebuild
+++ b/www-apps/moodle/moodle-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.2.ebuild,v 1.1 2011/02/22 16:22:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.ebuild,v 1.1 2011/07/09 20:25:29 blueness Exp $
 
 EAPI="2"