public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/
@ 2011-02-22 21:27 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2011-02-22 21:27 UTC (permalink / raw
  To: gentoo-commits

commit:     9fcfba56b3be5d69be37160a3a7437ff45e6c415
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 21:27:20 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 21:27:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=9fcfba56

www-apps/moodle: moved to tree

(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)

---
 www-apps/moodle/ChangeLog                     |    5 +
 www-apps/moodle/Manifest                      |    9 +-
 www-apps/moodle/files/config.php              |   29 ----
 www-apps/moodle/files/postinstall-en.txt      |  220 -------------------------
 www-apps/moodle/files/postinstall-nodb-en.txt |    6 -
 www-apps/moodle/moodle-1.9.11.ebuild          |  121 --------------
 www-apps/moodle/moodle-2.0.2.ebuild           |  133 ---------------
 7 files changed, 6 insertions(+), 517 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index a8927f8..e2fdf28 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.1 2010/07/19 14:05:32 blueness Exp $
 
+  22 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  -moodle-1.9.11.ebuild, -moodle-2.0.2.ebuild, -files/config.php,
+  -files/postinstall-en.txt, -files/postinstall-nodb-en.txt:
+  moved to tree
+
 *moodle-2.0.2 (22 Feb 2011)
 *moodle-1.9.11 (22 Feb 2011)
 

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 59afe81..eb91aee 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,9 +1,2 @@
-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-2.0.2.tgz 22270280 RMD160 957100de1ac3123911147ac5b00fe574b0cc0804 SHA1 c720e6dba716d21c6fa87cc88fbf939ab53c8320 SHA256 64c360b787e4bb099c328da09cf3b969d02c8ef57cc9d895598f0ddb4c7a44fe
-EBUILD moodle-1.9.11.ebuild 3019 RMD160 e89e36d92c7a66a212b32d0c9e9b17544a001edc SHA1 7f51fd0eeb1821e0c44adc09a75421350f5ec094 SHA256 ca63bb55126abc1ad93d4670c2607440abeaae27ab2a4973a7fcec1730becba2
-EBUILD moodle-2.0.2.ebuild 3582 RMD160 7de28d2289a51b25a6ee06e908f127a1c6751589 SHA1 38dd39644547d2307a6e127803ad3e3c6f266eb4 SHA256 40497a4218c753fdc2d63baa3c321aa164b29ca052550f3b78d04310ee2c7709
-MISC ChangeLog 2583 RMD160 e5d88e582fc351705feb2c2499270db9e74cc226 SHA1 2e56d355290e041d70d34d4ea2241362e111f8ed SHA256 8dc0b2b8507d509d1ab49cb2019a991f4c0dfbe8dbbb071d81a00fc7493c55b1
+MISC ChangeLog 2782 RMD160 0cb75c05055e3e5a8c6b335e001a059f122b08aa SHA1 d623c7365d1dea47c9b521d697c23dd08eff6a98 SHA256 b16656e7fc791e54421e35be44ce6130309e5e599cebe05f775c394456d814d5
 MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1

diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
deleted file mode 100644
index c959b4a..0000000
--- a/www-apps/moodle/files/config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?PHP
-unset($CFG);
-$CFG = new stdClass();
-
-$CFG->dbtype    = 'mydb';
-$CFG->dbhost    = 'localhost';
-$CFG->dbname    = 'moodle_db';
-$CFG->dbuser    = 'moodle_user';
-$CFG->dbpass    = 'moodle_pass';
-$CFG->prefix    = 'mdl_';
-
-$CFG->dbpersist = false;
-
-$CFG->wwwroot   = 'http://localhost/moodle';
-$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
-$CFG->dataroot  = '/var/www/localhost/moodle' ;
-
-$CFG->directorypermissions = 02777;
-
-$CFG->admin = 'admin';
-
-if (file_exists("$CFG->dirroot/lib/setup.php"))  {
-    include_once("$CFG->dirroot/lib/setup.php");
-} else {
-    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
-    echo "<p>Please supply this file or reinstall moodle</p>";
-    die;
-}
-?>

diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
deleted file mode 100644
index 6a5b44b..0000000
--- a/www-apps/moodle/files/postinstall-en.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-NEW INSTALLS
-
-0  Check to see if webapp-config automatically installed
-   moodle for you in /var/www/localhost/htdocs. You should
-   see a directory in there called moodle.  If it didn't
-   install it manually:
-
-	webapp-config -d moodle -I moodle X.Y.Z
-
-   Replace X.Y.Z with whatever version you just emerged.
-
-1  Edit the config.php file found at
-
-	/var/www/localhost/htdocs/moodle/config.php
-
-   You should probably change the database password,
-   $CFG->dbpass = 'moodle_pass' to something more
-   obscure.  Also, if your system has a FQDN, change
-   the $CFG->wwwroot = 'http://localhost/moodle'
-   to match the URL of your moodle installation.
-   
-   
-   IF YOU ARE USING MYSQL,      do step 2a
-   IF YOU ARE USING POSTGRESQL, do step 2b
-
-
-2a Create a new mysql database and account with the
-   appropriate privileges.  Make sure the username,
-   password and database match their values in
-   config.php from step 1.
-   
-   Connect to your mysql server using
-   
-	mysql -p -u root
-
-   and at the mysql> prompt issue the following commands
-
-	CREATE DATABASE moodle_db;
-	GRANT ALL ON moodle_db.*
-		TO moodle_user@localhost
-		IDENTIFIED BY 'moodle_pass';
-	flush privileges;
-
-2b Issue the following commands at a shell, making sure
-   the username, password and database match their values
-   in config.php from step 1.
-
-   su - postgres
-   psql -c "create user moodle_user createdb;" template1
-   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
-   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
-   psql -c "alter user moodle_user nocreatedb;" template1
-   su - root
-   /etc/init.d/postgresql-X.Y reload
-
-   Replace X.Y with your version postgresql.
-
-   NOTE: Moodle docs say that moodle only works with
-   postgresql-7, but I've used it with 8 no problems.
-
-3  Direct your browser to the URL in step 1.  You should see
-   the license agreement.  Click "Yes" to continue.
-
-4  You are now about to install.  Click the checkbox for
-   "Unattended operation" and "Continue" to start.  Follow
-   the wizard as you "Setup administrator account" and configure
-   the "Front Page settings".
-
-5  You now have a working installation.  Before putting it
-   into production, you'll probably want to check that
-   everything is sane.  In the "Site Administration" block,
-   click on
-
-   	Server -> Environment
-
-   Make sure that you've got the green okay on all the
-   Server Checks.  If you don't, click on the ? icons for
-   popup help.
-
-6  Add a cron-job to root's crontab.
-
-   	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   then add the line
-
-	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
-
-7  For more information on installing moodle, see
-
-   	http://docs.moodle.org/en/Installing_Moodle
-
-   For information on working with moodle, see
-
-	http://moodle.org/support/
-
-=================================================================
-
-UPGRADES
-
-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.
-
-
-=================================================================
-
-UNINSTALL
-
-1  Make sure you really want to do this.  I mean REALLY!
-   After step 3 you will be past the point of no return.
-
-2  If you just want to uninstall the webapp, do the following
-   and no more!
-
-	emerge --unmerge moodle
-
-   Your data is still in the db and in the moodledata dir.
-
-
-   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
-
-3  Uninstall the uploaded files
-
-	rm -rf /var/lib/moodledata
-
-
-   IF YOU ARE USING MYSQL,      do step 4a
-   IF YOU ARE USING POSTGRESQL, do step 4b
-
-
-4a Connect to your mysql server using 'mysql -p -u root' and
-   at the mysql> prompt issue the following commands:
-
-	DROP DATABASE moodle_db;
-	DROP USER moodle_user@localhost ;
-
-4b Issue the following commands
-
-	su - postgres
-	psql -c "drop database moodle_db;" template1
-	psql -c "drop user moodle_user;" template1
-
-5  Remove the root cron-job
-
-	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   and delete the line added above.
-
-=================================================================
-
-ADDITIONAL PHP REQUIREMENTS
-
-   Moodle allows for many method of authentication.  To see
-   what these are, in the "Site Administration" block, click
-   on
-
-	Users -> Authentication -> Manage Authentication
-
-   Moodle will try to authenticate by each method in order
-   until it either succeeds or exhausts the list and fails.
-
-   In order to use some of these methods, you need to make
-   sure PHP was compiled with the correct support.  You will
-   know that you do not have the correct support compiled in
-   if authentication by all previous methods fails, and you
-   encounter a method for which PHP does not have support.
-   An error will be thrown and reported in the web page.
-   
-   Currently, the ebuild has support for the following
-
-   	Auth Method		USE flag
-
-	IMAP(S) or POP3(S)	imap
-   	LDAP or CAS		ldap
-	External database	odbc
-	RADIUS			radius
-

diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
deleted file mode 100644
index 9126994..0000000
--- a/www-apps/moodle/files/postinstall-nodb-en.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-You have not specified which database you are going to use.
-You are on your own!  Go to
-
-		http://docs.moodle.org/en/Installing_Moodle
-
-and follow the instructions there.

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 d37fe0e..0000000
--- 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.10.ebuild,v 1.1 2010/10/29 15:55:40 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
deleted file mode 100644
index b3c205d..0000000
--- a/www-apps/moodle/moodle-2.0.2.ebuild
+++ /dev/null
@@ -1,133 +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-2.0.1.ebuild,v 1.1 2011/01/08 23:21:15 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
-}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/
@ 2011-05-11  1:09 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2011-05-11  1:09 UTC (permalink / raw
  To: gentoo-commits

commit:     6c544f5e35cc7ae989a02956d2448bf0851c3811
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 01:09:41 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed May 11 01:09:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6c544f5e

www-apps/moodle-{1.9.12,2.0.3}: version bumps to address security updates

(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 www-apps/moodle/ChangeLog                     |    6 +
 www-apps/moodle/Manifest                      |   19 ++-
 www-apps/moodle/files/config.php              |   29 ++++
 www-apps/moodle/files/postinstall-en.txt      |  220 +++++++++++++++++++++++++
 www-apps/moodle/files/postinstall-nodb-en.txt |    6 +
 www-apps/moodle/moodle-1.9.12.ebuild          |  121 ++++++++++++++
 www-apps/moodle/moodle-2.0.3.ebuild           |  133 +++++++++++++++
 7 files changed, 533 insertions(+), 1 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index e2fdf28..8ecaa5f 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.1 2010/07/19 14:05:32 blueness Exp $
 
+*moodle-1.9.12 (11 May 2011)
+
+  11 May 2011; Anthony G. Basile <blueness@gentoo.org> +moodle-1.9.12.ebuild,
+  +files/config.php, +files/postinstall-en.txt, +files/postinstall-nodb-en.txt:
+  Version bump to 1.9.12 and 2.0.3 - security updates
+
   22 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
   -moodle-1.9.11.ebuild, -moodle-2.0.2.ebuild, -files/config.php,
   -files/postinstall-en.txt, -files/postinstall-nodb-en.txt:

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index eb91aee..a9bbbd3 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,2 +1,19 @@
-MISC ChangeLog 2782 RMD160 0cb75c05055e3e5a8c6b335e001a059f122b08aa SHA1 d623c7365d1dea47c9b521d697c23dd08eff6a98 SHA256 b16656e7fc791e54421e35be44ce6130309e5e599cebe05f775c394456d814d5
+-----BEGIN PGP SIGNED MESSAGE-----
+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.12.tgz 14044589 RMD160 32054256881037026454c41e7dd4c3683cc361b2 SHA1 838d2fb9c17903c1835aee2154527158e5c7a83d SHA256 fc4fbe600102fc0fc878f6db423d5bac5ef9362aba8d97720939f1078f905f80
+DIST moodle-2.0.3.tgz 22438221 RMD160 e204249cb439754ed7c484815b763a4515c14ff0 SHA1 3dc8b1a46f94b54442b907461daaf453b955d1e6 SHA256 91ffa120a2674d835a0f087d472c789ddeaac305181c80c8a0af33351d065945
+EBUILD moodle-1.9.12.ebuild 3019 RMD160 7559287aea41b0aa11b995908961df1ab048b829 SHA1 23327777e3748d7c8a4dbdcc4bc24afaef7129b1 SHA256 b6ac2685ee48b1332f929943dd559c4a2665e563d962aa08f116fd07411783ba
+EBUILD moodle-2.0.3.ebuild 3582 RMD160 16b3e62dc3352dead9567133bc986f14a5c73cd0 SHA1 c2fd88bca8e7686ec689708623118481019083d7 SHA256 c1e610a0db8b0c0ef75c10449fe5423d69ff0afb1faf92f61fb91775844a1f2f
+MISC ChangeLog 3025 RMD160 91e6aaff9c664480fb53e3452b7115046c951099 SHA1 bed9d02db81bd1583c4098decd2c1a52d3f834f2 SHA256 23de54c2f621ec4240185dbb4994b5ebb830ff81580eaeaf7f5108a9976d04df
 MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk3J4dUACgkQl5yvQNBFVTX0hQCglQd8DGrCuaOxjNV5Zr4tfXfA
+7SwAoJEt8LmOMKsCD4/E2YxwfbewlExa
+=pVQF
+-----END PGP SIGNATURE-----

diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
new file mode 100644
index 0000000..c959b4a
--- /dev/null
+++ b/www-apps/moodle/files/config.php
@@ -0,0 +1,29 @@
+<?PHP
+unset($CFG);
+$CFG = new stdClass();
+
+$CFG->dbtype    = 'mydb';
+$CFG->dbhost    = 'localhost';
+$CFG->dbname    = 'moodle_db';
+$CFG->dbuser    = 'moodle_user';
+$CFG->dbpass    = 'moodle_pass';
+$CFG->prefix    = 'mdl_';
+
+$CFG->dbpersist = false;
+
+$CFG->wwwroot   = 'http://localhost/moodle';
+$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
+$CFG->dataroot  = '/var/www/localhost/moodle' ;
+
+$CFG->directorypermissions = 02777;
+
+$CFG->admin = 'admin';
+
+if (file_exists("$CFG->dirroot/lib/setup.php"))  {
+    include_once("$CFG->dirroot/lib/setup.php");
+} else {
+    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
+    echo "<p>Please supply this file or reinstall moodle</p>";
+    die;
+}
+?>

diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
new file mode 100644
index 0000000..6a5b44b
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-en.txt
@@ -0,0 +1,220 @@
+NEW INSTALLS
+
+0  Check to see if webapp-config automatically installed
+   moodle for you in /var/www/localhost/htdocs. You should
+   see a directory in there called moodle.  If it didn't
+   install it manually:
+
+	webapp-config -d moodle -I moodle X.Y.Z
+
+   Replace X.Y.Z with whatever version you just emerged.
+
+1  Edit the config.php file found at
+
+	/var/www/localhost/htdocs/moodle/config.php
+
+   You should probably change the database password,
+   $CFG->dbpass = 'moodle_pass' to something more
+   obscure.  Also, if your system has a FQDN, change
+   the $CFG->wwwroot = 'http://localhost/moodle'
+   to match the URL of your moodle installation.
+   
+   
+   IF YOU ARE USING MYSQL,      do step 2a
+   IF YOU ARE USING POSTGRESQL, do step 2b
+
+
+2a Create a new mysql database and account with the
+   appropriate privileges.  Make sure the username,
+   password and database match their values in
+   config.php from step 1.
+   
+   Connect to your mysql server using
+   
+	mysql -p -u root
+
+   and at the mysql> prompt issue the following commands
+
+	CREATE DATABASE moodle_db;
+	GRANT ALL ON moodle_db.*
+		TO moodle_user@localhost
+		IDENTIFIED BY 'moodle_pass';
+	flush privileges;
+
+2b Issue the following commands at a shell, making sure
+   the username, password and database match their values
+   in config.php from step 1.
+
+   su - postgres
+   psql -c "create user moodle_user createdb;" template1
+   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
+   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
+   psql -c "alter user moodle_user nocreatedb;" template1
+   su - root
+   /etc/init.d/postgresql-X.Y reload
+
+   Replace X.Y with your version postgresql.
+
+   NOTE: Moodle docs say that moodle only works with
+   postgresql-7, but I've used it with 8 no problems.
+
+3  Direct your browser to the URL in step 1.  You should see
+   the license agreement.  Click "Yes" to continue.
+
+4  You are now about to install.  Click the checkbox for
+   "Unattended operation" and "Continue" to start.  Follow
+   the wizard as you "Setup administrator account" and configure
+   the "Front Page settings".
+
+5  You now have a working installation.  Before putting it
+   into production, you'll probably want to check that
+   everything is sane.  In the "Site Administration" block,
+   click on
+
+   	Server -> Environment
+
+   Make sure that you've got the green okay on all the
+   Server Checks.  If you don't, click on the ? icons for
+   popup help.
+
+6  Add a cron-job to root's crontab.
+
+   	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   then add the line
+
+	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
+
+7  For more information on installing moodle, see
+
+   	http://docs.moodle.org/en/Installing_Moodle
+
+   For information on working with moodle, see
+
+	http://moodle.org/support/
+
+=================================================================
+
+UPGRADES
+
+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.
+
+
+=================================================================
+
+UNINSTALL
+
+1  Make sure you really want to do this.  I mean REALLY!
+   After step 3 you will be past the point of no return.
+
+2  If you just want to uninstall the webapp, do the following
+   and no more!
+
+	emerge --unmerge moodle
+
+   Your data is still in the db and in the moodledata dir.
+
+
+   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
+
+3  Uninstall the uploaded files
+
+	rm -rf /var/lib/moodledata
+
+
+   IF YOU ARE USING MYSQL,      do step 4a
+   IF YOU ARE USING POSTGRESQL, do step 4b
+
+
+4a Connect to your mysql server using 'mysql -p -u root' and
+   at the mysql> prompt issue the following commands:
+
+	DROP DATABASE moodle_db;
+	DROP USER moodle_user@localhost ;
+
+4b Issue the following commands
+
+	su - postgres
+	psql -c "drop database moodle_db;" template1
+	psql -c "drop user moodle_user;" template1
+
+5  Remove the root cron-job
+
+	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   and delete the line added above.
+
+=================================================================
+
+ADDITIONAL PHP REQUIREMENTS
+
+   Moodle allows for many method of authentication.  To see
+   what these are, in the "Site Administration" block, click
+   on
+
+	Users -> Authentication -> Manage Authentication
+
+   Moodle will try to authenticate by each method in order
+   until it either succeeds or exhausts the list and fails.
+
+   In order to use some of these methods, you need to make
+   sure PHP was compiled with the correct support.  You will
+   know that you do not have the correct support compiled in
+   if authentication by all previous methods fails, and you
+   encounter a method for which PHP does not have support.
+   An error will be thrown and reported in the web page.
+   
+   Currently, the ebuild has support for the following
+
+   	Auth Method		USE flag
+
+	IMAP(S) or POP3(S)	imap
+   	LDAP or CAS		ldap
+	External database	odbc
+	RADIUS			radius
+

diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
new file mode 100644
index 0000000..9126994
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-nodb-en.txt
@@ -0,0 +1,6 @@
+You have not specified which database you are going to use.
+You are on your own!  Go to
+
+		http://docs.moodle.org/en/Installing_Moodle
+
+and follow the instructions there.

diff --git a/www-apps/moodle/moodle-1.9.12.ebuild b/www-apps/moodle/moodle-1.9.12.ebuild
new file mode 100644
index 0000000..1252488
--- /dev/null
+++ b/www-apps/moodle/moodle-1.9.12.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.3.ebuild b/www-apps/moodle/moodle-2.0.3.ebuild
new file mode 100644
index 0000000..4612daa
--- /dev/null
+++ b/www-apps/moodle/moodle-2.0.3.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
+}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/
@ 2011-05-12 10:31 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2011-05-12 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     6da148934e072736e729cd39437b4a1f024b8591
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 10:02:18 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu May 12 10:02:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6da14893

www-apps:/moodle-{1.9.12,2.0.3}: moved to tree

(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 www-apps/moodle/ChangeLog                     |    5 +
 www-apps/moodle/Manifest                      |   15 +--
 www-apps/moodle/files/config.php              |   29 ----
 www-apps/moodle/files/postinstall-en.txt      |  220 -------------------------
 www-apps/moodle/files/postinstall-nodb-en.txt |    6 -
 www-apps/moodle/moodle-1.9.12.ebuild          |  121 --------------
 www-apps/moodle/moodle-2.0.3.ebuild           |  133 ---------------
 7 files changed, 9 insertions(+), 520 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 8ecaa5f..889b19f 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.1 2010/07/19 14:05:32 blueness Exp $
 
+  12 May 2011; Anthony G. Basile <blueness@gentoo.org> -moodle-1.9.12.ebuild,
+  -moodle-2.0.3.ebuild, -files/config.php, -files/postinstall-en.txt,
+  -files/postinstall-nodb-en.txt:
+  www-apps:/moodle-{1.9.12,2.0.3}: moved to tree
+
 *moodle-1.9.12 (11 May 2011)
 
   11 May 2011; Anthony G. Basile <blueness@gentoo.org> +moodle-1.9.12.ebuild,

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index a9bbbd3..4254bf9 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,19 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.12.tgz 14044589 RMD160 32054256881037026454c41e7dd4c3683cc361b2 SHA1 838d2fb9c17903c1835aee2154527158e5c7a83d SHA256 fc4fbe600102fc0fc878f6db423d5bac5ef9362aba8d97720939f1078f905f80
-DIST moodle-2.0.3.tgz 22438221 RMD160 e204249cb439754ed7c484815b763a4515c14ff0 SHA1 3dc8b1a46f94b54442b907461daaf453b955d1e6 SHA256 91ffa120a2674d835a0f087d472c789ddeaac305181c80c8a0af33351d065945
-EBUILD moodle-1.9.12.ebuild 3019 RMD160 7559287aea41b0aa11b995908961df1ab048b829 SHA1 23327777e3748d7c8a4dbdcc4bc24afaef7129b1 SHA256 b6ac2685ee48b1332f929943dd559c4a2665e563d962aa08f116fd07411783ba
-EBUILD moodle-2.0.3.ebuild 3582 RMD160 16b3e62dc3352dead9567133bc986f14a5c73cd0 SHA1 c2fd88bca8e7686ec689708623118481019083d7 SHA256 c1e610a0db8b0c0ef75c10449fe5423d69ff0afb1faf92f61fb91775844a1f2f
-MISC ChangeLog 3025 RMD160 91e6aaff9c664480fb53e3452b7115046c951099 SHA1 bed9d02db81bd1583c4098decd2c1a52d3f834f2 SHA256 23de54c2f621ec4240185dbb4994b5ebb830ff81580eaeaf7f5108a9976d04df
+MISC ChangeLog 3257 RMD160 8316629708054190f094df224b6efd4b2146f29b SHA1 3066f42c5d1f7bf042979184b1e8c361607e1d06 SHA256 b7e63f619d91b734b2def4215dea38f36782f7c221cd8ec413ee4b2d86dea6e7
 MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk3J4dUACgkQl5yvQNBFVTX0hQCglQd8DGrCuaOxjNV5Zr4tfXfA
-7SwAoJEt8LmOMKsCD4/E2YxwfbewlExa
-=pVQF
+iEYEAREIAAYFAk3LsCoACgkQl5yvQNBFVTXtggCfWrXqo4o7ymkLmI23NehTfcJg
+4ScAniL3Ti5scIr209FGVt22b6SS6w2r
+=0XsL
 -----END PGP SIGNATURE-----

diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
deleted file mode 100644
index c959b4a..0000000
--- a/www-apps/moodle/files/config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?PHP
-unset($CFG);
-$CFG = new stdClass();
-
-$CFG->dbtype    = 'mydb';
-$CFG->dbhost    = 'localhost';
-$CFG->dbname    = 'moodle_db';
-$CFG->dbuser    = 'moodle_user';
-$CFG->dbpass    = 'moodle_pass';
-$CFG->prefix    = 'mdl_';
-
-$CFG->dbpersist = false;
-
-$CFG->wwwroot   = 'http://localhost/moodle';
-$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
-$CFG->dataroot  = '/var/www/localhost/moodle' ;
-
-$CFG->directorypermissions = 02777;
-
-$CFG->admin = 'admin';
-
-if (file_exists("$CFG->dirroot/lib/setup.php"))  {
-    include_once("$CFG->dirroot/lib/setup.php");
-} else {
-    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
-    echo "<p>Please supply this file or reinstall moodle</p>";
-    die;
-}
-?>

diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
deleted file mode 100644
index 6a5b44b..0000000
--- a/www-apps/moodle/files/postinstall-en.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-NEW INSTALLS
-
-0  Check to see if webapp-config automatically installed
-   moodle for you in /var/www/localhost/htdocs. You should
-   see a directory in there called moodle.  If it didn't
-   install it manually:
-
-	webapp-config -d moodle -I moodle X.Y.Z
-
-   Replace X.Y.Z with whatever version you just emerged.
-
-1  Edit the config.php file found at
-
-	/var/www/localhost/htdocs/moodle/config.php
-
-   You should probably change the database password,
-   $CFG->dbpass = 'moodle_pass' to something more
-   obscure.  Also, if your system has a FQDN, change
-   the $CFG->wwwroot = 'http://localhost/moodle'
-   to match the URL of your moodle installation.
-   
-   
-   IF YOU ARE USING MYSQL,      do step 2a
-   IF YOU ARE USING POSTGRESQL, do step 2b
-
-
-2a Create a new mysql database and account with the
-   appropriate privileges.  Make sure the username,
-   password and database match their values in
-   config.php from step 1.
-   
-   Connect to your mysql server using
-   
-	mysql -p -u root
-
-   and at the mysql> prompt issue the following commands
-
-	CREATE DATABASE moodle_db;
-	GRANT ALL ON moodle_db.*
-		TO moodle_user@localhost
-		IDENTIFIED BY 'moodle_pass';
-	flush privileges;
-
-2b Issue the following commands at a shell, making sure
-   the username, password and database match their values
-   in config.php from step 1.
-
-   su - postgres
-   psql -c "create user moodle_user createdb;" template1
-   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
-   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
-   psql -c "alter user moodle_user nocreatedb;" template1
-   su - root
-   /etc/init.d/postgresql-X.Y reload
-
-   Replace X.Y with your version postgresql.
-
-   NOTE: Moodle docs say that moodle only works with
-   postgresql-7, but I've used it with 8 no problems.
-
-3  Direct your browser to the URL in step 1.  You should see
-   the license agreement.  Click "Yes" to continue.
-
-4  You are now about to install.  Click the checkbox for
-   "Unattended operation" and "Continue" to start.  Follow
-   the wizard as you "Setup administrator account" and configure
-   the "Front Page settings".
-
-5  You now have a working installation.  Before putting it
-   into production, you'll probably want to check that
-   everything is sane.  In the "Site Administration" block,
-   click on
-
-   	Server -> Environment
-
-   Make sure that you've got the green okay on all the
-   Server Checks.  If you don't, click on the ? icons for
-   popup help.
-
-6  Add a cron-job to root's crontab.
-
-   	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   then add the line
-
-	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
-
-7  For more information on installing moodle, see
-
-   	http://docs.moodle.org/en/Installing_Moodle
-
-   For information on working with moodle, see
-
-	http://moodle.org/support/
-
-=================================================================
-
-UPGRADES
-
-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.
-
-
-=================================================================
-
-UNINSTALL
-
-1  Make sure you really want to do this.  I mean REALLY!
-   After step 3 you will be past the point of no return.
-
-2  If you just want to uninstall the webapp, do the following
-   and no more!
-
-	emerge --unmerge moodle
-
-   Your data is still in the db and in the moodledata dir.
-
-
-   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
-
-3  Uninstall the uploaded files
-
-	rm -rf /var/lib/moodledata
-
-
-   IF YOU ARE USING MYSQL,      do step 4a
-   IF YOU ARE USING POSTGRESQL, do step 4b
-
-
-4a Connect to your mysql server using 'mysql -p -u root' and
-   at the mysql> prompt issue the following commands:
-
-	DROP DATABASE moodle_db;
-	DROP USER moodle_user@localhost ;
-
-4b Issue the following commands
-
-	su - postgres
-	psql -c "drop database moodle_db;" template1
-	psql -c "drop user moodle_user;" template1
-
-5  Remove the root cron-job
-
-	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   and delete the line added above.
-
-=================================================================
-
-ADDITIONAL PHP REQUIREMENTS
-
-   Moodle allows for many method of authentication.  To see
-   what these are, in the "Site Administration" block, click
-   on
-
-	Users -> Authentication -> Manage Authentication
-
-   Moodle will try to authenticate by each method in order
-   until it either succeeds or exhausts the list and fails.
-
-   In order to use some of these methods, you need to make
-   sure PHP was compiled with the correct support.  You will
-   know that you do not have the correct support compiled in
-   if authentication by all previous methods fails, and you
-   encounter a method for which PHP does not have support.
-   An error will be thrown and reported in the web page.
-   
-   Currently, the ebuild has support for the following
-
-   	Auth Method		USE flag
-
-	IMAP(S) or POP3(S)	imap
-   	LDAP or CAS		ldap
-	External database	odbc
-	RADIUS			radius
-

diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
deleted file mode 100644
index 9126994..0000000
--- a/www-apps/moodle/files/postinstall-nodb-en.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-You have not specified which database you are going to use.
-You are on your own!  Go to
-
-		http://docs.moodle.org/en/Installing_Moodle
-
-and follow the instructions there.

diff --git a/www-apps/moodle/moodle-1.9.12.ebuild b/www-apps/moodle/moodle-1.9.12.ebuild
deleted file mode 100644
index 1252488..0000000
--- a/www-apps/moodle/moodle-1.9.12.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.3.ebuild b/www-apps/moodle/moodle-2.0.3.ebuild
deleted file mode 100644
index 4612daa..0000000
--- a/www-apps/moodle/moodle-2.0.3.ebuild
+++ /dev/null
@@ -1,133 +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-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
-}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/
@ 2011-07-08 21:43 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2011-07-08 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     23fcd71dd417e56584a86290aaf6eb9f62e1679d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 21:43:46 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 21:43:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=23fcd71d

www-apps/moodle: added needed FILESDIR

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 www-apps/moodle/Manifest                      |    9 +-
 www-apps/moodle/files/config.php              |   29 ++++
 www-apps/moodle/files/postinstall-en.txt      |  220 +++++++++++++++++++++++++
 www-apps/moodle/files/postinstall-nodb-en.txt |    6 +
 4 files changed, 261 insertions(+), 3 deletions(-)

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 0663f1d..7373353 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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-2.1.tgz 23128617 RMD160 ed0758ffd1534c907ff27f5b9c5d1b285e499239 SHA1 9d7830f7b16621c22813634f19baae56cd565315 SHA256 8739ab133be99736ae7d9f004b4163b332dfd135c064899f84b24b8867ea2810
 EBUILD moodle-2.1.ebuild 3582 RMD160 1a8cf4d09c3ea6c68f1644e02be8d9d5d68a4690 SHA1 e61e0972e3d87fa74ebbb1632e5aa6be8dc36a54 SHA256 c5b2ec282ecb89b101d9a6c75839f95567736d6b3da66d48ff2e11a9ffe31947
 MISC ChangeLog 136 RMD160 fc9660fde19ae47a1042914c33b3122a7f4f3915 SHA1 68b48ffe651aa2fe5cd9b1668048476974c7dc58 SHA256 6ebbd5bae600a73b1d85e89ee5765d127d4feef5e8d04a48a4ac7b1dfd8fe243
@@ -8,7 +11,7 @@ MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk4XcR0ACgkQl5yvQNBFVTV0FQCghRJy0uLoMs/71jDn2dfwZJnL
-ZOcAn0JjY3g8SKF+UDeWerSRwQHIlOxl
-=vdxu
+iEYEAREIAAYFAk4XehIACgkQl5yvQNBFVTUfFgCggcylUUbaT1nL1VvFZBuo7Vxy
+RSsAmwYaQBEHyxoPw3FzjoUjRdvMVU7T
+=xBBp
 -----END PGP SIGNATURE-----

diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
new file mode 100644
index 0000000..c959b4a
--- /dev/null
+++ b/www-apps/moodle/files/config.php
@@ -0,0 +1,29 @@
+<?PHP
+unset($CFG);
+$CFG = new stdClass();
+
+$CFG->dbtype    = 'mydb';
+$CFG->dbhost    = 'localhost';
+$CFG->dbname    = 'moodle_db';
+$CFG->dbuser    = 'moodle_user';
+$CFG->dbpass    = 'moodle_pass';
+$CFG->prefix    = 'mdl_';
+
+$CFG->dbpersist = false;
+
+$CFG->wwwroot   = 'http://localhost/moodle';
+$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
+$CFG->dataroot  = '/var/www/localhost/moodle' ;
+
+$CFG->directorypermissions = 02777;
+
+$CFG->admin = 'admin';
+
+if (file_exists("$CFG->dirroot/lib/setup.php"))  {
+    include_once("$CFG->dirroot/lib/setup.php");
+} else {
+    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
+    echo "<p>Please supply this file or reinstall moodle</p>";
+    die;
+}
+?>

diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
new file mode 100644
index 0000000..6a5b44b
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-en.txt
@@ -0,0 +1,220 @@
+NEW INSTALLS
+
+0  Check to see if webapp-config automatically installed
+   moodle for you in /var/www/localhost/htdocs. You should
+   see a directory in there called moodle.  If it didn't
+   install it manually:
+
+	webapp-config -d moodle -I moodle X.Y.Z
+
+   Replace X.Y.Z with whatever version you just emerged.
+
+1  Edit the config.php file found at
+
+	/var/www/localhost/htdocs/moodle/config.php
+
+   You should probably change the database password,
+   $CFG->dbpass = 'moodle_pass' to something more
+   obscure.  Also, if your system has a FQDN, change
+   the $CFG->wwwroot = 'http://localhost/moodle'
+   to match the URL of your moodle installation.
+   
+   
+   IF YOU ARE USING MYSQL,      do step 2a
+   IF YOU ARE USING POSTGRESQL, do step 2b
+
+
+2a Create a new mysql database and account with the
+   appropriate privileges.  Make sure the username,
+   password and database match their values in
+   config.php from step 1.
+   
+   Connect to your mysql server using
+   
+	mysql -p -u root
+
+   and at the mysql> prompt issue the following commands
+
+	CREATE DATABASE moodle_db;
+	GRANT ALL ON moodle_db.*
+		TO moodle_user@localhost
+		IDENTIFIED BY 'moodle_pass';
+	flush privileges;
+
+2b Issue the following commands at a shell, making sure
+   the username, password and database match their values
+   in config.php from step 1.
+
+   su - postgres
+   psql -c "create user moodle_user createdb;" template1
+   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
+   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
+   psql -c "alter user moodle_user nocreatedb;" template1
+   su - root
+   /etc/init.d/postgresql-X.Y reload
+
+   Replace X.Y with your version postgresql.
+
+   NOTE: Moodle docs say that moodle only works with
+   postgresql-7, but I've used it with 8 no problems.
+
+3  Direct your browser to the URL in step 1.  You should see
+   the license agreement.  Click "Yes" to continue.
+
+4  You are now about to install.  Click the checkbox for
+   "Unattended operation" and "Continue" to start.  Follow
+   the wizard as you "Setup administrator account" and configure
+   the "Front Page settings".
+
+5  You now have a working installation.  Before putting it
+   into production, you'll probably want to check that
+   everything is sane.  In the "Site Administration" block,
+   click on
+
+   	Server -> Environment
+
+   Make sure that you've got the green okay on all the
+   Server Checks.  If you don't, click on the ? icons for
+   popup help.
+
+6  Add a cron-job to root's crontab.
+
+   	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   then add the line
+
+	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
+
+7  For more information on installing moodle, see
+
+   	http://docs.moodle.org/en/Installing_Moodle
+
+   For information on working with moodle, see
+
+	http://moodle.org/support/
+
+=================================================================
+
+UPGRADES
+
+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.
+
+
+=================================================================
+
+UNINSTALL
+
+1  Make sure you really want to do this.  I mean REALLY!
+   After step 3 you will be past the point of no return.
+
+2  If you just want to uninstall the webapp, do the following
+   and no more!
+
+	emerge --unmerge moodle
+
+   Your data is still in the db and in the moodledata dir.
+
+
+   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
+
+3  Uninstall the uploaded files
+
+	rm -rf /var/lib/moodledata
+
+
+   IF YOU ARE USING MYSQL,      do step 4a
+   IF YOU ARE USING POSTGRESQL, do step 4b
+
+
+4a Connect to your mysql server using 'mysql -p -u root' and
+   at the mysql> prompt issue the following commands:
+
+	DROP DATABASE moodle_db;
+	DROP USER moodle_user@localhost ;
+
+4b Issue the following commands
+
+	su - postgres
+	psql -c "drop database moodle_db;" template1
+	psql -c "drop user moodle_user;" template1
+
+5  Remove the root cron-job
+
+	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   and delete the line added above.
+
+=================================================================
+
+ADDITIONAL PHP REQUIREMENTS
+
+   Moodle allows for many method of authentication.  To see
+   what these are, in the "Site Administration" block, click
+   on
+
+	Users -> Authentication -> Manage Authentication
+
+   Moodle will try to authenticate by each method in order
+   until it either succeeds or exhausts the list and fails.
+
+   In order to use some of these methods, you need to make
+   sure PHP was compiled with the correct support.  You will
+   know that you do not have the correct support compiled in
+   if authentication by all previous methods fails, and you
+   encounter a method for which PHP does not have support.
+   An error will be thrown and reported in the web page.
+   
+   Currently, the ebuild has support for the following
+
+   	Auth Method		USE flag
+
+	IMAP(S) or POP3(S)	imap
+   	LDAP or CAS		ldap
+	External database	odbc
+	RADIUS			radius
+

diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
new file mode 100644
index 0000000..9126994
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-nodb-en.txt
@@ -0,0 +1,6 @@
+You have not specified which database you are going to use.
+You are on your own!  Go to
+
+		http://docs.moodle.org/en/Installing_Moodle
+
+and follow the instructions there.



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/
@ 2011-07-09 20:29 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2011-07-09 20:29 UTC (permalink / raw
  To: gentoo-commits

commit:     65688ed5ee66f6dcb301eed8d324a86a541acaf0
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 20:29:02 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 20:29:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=65688ed5

www-apps/moodle: version 2.1 moved to tree

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 www-apps/moodle/ChangeLog                     |    8 -
 www-apps/moodle/Manifest                      |   17 --
 www-apps/moodle/files/config.php              |   29 ----
 www-apps/moodle/files/postinstall-en.txt      |  220 -------------------------
 www-apps/moodle/files/postinstall-nodb-en.txt |    6 -
 www-apps/moodle/metadata.xml                  |    9 -
 www-apps/moodle/moodle-2.1.ebuild             |  133 ---------------
 7 files changed, 0 insertions(+), 422 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
deleted file mode 100644
index a156f88..0000000
--- a/www-apps/moodle/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-*moodle-2.1 (08 Jul 2011)
-
-  08 Jul 2011; Anthony G. Basile <blueness@gentoo.org> +moodle-2.1.ebuild,
-  +metadata.xml:
-  Bump to 2.1
-

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
deleted file mode 100644
index 7373353..0000000
--- a/www-apps/moodle/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-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-2.1.tgz 23128617 RMD160 ed0758ffd1534c907ff27f5b9c5d1b285e499239 SHA1 9d7830f7b16621c22813634f19baae56cd565315 SHA256 8739ab133be99736ae7d9f004b4163b332dfd135c064899f84b24b8867ea2810
-EBUILD moodle-2.1.ebuild 3582 RMD160 1a8cf4d09c3ea6c68f1644e02be8d9d5d68a4690 SHA1 e61e0972e3d87fa74ebbb1632e5aa6be8dc36a54 SHA256 c5b2ec282ecb89b101d9a6c75839f95567736d6b3da66d48ff2e11a9ffe31947
-MISC ChangeLog 136 RMD160 fc9660fde19ae47a1042914c33b3122a7f4f3915 SHA1 68b48ffe651aa2fe5cd9b1668048476974c7dc58 SHA256 6ebbd5bae600a73b1d85e89ee5765d127d4feef5e8d04a48a4ac7b1dfd8fe243
-MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk4XehIACgkQl5yvQNBFVTUfFgCggcylUUbaT1nL1VvFZBuo7Vxy
-RSsAmwYaQBEHyxoPw3FzjoUjRdvMVU7T
-=xBBp
------END PGP SIGNATURE-----

diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
deleted file mode 100644
index c959b4a..0000000
--- a/www-apps/moodle/files/config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?PHP
-unset($CFG);
-$CFG = new stdClass();
-
-$CFG->dbtype    = 'mydb';
-$CFG->dbhost    = 'localhost';
-$CFG->dbname    = 'moodle_db';
-$CFG->dbuser    = 'moodle_user';
-$CFG->dbpass    = 'moodle_pass';
-$CFG->prefix    = 'mdl_';
-
-$CFG->dbpersist = false;
-
-$CFG->wwwroot   = 'http://localhost/moodle';
-$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
-$CFG->dataroot  = '/var/www/localhost/moodle' ;
-
-$CFG->directorypermissions = 02777;
-
-$CFG->admin = 'admin';
-
-if (file_exists("$CFG->dirroot/lib/setup.php"))  {
-    include_once("$CFG->dirroot/lib/setup.php");
-} else {
-    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
-    echo "<p>Please supply this file or reinstall moodle</p>";
-    die;
-}
-?>

diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
deleted file mode 100644
index 6a5b44b..0000000
--- a/www-apps/moodle/files/postinstall-en.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-NEW INSTALLS
-
-0  Check to see if webapp-config automatically installed
-   moodle for you in /var/www/localhost/htdocs. You should
-   see a directory in there called moodle.  If it didn't
-   install it manually:
-
-	webapp-config -d moodle -I moodle X.Y.Z
-
-   Replace X.Y.Z with whatever version you just emerged.
-
-1  Edit the config.php file found at
-
-	/var/www/localhost/htdocs/moodle/config.php
-
-   You should probably change the database password,
-   $CFG->dbpass = 'moodle_pass' to something more
-   obscure.  Also, if your system has a FQDN, change
-   the $CFG->wwwroot = 'http://localhost/moodle'
-   to match the URL of your moodle installation.
-   
-   
-   IF YOU ARE USING MYSQL,      do step 2a
-   IF YOU ARE USING POSTGRESQL, do step 2b
-
-
-2a Create a new mysql database and account with the
-   appropriate privileges.  Make sure the username,
-   password and database match their values in
-   config.php from step 1.
-   
-   Connect to your mysql server using
-   
-	mysql -p -u root
-
-   and at the mysql> prompt issue the following commands
-
-	CREATE DATABASE moodle_db;
-	GRANT ALL ON moodle_db.*
-		TO moodle_user@localhost
-		IDENTIFIED BY 'moodle_pass';
-	flush privileges;
-
-2b Issue the following commands at a shell, making sure
-   the username, password and database match their values
-   in config.php from step 1.
-
-   su - postgres
-   psql -c "create user moodle_user createdb;" template1
-   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
-   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
-   psql -c "alter user moodle_user nocreatedb;" template1
-   su - root
-   /etc/init.d/postgresql-X.Y reload
-
-   Replace X.Y with your version postgresql.
-
-   NOTE: Moodle docs say that moodle only works with
-   postgresql-7, but I've used it with 8 no problems.
-
-3  Direct your browser to the URL in step 1.  You should see
-   the license agreement.  Click "Yes" to continue.
-
-4  You are now about to install.  Click the checkbox for
-   "Unattended operation" and "Continue" to start.  Follow
-   the wizard as you "Setup administrator account" and configure
-   the "Front Page settings".
-
-5  You now have a working installation.  Before putting it
-   into production, you'll probably want to check that
-   everything is sane.  In the "Site Administration" block,
-   click on
-
-   	Server -> Environment
-
-   Make sure that you've got the green okay on all the
-   Server Checks.  If you don't, click on the ? icons for
-   popup help.
-
-6  Add a cron-job to root's crontab.
-
-   	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   then add the line
-
-	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
-
-7  For more information on installing moodle, see
-
-   	http://docs.moodle.org/en/Installing_Moodle
-
-   For information on working with moodle, see
-
-	http://moodle.org/support/
-
-=================================================================
-
-UPGRADES
-
-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.
-
-
-=================================================================
-
-UNINSTALL
-
-1  Make sure you really want to do this.  I mean REALLY!
-   After step 3 you will be past the point of no return.
-
-2  If you just want to uninstall the webapp, do the following
-   and no more!
-
-	emerge --unmerge moodle
-
-   Your data is still in the db and in the moodledata dir.
-
-
-   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
-
-3  Uninstall the uploaded files
-
-	rm -rf /var/lib/moodledata
-
-
-   IF YOU ARE USING MYSQL,      do step 4a
-   IF YOU ARE USING POSTGRESQL, do step 4b
-
-
-4a Connect to your mysql server using 'mysql -p -u root' and
-   at the mysql> prompt issue the following commands:
-
-	DROP DATABASE moodle_db;
-	DROP USER moodle_user@localhost ;
-
-4b Issue the following commands
-
-	su - postgres
-	psql -c "drop database moodle_db;" template1
-	psql -c "drop user moodle_user;" template1
-
-5  Remove the root cron-job
-
-	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   and delete the line added above.
-
-=================================================================
-
-ADDITIONAL PHP REQUIREMENTS
-
-   Moodle allows for many method of authentication.  To see
-   what these are, in the "Site Administration" block, click
-   on
-
-	Users -> Authentication -> Manage Authentication
-
-   Moodle will try to authenticate by each method in order
-   until it either succeeds or exhausts the list and fails.
-
-   In order to use some of these methods, you need to make
-   sure PHP was compiled with the correct support.  You will
-   know that you do not have the correct support compiled in
-   if authentication by all previous methods fails, and you
-   encounter a method for which PHP does not have support.
-   An error will be thrown and reported in the web page.
-   
-   Currently, the ebuild has support for the following
-
-   	Auth Method		USE flag
-
-	IMAP(S) or POP3(S)	imap
-   	LDAP or CAS		ldap
-	External database	odbc
-	RADIUS			radius
-

diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
deleted file mode 100644
index 9126994..0000000
--- a/www-apps/moodle/files/postinstall-nodb-en.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-You have not specified which database you are going to use.
-You are on your own!  Go to
-
-		http://docs.moodle.org/en/Installing_Moodle
-
-and follow the instructions there.

diff --git a/www-apps/moodle/metadata.xml b/www-apps/moodle/metadata.xml
deleted file mode 100644
index 3cf0cd5..0000000
--- a/www-apps/moodle/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
-</pkgmetadata>

diff --git a/www-apps/moodle/moodle-2.1.ebuild b/www-apps/moodle/moodle-2.1.ebuild
deleted file mode 100644
index 67e9a98..0000000
--- a/www-apps/moodle/moodle-2.1.ebuild
+++ /dev/null
@@ -1,133 +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-2.0.3.ebuild,v 1.1 2011/05/11 19:14:39 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
-}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/
@ 2011-07-11  8:18 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2011-07-11  8:18 UTC (permalink / raw
  To: gentoo-commits

commit:     9e49fb4154cacffeb6057c3475b27f19a95f8c4f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 08:18:35 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 08:18:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=9e49fb41

www-apps/moodle: address bug #374605

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 www-apps/moodle/ChangeLog                     |   54 ++++++
 www-apps/moodle/Manifest                      |   21 +++
 www-apps/moodle/files/config.php              |   29 ++++
 www-apps/moodle/files/postinstall-en.txt      |  220 +++++++++++++++++++++++++
 www-apps/moodle/files/postinstall-nodb-en.txt |    6 +
 www-apps/moodle/metadata.xml                  |    9 +
 www-apps/moodle/moodle-1.9.12.ebuild          |  126 ++++++++++++++
 www-apps/moodle/moodle-2.0.3.ebuild           |  139 ++++++++++++++++
 www-apps/moodle/moodle-2.1.ebuild             |  139 ++++++++++++++++
 9 files changed, 743 insertions(+), 0 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
new file mode 100644
index 0000000..c6fa69e
--- /dev/null
+++ b/www-apps/moodle/ChangeLog
@@ -0,0 +1,54 @@
+# 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.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)
+
+  11 May 2011; Anthony G. Basile <blueness@gentoo.org> +moodle-1.9.12.ebuild,
+  +moodle-2.0.3.ebuild:
+  Version bumps address several security issues.
+  See http://docs.moodle.org/en/Moodle_1.9.12_release_notes
+  and http://docs.moodle.org/en/Moodle_2.0.3_release_notes
+
+  10 Mar 2011; Anthony G. Basile <blueness@gentoo.org> -moodle-1.9.9.ebuild,
+  -moodle-1.9.9-r1.ebuild, -moodle-1.9.10.ebuild, -moodle-2.0.1.ebuild:
+  Removed decprecated versions, bug #353431
+
+*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)
+
+  08 Jan 2011; Anthony G. Basile <blueness@gentoo.org> +moodle-2.0.1.ebuild:
+  Version bump
+
+*moodle-1.9.10 (29 Oct 2010)
+
+  29 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  +moodle-1.9.10.ebuild:
+  Version bump
+
+*moodle-1.9.9-r1 (13 Aug 2010)
+
+  13 Aug 2010; Anthony G. Basile <blueness@gentoo.org>
+  +moodle-1.9.9-r1.ebuild, files/postinstall-en.txt:
+  Ported to EAPI 2 USE deps. Bug #332165
+
+*moodle-1.9.9 (19 Jul 2010)
+
+  19 Jul 2010; Anthony G. Basile <blueness@gentoo.org> +moodle-1.9.9.ebuild,
+  +files/config.php, +files/postinstall-en.txt,
+  +files/postinstall-nodb-en.txt, +metadata.xml:
+  New ebuild by Anthony G. Basile. Bug #104275
+

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
new file mode 100644
index 0000000..d640512
--- /dev/null
+++ b/www-apps/moodle/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.12.tgz 14044589 RMD160 32054256881037026454c41e7dd4c3683cc361b2 SHA1 838d2fb9c17903c1835aee2154527158e5c7a83d SHA256 fc4fbe600102fc0fc878f6db423d5bac5ef9362aba8d97720939f1078f905f80
+DIST moodle-2.0.3.tgz 22438221 RMD160 e204249cb439754ed7c484815b763a4515c14ff0 SHA1 3dc8b1a46f94b54442b907461daaf453b955d1e6 SHA256 91ffa120a2674d835a0f087d472c789ddeaac305181c80c8a0af33351d065945
+DIST moodle-2.1.tgz 23128617 RMD160 ed0758ffd1534c907ff27f5b9c5d1b285e499239 SHA1 9d7830f7b16621c22813634f19baae56cd565315 SHA256 8739ab133be99736ae7d9f004b4163b332dfd135c064899f84b24b8867ea2810
+EBUILD moodle-1.9.12.ebuild 3169 RMD160 5c093b37a4321f6fdaf41a849e26009a0cb46584 SHA1 d2d281bd4426337a55da42e475985ad2da3a84b5 SHA256 4af9fc292090859e4a9f214f59f73b3fab3de38016cd4dbeca46ffd43c1c7b01
+EBUILD moodle-2.0.3.ebuild 4021 RMD160 c1b112fbc29341a5f172396a88e9712111da3e21 SHA1 f403c21c02979b39ee90facaa6dae67feeb4f5ad SHA256 81b739a5e8a40e1842d38f17ebcb0be66b615c5af9cd449e550fc32940cec5ce
+EBUILD moodle-2.1.ebuild 4019 RMD160 305eedf08ce9c1fa89ecff13298f614eb976e5b6 SHA1 5b4ff5fd167d2dcde75eefc3658d72427db6809f SHA256 cfd9091edab13f17a0e0f534fcafe1597572b04dcddcb549f03f61e056341900
+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)
+
+iEYEAREIAAYFAk4asdsACgkQl5yvQNBFVTUirQCfSphcGoGkkGRZBC52rrKeCaFO
+AbwAn2am3n27VKMQIAas578uml+KtnyG
+=uaw4
+-----END PGP SIGNATURE-----

diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
new file mode 100644
index 0000000..c959b4a
--- /dev/null
+++ b/www-apps/moodle/files/config.php
@@ -0,0 +1,29 @@
+<?PHP
+unset($CFG);
+$CFG = new stdClass();
+
+$CFG->dbtype    = 'mydb';
+$CFG->dbhost    = 'localhost';
+$CFG->dbname    = 'moodle_db';
+$CFG->dbuser    = 'moodle_user';
+$CFG->dbpass    = 'moodle_pass';
+$CFG->prefix    = 'mdl_';
+
+$CFG->dbpersist = false;
+
+$CFG->wwwroot   = 'http://localhost/moodle';
+$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
+$CFG->dataroot  = '/var/www/localhost/moodle' ;
+
+$CFG->directorypermissions = 02777;
+
+$CFG->admin = 'admin';
+
+if (file_exists("$CFG->dirroot/lib/setup.php"))  {
+    include_once("$CFG->dirroot/lib/setup.php");
+} else {
+    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
+    echo "<p>Please supply this file or reinstall moodle</p>";
+    die;
+}
+?>

diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
new file mode 100644
index 0000000..6a5b44b
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-en.txt
@@ -0,0 +1,220 @@
+NEW INSTALLS
+
+0  Check to see if webapp-config automatically installed
+   moodle for you in /var/www/localhost/htdocs. You should
+   see a directory in there called moodle.  If it didn't
+   install it manually:
+
+	webapp-config -d moodle -I moodle X.Y.Z
+
+   Replace X.Y.Z with whatever version you just emerged.
+
+1  Edit the config.php file found at
+
+	/var/www/localhost/htdocs/moodle/config.php
+
+   You should probably change the database password,
+   $CFG->dbpass = 'moodle_pass' to something more
+   obscure.  Also, if your system has a FQDN, change
+   the $CFG->wwwroot = 'http://localhost/moodle'
+   to match the URL of your moodle installation.
+   
+   
+   IF YOU ARE USING MYSQL,      do step 2a
+   IF YOU ARE USING POSTGRESQL, do step 2b
+
+
+2a Create a new mysql database and account with the
+   appropriate privileges.  Make sure the username,
+   password and database match their values in
+   config.php from step 1.
+   
+   Connect to your mysql server using
+   
+	mysql -p -u root
+
+   and at the mysql> prompt issue the following commands
+
+	CREATE DATABASE moodle_db;
+	GRANT ALL ON moodle_db.*
+		TO moodle_user@localhost
+		IDENTIFIED BY 'moodle_pass';
+	flush privileges;
+
+2b Issue the following commands at a shell, making sure
+   the username, password and database match their values
+   in config.php from step 1.
+
+   su - postgres
+   psql -c "create user moodle_user createdb;" template1
+   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
+   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
+   psql -c "alter user moodle_user nocreatedb;" template1
+   su - root
+   /etc/init.d/postgresql-X.Y reload
+
+   Replace X.Y with your version postgresql.
+
+   NOTE: Moodle docs say that moodle only works with
+   postgresql-7, but I've used it with 8 no problems.
+
+3  Direct your browser to the URL in step 1.  You should see
+   the license agreement.  Click "Yes" to continue.
+
+4  You are now about to install.  Click the checkbox for
+   "Unattended operation" and "Continue" to start.  Follow
+   the wizard as you "Setup administrator account" and configure
+   the "Front Page settings".
+
+5  You now have a working installation.  Before putting it
+   into production, you'll probably want to check that
+   everything is sane.  In the "Site Administration" block,
+   click on
+
+   	Server -> Environment
+
+   Make sure that you've got the green okay on all the
+   Server Checks.  If you don't, click on the ? icons for
+   popup help.
+
+6  Add a cron-job to root's crontab.
+
+   	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   then add the line
+
+	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
+
+7  For more information on installing moodle, see
+
+   	http://docs.moodle.org/en/Installing_Moodle
+
+   For information on working with moodle, see
+
+	http://moodle.org/support/
+
+=================================================================
+
+UPGRADES
+
+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.
+
+
+=================================================================
+
+UNINSTALL
+
+1  Make sure you really want to do this.  I mean REALLY!
+   After step 3 you will be past the point of no return.
+
+2  If you just want to uninstall the webapp, do the following
+   and no more!
+
+	emerge --unmerge moodle
+
+   Your data is still in the db and in the moodledata dir.
+
+
+   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
+
+3  Uninstall the uploaded files
+
+	rm -rf /var/lib/moodledata
+
+
+   IF YOU ARE USING MYSQL,      do step 4a
+   IF YOU ARE USING POSTGRESQL, do step 4b
+
+
+4a Connect to your mysql server using 'mysql -p -u root' and
+   at the mysql> prompt issue the following commands:
+
+	DROP DATABASE moodle_db;
+	DROP USER moodle_user@localhost ;
+
+4b Issue the following commands
+
+	su - postgres
+	psql -c "drop database moodle_db;" template1
+	psql -c "drop user moodle_user;" template1
+
+5  Remove the root cron-job
+
+	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   and delete the line added above.
+
+=================================================================
+
+ADDITIONAL PHP REQUIREMENTS
+
+   Moodle allows for many method of authentication.  To see
+   what these are, in the "Site Administration" block, click
+   on
+
+	Users -> Authentication -> Manage Authentication
+
+   Moodle will try to authenticate by each method in order
+   until it either succeeds or exhausts the list and fails.
+
+   In order to use some of these methods, you need to make
+   sure PHP was compiled with the correct support.  You will
+   know that you do not have the correct support compiled in
+   if authentication by all previous methods fails, and you
+   encounter a method for which PHP does not have support.
+   An error will be thrown and reported in the web page.
+   
+   Currently, the ebuild has support for the following
+
+   	Auth Method		USE flag
+
+	IMAP(S) or POP3(S)	imap
+   	LDAP or CAS		ldap
+	External database	odbc
+	RADIUS			radius
+

diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
new file mode 100644
index 0000000..9126994
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-nodb-en.txt
@@ -0,0 +1,6 @@
+You have not specified which database you are going to use.
+You are on your own!  Go to
+
+		http://docs.moodle.org/en/Installing_Moodle
+
+and follow the instructions there.

diff --git a/www-apps/moodle/metadata.xml b/www-apps/moodle/metadata.xml
new file mode 100644
index 0000000..3cf0cd5
--- /dev/null
+++ b/www-apps/moodle/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>web-apps</herd>
+<maintainer>
+	<email>blueness@gentoo.org</email>
+	<name>Anthony G. Basile</name>
+</maintainer>
+</pkgmetadata>

diff --git a/www-apps/moodle/moodle-1.9.12.ebuild b/www-apps/moodle/moodle-1.9.12.ebuild
new file mode 100644
index 0000000..5c20029
--- /dev/null
+++ b/www-apps/moodle/moodle-1.9.12.ebuild
@@ -0,0 +1,126 @@
+# 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.12.ebuild,v 1.1 2011/05/11 19:14:39 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_A="ctype,curl,gd,iconv,ssl,tokenizer,xml,xmlrpc,zlib"
+PHPFLAGS_B="ctype,curl,gd-external,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_A}]
+		>=dev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS_B}]
+	)
+	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.3.ebuild b/www-apps/moodle/moodle-2.0.3.ebuild
new file mode 100644
index 0000000..4afe8fb
--- /dev/null
+++ b/www-apps/moodle/moodle-2.0.3.ebuild
@@ -0,0 +1,139 @@
+# 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.3.ebuild,v 1.1 2011/05/11 19:14:39 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_A="gd,soap,ssl,tokenizer,xmlrpc"
+PHP_OPTIONAL_FLAGS_52_B="gd-external,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_52_A="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_A}"
+PHP_FLAGS_52_B="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_B}"
+
+PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS_53_A="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_OPTIONAL_FLAGS_53_B="gd-external,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_53_A="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_A}"
+PHP_FLAGS_53_B="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_B}"
+
+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_A}]
+		=dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_B}]
+		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_A}]
+		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_B}]
+	)
+	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
+}

