Version bump to 2.8 branch

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

4 files changed, 188 insertions, 15 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index edd3b724e540..33fb0caacf6d 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/moodle
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.63 2014/11/10 12:42:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.64 2014/11/10 13:21:17 blueness Exp $
+
+*moodle-2.8 (10 Nov 2014)
+
+  10 Nov 2014; Anthony G. Basile <blueness@gentoo.org> +files/config-r1.php,
+  +moodle-2.8.ebuild:
+  Version bump to 2.8 branch
 
   10 Nov 2014; Anthony G. Basile <blueness@gentoo.org> -moodle-2.5.8.ebuild,
   -moodle-2.6.5.ebuild, -moodle-2.7.2.ebuild:
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 3b16a0c6e8d6..4478bd4cb4b2 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,31 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX config-r1.php 1780 SHA256 b97d05c5701dda71fd8edd62b38c9f0d2c9d8b35fb8700d3b021968fc4c448db SHA512 9929df2b4b0db7ab759f35d919ffd65b06a7063ad0908368aa5bd027f52f1992f0b46ec121d90076f664eb00b8e9386d8ae286acfe95b475ce1e9b2e1c5e1700 WHIRLPOOL d4cfd1d82b5d7cf8413f311495dbb8aca9453ea5d26e9ac92e2ed303cb2f2e9b9ceec3f4658dc1b58e09c1af71d0778d90c51904244a98378016fa0c02284a0a
 AUX config.php 718 SHA256 c62a37c0d81043ee4ca7fc4d7610d19dc2df426d556eb3285d7b1fe367a44a8d SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479 WHIRLPOOL 51daeca50711e6cda7ef3703be71fd59bd7abeb2bfa4b0c7b42924dea5d0cbb9d4fac478aeb13bc655d097bbed3ddb99e35e43c6b2f800cabcf916142996bbb8
 AUX postinstall-en.txt 6524 SHA256 dad8831abc23179ebcd2c2431f11d83346c142175c59da47cf5f913c928de667 SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf WHIRLPOOL 6ed4f9db76238db6e0a2afd98b8877a1de4e06311d77a6153bb9d8bbc559fd226190c7bf4a8053e35000fcb24babf154021a42d1b58ba92c3ee86bb5dfae1894
 AUX postinstall-nodb-en.txt 171 SHA256 f39ff660a1cafbbd96ce18c46f056450ace04df5ac401eeccaf16441d54f3b6a SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e WHIRLPOOL 3f91b917e8c92866d570c0af2dabbb11eb6bdf7d4cf3e9e8984649b5c147736f267156c490ab51fcd7fda9e7b3ac2ead8259231b20e74e349fb143ed44b08616
 DIST moodle-2.5.9.tgz 32508492 SHA256 721de0bd4c6251858a3ad576861d3e0660d26cc7b14cb0fd95f74d2fcf522ad8 SHA512 946e3f1178ed2759e2bccdcd02607f77e10d9962b47b8f5d708d62d951c1ba8d2b3e89352ff5132ebae2215f35d55f795041b0a1b62bf54b91315af6217a7b64 WHIRLPOOL 9fbca9e603a50fdc278397c6d3d745949899df0d30aaa00edcd87823e668af7143048ce685df79f0f5135e3fca8c85f8f9b95781039586500b763e0e1da9c99a
 DIST moodle-2.6.6.tgz 39481878 SHA256 cbc617b05f985d653e5b53cb7ac92226b04b48c09d8073f36793201cbcc2f552 SHA512 afb7fcf7d9c9efd09b3a282ee17456c25981620fb1c62f2059d418120178e9693f0847d59b56c02cc346eb76f8e2446fa7a6a74d1f70f14dc623c0e20a78decb WHIRLPOOL 270bbdf62f79b5f36e8c97cefd049ef6288d8a8173b486f93167c0826c304cb9b058e16d1ec8ab8f4e8f4d4b230b7153db53ad52f1714eed5c38c0e2f09adc46
 DIST moodle-2.7.3.tgz 34891141 SHA256 baaf5a323d44417c40fd4104378426c18c80cf17db19180f76b2e3c2b5a40dc9 SHA512 1d2c6c9dc885c8d0a0455c1bae9c4477272a9029bccda1862b87f2979512922c36a95aab4b193c5ce3119467bff89da8eb13b25ba2a196f4f61c5542a513879a WHIRLPOOL 747b3c06820d3a0204a99008c06f574ad4650602dd9d8de44b130fbec34bd8eea1eeaaa436b3117f6c592dbc3ae32d51f405b126ce66da7cd9a3abf4af5b4a5f
