Cleanup vulnerable versions, bug #501192

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

6 files changed, 19 insertions, 535 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 9f9767f1d692..6d76de2fbe6d 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,10 @@
 # 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.52 2014/01/12 23:32:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.53 2014/02/13 14:57:11 blueness Exp $
+
+  13 Feb 2014; Anthony G. Basile <blueness@gentoo.org> -moodle-2.3.10.ebuild,
+  -moodle-2.4.7.ebuild, -moodle-2.5.3.ebuild, -moodle-2.6.1.ebuild:
+  Cleanup vulnerable versions, bug #501192
 
 *moodle-2.4.8 (12 Jan 2014)
 *moodle-2.5.4 (12 Jan 2014)
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 40a3025ede04..5b5f3e25a7c9 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -4,38 +4,30 @@ Hash: SHA256
 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.3.10.tgz 28280693 SHA256 e9cf9050aff2f50c32eeab901acd3f01f24a93ed7c10b8c970c2d10ba5582631 SHA512 81326c21af1d58139a758d3dfb2ba1d4a7d83069e9435ad6bacb0d655c8f0d97b0248982611790ee650d1fb1cd209c347d74644f58493cc8090821659fea1ef7 WHIRLPOOL 6466131b2bce746853d5f440c742fe1e21fad18f4d43c3178bc60552c45419a30a049a04825fece6bc13085e19c3fe6aecf6fd8b267f9492d9c76720b6067a00
 DIST moodle-2.3.11.tgz 28275140 SHA256 6aaea2cada667608d10a218d85d136ac971ad900ec339b9e846a39916e99905f SHA512 47cd9624c9caf52f35910d48a3bc5de23e28aaac8137de238c02ac37931e3ef12356f423d90689a1ef8e6cc4c600fe01c92fe8d0a640cee0d7cafb3516058f2d WHIRLPOOL 90d6b7a03ba2d7e05c558c5c7f75043a8ef03117125f777ab024053ca76521b9e35003a870ecd36a27a1726a6d0f194df76093faae470e34f8d8519f767c421e
-DIST moodle-2.4.7.tgz 30484284 SHA256 328e603a296f09d75379537af3a7a827f8b5f689e3f2a6c069ef1e4c93a77696 SHA512 edb218ecd40f5aae3cd626b1919db42bf10bf349a37256a4171cfd01380110b7ba7f820397bceaef35010d26e1af3ee9c1d27a4a9b34fd2f11528ca2c6c95912 WHIRLPOOL 6960642a21d2d9ea4cb118dc73ccbb955fba16c06b86284ec58ff1914c4378d913fb71d2f1cd5972a2693fcb147d25d2f3d6fe54a0d7b954354f8a047439c09d
 DIST moodle-2.4.8.tgz 30514150 SHA256 d7df895031a2c465baf01596f3a3f64dbb07c0c3a8ec576b111466bee7725737 SHA512 d4375529591e356cfd3d2750e4185d7c81b012da6088ff45f202f7e6952f5c408174f99fd2ccab14e9eea9552b16a1170aadac7dcc0c13a5b84e3b07c3c046dd WHIRLPOOL 30d1103c067d72aa9fe3e369b4330af0fe8ab2d0729b03e71006496974e30f011ba590854d1e1ca0782ea61c4508205d29eba7f92722a741de00925e07aab1d4
-DIST moodle-2.5.3.tgz 32377514 SHA256 7d7914f2c38b2328fafd728376640828fe165a426278af1cb2c9d55440400ae9 SHA512 be932d42c06f17bf4a5c66c0c544bc1a9938f375dd63226154852799695ae4ffbda7426a8efef3959d3c1f520ab4ef2f940c3a58925c07d1e2e29d703aa24416 WHIRLPOOL 15b2095eec06007033b2cf0d34ec6bdd6345b246ae8660220d5f25c7142d14a656e967807165ce8f63a3644606a4f181a331ee8bee18113b565ebecd314e5e43
 DIST moodle-2.5.4.tgz 32423521 SHA256 dc40032aabe633d37466c1005e794363515bb207182f68255176642fe2018c66 SHA512 ebc6b5bf6dfd7045d834db760efcf9677044fe34bd3c35aa2d837304a734c3e9ff97a6191168c99aadc5e90b08f6973c68259f9074598ace7ef900a5835ac83c WHIRLPOOL bae4ed8dce9d07a04bb30d5d5ff0f5a5621e90f2da3bc1a0a1f885bc2f6f8a2faa85ab825036d975408c6c74796971178ef785b053d0ded5e857a30af2972c24