diff --git a/www-apps/moodle/moodle-2.1.ebuild b/www-apps/moodle/moodle-2.1.ebuild
new file mode 100644
index 0000000..53321a5
--- /dev/null
+++ b/www-apps/moodle/moodle-2.1.ebuild
@@ -0,0 +1,139 @@
+# 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.1.ebuild,v 1.1 2011/07/09 20:25:29 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_A="gd,soap,ssl,tokenizer,xmlrpc"
+PHP_OPTIONAL_FLAGS_52_B="gd-external,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_52_A="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_A}"
+PHP_FLAGS_52_B="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_B}"
+
+PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS_53_A="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_OPTIONAL_FLAGS_53_B="gd-external,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_53_A="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_A}"
+PHP_FLAGS_53_B="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_B}"
+
+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_A}]
+		=dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_B}]
+		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_A}]
+		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_B}]
+	)
+	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
+}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/
@ 2011-07-12 21:24 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2011-07-12 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     7e3f6c085cb58ca3179cf88f0c39f98e0df8b7d4
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 21:24:05 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 21:24:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=7e3f6c08

www-apps/moodle: moved to tree, bug #374605

---
 www-apps/moodle/ChangeLog                     |   54 ------
 www-apps/moodle/Manifest                      |   21 ---
 www-apps/moodle/files/config.php              |   29 ----
 www-apps/moodle/files/postinstall-en.txt      |  220 -------------------------
 www-apps/moodle/files/postinstall-nodb-en.txt |    6 -
 www-apps/moodle/metadata.xml                  |    9 -
 www-apps/moodle/moodle-1.9.12.ebuild          |  126 --------------
 www-apps/moodle/moodle-2.0.3.ebuild           |  139 ----------------
 www-apps/moodle/moodle-2.1.ebuild             |  139 ----------------
 9 files changed, 0 insertions(+), 743 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