+DIST moodle-2.8.tgz 35721209 SHA256 176ce7370bf7a95786cdd971774aed23d1cd84279971545bce6ea05b5c878966 SHA512 b754c0ac833109bb459041087ffb7ff6d691e3a3f55c1a66f77db6612b1035e2728e38b2e24ec8201c903da9d63735166709c2b455e5b964994719c1c8f714c5 WHIRLPOOL 698410a359e30207b063475e386ef548f45f407f016293f6599e59b2f4514f5169e9bb8f9167fd867f0a7bc491787b18e0c56179f6956b889af9f01e6ea9f14f
 EBUILD moodle-2.5.9.ebuild 3359 SHA256 793dfc256be226504700a03d3dca889b9045dc249e5775689c595e064eb0ae00 SHA512 18359213ac8ea0c99955dfce66d6c8bbbf16a04a49d409685d83739e4e4f0ac492e1a42311e7adf9effd7a06a67694905a7f8b72f356c983e8c9135e8280f40b WHIRLPOOL 7328a69552f454ebec13c116cba49843b12f7d9d20170885f28ffb2e33d52ac903139599ba1579840c5e179e183e10546f3371b585ca2fca06a5fa2e9050a51a
 EBUILD moodle-2.6.6.ebuild 3359 SHA256 bca236ae638cc876152d0485980b521023ee71566a7992b60d51c74f56e51ce9 SHA512 20ebf2bbccb64dda35e8f82da7ef81c5f295d8317aebbae5b0b8c0cd34c24ab672d1ebe8e23939c8f5e9abf5496a6ca1187b3aa773adab0ef2ef7f0838b78bed WHIRLPOOL c98c43385694adc1f6883a9d5a7dc920c5a55b35f19a23463cd71cd3dbe3fa371494a39657edf85d6a59ef901275c5187208bc4b8988e18b1375d766eb991678
 EBUILD moodle-2.7.3.ebuild 3359 SHA256 3795902248cb4c8f5b983fef5f097a23af13975336d4bf9d582bce4687e8e7f0 SHA512 2bf4974f01509583f9a8e61e0b0a04bb5c8ed7c76233560028b8dbc68705be86f10e650a509872734e5afc758ecdc2b1a86156c7c94e1b19445551126b37020c WHIRLPOOL 57ea4c83a0129068c313e0c615a3e1b48bbc070dccec513f6ea08040830af262ccf972166e27d8143912d4d05ce1326b9bdf35667cae90278c7b25dd0377b9a7
