Version bumps.

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

5 files changed, 413 insertions, 15 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 5265f93ab266..f098f52a43e1 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/moodle
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.71 2015/07/04 14:00:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.72 2015/07/04 14:04:38 blueness Exp $
+
+*moodle-2.7.9 (04 Jul 2015)
+*moodle-2.9.1 (04 Jul 2015)
+*moodle-2.8.7 (04 Jul 2015)
+
+  04 Jul 2015; Anthony G. Basile <blueness@gentoo.org> +moodle-2.7.9.ebuild,
+  +moodle-2.8.7.ebuild, +moodle-2.9.1.ebuild:
+  Version bumps.
 
   04 Jul 2015; Anthony G. Basile <blueness@gentoo.org> -moodle-2.6.11.ebuild:
   Upstream support has been dropped.
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 9d44198b6752..af32078bd51e 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -6,27 +6,33 @@ AUX config.php 718 SHA256 c62a37c0d81043ee4ca7fc4d7610d19dc2df426d556eb3285d7b1f
 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.7.8.tgz 34978840 SHA256 47e87402dee85f7c046371167b1b1996e6956d2557d77e5cb82324e805e1643c SHA512 5c3f6360a843d3090aa314171b269ad89e4a6c8dedff745b86931fd08a257d91dbfe1e77ca88a4200d62f05d0db2b3a2c02195a9b2b0e5c56c7a3b3e17e6cce7 WHIRLPOOL 578c05b7fcbb4db2a46242aed68ed30d46520701c636dec6b55797017756f012072a58d3f66e7528d248c49e544b0191d6bb496f4901f17c35f25cec2ad96672
+DIST moodle-2.7.9.tgz 34986369 SHA256 d746bfacd44bc7b33ed7cff12b7189bd2021e809a4a64836f124c4ae75d08a7d SHA512 76d74dc0b19959b935c12138d81501f55cf34bdf8b62c82d21ac4f02e4290ceecac2b9f17adb7b07b2ec72f1d39a3f2b5a42b01b03a7fce58a6d242a945ff626 WHIRLPOOL baee4892b49c580a2c9de060b7ccd3e6eb397e24bdf8ac69accb46d2553ac651546af86be7537b28ce36f9378d35eeb75d569fb81acba94cd7bb9a0493ca72c3
 DIST moodle-2.8.6.tgz 35833782 SHA256 54287a4417db6885ff7e327d61b167f298a5a4663130def0fbbb9186f4815eb7 SHA512 43477e10cabb5af8b82caac0d09d4b6d96b79ceed1867797a9e6fc1fdc0086340aae354ed14b3365ad14929d63482cf1d5f5ffac78bb8ea3f33c18266f0c011d WHIRLPOOL 3a19f2f3afaeeb44c4af73d77957f9a071706035c418030ab1265d297d2679cb8bbbacf3265f0b62409143f0f8b36ca2e032e93ac27eb6235c115e907646bae1
+DIST moodle-2.8.7.tgz 35867384 SHA256 cd4cf38bb329cad3575d32e6692c9cdba97b25d7b09d2aaf0b20aa5fac2878f4 SHA512 4c6d71225c825568ab9a4137153274cedb30905ff70b58c35299606c7101b45e8f32c969cdaada6e5fe86d015de94b057389597dea017ac7d8d5122b71e90cab WHIRLPOOL 66bad29da03d0c7f8d2a009efb1b241289a56c193180f13ab1c5bb7953e03c03f326af6e96365a23192443197d9edae0d65980c7c85a97a5634092ab7d1e557f
+DIST moodle-2.9.1.tgz 36340544 SHA256 bfc9398904809ed6041e8bcbdb75d7bc1917d5a0ff47fd0069812d783e03c020 SHA512 5875c78bc7f16eca15df5dc052eee8748e26799337e76b344d49a6c7b79c1fc1c3acddf716df37cd38cfb595e3deab24aee88b3198d4b1076ce09ea2316d0456 WHIRLPOOL 2b1ea95ea90baaa92f236ab9a2701bcb330be8b85c3a23d5c4fffb677b899f5e7a1847be4a6c0410300167b41e8bea03b0240e137d3bbdb4bb7475d48ff642d7
 DIST moodle-2.9.tgz 36300753 SHA256 d8fba8eb839c582a9b6451a28f82f690508b818af8d04964d57acef0606daf05 SHA512 1ff856c774ca4a593e8294feff17825623eaf5934b2455b9bb4cfba762ec4eceefbf8d986615208b6a3f9af132ed93077419d84fb9d2421c880a07e1ac0d0f4c WHIRLPOOL 1603f188339b6f1fad9fa93702aacef4afffd1f3102cf1a3da65348c4782b95ad9cce5b76aad2ab8cda7a29be79c56bafd5f2da268a8227e2a30452ff51ed7c9
 EBUILD moodle-2.7.8.ebuild 3359 SHA256 72d1a16125f354c8ce12e987246428820b6a3b921d9c0e03afa9b96c5deffe4f SHA512 46745b74084b3bdf2833b2bd1b9e1ea2a9cc11539a9c2a7af5390a0dcfdf70cea7eac94fdfb024a493f6cf47e247de8b5429c9c78de228ca74bacf25735040dc WHIRLPOOL 0709c870c6e7e0f2219d71553dd037bbbe0255cd3e148d11914d2e7ada6989da2d9fc74b0d9108716fd5c5b6a5866ba0b3f499b6f990338a8fca77a5fb38aec6