deleted file mode 100644
index c6fa69e..0000000
--- a/www-apps/moodle/ChangeLog
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.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)
-
-  11 May 2011; Anthony G. Basile <blueness@gentoo.org> +moodle-1.9.12.ebuild,
-  +moodle-2.0.3.ebuild:
-  Version bumps address several security issues.
-  See http://docs.moodle.org/en/Moodle_1.9.12_release_notes
-  and http://docs.moodle.org/en/Moodle_2.0.3_release_notes
-
-  10 Mar 2011; Anthony G. Basile <blueness@gentoo.org> -moodle-1.9.9.ebuild,
-  -moodle-1.9.9-r1.ebuild, -moodle-1.9.10.ebuild, -moodle-2.0.1.ebuild:
-  Removed decprecated versions, bug #353431
-
-*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)
-
-  08 Jan 2011; Anthony G. Basile <blueness@gentoo.org> +moodle-2.0.1.ebuild:
-  Version bump
-
-*moodle-1.9.10 (29 Oct 2010)
-
-  29 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
-  +moodle-1.9.10.ebuild:
-  Version bump
-
-*moodle-1.9.9-r1 (13 Aug 2010)
-
-  13 Aug 2010; Anthony G. Basile <blueness@gentoo.org>
-  +moodle-1.9.9-r1.ebuild, files/postinstall-en.txt:
-  Ported to EAPI 2 USE deps. Bug #332165
-
-*moodle-1.9.9 (19 Jul 2010)
-
-  19 Jul 2010; Anthony G. Basile <blueness@gentoo.org> +moodle-1.9.9.ebuild,
-  +files/config.php, +files/postinstall-en.txt,
-  +files/postinstall-nodb-en.txt, +metadata.xml:
-  New ebuild by Anthony G. Basile. Bug #104275
-

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
deleted file mode 100644
index d640512..0000000
--- a/www-apps/moodle/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.12.tgz 14044589 RMD160 32054256881037026454c41e7dd4c3683cc361b2 SHA1 838d2fb9c17903c1835aee2154527158e5c7a83d SHA256 fc4fbe600102fc0fc878f6db423d5bac5ef9362aba8d97720939f1078f905f80
-DIST moodle-2.0.3.tgz 22438221 RMD160 e204249cb439754ed7c484815b763a4515c14ff0 SHA1 3dc8b1a46f94b54442b907461daaf453b955d1e6 SHA256 91ffa120a2674d835a0f087d472c789ddeaac305181c80c8a0af33351d065945
-DIST moodle-2.1.tgz 23128617 RMD160 ed0758ffd1534c907ff27f5b9c5d1b285e499239 SHA1 9d7830f7b16621c22813634f19baae56cd565315 SHA256 8739ab133be99736ae7d9f004b4163b332dfd135c064899f84b24b8867ea2810
-EBUILD moodle-1.9.12.ebuild 3169 RMD160 5c093b37a4321f6fdaf41a849e26009a0cb46584 SHA1 d2d281bd4426337a55da42e475985ad2da3a84b5 SHA256 4af9fc292090859e4a9f214f59f73b3fab3de38016cd4dbeca46ffd43c1c7b01
-EBUILD moodle-2.0.3.ebuild 4021 RMD160 c1b112fbc29341a5f172396a88e9712111da3e21 SHA1 f403c21c02979b39ee90facaa6dae67feeb4f5ad SHA256 81b739a5e8a40e1842d38f17ebcb0be66b615c5af9cd449e550fc32940cec5ce
-EBUILD moodle-2.1.ebuild 4019 RMD160 305eedf08ce9c1fa89ecff13298f614eb976e5b6 SHA1 5b4ff5fd167d2dcde75eefc3658d72427db6809f SHA256 cfd9091edab13f17a0e0f534fcafe1597572b04dcddcb549f03f61e056341900
-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)
-
-iEYEAREIAAYFAk4asdsACgkQl5yvQNBFVTUirQCfSphcGoGkkGRZBC52rrKeCaFO
-AbwAn2am3n27VKMQIAas578uml+KtnyG
-=uaw4
------END PGP SIGNATURE-----

diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
deleted file mode 100644
index c959b4a..0000000
--- a/www-apps/moodle/files/config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?PHP
-unset($CFG);
-$CFG = new stdClass();
-
-$CFG->dbtype    = 'mydb';
-$CFG->dbhost    = 'localhost';
-$CFG->dbname    = 'moodle_db';
-$CFG->dbuser    = 'moodle_user';
-$CFG->dbpass    = 'moodle_pass';
-$CFG->prefix    = 'mdl_';
-
-$CFG->dbpersist = false;
-
-$CFG->wwwroot   = 'http://localhost/moodle';
-$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
-$CFG->dataroot  = '/var/www/localhost/moodle' ;
-
-$CFG->directorypermissions = 02777;
-
-$CFG->admin = 'admin';
-
-if (file_exists("$CFG->dirroot/lib/setup.php"))  {
-    include_once("$CFG->dirroot/lib/setup.php");
-} else {
-    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
-    echo "<p>Please supply this file or reinstall moodle</p>";
-    die;
-}
-?>

diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
deleted file mode 100644
index 6a5b44b..0000000
--- a/www-apps/moodle/files/postinstall-en.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-NEW INSTALLS
-
-0  Check to see if webapp-config automatically installed
-   moodle for you in /var/www/localhost/htdocs. You should
-   see a directory in there called moodle.  If it didn't
-   install it manually:
-
-	webapp-config -d moodle -I moodle X.Y.Z
-
-   Replace X.Y.Z with whatever version you just emerged.
-
-1  Edit the config.php file found at
-
-	/var/www/localhost/htdocs/moodle/config.php
-
-   You should probably change the database password,
-   $CFG->dbpass = 'moodle_pass' to something more
-   obscure.  Also, if your system has a FQDN, change
-   the $CFG->wwwroot = 'http://localhost/moodle'
-   to match the URL of your moodle installation.
-   
-   
-   IF YOU ARE USING MYSQL,      do step 2a
-   IF YOU ARE USING POSTGRESQL, do step 2b
-
-
-2a Create a new mysql database and account with the
-   appropriate privileges.  Make sure the username,
-   password and database match their values in
-   config.php from step 1.
-   
-   Connect to your mysql server using
-   
-	mysql -p -u root
-
-   and at the mysql> prompt issue the following commands
-
-	CREATE DATABASE moodle_db;
-	GRANT ALL ON moodle_db.*
-		TO moodle_user@localhost
-		IDENTIFIED BY 'moodle_pass';
-	flush privileges;
-
-2b Issue the following commands at a shell, making sure
-   the username, password and database match their values
-   in config.php from step 1.
-
-   su - postgres
-   psql -c "create user moodle_user createdb;" template1
-   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
-   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
-   psql -c "alter user moodle_user nocreatedb;" template1
-   su - root
-   /etc/init.d/postgresql-X.Y reload
-
-   Replace X.Y with your version postgresql.
-
-   NOTE: Moodle docs say that moodle only works with
-   postgresql-7, but I've used it with 8 no problems.
-
-3  Direct your browser to the URL in step 1.  You should see
-   the license agreement.  Click "Yes" to continue.
-
-4  You are now about to install.  Click the checkbox for
-   "Unattended operation" and "Continue" to start.  Follow
-   the wizard as you "Setup administrator account" and configure
-   the "Front Page settings".
-
-5  You now have a working installation.  Before putting it
-   into production, you'll probably want to check that
-   everything is sane.  In the "Site Administration" block,
-   click on
-
-   	Server -> Environment
-
-   Make sure that you've got the green okay on all the
-   Server Checks.  If you don't, click on the ? icons for
-   popup help.
-
-6  Add a cron-job to root's crontab.
-
-   	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   then add the line
-
-	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
-
-7  For more information on installing moodle, see
-
-   	http://docs.moodle.org/en/Installing_Moodle
-
-   For information on working with moodle, see
-
-	http://moodle.org/support/
-
-=================================================================
-
-UPGRADES
-
-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.
-
-
-=================================================================
-
-UNINSTALL
-
-1  Make sure you really want to do this.  I mean REALLY!
-   After step 3 you will be past the point of no return.
-
-2  If you just want to uninstall the webapp, do the following
-   and no more!
-
-	emerge --unmerge moodle
-
-   Your data is still in the db and in the moodledata dir.
-
-
-   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
-
-3  Uninstall the uploaded files
-
-	rm -rf /var/lib/moodledata
-
-
-   IF YOU ARE USING MYSQL,      do step 4a
-   IF YOU ARE USING POSTGRESQL, do step 4b
-
-
-4a Connect to your mysql server using 'mysql -p -u root' and
-   at the mysql> prompt issue the following commands:
-
-	DROP DATABASE moodle_db;
-	DROP USER moodle_user@localhost ;
-
-4b Issue the following commands
-
-	su - postgres
-	psql -c "drop database moodle_db;" template1
-	psql -c "drop user moodle_user;" template1
-
-5  Remove the root cron-job
-
-	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   and delete the line added above.
-
-=================================================================
-
-ADDITIONAL PHP REQUIREMENTS
-
-   Moodle allows for many method of authentication.  To see
-   what these are, in the "Site Administration" block, click
-   on
-
-	Users -> Authentication -> Manage Authentication
-
-   Moodle will try to authenticate by each method in order
-   until it either succeeds or exhausts the list and fails.
-
-   In order to use some of these methods, you need to make
-   sure PHP was compiled with the correct support.  You will
-   know that you do not have the correct support compiled in
-   if authentication by all previous methods fails, and you
-   encounter a method for which PHP does not have support.
-   An error will be thrown and reported in the web page.
-   
-   Currently, the ebuild has support for the following
-
-   	Auth Method		USE flag
-
-	IMAP(S) or POP3(S)	imap
-   	LDAP or CAS		ldap
-	External database	odbc
-	RADIUS			radius
-

diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
deleted file mode 100644
index 9126994..0000000
--- a/www-apps/moodle/files/postinstall-nodb-en.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-You have not specified which database you are going to use.
-You are on your own!  Go to
-
-		http://docs.moodle.org/en/Installing_Moodle
-
-and follow the instructions there.

diff --git a/www-apps/moodle/metadata.xml b/www-apps/moodle/metadata.xml
deleted file mode 100644
index 3cf0cd5..0000000
--- a/www-apps/moodle/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
-</pkgmetadata>

diff --git a/www-apps/moodle/moodle-1.9.12.ebuild b/www-apps/moodle/moodle-1.9.12.ebuild
deleted file mode 100644
index 5c20029..0000000
--- a/www-apps/moodle/moodle-1.9.12.ebuild
+++ /dev/null
@@ -1,126 +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.12.ebuild,v 1.1 2011/05/11 19:14:39 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_A="ctype,curl,gd,iconv,ssl,tokenizer,xml,xmlrpc,zlib"
-PHPFLAGS_B="ctype,curl,gd-external,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_A}]
-		>=dev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS_B}]
-	)
-	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.3.ebuild b/www-apps/moodle/moodle-2.0.3.ebuild
deleted file mode 100644
index 4afe8fb..0000000
--- a/www-apps/moodle/moodle-2.0.3.ebuild
+++ /dev/null
@@ -1,139 +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-2.0.3.ebuild,v 1.1 2011/05/11 19:14:39 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_A="gd,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_52_B="gd-external,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_52_A="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_A}"
-PHP_FLAGS_52_B="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_B}"
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53_A="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_53_B="gd-external,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53_A="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_A}"
-PHP_FLAGS_53_B="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_B}"
-
-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_A}]
-		=dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_B}]
-		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_A}]
-		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_B}]
-	)
-	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
-}