-MISC ChangeLog 13268 SHA256 f9c1aee20ff43ce35ddbad2b75e70b5c6bcbfb76142151d18edc384328227630 SHA512 ab8463566383c3f0d32008d113ecb7d132f1df1df6fbc133e923f460580b28029bf1c9a52203a58e70eb1564223972123b9017da1adcc0eadef6e5eaed51711e WHIRLPOOL 8c5dc76033e9771ec955ffb146ed7d62c46b6b4deba63f2e20c371bceb8247a9c8806b1028d696aeb6419d3b25d8d3394349c53a190fce24f266e18a47e90e85
+EBUILD moodle-2.8.ebuild 3524 SHA256 a0725ba8e3ec633711e3451d1b047b0fe167dffeecf8251763a9c7f6d77dea43 SHA512 5f2c9480fc451ca53e7ca4133b9f9aa0a2e08f3eb22770654a26b16d133484eef2ef3bb52d7b61c704e6f4a46b469b16314dc0d9a3120ec01e19a022ad66c74e WHIRLPOOL 8138f000af8464d58233fff7e8eb30aac6dc726daf807efe1b6ca4673f4d18ac96eb9b8f1b9813c1cb99b7eceebd27abaa11527a28f1223d591913c9657d13f9
+MISC ChangeLog 13424 SHA256 ca0d51cf91140e180805fac65b310aadf70fe292915ab7f79c648d4317240d29 SHA512 ccf2102112309fe7471581ecf959861213904aab0e80b2778c3d8fa51eb31cb6a74f8f668a9cc4191b9be88cd4c59ebc618ad6d4f35463ad8fe3d81eb0c91c9c WHIRLPOOL e4558b202b32a614e0e3c04e1ba6d9aae1f0fe3cccf52c484ae12efbf2d9c5a6c9bb763aa07aaba65e17b43b8d77c30d0064cd3ab6c5147ae2db2cb5707e8e2e
 MISC metadata.xml 256 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1 SHA512 b94120ce0ef0ab704cecc6b00d1e0460fe60159b4b7d2fedeefbc9e7b0917ead1637ba2cbe598c67cb9b86d7b0874603e555333f4bba1959e228d33a4cd1b2a5 WHIRLPOOL 8269d207868c3ea1efbf1aed77209b809488b66dc46d6304401435747aa527907fd37be2887d09e116409f1dd56f235d3812a6a7898d25701131a8305a6db5c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUYLMeAAoJEJOE+m71LUu6eCsP+wXf9rgF6KTUeZ5ZMRSkrKM7