-DIST moodle-2.6.1.tgz 38847952 SHA256 e7e68665713609fcfd975c402aba6d6d0f4d1fd5b28bd9b2e240c18da1379d47 SHA512 23f67d1735b293f403005eb4a2b91562f21f0052f2341a858813e34bcb5c11734456c3cae44c75655e34c8316a765aee4324b056c762fda04b64842f3a57b9f2 WHIRLPOOL 63e07b07d3f88ff28e16d77f777f9bd2c894056d4f8cb22a7324407b9ef0fa36bd2e7219a2989ed6b2f9bf10c503c9f8398a3a74df87a77d0b69f25e27f5a47f
 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.3.11.ebuild 3376 SHA256 57d0c2e140a286cc0d802638e9e744c769322b4e82a83101eca8a468199cbb79 SHA512 93770bf8ec1c402fda7b02fb431382b4481be89151bbbd825c6a86a13e74b6ab2e382b2f01fba66684efbc59fc006031069bd99d00b9b620adf193ab77b573d4 WHIRLPOOL 375fc2660e24f84fc3ed17334b2fe83cd59a62fef373d4383ebc509ca3a47db1df5575fd86b7a496d19698d10f7ded29b3157c3f9479734e90bdc3c440090390
-EBUILD moodle-2.4.7.ebuild 3357 SHA256 6ca4e2e3230552cc14b0c7bad47e3e2075f2d1e27fc3d6d20ee59b367b3c0a4f SHA512 ba8a6b7acd7e8a926d484cb2024aae8259ed56c8998bebf92953cb16031e6ce8f510d81574d1247965ffa6302c06fdede62e165ca5f6f7f5960e98d178a77931 WHIRLPOOL d8c53bfc21432bdfdaf79ad5348e0580b42afb69bdebb5b041b81245b480c9b6e999963a5c065b55dafe7a223329fc8693eea6d48e0143a56f9ab99d04ecfe5f
 EBUILD moodle-2.4.8.ebuild 3357 SHA256 9c3d93bd2b1eef8ff8cb4c20c5fa319dc31c6f4a4f678f0e67ce1c27d334178e SHA512 eb79bdcc97719e93ab7b29cb1fd11d0edb4b42247fd98041e717a4bd3a7c7bfcb2d5c849b11eb8f6bd7d2557628c550af4fd193fbee332e4e235366fde501ae0 WHIRLPOOL 16c9b60579eeea56af15d9fb1e677ffc4884e01ef352c00ad2b276f325a65eff7180f87da98aa98efc2fc2bc2e24ff3dd676f3e0f5758040158f620eea967969
-EBUILD moodle-2.5.3.ebuild 3359 SHA256 c4da55d1d8788303a8a23e8bf6281af4c9814b001a654b49ab374984d6e6b8a7 SHA512 8e86f87e833799f5569237269befc2d27a68919adb21b4627ba7cd587371c11bbc063010166515e7921bf467545fd884a204cf3506b279a6c0509d1a7b92d2e1 WHIRLPOOL a1623afd9b215bd985e3f7582a522ca28faa02dee86182982f2af36319ca24104957d8d8e06e9456b2913911cfde22baeb2dd01d73ac19d67d8a40c035be1f6c
 EBUILD moodle-2.5.4.ebuild 3359 SHA256 4c50e0cd0772b26b17c6efcfd3fd5001919aab41e64ecc328a613d3725d821d2 SHA512 7b8eb6cf66a867f5498ff8a9877a0e378a5af9c383c1db7188d5ac8fc2ca1d7383a85d52897eae9972fb46356b45a4bc022d047e4e8ff9f88921e4377f647fad WHIRLPOOL da361cf8e4c7ab258d30eaba8ac091242b7c14cefe456429363bb5b8b5740f7521e61f7f5cb7632546d32598cd5874961032691a32da9758155024f4133db0bd
