Version bumps

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

5 files changed, 400 insertions, 22 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 3b6cafdef144..fb55b408fc2c 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.66 2015/02/01 22:09:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.67 2015/03/08 16:45:59 blueness Exp $
+
+*moodle-2.7.6 (08 Mar 2015)
+*moodle-2.6.9 (08 Mar 2015)
+*moodle-2.8.4 (08 Mar 2015)
+
+  08 Mar 2015; Anthony G. Basile <blueness@gentoo.org> +moodle-2.6.9.ebuild,
+  +moodle-2.7.6.ebuild, +moodle-2.8.4.ebuild:
+  Version bumps
 
 *moodle-2.6.8 (01 Feb 2015)
 *moodle-2.7.5 (01 Feb 2015)
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index c59b8fc7e19c..1de56890d47d 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,32 +1,18 @@
------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.6.8.tgz 39484219 SHA256 28db4c8088fe2994734a755f6328fed0501413660cf4d2bc536104d547bc7a76 SHA512 1646482d3c4e3dbd5027761a3f1fa86042eec5d8c46496d0b6eda656f72a1da47d6ad7e3b428b75bf8f12ec3007c6663bac7e188efea8b25841af35c80b3b738 WHIRLPOOL 032e3ce387528994af515f6e7d30b53e907348687df42a3a26f110f4ff679ea1abcc783012095609c974341b407cc35a080df542453ccb7b6583ace36ca710a7
+DIST moodle-2.6.9.tgz 39487020 SHA256 b6f4f0d1eedcb6db16b94041052440e1ff2adf10867746e148dafd7797bf6cd1 SHA512 f658130b8a22d4a5fe0f5072bb4435d3883795accaa5bbe2adaf70eb747813e9c23b64446035e1471e2e5bfb4abe22cf09f57c2944c7e075cabae2c673b438fe WHIRLPOOL be4ebacf36ebd1e4b39942a519850cd8d1e1e2e5e26bb8a7cc3b8d55cf818f0607ef7f28f0ee62952c1c09b51ef9160c5006d383f9da3dc9693a2f6a296f4825
 DIST moodle-2.7.5.tgz 34939041 SHA256 dacae03e4fe71886f507467b113e452575d199e5226f07413bdee13ac36267f0 SHA512 ffb415c246b5082ce2789efefa5120321e25244e9e33f0d61d4ad7472795993963c5541a9751e6404c654e7c30b2caf81fbd857c4e6d458def2f99dbf21369b9 WHIRLPOOL 1b5761e1cbd8c40a2660ad467c88e413a498417363a3e332514d3f3a753ed4ae586985094e0f91daf379ae5bc7a4e2c0a426964bce8f23925f73625d890cb1f2
+DIST moodle-2.7.6.tgz 34951044 SHA256 eaf15b54daaed51b46f4e266b6720ab02f6f759298147cc1ad673d94f38d0f55 SHA512 c9f0f54159b6dafe135251d34909ceb861657a40fea75864c4e77f588bbff99b155c0b2e08bc6c208d1af08f1cb87ce2600857804066599d86183ef650dc2553 WHIRLPOOL 1a6ff6ae77d636d693fb5517d4803910c71f0792bda3f15744335eed2305bee92bfe2fcf6c90efec9110c14cecb74be76416e506577d8afe7089a20e6140d57d
 DIST moodle-2.8.3.tgz 35773906 SHA256 b2b02974021f1f22d240ebcf6218c32acd06b550698440db0bc4f23d46f59263 SHA512 6402281836c3ebe5780c16f4c37b25fe50cdf44285e4bdcd8a891241f25cfbafc20ba0ec355267c46b0d728b93ff927f57672e3a77d30d1c06a1ae9a33379c5c WHIRLPOOL 0c5d9c8a72abb0b5c3fd595e22fcca53e51fb2ef546363be079e15def41800b48643e0a88cfd1ce0d499db6416adc523e1ede2605f4158ef93a21d05b174862d