diff --git a/www-apps/moodle/moodle-2.1.ebuild b/www-apps/moodle/moodle-2.1.ebuild
deleted file mode 100644
index 53321a5..0000000
--- a/www-apps/moodle/moodle-2.1.ebuild
+++ /dev/null
@@ -1,139 +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-2.1.ebuild,v 1.1 2011/07/09 20:25:29 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_A="gd,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_52_B="gd-external,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_52_A="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_A}"
-PHP_FLAGS_52_B="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_B}"
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53_A="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_53_B="gd-external,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53_A="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_A}"
-PHP_FLAGS_53_B="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_B}"
-
-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_A}]
-		=dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_B}]
-		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_A}]
-		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_B}]
-	)
-	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
-}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/
@ 2012-01-16 19:13 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2012-01-16 19:13 UTC (permalink / raw
  To: gentoo-commits

commit:     88436c1fb641600e9eb403bb1374100bf9b456a4
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 19:13:16 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 19:13:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=88436c1f

www-apps/moodle: removed gd-external, fix depend on >=php5.3* for moodle 2.1* and 2.2*

(Portage version: 2.1.10.41/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 www-apps/moodle/ChangeLog                     |   13 ++
 www-apps/moodle/Manifest                      |   23 +++
 www-apps/moodle/files/config.php              |   29 ++++
 www-apps/moodle/files/postinstall-en.txt      |  220 +++++++++++++++++++++++++
 www-apps/moodle/files/postinstall-nodb-en.txt |    6 +
 www-apps/moodle/metadata.xml                  |    9 +
 www-apps/moodle/moodle-1.9.16-r1.ebuild       |  122 ++++++++++++++
 www-apps/moodle/moodle-2.0.7-r1.ebuild        |  133 +++++++++++++++
 www-apps/moodle/moodle-2.1.4-r1.ebuild        |  126 ++++++++++++++
 www-apps/moodle/moodle-2.2.1-r1.ebuild        |  126 ++++++++++++++
 10 files changed, 807 insertions(+), 0 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
new file mode 100644
index 0000000..f23b819
--- /dev/null
+++ b/www-apps/moodle/ChangeLog
@@ -0,0 +1,13 @@
+
+
+*moodle-2.2.1-r1 (16 Jan 2012)
+*moodle-2.1.4-r1 (16 Jan 2012)
+*moodle-2.0.7-r1 (16 Jan 2012)
+*moodle-1.9.16-r1 (16 Jan 2012)
+
+  16 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +moodle-1.9.16-r1.ebuild, +moodle-2.0.7-r1.ebuild, +moodle-2.1.4-r1.ebuild,
+  +moodle-2.2.1-r1.ebuild, +files/config.php, +files/postinstall-en.txt,
+  +files/postinstall-nodb-en.txt, +metadata.xml:
+  Removed gd-external, fix depend on >=php5.3* for moodle 2.1* and 2.2*
+

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
new file mode 100644
index 0000000..c1b890f
--- /dev/null
+++ b/www-apps/moodle/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.16.tgz 14052946 RMD160 4618557f3e8886010713ebfb1bbcd0042f3a1d10 SHA1 eec230b06cf94dfe45eb46e1e04dec78866d7869 SHA256 dbfc75a2fbac1b68520110989347174bd90982caa216a384190f627518bff8ac
+DIST moodle-2.0.7.tgz 22512947 RMD160 7ab98f36da35d03aff85f74f4e3392daaecceca5 SHA1 8c2fe470bf3de2150d2ca5878b7deb4457110555 SHA256 6ac7ae83dc5827d2054ab58d6e70a980b18bb28def18704fa5831ca578c6fc12
+DIST moodle-2.1.4.tgz 23938102 RMD160 b6c3993cfcbecca25d2c39bac33dc37a91480055 SHA1 6d8032953d94803a92234b6fb2cc57dcfb1fbb51 SHA256 9d0fe131f6a5cee9ba98bfb5ac1dcef703bec43b77cf5f8e0d6377ea45d80cdb
+DIST moodle-2.2.1.tgz 24892608 RMD160 d6d5e7c4b6c77ccee05fb794ccdfdfcb9029132e SHA1 051cdc4030b961585029302edc8417a096547c59 SHA256 863b8bc071c3999b2a61ffa86ee8fade6b4c121d4690a0fd74450648f57ac1fc
+EBUILD moodle-1.9.16-r1.ebuild 2987 RMD160 a7c2fe1fef6307270a6920669f7ae9bdcd576c70 SHA1 d66f287ab169a96a3d9d8313f9585c7514ac85e5 SHA256 84e3a93258b83f82c39b7352fa67b8974edaf18c5cfbc5f0ef8d921eae4e57ff
+EBUILD moodle-2.0.7-r1.ebuild 3541 RMD160 078f8e76fb7d9b4df914678ebfbbb44602296cdb SHA1 63e3d3bbfca161a9e6d573570c2216ddfeca73a4 SHA256 87bf92ef8a2ab763b044080bcdd363c1543985e4ed4bba9d324a8b50319a7fd9
+EBUILD moodle-2.1.4-r1.ebuild 3265 RMD160 7ab9658a77dfb99c0080ce742cd875c7ba810d17 SHA1 bd95aea54d8fa74268d97054d9fcd0701eaa6b29 SHA256 d9ddcfd1710eb5139b9e77f46780edde56aecd9a3a8b88ea92861f744803f2d3
+EBUILD moodle-2.2.1-r1.ebuild 3265 RMD160 9faaf6cc334c49889691ea5b49a2b968516c33ec SHA1 e47ca78008dc4e931c4d2026d55736f89977f65c SHA256 88528913895dd8e10d077db26d478978417042a47927c4ef74108f6c6fc7bbc3
+MISC ChangeLog 456 RMD160 b22d9d1560efbf01128950cf9d79e10cc2fa79f7 SHA1 a7dee2a13fbf74f29d5adc5525fd6c414bd11f2e SHA256 e56d6e8355aa6c30a4f2da5b2190f85049275f7c8f339c0ad3ada1afe7514e71
+MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk8UdswACgkQl5yvQNBFVTUBcACfbOUffYZGqS7zAf7Q4H1BxB7w
+tncAnRzFzF/pcA7gOOApFS7pPg1++r7W
+=+5xe
+-----END PGP SIGNATURE-----

diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
new file mode 100644
index 0000000..c959b4a
--- /dev/null
+++ b/www-apps/moodle/files/config.php
@@ -0,0 +1,29 @@
+<?PHP
+unset($CFG);
+$CFG = new stdClass();
+
+$CFG->dbtype    = 'mydb';
+$CFG->dbhost    = 'localhost';
+$CFG->dbname    = 'moodle_db';
+$CFG->dbuser    = 'moodle_user';
+$CFG->dbpass    = 'moodle_pass';
+$CFG->prefix    = 'mdl_';
+
+$CFG->dbpersist = false;
+
+$CFG->wwwroot   = 'http://localhost/moodle';
+$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
+$CFG->dataroot  = '/var/www/localhost/moodle' ;
+
+$CFG->directorypermissions = 02777;
+
+$CFG->admin = 'admin';
+
+if (file_exists("$CFG->dirroot/lib/setup.php"))  {
+    include_once("$CFG->dirroot/lib/setup.php");
+} else {
+    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
+    echo "<p>Please supply this file or reinstall moodle</p>";
+    die;
+}
+?>

diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
new file mode 100644
index 0000000..6a5b44b
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-en.txt
@@ -0,0 +1,220 @@
+NEW INSTALLS
+
+0  Check to see if webapp-config automatically installed
+   moodle for you in /var/www/localhost/htdocs. You should
+   see a directory in there called moodle.  If it didn't
+   install it manually:
+
+	webapp-config -d moodle -I moodle X.Y.Z
+
+   Replace X.Y.Z with whatever version you just emerged.
+
+1  Edit the config.php file found at
+
+	/var/www/localhost/htdocs/moodle/config.php
+
+   You should probably change the database password,
+   $CFG->dbpass = 'moodle_pass' to something more
+   obscure.  Also, if your system has a FQDN, change
+   the $CFG->wwwroot = 'http://localhost/moodle'
+   to match the URL of your moodle installation.
+   
+   
+   IF YOU ARE USING MYSQL,      do step 2a
+   IF YOU ARE USING POSTGRESQL, do step 2b
+
+
+2a Create a new mysql database and account with the
+   appropriate privileges.  Make sure the username,
+   password and database match their values in
+   config.php from step 1.
+   
+   Connect to your mysql server using
+   
+	mysql -p -u root
+
+   and at the mysql> prompt issue the following commands
+
+	CREATE DATABASE moodle_db;
+	GRANT ALL ON moodle_db.*
+		TO moodle_user@localhost
+		IDENTIFIED BY 'moodle_pass';
+	flush privileges;
+
+2b Issue the following commands at a shell, making sure
+   the username, password and database match their values
+   in config.php from step 1.
+
+   su - postgres
+   psql -c "create user moodle_user createdb;" template1
+   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
+   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
+   psql -c "alter user moodle_user nocreatedb;" template1
+   su - root
+   /etc/init.d/postgresql-X.Y reload
+
+   Replace X.Y with your version postgresql.
+
+   NOTE: Moodle docs say that moodle only works with
+   postgresql-7, but I've used it with 8 no problems.
+
+3  Direct your browser to the URL in step 1.  You should see
+   the license agreement.  Click "Yes" to continue.
+
+4  You are now about to install.  Click the checkbox for
+   "Unattended operation" and "Continue" to start.  Follow
+   the wizard as you "Setup administrator account" and configure
+   the "Front Page settings".
+
+5  You now have a working installation.  Before putting it
+   into production, you'll probably want to check that
+   everything is sane.  In the "Site Administration" block,
+   click on
+
+   	Server -> Environment
+
+   Make sure that you've got the green okay on all the
+   Server Checks.  If you don't, click on the ? icons for
+   popup help.
+
+6  Add a cron-job to root's crontab.
+
+   	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   then add the line
+
+	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
+
+7  For more information on installing moodle, see
+
+   	http://docs.moodle.org/en/Installing_Moodle
+
+   For information on working with moodle, see
+
+	http://moodle.org/support/
+
+=================================================================
+
+UPGRADES
+
+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.
+
+
+=================================================================
+
+UNINSTALL
+
+1  Make sure you really want to do this.  I mean REALLY!
+   After step 3 you will be past the point of no return.
+
+2  If you just want to uninstall the webapp, do the following
+   and no more!
+
+	emerge --unmerge moodle
+
+   Your data is still in the db and in the moodledata dir.
+
+
+   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
+
+3  Uninstall the uploaded files
+
+	rm -rf /var/lib/moodledata
+
+
+   IF YOU ARE USING MYSQL,      do step 4a
+   IF YOU ARE USING POSTGRESQL, do step 4b
+
+
+4a Connect to your mysql server using 'mysql -p -u root' and
+   at the mysql> prompt issue the following commands:
+
+	DROP DATABASE moodle_db;
+	DROP USER moodle_user@localhost ;
+
+4b Issue the following commands
+
+	su - postgres
+	psql -c "drop database moodle_db;" template1
+	psql -c "drop user moodle_user;" template1
+
+5  Remove the root cron-job
+
+	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   and delete the line added above.
+
+=================================================================
+
+ADDITIONAL PHP REQUIREMENTS
+
+   Moodle allows for many method of authentication.  To see
+   what these are, in the "Site Administration" block, click
+   on
+
+	Users -> Authentication -> Manage Authentication
+
+   Moodle will try to authenticate by each method in order
+   until it either succeeds or exhausts the list and fails.
+
+   In order to use some of these methods, you need to make
+   sure PHP was compiled with the correct support.  You will
+   know that you do not have the correct support compiled in
+   if authentication by all previous methods fails, and you
+   encounter a method for which PHP does not have support.
+   An error will be thrown and reported in the web page.
+   
+   Currently, the ebuild has support for the following
+
+   	Auth Method		USE flag
+
+	IMAP(S) or POP3(S)	imap
+   	LDAP or CAS		ldap
+	External database	odbc
+	RADIUS			radius
+

diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
new file mode 100644
index 0000000..9126994
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-nodb-en.txt
@@ -0,0 +1,6 @@
+You have not specified which database you are going to use.
+You are on your own!  Go to
+
+		http://docs.moodle.org/en/Installing_Moodle
+
+and follow the instructions there.

diff --git a/www-apps/moodle/metadata.xml b/www-apps/moodle/metadata.xml
new file mode 100644
index 0000000..3cf0cd5
--- /dev/null
+++ b/www-apps/moodle/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>web-apps</herd>
+<maintainer>
+	<email>blueness@gentoo.org</email>
+	<name>Anthony G. Basile</name>
+</maintainer>
+</pkgmetadata>

diff --git a/www-apps/moodle/moodle-1.9.16-r1.ebuild b/www-apps/moodle/moodle-1.9.16-r1.ebuild
new file mode 100644
index 0000000..3d6d5c5
--- /dev/null
+++ b/www-apps/moodle/moodle-1.9.16-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.16.ebuild,v 1.1 2012/01/08 17:47:30 blueness Exp $
+
+EAPI="4"
+
+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=""
+	DB_COUNT=0
+	for db in ${DBTYPES}; 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}
+	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[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.7-r1.ebuild b/www-apps/moodle/moodle-2.0.7-r1.ebuild
new file mode 100644
index 0000000..129b422
--- /dev/null
+++ b/www-apps/moodle/moodle-2.0.7-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.7.ebuild,v 1.1 2012/01/08 17:47:30 blueness Exp $
+
+EAPI="4"
+
+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}
+	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
+}

diff --git a/www-apps/moodle/moodle-2.1.4-r1.ebuild b/www-apps/moodle/moodle-2.1.4-r1.ebuild
new file mode 100644
index 0000000..f1c1424
--- /dev/null
+++ b/www-apps/moodle/moodle-2.1.4-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.4.ebuild,v 1.1 2012/01/08 17:47:30 blueness Exp $
+
+EAPI="4"
+
+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_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.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}
+	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
+}