+EBUILD moodle-2.7.9.ebuild 3359 SHA256 ba3bc7a5df6afbf1c90d2d63b12eb3c2fc6e2a73dec28c259a60e6975d6efb01 SHA512 f54d9ab16e035475592b535e2768b0311da25a50ae686eabd5609e77996069395e4f55197e3a0ce8aca73cf157ab6650ca96c4ece61419d07847127d48ca15b3 WHIRLPOOL 3a3076da88ec22fe1e9e166d06fc952e795b533a9d2202b579fd40a04b6e8cf0c40b4479205e72d40a798dbabf0cb448cb54358ac3205b00545560bdba30f2fe
 EBUILD moodle-2.8.6.ebuild 3526 SHA256 cf1d965c076692f95bdadbd1d6a2e70e3d014e291f4de3ef3fe526d15b606332 SHA512 126f861363c2e9fdf6a9c927bacb1d34baecab58b18eea9c69e5ed82ced130907b1511c9ba79e41ca5261cc89cd5065ea430e86cc249457c47b8b2d392f1d68e WHIRLPOOL bf96ab5013a8392ee74270a93b86f91097044fc06c0cde4fde321f5224814cc18f5b7eb8997d221a119b004686b243d7852f754ccca08a105849bf956679929c
+EBUILD moodle-2.8.7.ebuild 3526 SHA256 c1ba11e1df749615acde5674ac0d549064bc21aa51aacd5d9946826ae4808784 SHA512 8be7ace5f665b17392c2d216d1d266c55b7c505cbeaef2bc278ffeb2ca38489f2614d7f09f42fe07dbbd58eeeb996f8ec5716ec21771eb932aec0d85b3674dd7 WHIRLPOOL 0cec7fe17744ede267d0168c7ed93b1a91c5250382d691594b97a76ec2abcf7ab2d6317ab650ff967820774a9ce2cca595f4d412e108baff6a6d54aabb798716
+EBUILD moodle-2.9.1.ebuild 3526 SHA256 06a8c67fab4cf064836341a639401794e47f1785194a04d31246d6ce9422ef01 SHA512 82e89a49ccaa27356338280ca2786f1e26ff0ed400769bf88faf0b79752755c39926c540dad99d38b813a4bd2f42eb61b4616e4049df8cfb2a779641627e6bc4 WHIRLPOOL a02d4ea166a5f7e95c2fca0c226e7763f8eeefedf5196668a22dc9727ab2e8f1b75d7f64f8fb274bc4820c28858d93b0768654eee9c891065b8078225bd3ae95
 EBUILD moodle-2.9.ebuild 3524 SHA256 e5a8cd0f2d6d5ffd4e6f4a54a42e20fc081e69ccc0f1ecf474b880b528e9e318 SHA512 ee545640e27946fbc05a63071534f00c7fdfb7e6fc9cbd716c9072a6513d573d1bc380a354b0b1ed5fb270efe41927426341282051412e4dcc26d3d06c12a4c1 WHIRLPOOL ed84d0ba1b6e044794bbf23ed11004dddeb0d39c0e4f63de7797f224bb5101f0bc296a334e25bc4c2f2bbb60e76c8a645e3c00b56aa443129c3eea828e77e71f
-MISC ChangeLog 15229 SHA256 bb87cf6bf90b52d7d7be5489e322d8723a1f6b3db8298f215dd9daebfceff8a3 SHA512 1fa3a6273f243e2ecd578101fd1f1ff8d43b917e85eae848baa2b726e7f78e4cb6415c15b6b9003a421dca7ec1fb772202d42c6c6c1e55f448820d883eeb75d3 WHIRLPOOL b7b2e5957a35a018c62cd28e3b1aa9de379e7dc9ca7edd81772ea65645be0b57346f62636db21d123359c548cabfc606759f41ac2581c47c99a1d45bcebb1d3c
+MISC ChangeLog 15455 SHA256 9718d87e0d648346b9309ca2d5a5fb12843de44ccd33dd624a85ba88e9d074a4 SHA512 fc31908018f045f4117dff365e49614f65f9df0361abd038cd2625d3898b386793f233c1d7c4d87d8480922ad4e6f20076576a35371b37141794c3dd53c7a562 WHIRLPOOL fcc59f6e313853341986adb7be61e28969f7ace1226dab73bf219c03b3b7903f6110f25926f1b1f66daf994abccae1216ed2f8059bbfa6e96bc0d638fb822dc6
 MISC metadata.xml 256 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1 SHA512 b94120ce0ef0ab704cecc6b00d1e0460fe60159b4b7d2fedeefbc9e7b0917ead1637ba2cbe598c67cb9b86d7b0874603e555333f4bba1959e228d33a4cd1b2a5 WHIRLPOOL 8269d207868c3ea1efbf1aed77209b809488b66dc46d6304401435747aa527907fd37be2887d09e116409f1dd56f235d3812a6a7898d25701131a8305a6db5c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIbBAEBCAAGBQJVl+edAAoJEJOE+m71LUu6eEgP9R2U5J10D8ATJ5xj6JA5iT1s