+DIST moodle-2.8.4.tgz 35795753 SHA256 ac7df097f32ac6b186a593e4aed8f1b13c66081f641ec0268687fdbb2c482929 SHA512 4b425dfb1fde6939117953ed382733e5ee5a609c152177835e885b87c23aa49e162b3f90a67096dce78f7c302d72baa789b1fbf7f7fc1d1d9c6515285726ef58 WHIRLPOOL b505800d473f9bd22452dceab72a7b81557139fb0325bf8847b915d939ebf33bc6a53f2ef43abc6962162fee5e76af7478ea2a9816f7ec420ea7ee2d25ad41d8
 EBUILD moodle-2.6.8.ebuild 3359 SHA256 c33817f8ae0d85fc8f17a4236b0dca51c5c00a741209fcc24a36d731e83e6255 SHA512 a7ea6a26531a52286a3e51af71d0175d1ddbfe3d9ee02262621b8535713f969937a29b11b968c99a628017494de6bf2115d7138df369e7ed5268f59663be0347 WHIRLPOOL 17cac25513a1a220f956042cc6b4e9acc9df3b895232b962f0a0f8c90698b59f28da1e6bce685d3dd34a5bf3b43d9a9e0f0f2489d0304a53b277d4b175c0f7f4
+EBUILD moodle-2.6.9.ebuild 3359 SHA256 3b517322af339ca8cb7b5a6e1db1ef35730dc94d31db5062050f93eb2d25b58f SHA512 6f5d2c0d77dd6deb6afb39f4c4b4c4cacfc40fabd3c6ef54a6e0aaabbc5eb2ebbb4b8057106f587c6ae71b2b2fe7d563b879fa4ca93b7ee5ef39c8abb8acf95e WHIRLPOOL 6cbd35eb7a7f4e488e9eb062ba6f2ecbf60614c241508703fad69a0860a7e5ae473eb29011a496ccd4931a7f0c074d77beb02f274eed83978ec7605ecce5c386
 EBUILD moodle-2.7.5.ebuild 3359 SHA256 f141cc93d1e4c7635bda5695e735cdb01a2d60667957597e3ee6ce8e2441ba56 SHA512 2e601da0db6d5c46561d030ca1023c81717bd69299754cc071c4246509168c5932957631dd4100f87868bfb2a025bb5b9fb90ae56c09af14a006ee194c0b092c WHIRLPOOL dc7f95149f47e86496cf7a8b4e326bf13d19a7b5cb07a312eb3cc7bebac5a2d48a68b70d6619c53c6ca72ea80d7168f3e58acdffa5015f0b46bbf6142b8eefc7
+EBUILD moodle-2.7.6.ebuild 3359 SHA256 7e9b1f6ac92ee8d585e25784ee27a747ceeee8e6234205a2d893947c87a6de02 SHA512 3f705fda20f8847dbc54c173bb36df110a9ff892320f148b382d1c2721a4c1af4ee817091bdee13cd37fdb6b420fa14f5526daacc05072e7a2f11b2bf0e48140 WHIRLPOOL daa5a15fff541d5d9214dc447fc16cb6367c5366b19804a0e8881da66119b34f3fdb266431368eef3ab91de417508dda753aa01f8b4afbe9347553910e2ed6cd
 EBUILD moodle-2.8.3.ebuild 3526 SHA256 5685551a7c0b603cdc75530f39ff870b5275acdd793197c1abfe4b0ac6b6444f SHA512 6ae4900f89f42c9456342bb8b17461067a73c868b3563285ec002d16a9c04733031a99decaca220f2938d5f778f81dd8d8e6d2eb5798e06d7abaf5d9bba62aff WHIRLPOOL 898e6bb31130e5c1198f5cd14ee7963d1f4461f005bfa525e2cb2b5fcc364c1468e5f3b2a148f00125227c72b68f5360cdde6be7a145e8beae3fae810e9e2a4b