-EBUILD moodle-2.6.1.ebuild 3359 SHA256 d6a9852953daba2ecdef03e7ff7f3f008933348555c84077fcaf7a7a439ba66f SHA512 d3da2605baf3523fcfa54d20ac6d701fa3cba3360ca1a555f6280d89aec8bd33212ae639b60570b8a8ca8f9b10095c9f1f53f4c81647d05346869c32b383135a WHIRLPOOL 735fe41e118163ef5cba8b973a5b5971d7759e584ffc839ce7a4eaa28055cf303caae742589974f58663a0ee7af18898685017ed91b7b0db518bb6bfc2136ade
 EBUILD moodle-2.6.ebuild 3357 SHA256 f47b90b673ccfca31a69d8bfd3d9a6b1bbee01c64dae343bc05e3bff2a2560be SHA512 d0244c4654d4198df0cfc6e45d4d12c279d191a414013f0c6ec8d668f15d2dda96ee341991959e6824b0a8d8a789ac056901a89accbdf2ae2e759794bad661ca WHIRLPOOL 6382e68dfb77d08ed19f1c5ed96071afd570885ce67f51136236aec6b834bb1e19a8ff5f0b884dd0e8d3d031c8827c20e48eef48a245706d9ff53403967c01b1
-MISC ChangeLog 10946 SHA256 e267a642bb931a7ffbbe49df429a8df9d3a2431416e9e5ca41c624d372b88474 SHA512 dd8d33d646f1fb57e434dae4d104613f9dd7c8398d7554f8ed2924c6f3a8f8d20a599d0f53cb3a73cfc315c94a25ea28118ad664d44ff9319a02ccb3e00bd0fc WHIRLPOOL ed7ec193f971a72df132c04f493ee8631ffc0ba1598594bd07b41b75387acd16c84210ba69f3e268bec9bb63b589e3f06d2d9c9e9a6d37deb319f4b9cb2ca261
+MISC ChangeLog 11136 SHA256 d2f415475f5d3732bedd88564f05cb568cea8012dd7d7a39850f9b942557ec20 SHA512 1590b7d97fce061396441ce63eae721e43f6957edb28718a0409f25121c066a5096242c027a8814431251b7cd759bce4910efbe4c366a5527f6d29abd83ec5b7 WHIRLPOOL 000eb9d77d6cb2d79a5d913a5f16def0631c6e07faf3c36a532df9df3a86b40c92e23c40af9e23b833d63aae37cfd83e9263d18d9921df7bbbae4f7c6cec6fca
 MISC metadata.xml 256 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1 SHA512 b94120ce0ef0ab704cecc6b00d1e0460fe60159b4b7d2fedeefbc9e7b0917ead1637ba2cbe598c67cb9b86d7b0874603e555333f4bba1959e228d33a4cd1b2a5 WHIRLPOOL 8269d207868c3ea1efbf1aed77209b809488b66dc46d6304401435747aa527907fd37be2887d09e116409f1dd56f235d3812a6a7898d25701131a8305a6db5c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS0yYZAAoJEJOE+m71LUu6dE4P/1+dxmXhqIPuFViAClh49NGD
