Version bumps.

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

5 files changed, 314 insertions, 5 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 0d5514b8804e..de0c91e1a19c 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2011/01/08 23:21:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.5 2011/02/22 16:22:08 blueness Exp $
+
+*moodle-2.0.2 (22 Feb 2011)
+*moodle-1.9.11 (22 Feb 2011)
+
+  22 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +moodle-1.9.11.ebuild, +moodle-2.0.2.ebuild, files/postinstall-en.txt:
+  Version bumps.
 
 *moodle-2.0.1 (08 Jan 2011)
 
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index c38bc095065a..f947c47461e3 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,12 +1,16 @@
 AUX config.php 718 RMD160 9e4b97aafca65da8648466d11728c457fff439ab SHA1 d71fc86158e82f706ca2cdfe1efe2e8de62cc607 SHA256 c62a37c0d81043ee4ca7fc4d7610d19dc2df426d556eb3285d7b1fe367a44a8d
-AUX postinstall-en.txt 4959 RMD160 6a8a6d2b3205d9c7e7e87907c9d91d203071d1ab SHA1 768be257b43cdb43da8f4e11bba04bbd47ebd364 SHA256 75abb103eb3aeb71d7688580873c05c295f42dd5624bf18d0cf15759bf022434
+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.10.tgz 14037302 RMD160 f50a31d4e3cdadc222d6236dfb298ed10665bd8b SHA1 69a9dad8f93ff927d7947ba596eac17058b31245 SHA256 6bcba3babafc345b057e1fbe2634ef645a0b3227bef0221a2aec3dce2dd78ce4
+DIST moodle-1.9.11.tgz 14045392 RMD160 d50216d4cf535533aed7ca7dcc9211cbbe2fb52f SHA1 0355999061bff37693e2cf8f55e11abcfc0a7744 SHA256 b21da3a8e73c061b2115242b73e5328d078f979b9ca86523a392857c4fc59531
 DIST moodle-1.9.9.tgz 14017622 RMD160 a44406d71829c88d5ad21a3368b62c76c420c7e7 SHA1 936eaa405cef8722c31f6a0a385fee7fa9999919 SHA256 20e16da64c70f61c4c49f08aa359499a4ef500c3f8de477dc70721c07b8ec49d
 DIST moodle-2.0.1.tgz 24593551 RMD160 74cc2ad94de8a37529e584ecec790787678b47ab SHA1 060a8a440655497bad980c31595336a3552db9bd SHA256 39ea51b94b40aaa08369e5ca6fd0f752fa386c28eb9248d353c2cee32a86b56d
+DIST moodle-2.0.2.tgz 22270280 RMD160 957100de1ac3123911147ac5b00fe574b0cc0804 SHA1 c720e6dba716d21c6fa87cc88fbf939ab53c8320 SHA256 64c360b787e4bb099c328da09cf3b969d02c8ef57cc9d895598f0ddb4c7a44fe
 EBUILD moodle-1.9.10.ebuild 3019 RMD160 ea5890c2093f8a7779afbe331fe6bab7ae79e92d SHA1 a8fa128c8e2f779f4c778fb1a52189354ea236f0 SHA256 515809d7118576bab3c0a2169a9c7b6553aa45a0a95f5504bb55f50b49d61213
+EBUILD moodle-1.9.11.ebuild 3019 RMD160 7559287aea41b0aa11b995908961df1ab048b829 SHA1 23327777e3748d7c8a4dbdcc4bc24afaef7129b1 SHA256 b6ac2685ee48b1332f929943dd559c4a2665e563d962aa08f116fd07411783ba
 EBUILD moodle-1.9.9-r1.ebuild 2989 RMD160 024a627adb5e66375197355e0023623d67a91abf SHA1 c48d6ec8cd0e83db1ccf4015ee126d9a2c9800c1 SHA256 cd58281cf72b2eb0e892e8e7ad7452519b9e53fc487fbbb66bc18bc3d2cfa238
 EBUILD moodle-1.9.9.ebuild 2993 RMD160 136c99c12160d195ed2f20ec2477f9af45bb85e4 SHA1 ff62ae9fcc4c94d6e20dabc543c873e0297e7ddf SHA256 1c420d8cf32105b7cc0486410a7dc528253cef54ae9496651cf1e7354d84ec2d
 EBUILD moodle-2.0.1.ebuild 3582 RMD160 7de28d2289a51b25a6ee06e908f127a1c6751589 SHA1 38dd39644547d2307a6e127803ad3e3c6f266eb4 SHA256 40497a4218c753fdc2d63baa3c321aa164b29ca052550f3b78d04310ee2c7709