-FwK0xdqQ9iJdGQRTWOxm+/oQcSSM0RZY3fVApF4v7CEwWAzummLBrMLMblZHZNZp
-Ea2BSxGtPRLCogK4TqTcwZO/7VqxvGLjG5e39IJFbujBZzKvtT2tDv7gGJj8F/27
-wBchVWAy25kAFclDyEGLgrP24z5RYH8jBLmNb8LLtwiygt/tg6VGJRpkhF4tFyO8
-8UM4r+KInBHL6043hrLM9WVBKSqoU5drCsVweKfZI7eg2tV5rdL1kq/MP1/cLJ9x
-+8j437jnWWLLPoL3PR6vepfjymZKFb/uC/K0Q9vKnu/mrucVgIHj/IvBUWlZ4OY0
-rAkiGhXA7rPbqvEd+qZ5pJQHu67ABs4VwpQAkSYlFHUy+CWCO30cKuSid4fojDny
-FeIliHpkcmWrm1y68q25bAr2t8KEXliI5vErryQEtqwQn2F7qo8/3/yrkyvKJCLT
-ZlTTRWz0p8LmaeNmeTM6GUlyLINugCpwiACA/G2CzPz9MSSTDlrghZ1dVGyPODW4
-5M+4LaSsQDMugamnusLs6mUB84lfRDzg9ndxqiNhu03glIJ7K447ecrSoreIZ71y
-h3B0CDhcquj8Ad/xZhXLn4hguxeyoAKtvJHCGCaPVcWyewTVIP10P3GJgNVa28fX
-s8kD4opQKCsGbVgakUo=
-=Ecg5
+iQIcBAEBCAAGBQJVl+ijAAoJEJOE+m71LUu69nQP/1FO0LtdWU3gUbJ9royRTGvA
+ORieb/TWpt1KCYxI5OWcmewr24AZKrrhvZrG7XKEjH6wW02Ev2XGYEjFFBN58Ilw
+RV6ZWakZOw3XHSfTG6JAThzpB7Om+XY/+U6T8URqVyZHoZAnwOBRo7tqqetUbc+E
+i5qoE8OFrP3FZsYfHohJdQVgWmGSo5bNFYFfQ0xbBD5vM/NGiEGaonbHQ7y+Ytrh
+oGDN5Bns2VtuOkUxYJscmB0I73+Os7FRskpxdXS61LN5r+eQhB4VqBbg4ZXj5ke8
+m/Gu4xCHZ9QGUAFUyBEsMm+N79NHoANeaywryazSbnou/2x6ByszobFKs8Rf1ygP
+Bmtp2+DPpzcpUz884QDBcoKbl8ZOsCwNmHT6mzY/hnJ029noVqQ5jDlHUO4xQkFJ
+BEaAlLQrQsDW9jD2hJLzeFAoFesg8uXxDZ/hFcG/ooiOzSlKmIEzhecweOaV6fT4
+BlziHVrJuHeqvbGGer47A0tL/8jaPcngxnxLQsDSaQXUrz5upJp+K805usAHlHbF
+V4/wacEouw6Dr6ukw210tAp3P7FOfsON6OcGiPp8snPepna3qTBwHgZXnApYo+le
+O1nH0C6IoAwN2Or7bd0qcaxjlR9mkrEmy5q/Kr5evzKpKPJwsnb2JW6wv21XS4P1
+ZgSmEbaV8BLrWWjsD4Yn
+=pxeu
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moodle/moodle-2.7.9.ebuild b/www-apps/moodle/moodle-2.7.9.ebuild
new file mode 100644
index 000000000000..189b33ffe6c3
--- /dev/null
+++ b/www-apps/moodle/moodle-2.7.9.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.7.9.ebuild,v 1.1 2015/07/04 14:04:38 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.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.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
+}
diff --git a/www-apps/moodle/moodle-2.8.7.ebuild b/www-apps/moodle/moodle-2.8.7.ebuild
new file mode 100644
index 000000000000..6bc215ba0828
--- /dev/null
+++ b/www-apps/moodle/moodle-2.8.7.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.8.7.ebuild,v 1.1 2015/07/04 14:04:38 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
+}
diff --git a/www-apps/moodle/moodle-2.9.1.ebuild b/www-apps/moodle/moodle-2.9.1.ebuild
new file mode 100644
index 000000000000..b80ec3ce5ee5
--- /dev/null
+++ b/www-apps/moodle/moodle-2.9.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.9.1.ebuild,v 1.1 2015/07/04 14:04:38 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
+}