-E1NGwvYzF1UZkISXVmlil+wCmXw2Ne5z+t26gO8xT6s03VUwbMfgQ4TtqNLz156i
-NhBstfEIYOMsgmJNJ/NhDvNKf6tewfNZPSSzfhu7r8kj1XcD+KtiRhTO6zChnbNS
-qgBQMv0RIeSvoVwSUVWBlN3WRzfOMcENj9BEaX8EyuW1eRmqykq628JvSVPQjpf2
-3Tv77luZx0Saa4VCHpkNE++2QZhS83LbHhiMeV7iX+cZYDF8HQxF4YT4yr/WkqCo
-is51HUCqU4h7Y0qqSYsv/Y11xcEVkxNpkmzZVS6Elo1QroiX7XSiOWNHUqBahdRS
-LyfkYyaiZak/L933suk5puMxj/Ubq1BqECBCR6v3toTFdb1Q4e/0+V6I13Dh53Vq
-Z7WPMOsyurqKmf+rFbamj+/UwObXwkdfQWN0SfhO9P6H0pMtTup8sC9Wa8mXfnuU
-e9gDXFmVeosyTQ4dNg3bauKw9cyyTmX6trq2X71FnhrECD2CXpYtRrF7xhj1iHBc
-R7TgbgMpY7nWwRajIvYnaED2+KBKbCFlZIJ3hzTosEsZYQKnCa7nktQtARaNQYCo
-s/8xBhn3sLxxAIjIc6HF2D8mC74uEuBP+DQLmLdWj276mr5R2pm9NXqi7FvvC7QF
-Zr0tAwEFExz5q2KyknV3
-=6ya4
+iQIcBAEBCAAGBQJS/N2SAAoJEJOE+m71LUu6KjkP/jgWrsZ/CTxmtCg9UwrYZ+ec
+ax0cZEUJMAKtLKXY6JxlTTAJQc9IOkSUh1ZRuu5fNR82dFqPKTbqqMzQv3NnTNTG
+kgPsXqrNXRQQVLD54KIMqUnmtczC/wWRZk23bUDaDZse+jIzB8DvFuKEoMuK8XhE
+lV/+BMMOMhvBytIS12bm8S9rcU68Ew5aSlmn2mp4ZFgWDQYT6nrYGww3Oou2ry4Y
+DOrOtvo3ioW0WRgnogotaOIGNhUwAfWo3g06MDMxZsQIaCf3cDCrkAmgIoWUlFY9
+Y9SldlB/GxIhsRqhTYL+qdwcvSvmPg+WfIcbWAY2wVhM1inUnV+N1a8KDx1a6kYM
+D9iHICIgAbXWPZirWSWQ0TjkN1V0b888waHDKTolEsAbzleNFhVfhx0kBWjeETnu
+akpvyQ8j6o0BycBP9uHeyN+N9YyP90yD1xgAGjvpON9mgN0jix3uWU1IM72qIcmf
+KFx2EcgirYfGYF5p0VYFJkKWgIQFcC63T5a2SRTmt5OmGIZncJXsNNwvGkYjCLaD
+Lp5w0zBmuA32eZqiUI3auKOiUK+Azy0l2VcKqTIrM7LduIAYkCXc71USZSyxyk3A
+mDwBav3mLbudT/ukOMqG9Wz8Tm3qgMwVe80r8Jt4k/zEioO8OgOHigr8c0NU/rfZ
+lY9c6UIMxwbLDJCN1Ad6
+=BsfQ
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moodle/moodle-2.3.10.ebuild b/www-apps/moodle/moodle-2.3.10.ebuild
deleted file mode 100644
index 6edb7d5ba2f6..000000000000
--- a/www-apps/moodle/moodle-2.3.10.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.3.10.ebuild,v 1.1 2013/11/10 23:15:10 blueness Exp $
-
-EAPI="4"
-
-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_53="ctype,curl,iconv,json,session,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"
-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*[${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
-
-	# 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.4.7.ebuild b/www-apps/moodle/moodle-2.4.7.ebuild
deleted file mode 100644
index 5961117c1b1e..000000000000
--- a/www-apps/moodle/moodle-2.4.7.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.4.7.ebuild,v 1.1 2013/11/10 23:15:10 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*[${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.5.3.ebuild b/www-apps/moodle/moodle-2.5.3.ebuild
deleted file mode 100644
index 0af8875fc3a6..000000000000
--- a/www-apps/moodle/moodle-2.5.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.5.3.ebuild,v 1.1 2013/11/10 23:15:10 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.6.1.ebuild b/www-apps/moodle/moodle-2.6.1.ebuild
deleted file mode 100644
index 7eeb967c03f4..000000000000
--- a/www-apps/moodle/moodle-2.6.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.6.1.ebuild,v 1.1 2014/01/12 23:32: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?,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
-}