-W+Be9gjSft2LIJI/jn0uqmLSVtPyhWQfQsDi6i1WFCWuwqIMnc3r5jNpYVJ5cQAj
-E2ZBA6BQR7WnZ4/hqrBnfHrv8d13zYgSYPLIejSbRoYyzvM9tn8EnIxXohwsZkHT
-A9BEBY42Vgh5gY0TxXFJbesSZWnSYhkt36TUbPoKleh+v5tGVgq4N0FW3dr41iFF
-ilTD/RsW5XtVcy5aofGfDRQc0O1hOi6PwQnH3j83QE8V3WmuxQFuDTsbF8B5hyC+
-v6yy2eOVpqzFsEZUg50C+XaWDmU5rQg56uTljPE8ipElBCLiFxGDFEBEEw/LfjDd
-A4jRVJo1N8UIpJYtBlTHtjs48BCwyzjRPgsILG/m//5dCd5/j46msImvo0TxFZWC
-49Q9NJ/h5GcJso8hzXjEro/0ubQFKEGv0fpUNeSY7xZN6o0Vjh2Z1Tfq492wRFpf
-zl14gReVhBtVtIuYGxoHv0mp9MrCk8/sgTRFs+FOPOBOuiJq08iDaMiGJfn4qe6P
-ddMam92yOA3UwC6wOuChnvYbbaFB/QWneeGCGM+ypKH+ijs47yf8OZqcsChYVZVo
-zbyFjM7//hkCPQnBLq2Kgq0YIbKf0cYzYEMgyY6OIp4qaffoS/27H+lZW3RutRIh
-tPMgRGO3GXpG17keyfkW
-=vxXD
+iQIcBAEBCAAGBQJUYLxSAAoJEJOE+m71LUu6mI4P/ivHHNKfzotEFaV6qIoWqzu0
+XD5SPGxMUGnmh3Eb/Nk0p99B4EcpUIZ/J9JpKM4xXBYPUuBtPMHWalS8q0tsUmK2
+wu+2mkYnYvQGss1XAaBbQJw73FThkNWCH2MQECZRPmgxyk49XqKiH6Qg5EMJBh5N
+H/6TVteA2mi+XjR4SpmEsanK4Xxn34UUtavQgnsvNbRd1JSiaYruX1PTEkYnvRkx
+KIdoQxZE37NBPJ/qgrrMJqh4Z6ALtGa/TjzV2h0sQ/MKJuUYz6V66shz2yP7KaZg
+ox5uO6OVHrZes/dzIOHeOwdhDfnMaWN47OPsnMGegHSIwFoj25qxNXBmui4cizEX
+WCe8n9OugA6nej6vGrds7PtZgh8lgiwAlOBYa98D2uQD94LIyVBUD/IGcPY2oGPG
+SeyUHnMJhvIjVqoPoDJWoLhiBWYBuruHqdz4b2mLDmL2CtKiYwW5ygiB/O606RU+
+HlwR2pO1fMRt1DYIHS5yrbzCclhQk/6CQ2CzWi1T6QEu6/smjMantvTT7NF41yit
+2oimoKsJVj2Tkl0/ZaHM61xSyCV8jEK+Wimxm03w62Yd798vjqHgPVXf6PvtlqRu
+RvFmi8gcmlHEmcdcp4ueuwvBoKpUgfq2njCXxuVISiqSCsP//iLNsYGVdwHsPBQe
+CoW3qG4f1MhHWtKTm9iO
+=B5eE
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moodle/files/config-r1.php b/www-apps/moodle/files/config-r1.php
new file mode 100644
index 000000000000..7eef454b7dfc
--- /dev/null
+++ b/www-apps/moodle/files/config-r1.php
@@ -0,0 +1,36 @@
+<?php
+unset($CFG);  // Ignore this line
+global $CFG;  // This is necessary here for PHPUnit execution
+$CFG = new stdClass();
+
+$CFG->dbtype    = 'mydb';       // 'pgsql', 'mariadb', 'mysqli', 'mssql', 'sqlsrv' or 'oci'
+$CFG->dblibrary = 'native';     // 'native' only at the moment
+$CFG->dbhost    = 'localhost';  // eg 'localhost' or 'db.isp.com' or IP
+$CFG->dbname    = 'moodle';     // database name, eg moodle
+$CFG->dbuser    = 'username';   // your database username
+$CFG->dbpass    = 'password';   // your database password
+$CFG->prefix    = 'mdl_';       // prefix to use for all table names
+$CFG->dboptions = array(
+    'dbpersist' => false,       // should persistent database connections be
+                                //  used? set to 'false' for the most stable
+                                //  setting, 'true' can improve performance
+                                //  sometimes
+    'dbsocket'  => false,       // should connection via UNIX socket be used?
+                                //  if you set it to 'true' or custom path
+                                //  here set dbhost to 'localhost',
+                                //  (please note mysql is always using socket
+                                //  if dbhost is 'localhost' - if you need
+                                //  local port connection use '127.0.0.1')
+    'dbport'    => '',          // the TCP port number to use when connecting
+                                //  to the server. keep empty string for the
+                                //  default port
+);
+
+$CFG->wwwroot   = 'http://example.com/moodle';
+$CFG->dataroot  = '/home/example/moodledata';
+$CFG->directorypermissions = 02777;
+
+$CFG->admin = 'admin';
+
+require_once(dirname(__FILE__) . '/lib/setup.php'); // Do not edit
+?>
diff --git a/www-apps/moodle/moodle-2.8.ebuild b/www-apps/moodle/moodle-2.8.ebuild
new file mode 100644
index 000000000000..e74095ae3e8a
--- /dev/null
+++ b/www-apps/moodle/moodle-2.8.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.8.ebuild,v 1.1 2014/11/10 13:21:17 blueness Exp $
+
+EAPI="5"
+
+inherit versionator webapp
+
+AVC=( $(get_version_components) )
+MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="http://moodle.org"
+SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.4.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror "\033[1;31m**************************************************\033[00m"
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo "\033[1;32m**************************************************\033[00m"
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo "\033[1;32m**************************************************\033[00m"
+	einfo
+}