diff --git a/www-apps/moodle/moodle-2.2.1-r1.ebuild b/www-apps/moodle/moodle-2.2.1-r1.ebuild
new file mode 100644
index 0000000..a231256
--- /dev/null
+++ b/www-apps/moodle/moodle-2.2.1-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.1.ebuild,v 1.1 2012/01/08 18:07:28 blueness Exp $
+
+EAPI="4"
+
+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_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.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}
+	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
+}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/
@ 2012-01-29  3:11 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2012-01-29  3:11 UTC (permalink / raw
  To: gentoo-commits

commit:     077fb0d002bbc03eab41404dfaae872ffc26f9ba
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 03:11:11 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 03:11:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=077fb0d0

www-apps/moodle: moved to tree

---
 www-apps/moodle/ChangeLog                     |   17 --
 www-apps/moodle/Manifest                      |   13 --
 www-apps/moodle/files/config.php              |   29 ----
 www-apps/moodle/files/postinstall-en.txt      |  220 -------------------------
 www-apps/moodle/files/postinstall-nodb-en.txt |    6 -
 www-apps/moodle/metadata.xml                  |    9 -
 www-apps/moodle/moodle-1.9.16-r1.ebuild       |  122 --------------
 www-apps/moodle/moodle-2.0.7-r1.ebuild        |  126 --------------
 www-apps/moodle/moodle-2.1.4-r1.ebuild        |  126 --------------
 www-apps/moodle/moodle-2.2.1-r1.ebuild        |  126 --------------
 10 files changed, 0 insertions(+), 794 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
deleted file mode 100644
index 4069a30..0000000
--- a/www-apps/moodle/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-  29 Jan 2012; Anthony G. Basile <blueness@gentoo.org> moodle-1.9.16-r1.ebuild,
-  moodle-2.0.7-r1.ebuild, moodle-2.1.4-r1.ebuild, moodle-2.2.1-r1.ebuild:
-  testing bug #400853
-
-*moodle-2.2.1-r1 (16 Jan 2012)
-*moodle-2.1.4-r1 (16 Jan 2012)
-*moodle-2.0.7-r1 (16 Jan 2012)
-*moodle-1.9.16-r1 (16 Jan 2012)
-
-  16 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
-  +moodle-1.9.16-r1.ebuild, +moodle-2.0.7-r1.ebuild, +moodle-2.1.4-r1.ebuild,
-  +moodle-2.2.1-r1.ebuild, +files/config.php, +files/postinstall-en.txt,
-  +files/postinstall-nodb-en.txt, +metadata.xml:
-  Removed gd-external, fix depend on >=php5.3* for moodle 2.1* and 2.2*
-

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
deleted file mode 100644
index 819b1e5..0000000
--- a/www-apps/moodle/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-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.16.tgz 14052946 RMD160 4618557f3e8886010713ebfb1bbcd0042f3a1d10 SHA1 eec230b06cf94dfe45eb46e1e04dec78866d7869 SHA256 dbfc75a2fbac1b68520110989347174bd90982caa216a384190f627518bff8ac
-DIST moodle-2.0.7.tgz 22512947 RMD160 7ab98f36da35d03aff85f74f4e3392daaecceca5 SHA1 8c2fe470bf3de2150d2ca5878b7deb4457110555 SHA256 6ac7ae83dc5827d2054ab58d6e70a980b18bb28def18704fa5831ca578c6fc12
-DIST moodle-2.1.4.tgz 23938102 RMD160 b6c3993cfcbecca25d2c39bac33dc37a91480055 SHA1 6d8032953d94803a92234b6fb2cc57dcfb1fbb51 SHA256 9d0fe131f6a5cee9ba98bfb5ac1dcef703bec43b77cf5f8e0d6377ea45d80cdb
-DIST moodle-2.2.1.tgz 24892608 RMD160 d6d5e7c4b6c77ccee05fb794ccdfdfcb9029132e SHA1 051cdc4030b961585029302edc8417a096547c59 SHA256 863b8bc071c3999b2a61ffa86ee8fade6b4c121d4690a0fd74450648f57ac1fc
-EBUILD moodle-1.9.16-r1.ebuild 2995 RMD160 5fed7d2df5950c39a57bf5a9fb528d22814484c2 SHA1 fed9dda80b6f68209832225ad737daf68dcd5e1f SHA256 f40892a6969802eafb52bb929b73314fc8d94bd05e9089df4601d85bcfb8e85b
-EBUILD moodle-2.0.7-r1.ebuild 3273 RMD160 f9e9f04879d6b4ba6829858aab328004f13657f9 SHA1 f8105f6c688856990b5174c62d7a9ca3c97c578a SHA256 c60694213607832e29cd64b5bc004be7639a835fbb5d730a70cfe87947827dbc
-EBUILD moodle-2.1.4-r1.ebuild 3273 RMD160 740fa15ab3cf978e4923fe1b68bc7d7099bdd112 SHA1 279b0ec3635ae8745d4a8f6f80be2480afae4a8c SHA256 b07309597b0bfbaa0a254d900312549c8e05a445e2ab0b19e336952ecda166ed
-EBUILD moodle-2.2.1-r1.ebuild 3273 RMD160 b69ea843c995a3abb533cf16ec2c73a9079b06fc SHA1 27c0f007667603e4d7bba9e5418d80735f274340 SHA256 7bce7530f865d66ddbfeb4e35d80227960fe5fa68e82510ffdcc246355bf3d4e
-MISC ChangeLog 633 RMD160 6b45e9b8c3cca27bae63690c8ca17566f2b2ee0d SHA1 2e43e29ca13b1e178da2cdd601cc4c1be95b96f9 SHA256 3e04f313dddce514c4489cc731fab29dd3df782634bdaf5e9e9c82193ed7fd60
-MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1

diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
deleted file mode 100644
index c959b4a..0000000
--- a/www-apps/moodle/files/config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?PHP
-unset($CFG);
-$CFG = new stdClass();
-
-$CFG->dbtype    = 'mydb';
-$CFG->dbhost    = 'localhost';
-$CFG->dbname    = 'moodle_db';
-$CFG->dbuser    = 'moodle_user';
-$CFG->dbpass    = 'moodle_pass';
-$CFG->prefix    = 'mdl_';
-
-$CFG->dbpersist = false;
-
-$CFG->wwwroot   = 'http://localhost/moodle';
-$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
-$CFG->dataroot  = '/var/www/localhost/moodle' ;
-
-$CFG->directorypermissions = 02777;
-
-$CFG->admin = 'admin';
-
-if (file_exists("$CFG->dirroot/lib/setup.php"))  {
-    include_once("$CFG->dirroot/lib/setup.php");
-} else {
-    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
-    echo "<p>Please supply this file or reinstall moodle</p>";
-    die;
-}
-?>

diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
deleted file mode 100644
index 6a5b44b..0000000
--- a/www-apps/moodle/files/postinstall-en.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-NEW INSTALLS
-
-0  Check to see if webapp-config automatically installed
-   moodle for you in /var/www/localhost/htdocs. You should
-   see a directory in there called moodle.  If it didn't
-   install it manually:
-
-	webapp-config -d moodle -I moodle X.Y.Z
-
-   Replace X.Y.Z with whatever version you just emerged.
-
-1  Edit the config.php file found at
-
-	/var/www/localhost/htdocs/moodle/config.php
-
-   You should probably change the database password,
-   $CFG->dbpass = 'moodle_pass' to something more
-   obscure.  Also, if your system has a FQDN, change
-   the $CFG->wwwroot = 'http://localhost/moodle'
-   to match the URL of your moodle installation.
-   
-   
-   IF YOU ARE USING MYSQL,      do step 2a
-   IF YOU ARE USING POSTGRESQL, do step 2b
-
-
-2a Create a new mysql database and account with the
-   appropriate privileges.  Make sure the username,
-   password and database match their values in
-   config.php from step 1.
-   
-   Connect to your mysql server using
-   
-	mysql -p -u root
-
-   and at the mysql> prompt issue the following commands
-
-	CREATE DATABASE moodle_db;
-	GRANT ALL ON moodle_db.*
-		TO moodle_user@localhost
-		IDENTIFIED BY 'moodle_pass';
-	flush privileges;
-
-2b Issue the following commands at a shell, making sure
-   the username, password and database match their values
-   in config.php from step 1.
-
-   su - postgres
-   psql -c "create user moodle_user createdb;" template1
-   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
-   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
-   psql -c "alter user moodle_user nocreatedb;" template1
-   su - root
-   /etc/init.d/postgresql-X.Y reload
-
-   Replace X.Y with your version postgresql.
-
-   NOTE: Moodle docs say that moodle only works with
-   postgresql-7, but I've used it with 8 no problems.
-
-3  Direct your browser to the URL in step 1.  You should see
-   the license agreement.  Click "Yes" to continue.
-
-4  You are now about to install.  Click the checkbox for
-   "Unattended operation" and "Continue" to start.  Follow
-   the wizard as you "Setup administrator account" and configure
-   the "Front Page settings".
-
-5  You now have a working installation.  Before putting it
-   into production, you'll probably want to check that
-   everything is sane.  In the "Site Administration" block,
-   click on
-
-   	Server -> Environment
-
-   Make sure that you've got the green okay on all the
-   Server Checks.  If you don't, click on the ? icons for
-   popup help.
-
-6  Add a cron-job to root's crontab.
-
-   	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   then add the line
-
-	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
-
-7  For more information on installing moodle, see
-
-   	http://docs.moodle.org/en/Installing_Moodle
-
-   For information on working with moodle, see
-
-	http://moodle.org/support/
-
-=================================================================
-
-UPGRADES
-
-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.
-
-
-=================================================================
-
-UNINSTALL
-
-1  Make sure you really want to do this.  I mean REALLY!
-   After step 3 you will be past the point of no return.
-
-2  If you just want to uninstall the webapp, do the following
-   and no more!
-
-	emerge --unmerge moodle
-
-   Your data is still in the db and in the moodledata dir.
-
-
-   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
-
-3  Uninstall the uploaded files
-
-	rm -rf /var/lib/moodledata
-
-
-   IF YOU ARE USING MYSQL,      do step 4a
-   IF YOU ARE USING POSTGRESQL, do step 4b
-
-
-4a Connect to your mysql server using 'mysql -p -u root' and
-   at the mysql> prompt issue the following commands:
-
-	DROP DATABASE moodle_db;
-	DROP USER moodle_user@localhost ;
-
-4b Issue the following commands
-
-	su - postgres
-	psql -c "drop database moodle_db;" template1
-	psql -c "drop user moodle_user;" template1
-
-5  Remove the root cron-job
-
-	su - root
-	crontab -e  # fcrontab -e if you use fcron
-
-   and delete the line added above.
-
-=================================================================
-
-ADDITIONAL PHP REQUIREMENTS
-
-   Moodle allows for many method of authentication.  To see
-   what these are, in the "Site Administration" block, click
-   on
-
-	Users -> Authentication -> Manage Authentication
-
-   Moodle will try to authenticate by each method in order
-   until it either succeeds or exhausts the list and fails.
-
-   In order to use some of these methods, you need to make
-   sure PHP was compiled with the correct support.  You will
-   know that you do not have the correct support compiled in
-   if authentication by all previous methods fails, and you
-   encounter a method for which PHP does not have support.
-   An error will be thrown and reported in the web page.
-   
-   Currently, the ebuild has support for the following
-
-   	Auth Method		USE flag
-
-	IMAP(S) or POP3(S)	imap
-   	LDAP or CAS		ldap
-	External database	odbc
-	RADIUS			radius
-

diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
deleted file mode 100644
index 9126994..0000000
--- a/www-apps/moodle/files/postinstall-nodb-en.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-You have not specified which database you are going to use.
-You are on your own!  Go to
-
-		http://docs.moodle.org/en/Installing_Moodle
-
-and follow the instructions there.

diff --git a/www-apps/moodle/metadata.xml b/www-apps/moodle/metadata.xml
deleted file mode 100644
index 3cf0cd5..0000000
--- a/www-apps/moodle/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
-</pkgmetadata>

diff --git a/www-apps/moodle/moodle-1.9.16-r1.ebuild b/www-apps/moodle/moodle-1.9.16-r1.ebuild
deleted file mode 100644
index b166e9d..0000000
--- a/www-apps/moodle/moodle-1.9.16-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.16.ebuild,v 1.1 2012/01/08 17:47:30 blueness Exp $
-
-EAPI="4"
-
-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,session,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=""
-	DB_COUNT=0
-	for db in ${DBTYPES}; 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}
-	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[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.7-r1.ebuild b/www-apps/moodle/moodle-2.0.7-r1.ebuild
deleted file mode 100644
index 54c96b0..0000000
--- a/www-apps/moodle/moodle-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.7.ebuild,v 1.1 2012/01/08 17:47:30 blueness Exp $
-
-EAPI="4"
-
-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_53="ctype,curl,iconv,json,session,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.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}
-	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
-}

diff --git a/www-apps/moodle/moodle-2.1.4-r1.ebuild b/www-apps/moodle/moodle-2.1.4-r1.ebuild
deleted file mode 100644
index 670aad7..0000000
--- a/www-apps/moodle/moodle-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.4.ebuild,v 1.1 2012/01/08 17:47:30 blueness Exp $
-
-EAPI="4"
-
-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_53="ctype,curl,iconv,json,session,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.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}
-	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
-}

diff --git a/www-apps/moodle/moodle-2.2.1-r1.ebuild b/www-apps/moodle/moodle-2.2.1-r1.ebuild
deleted file mode 100644
index 6744801..0000000
--- a/www-apps/moodle/moodle-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.1.ebuild,v 1.1 2012/01/08 18:07:28 blueness Exp $
-
-EAPI="4"
-
-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_53="ctype,curl,iconv,json,session,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.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}
-	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
-}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-01-29  3:11 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-08 21:43 [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2012-01-29  3:11 Anthony G. Basile
2012-01-16 19:13 Anthony G. Basile
2011-07-12 21:24 Anthony G. Basile
2011-07-11  8:18 Anthony G. Basile
2011-07-09 20:29 Anthony G. Basile
2011-05-12 10:31 Anthony G. Basile
2011-05-11  1:09 Anthony G. Basile
2011-02-22 21:27 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox