Version bump 2.6 branch

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

3 files changed, 150 insertions, 15 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 2bad5b30a309..2c5405363c0e 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/moodle
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.50 2013/11/12 13:07:05 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.51 2013/11/27 23:53:25 blueness Exp $
+
+*moodle-2.6 (27 Nov 2013)
+
+  27 Nov 2013; Anthony G. Basile <blueness@gentoo.org> +moodle-2.6.ebuild:
+  Version bump 2.6 branch
 
   12 Nov 2013; Anthony G. Basile <blueness@gentoo.org> -moodle-2.3.9.ebuild,
   -moodle-2.4.6.ebuild, -moodle-2.5.2.ebuild:
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index fb86a6defbdf..82dec01cf2e1 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -7,25 +7,27 @@ AUX postinstall-nodb-en.txt 171 SHA256 f39ff660a1cafbbd96ce18c46f056450ace04df5a
 DIST moodle-2.3.10.tgz 28280693 SHA256 e9cf9050aff2f50c32eeab901acd3f01f24a93ed7c10b8c970c2d10ba5582631 SHA512 81326c21af1d58139a758d3dfb2ba1d4a7d83069e9435ad6bacb0d655c8f0d97b0248982611790ee650d1fb1cd209c347d74644f58493cc8090821659fea1ef7 WHIRLPOOL 6466131b2bce746853d5f440c742fe1e21fad18f4d43c3178bc60552c45419a30a049a04825fece6bc13085e19c3fe6aecf6fd8b267f9492d9c76720b6067a00
 DIST moodle-2.4.7.tgz 30484284 SHA256 328e603a296f09d75379537af3a7a827f8b5f689e3f2a6c069ef1e4c93a77696 SHA512 edb218ecd40f5aae3cd626b1919db42bf10bf349a37256a4171cfd01380110b7ba7f820397bceaef35010d26e1af3ee9c1d27a4a9b34fd2f11528ca2c6c95912 WHIRLPOOL 6960642a21d2d9ea4cb118dc73ccbb955fba16c06b86284ec58ff1914c4378d913fb71d2f1cd5972a2693fcb147d25d2f3d6fe54a0d7b954354f8a047439c09d
 DIST moodle-2.5.3.tgz 32377514 SHA256 7d7914f2c38b2328fafd728376640828fe165a426278af1cb2c9d55440400ae9 SHA512 be932d42c06f17bf4a5c66c0c544bc1a9938f375dd63226154852799695ae4ffbda7426a8efef3959d3c1f520ab4ef2f940c3a58925c07d1e2e29d703aa24416 WHIRLPOOL 15b2095eec06007033b2cf0d34ec6bdd6345b246ae8660220d5f25c7142d14a656e967807165ce8f63a3644606a4f181a331ee8bee18113b565ebecd314e5e43
+DIST moodle-2.6.tgz 38422459 SHA256 5b717db242b2add85a666e6c601dd6aa110a766b428d3348dc7a014639dc1cf8 SHA512 d32830422252fb109650f771958b6f08da615b799273353844f56e97edd692307b0e56dfcecc23a2958cf53fa420e341982cb475e237693e7aff3b79ae8ed425 WHIRLPOOL 65b1d6b806467537b9ce897dc2f9455a06b9a3f9ed2e69c8a86bbd14cb593a2c77fe36ef3a3ef9e7a4e2dee351bc9c3b304f2131a03d5f0970aafb991a80cbe6
 EBUILD moodle-2.3.10.ebuild 3376 SHA256 c5aba11c0a3514764ac2747bb89eb22a1d296c6f00ab9ad3c77c78ea773d4209 SHA512 d6221df73c3d528ece3bfc2a34ccbb78cc702c38df1f7917321d1acc69b1512e7de5378c31a55a185080005b13a915d45ce0073e3e97f7851bda32003d04d001 WHIRLPOOL 2f537c357d9fca3c3f6d69096e3be1506a7c1e8ca22b15164221fdbf1e09ce73dc66afd8ee5ce86d3265b88b0d2342ff3c7b472141e933928857412bb419a908
 EBUILD moodle-2.4.7.ebuild 3357 SHA256 6ca4e2e3230552cc14b0c7bad47e3e2075f2d1e27fc3d6d20ee59b367b3c0a4f SHA512 ba8a6b7acd7e8a926d484cb2024aae8259ed56c8998bebf92953cb16031e6ce8f510d81574d1247965ffa6302c06fdede62e165ca5f6f7f5960e98d178a77931 WHIRLPOOL d8c53bfc21432bdfdaf79ad5348e0580b42afb69bdebb5b041b81245b480c9b6e999963a5c065b55dafe7a223329fc8693eea6d48e0143a56f9ab99d04ecfe5f
 EBUILD moodle-2.5.3.ebuild 3359 SHA256 c4da55d1d8788303a8a23e8bf6281af4c9814b001a654b49ab374984d6e6b8a7 SHA512 8e86f87e833799f5569237269befc2d27a68919adb21b4627ba7cd587371c11bbc063010166515e7921bf467545fd884a204cf3506b279a6c0509d1a7b92d2e1 WHIRLPOOL a1623afd9b215bd985e3f7582a522ca28faa02dee86182982f2af36319ca24104957d8d8e06e9456b2913911cfde22baeb2dd01d73ac19d67d8a40c035be1f6c
-MISC ChangeLog 10540 SHA256 c8ba1767610ecebab2f46d1f660d3f25801c8ed6fd3545700342f7f608ebd508 SHA512 67b4339d8983d61cb3343fed3325e0d7a7ab9bc80769a06e8defc3ed8ca139d3cdee2b5cf150320ba89308a1c43998f07e096484bcdad8ce33572d6351c38a69 WHIRLPOOL 21dad75c320f05217f49d8ab1a9e5ed353894cdd2ab4ea293473f209d47b89c912eba979a1deb5d15750ad829cef304eb6f385a5f6812fbfa438e7fd8f701dfd
+EBUILD moodle-2.6.ebuild 3357 SHA256 f47b90b673ccfca31a69d8bfd3d9a6b1bbee01c64dae343bc05e3bff2a2560be SHA512 d0244c4654d4198df0cfc6e45d4d12c279d191a414013f0c6ec8d668f15d2dda96ee341991959e6824b0a8d8a789ac056901a89accbdf2ae2e759794bad661ca WHIRLPOOL 6382e68dfb77d08ed19f1c5ed96071afd570885ce67f51136236aec6b834bb1e19a8ff5f0b884dd0e8d3d031c8827c20e48eef48a245706d9ff53403967c01b1
+MISC ChangeLog 10669 SHA256 d8d74c1a5d7120633fdb01af021d343d9c5f30fa93ada70e8645b38ff22db37b SHA512 576f0a683a13a43828463d573e8480fce2d8d4f2b367a0792208bb2a5d564af66d3d6b9919fb71a13042a73a95d39df87bbe8e5c73614f353a15a4777b68d572 WHIRLPOOL bfdc0d8c49267d4ca2b950e9735fbb21a46d10c10f42ec7879aa56710678303a830f7bf01e69ea3b18ee5234305350769fe0f8578309641920aa5e4f2c48aff2
 MISC metadata.xml 256 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1 SHA512 b94120ce0ef0ab704cecc6b00d1e0460fe60159b4b7d2fedeefbc9e7b0917ead1637ba2cbe598c67cb9b86d7b0874603e555333f4bba1959e228d33a4cd1b2a5 WHIRLPOOL 8269d207868c3ea1efbf1aed77209b809488b66dc46d6304401435747aa527907fd37be2887d09e116409f1dd56f235d3812a6a7898d25701131a8305a6db5c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSgigRAAoJEJOE+m71LUu6iT4P/3RJJUOmp41GNmu6QdSZU/Ta
-IIadJ6Efrsy1DSVud1DM6Dam5Q3ZdZdqMhiI5Q09uga6f3q1RS5p3/9fhpJWtpf7
-Dihr0v51sfLeLo2Xe/qywMYrPdEZo/JUVdq8PorCEIFKs8PZnaKuaRFbz/7GAfW5
-4o54jpNKSjrZFK6geLDPar1M2RQMHbodmxqRe6y/VQDQMbwnWfRLM5/R23M4sAMV
-7aJo67Ka8M+NYG3wYEqD0AzPD53TC96/fJdO6j+cpdvUnVQkQX50O9mI58S1unpK
-LCu2stN3mHVgcBAZ93ZhQCG0YiTsHEAu89Ccov54Q5pn1eetkQ18pIOx+p8xXOBQ
-fO9qT7uguhj4X1Ej5r66DzQDtLHF/z+4eLUH5vKqKw4inD4trCos0Wm8a/+6weRi
-QGxXa2NyetT6XyA7qS8/uutAJhaXjzosVx61Zy12HLMlZPbFY1BasOf8eDV/Kwqu
-F1o9p5eicPa93gufSvKOKfow3txKoNgT7GUwLUKi1QysLUxtK22kKxt1Po92JWTt
-ybrPtoaSZgw0zOKW8HDOUBTbV/S8Uaon7u8jqWYSnRtrzM4Ql681QRzu1DzWuMlj
-x3sA7Skeh8E5kCNYNToAK0ivdRimJws89ovVAOusptI3ZszsxH8Xy/c+XwMBdMHt
-rrBHvzw782cY8lR8OMPm
-=iVRg
+iQIcBAEBCAAGBQJSloY3AAoJEJOE+m71LUu6vy0QAKhzNA5j2tkzlNBtGsViblQ4
+iXW+0CnuorVOuJ9IKObrEhud6En6GhN+znCVPtkt2Db0FgVK4m6bGVOdjUGXxqBY
+D8JqL1QHarObCaLr6jYqYdURjNU2AQhtsVLHGps0oxkltd4NOwIGz2KzwC3eMIkf
+P+WYpZSIhsGhbUsGmXL0oLLQmpLtTxiJPwKsNDjDAMOLV04gqIh2oVzx0hFbk1Me
+MkPhMmP/rWfGCKXjYZHQDzvkb/twcSz9BfnTDOm79DTZ8qQxZhdByQ0novqQcwsg
+VA7sqAlcyhXEoWY6iq6C/9ZrYg+1kMDzn1gFHzV6UuKOvryUWm3SluWzwNRwfIEq
+xS+O9yTR240/qN1fbBvD7QK3dLitkUHUFvT7CzLA+FnoVTa98llN8xuTkLf/9/Dl
+/uZZkzM4zoIoags9u5MrszFdGa1/w2Ek6z744Fjhk6At8JrRGXQQiIHjzcc9Cl0D
+KkeSIXmdABcxm01jP0+c9w4sehwLJL8WHUwTC59zL6kRaCRp0M16qAKUG2N7Akdj
+ekn0VE4Tbe2p3K9tbF6mrccaokQuhcCAIuBuy7QFZg68EXg8wriKAbf3o3pFwulo
+O5J8lNP+enAWrebCBv3Mu7LRa3uHpCkXZ1Dt0quaee5uPJ+KuRpYoJGKV75U9KTd
+Alg7oArv5eXF/HTAza9T
+=qDGP
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moodle/moodle-2.6.ebuild b/www-apps/moodle/moodle-2.6.ebuild
new file mode 100644
index 000000000000..b1d34ede4587
--- /dev/null
+++ b/www-apps/moodle/moodle-2.6.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.6.ebuild,v 1.1 2013/11/27 23:53:25 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?,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
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-7* )
+# which may live on another server
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.3.3[${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.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[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
+}