[gentoo-commits] dev/blueness:master commit in: www-apps/moodle/files/, www-apps/moodle/

[Anthony G. Basile]

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@g.o>
+  -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
-}