-MISC ChangeLog 886 RMD160 a7cb9aabf1d7559cf1a40862ff1752ff652cf3d3 SHA1 64afbc89e5c09922da4951fb252684faa01f174e SHA256 59c3104aa44f8570fb9567ae54aabccc9f28b768d6f28b8d5ebe458f2dda3ab4
+EBUILD moodle-2.0.2.ebuild 3582 RMD160 16b3e62dc3352dead9567133bc986f14a5c73cd0 SHA1 c2fd88bca8e7686ec689708623118481019083d7 SHA256 c1e610a0db8b0c0ef75c10449fe5423d69ff0afb1faf92f61fb91775844a1f2f
+MISC ChangeLog 1090 RMD160 51c29d88def329126622a875d4339882599af0bb SHA1 d9cd92c4d6769e7fd6dd71c31e0721de60ff68a1 SHA256 847a72ef07cf4abad828c1a93ea3146c9ea6c48a9bbbe91963bf5aded6bc3596
 MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1
diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
index c46bfcc25eb4..6a5b44bac93d 100644
--- a/www-apps/moodle/files/postinstall-en.txt
+++ b/www-apps/moodle/files/postinstall-en.txt
@@ -98,8 +98,51 @@ NEW INSTALLS
 
 UPGRADES
 
-   TODO - When the next release is out, I will fill this
-   section in.
+0  Before any upgade you should backup your database in case you have
+   to roll back.  The moodle dirroot directory ($CFG->dirroot in the
+   config.php file) isn't as critical since you can always reinstall
+   that with web-apps.  The moodle data root ($CFG->dataroot in config.php),
+   where files are uploaded, will not be touched.  But the upgrade will
+   probably change your db schema, and the new format may not be backward
+   compatible.  For mysql use
+
+	mysqldump -u moodle_user -p -C -Q -e --create-options moodle_db > moodle-backup.sql
+
+   or for postgresql use
+
+	su - postgres
+	pg_dump moodle_db > moodle-backup.sql
+
+   If you have to fall back, you can do so using
+
+	mysql -p -u moodle_user moodle_db < moodle-backup.sql
+
+   or
+
+	su - postgres
+	psql moodle_db < moodle-backup.sql
+
+   TEST THIS!  PRACTICE THIS!  Make sure it will work for you if you
+   have to fall back.
+
+1  Emerge the new moodle ebuild.  Be prepared to add USE flags for
+   php and re-emerge it since upgrades may require new functionality
+   from php.  Remember to restart apache after re-emerging php!
+
+2  If the ebuild didn't do it for you, update using
+
+	webapp-config -d moodle -U moodle X.Y.Z
+
+3  Aim your browser to the URL in the config.php file defined
+   by $CFG->wwwroot.  You will get a message that you are about
+   to automatically upgrade your server and cannot go back.
+   This is why you backed up your db in step 1.  You can go back
+   if you use webapp-config to install the older version AND
+   drop the new db and restart the old one.  You did practice
+   restoring, right?
+
+4  Click "Continue" and follow through with the upgrade.
+
 
 =================================================================
 
@@ -174,3 +217,4 @@ ADDITIONAL PHP REQUIREMENTS
    	LDAP or CAS		ldap
 	External database	odbc
 	RADIUS			radius
+
diff --git a/www-apps/moodle/moodle-1.9.11.ebuild b/www-apps/moodle/moodle-1.9.11.ebuild
new file mode 100644
index 000000000000..12524881bc09
--- /dev/null
+++ b/www-apps/moodle/moodle-1.9.11.ebuild
@@ -0,0 +1,121 @@
+# 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.0.2.ebuild
new file mode 100644
index 000000000000..4612daa7648d
--- /dev/null
+++ b/www-apps/moodle/moodle-2.0.2.ebuild
@@ -0,0 +1,133 @@
+# 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 $
+
+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 ~ia64 ~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_52="ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip"
+PHP_OPTIONAL_FLAGS_52="gd,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_52="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52}"
+
+PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} 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-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52}]
+		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
+	)
+	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
+
+	if [[ ${DB_COUNT} -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 [[ ${DB_COUNT} -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}
+
+	# 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} || die "Unable to 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[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
+}