-MISC ChangeLog 14065 SHA256 49531c12ae34cb850fc33eb9f19af1861facccc6bdd96de8a9f716c1a78af000 SHA512 03ad29ffd967112b047a75112690760062c6dd772d4aa6bfe1454af6a20f44d845affcc18e5c02d0d68a3f81cd9ebd72539be4174f33d2d0ad08eacec7a600e8 WHIRLPOOL 85a7ce973189deb2feeda66f32ff70935b569d4f89f38e34cbd45ed5749a7de15cb1ee2c7a28759e39df5dbace60c93e6ef88e1577c374dfdc0ee25122fa4b1b
+EBUILD moodle-2.8.4.ebuild 3526 SHA256 4666046a3036d286c9adf00a259ce259d4c8e7da3578f2f06a94470ba73e6d49 SHA512 974426d7e56362ed6aac29f89f88052c17988c0749aac26ad1625e0510ff5c9f0fac3ec6dcc86181d1129794cda8a69f378f40573b02244c292000188baa9755 WHIRLPOOL b137b55dca164d155cf1f368270456d9553955bc43d1af4983c9ec35a8de6f7396f5ed5b5873aac9aa3ebceaaf8130e5aa29d034c094c0575cd82867440a37d4
+MISC ChangeLog 14290 SHA256 0edcc9c7707e53e3f5f5018d4407b63f9a7c0e171992f3dfe386ab1b63afcabc SHA512 bf39b82ed03aef65ee45aeee6f93c1a51cee4c624964cfa6e859c0d3d658ac65e284e7c100168fce19d59796986b1aab05ee0e03e56d48d9275ce4f96a02eab5 WHIRLPOOL cd1937ff9df22572dbfd16e491ad310a609cbd10a9dd40c6651ccaa6c092817e6c78d843932aa0885c9c84dcf0b31d0457742efe62adcc47bc080cb1202859b5
 MISC metadata.xml 256 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1 SHA512 b94120ce0ef0ab704cecc6b00d1e0460fe60159b4b7d2fedeefbc9e7b0917ead1637ba2cbe598c67cb9b86d7b0874603e555333f4bba1959e228d33a4cd1b2a5 WHIRLPOOL 8269d207868c3ea1efbf1aed77209b809488b66dc46d6304401435747aa527907fd37be2887d09e116409f1dd56f235d3812a6a7898d25701131a8305a6db5c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUzqVjAAoJEJOE+m71LUu6vYUP/ihrzLLXtrAz7p35AUWsY99V
-xftxFxrIQSGpefD/wln/rfQaojGSq4Pzp0f8MKuwxSrm4KQWH/bzZ6WQ5vr9d3qJ
-Gzrfg/Io/EW4vMWub2LHE+AOPfKchtw3N1oJ6KH1wYG3PaOFI3c4Opg5qhNXVvrq
-Z03iURQWXuINWXoNmSw6/Wjc3amgHR/j4E6PFn0xxn93UUT/tJkD5QjqZatwKJzm
-rv+9kzPSLrWqu2sIp0qztr8z1wCNdWLqyRjDSF+1opCs9OfUQ8UUIy374Lb2OU3e
-ZU4OXjIsCFbBrYoP/dsdVW0zU7qDZFEP5vdl+pbs8CsmKJ0aCcKBOTxC5UinBtzR
-2A86PWYB2KG1/Dnwfil9nYud6J/AE6yPXYaI13t1jTcBp+wcehDEc1IAI/3N/rD7
-ui1y5QKl10O71PtPj0rzzvzGxjaCRI7/mA4vVhr4HkmqnMfLN3aPOqu4J6pnZ4My
-zHnk0Vf6f3c9FQeAP5b8BmfMNlwgrmAAqbPZeI4E+TI947jdoGzBBvneQH6BHMod
-kmDIhi3huB2iyHB5S9iyzh+6jgLwOsAqzVaXJciQWcGzGni1ikhV/zbPzChMnHM7
-xDiUkHFaClHgWKFw4MwSQUMZ/ZVVFTgPqJecEULmPXgo9aQbaIKpmFve2ZRR3J7+
-kz/6vjFchQ5MWeA49AG7
-=lyAC
------END PGP SIGNATURE-----
diff --git a/www-apps/moodle/moodle-2.6.9.ebuild b/www-apps/moodle/moodle-2.6.9.ebuild
new file mode 100644
index 000000000000..8b87eb43388a
--- /dev/null
+++ b/www-apps/moodle/moodle-2.6.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.6.9.ebuild,v 1.1 2015/03/08 16:45:59 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
+}
diff --git a/www-apps/moodle/moodle-2.7.6.ebuild b/www-apps/moodle/moodle-2.7.6.ebuild
new file mode 100644
index 000000000000..aeb772d473d6
--- /dev/null
+++ b/www-apps/moodle/moodle-2.7.6.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.6.ebuild,v 1.1 2015/03/08 16:45:59 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.4.ebuild b/www-apps/moodle/moodle-2.8.4.ebuild
new file mode 100644
index 000000000000..04e9e9fff853
--- /dev/null
+++ b/www-apps/moodle/moodle-2.8.4.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.4.ebuild,v 1.1 2015/03/08 16:45:59 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
+}