Remove older vulnerable versions, bug #463336

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

5 files changed, 19 insertions, 405 deletions

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 6872dc562c72..0d4971aac7ee 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2013/03/18 21:11:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.41 2013/03/26 12:11:04 blueness Exp $
+
+  26 Mar 2013; Anthony G. Basile <blueness@gentoo.org> -moodle-2.2.7.ebuild,
+  -moodle-2.3.4.ebuild, -moodle-2.4.1.ebuild:
+  Remove older vulnerable versions, bug #463336
 
   18 Mar 2013; Anthony G. Basile <blueness@gentoo.org> -moodle-2.2.8.ebuild,
   -moodle-2.3.5.ebuild, -moodle-2.4.2.ebuild:
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 073a05108ca7..7c06fc93dcea 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -4,34 +4,28 @@ 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.2.7.tgz 24540389 SHA256 fccadf32667bdafde055251007e937633a5fd60fca6fe5dc8904fa60a52c1e15 SHA512 79968426077a153ddaaac0b5391d888e910b8cae515ec097aa4fa2c8b520c8f2336558bf376588913cbeeaf28a4840453ea5e2f3e1c4c7dd2fa0edddd7731b25 WHIRLPOOL 91a96de1a145a650e172a7c26bffd0c9bfd976eaf9d21072bb5c0c7b4d0c37997163705ad534be070e33bfa863bda5f191c1931aad4d3e618c4e65f8de2e9fc9
 DIST moodle-2.2.9.tgz 24547255 SHA256 162f6ad59498ba95a04fb1e6b308545e4a22e51d54d0e50a0778efa9f81bca8b SHA512 a897dbdc1929dabab97b18e509e0a43e8519a1210a8065cf3d948b3d017654dd7a590104201f5b8a452f11bd44d42521ba19b377b26d3387223e87d5e3c8707d WHIRLPOOL 9a80c061f2ed2ffb41f7f759d596652d79ab2019ae0c04d0c76060e84c751865a9c7cd77fc34fb88b632050866fea01d0f257d0134e72e4cd5070338f2abb143
-DIST moodle-2.3.4.tgz 28101505 SHA256 f3d6eb081956e9e22377a3112cf633ed8dc0ae5006e2b31bc4138d040fb32e5b SHA512 5fbf095da92fffd3c376e6a2fa48a523e9e143a65c71d9d2b149ca260889a372155c76c64fa7d202e2842ced46b7bbdf7c2b5c396ff3bb3fd464f0285234baca WHIRLPOOL f50cceef155128722b101cde7cb99d242f914b6ed3cc23b45e31b409aa137ebb1fc4fd9a0604971980dd7a012e761526c16a05b733ca28b7ddad8bb2589a77dd
 DIST moodle-2.3.6.tgz 28153083 SHA256 4f9ca9c5688d39f0a880fed4d290db886be1c3effc226d3e2f616f40ffe8fa26 SHA512 ba7494cac362751111dfab05027f8481196de2a1198e9c6abdd52468dd3519c5eaaad81ad1a943ef62a966a586d81cf197e51c6f71e26c287cecae4ea582e72c WHIRLPOOL 45c70b368036de24e9a431c8582346ed0d44d44fd257fd45a33c2c868ab21aab73db1d73da49395db041f730f4ff23bad7c12583d58100666f3d3f4decfb8dee
-DIST moodle-2.4.1.tgz 30235452 SHA256 5ed86c9f57f05165f54d2c955ea3c20997d4c9deca4af00d4a6930c0527a8f21 SHA512 3aadd1a44517f3f64bede4b2f8aa22d7e7faf6b5ba74f4c4eeefc1d6c6b31bad8d2bdb54b0516ebd58a99d77e5d2785601d9d1fd0636a12f4452d9ed137ea206 WHIRLPOOL 4757f57a2e678d75a9ee4b372fb47fa9ae58bae8d0bc2dec327e6b6a6d4958ba983c3d37f7f58657e0f2783ee94ba4a11bf10b90a95f269fbde74eb3d5379cb7
 DIST moodle-2.4.3.tgz 30289683 SHA256 67c78c1cbe84d0694b9c18b811eaf43f6ef0e867173f912f03b8d8ada90f5068 SHA512 97a29a6549c73af336eedb1e1bd701f4dc57a0f4712140e484d860411296fb963023d72005e5d790b182f2807d9844e2345f2a29125c24fe75544af389ed1c30 WHIRLPOOL b6c53880a144f07675e660df16a78fd48a0a669c9f75fb30adf336fe2e67b0cbc320d9de6e1e4969de1d31bd189ab2ddcdc925a07bca79af83bd110e813efc57
-EBUILD moodle-2.2.7.ebuild 3375 SHA256 69a53ee16092d0b01813f723f9d20d3bef381c106fb31d320fd027d6dadbac6e SHA512 92126c772a21c7d25a7606d93a630040b1b79956c1a9f1603dfde24d929aa2e04dfe06ace2c88ec14297fc3463de7b499fbfbe293a0bb572d87e061ba711ba51 WHIRLPOOL 8d37a2489f4a783168e09584435a67759797ffdaed7723838616a60817414a48c9ab3877d00af450c1778831807192e815981b1132b397bb2a5be43f84382fa6
 EBUILD moodle-2.2.9.ebuild 3375 SHA256 ee661c944203063d2d554fa4cac64c2b4c462e466cd117b15327d7c3bb7fe527 SHA512 0c2bc51b293a944db88cae7db695642ce07f75af96b34ace5f61bbbd86ed69105dde89e1e4461a1193e7839450ccd7ee5df3a41792b7162eb281eea87e4188a6 WHIRLPOOL eeee451a3c980a97a61af0bced9241fa3a38aaac80afa9bba2bdd314a72cd4f6131647903c7ff34771eef2634e5bf609d8248c9a073e0ba2ace2ee0cb9c77a8e
-EBUILD moodle-2.3.4.ebuild 3375 SHA256 ef491faade50dc4b79f3d39465e15dae3feeaf1f051a9852d231b3fdd9e4309a SHA512 e11c389121491aa6bc9a0059bd04c331ad28a39b68ce310c3e0e92aa4e95912bea66dafbb68f530ee179b56845558876e504b739f8776ebd213fe0fd35327122 WHIRLPOOL 4d33e4f78b504e4a5dbc2e19d30398f77a6762cbaf06995543592015433c0d53e3f389b3422e961f55ab2d1d4ce9b3a0a03e0061ebf7fe2fdca1a7afa1ec3e57
 EBUILD moodle-2.3.6.ebuild 3375 SHA256 6730a0b80cbc82cfebda198719affbfa46528e7b0f9cf6f3f40fa2c3f5270b76 SHA512 0cd8499b22b32eabd0dbd715017c42a69923a08ea8c0bdc6e056e11fdc0b4dca20c7538cad3bad64f32f1bd7442a143bbcffb87d6b05da93a3c03c4125c626cd WHIRLPOOL 69c02eb47becad804c5faf4721521ab35cf33b59006cc1b35a34c32ba65f6fce9d9f4e80132ff4ec9cb9e71a3cc1a90400b143a3a8d684808590ff8c9cfe6876
-EBUILD moodle-2.4.1.ebuild 3357 SHA256 5852320b191a43bc3c842a696af3ab7d13d69b281f9b26c37604c80f09dc073d SHA512 630d077d3de00e932d5fc747a51e83e0f21b0976dce1ff6c21a4f36e2439875e5e132852318593b76b63f071847e45c6dad4343c5113b898f2a95f8e1ba1a2ff WHIRLPOOL 5b4728cdf920a5938ab3f61c2dfeba9a8e7ba665d48a8df83c7571607fccb60b9b9437ea42c0e7af6c2083571676a393dde938445fe08a2d96ae300756046dea
 EBUILD moodle-2.4.3.ebuild 3357 SHA256 a410c23de919b033219be94611776030d14d0ecec56b90cfbb413bd0ba9510c8 SHA512 1eb8255e35dc80a4b5a9cb226eeed5231d8f91671ddcb406bf4aa6055b970a72f863e752f6b24ba4443ad7e72ec474fd563c4e0df2e2db1ec8c108edbeeb2f69 WHIRLPOOL f3b3e38eca1e9f1fd06847770fff11358337f8919a79abd4fbdd9f8d7b1d505a9aefc975c13aef176df989c74c75e0d6d3b2d6cb7b6c05531b69f206d067c00a
-MISC ChangeLog 8539 SHA256 e4c3bca8256a1d23c9a634d60c196a45bb6efad1df1b404d08cdfaad9fb8e39a SHA512 1f29617085989ea26bec9ab91dee5d823f441c489c17953721277212fce8ee95be0210bf59ae69bdf01d9c6e559b868a4e2f519c290bda6f28853a0763d8a3e4 WHIRLPOOL a5682870f2eda08c3f932673af09e90cb6c8c4c6b21b39fae8d16ab44cd2ef5cb3b0844726c0ae3db6696d7c573a5f4e07c81d6cec474fea3add85990f8b5b17
+MISC ChangeLog 8711 SHA256 bce2987a12758e197295c2133631bc7eb643dd816f18c825090f1ab173bb23a9 SHA512 6b1f26e7fc2566da7bc7b4f614096d312df89f19aed660d1fb605acda4de63706020504d784da9c0bf66c57d3b97c0e2e6dfa3a9a03ca77e6e29138da44a07d4 WHIRLPOOL 209fe4f9a29103a2fc82d87320b07804db936a9856881e74a8b3cd22ce82ac98cae364b7c86ee1dc8a2a08df1e6861fe17a9af207c9bf52a3f38274832869c2a
 MISC metadata.xml 256 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1 SHA512 b94120ce0ef0ab704cecc6b00d1e0460fe60159b4b7d2fedeefbc9e7b0917ead1637ba2cbe598c67cb9b86d7b0874603e555333f4bba1959e228d33a4cd1b2a5 WHIRLPOOL 8269d207868c3ea1efbf1aed77209b809488b66dc46d6304401435747aa527907fd37be2887d09e116409f1dd56f235d3812a6a7898d25701131a8305a6db5c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRR4L6AAoJEJOE+m71LUu6TPQP/jIiHBTKA/pNl3oCv5us29bD
-/QA4qfd/CTueKygQEe3A+c+MxUn2IO8CczGHHVZtzTyOrUtKwQabFW66TjKKjPgx
-N0jPM3vHIbQB7jnQcHMJ//1N9HBFq6HpntmYjTL+ZoAgJ59n0if9uc677JMFlyLu
-jcc/riY6aKO39ZDGP6NFDFJkyWExafjRjCh0Vt3qqkEee2Yv8x8jdUSlf61u0611
-QV2RAl5QJckLbSzW/RqrEFXgVwbdEF26O18LfnzZ+5r783uczBYrk9dbhBlN5IKW
-a9j+kZXZEL65/QVifndazRne8sn3e6t4BBrcaCCVMKypl2Yq42mUPj0hn2zp3zQd
-xoPNE/ybFMP0/d4vDwu9q+5sKiK2UPYSL+TxERivbQsblM/LSJk0fa80FItO4r4F
-hna/Xyg3mLBCTfKAbEvGCE5WNrNmjFtNnHdUYHWqJMoAUJDo0XR22E0Iwzzd0w9I
-7qF0W9pe6yq6Bj7KZRV4bM+cWPM9+J977GO11tsE32LaWnYKxvUzREanZFwnfPco
-J7BYq/Jldge7pX5iqFx6vlU9339WqUkGlJYsKgSggWUABW8V+tgIMEOaHGaXsupP
-4tOURHLNIDVRVFtapwANgpB8Ve+GKB46HO1y+kFFCETqL8garheako122oYUvRuW
-2DuoCUMNDrpLoJYJ7ph1
-=6C+O
+iQIcBAEBCAAGBQJRUZA6AAoJEJOE+m71LUu6bT0P/RvcIJNJ0K7ursDEopB5h0kV
+F89LfMnpCQ35+XXR20mYUAldwE2J3mBQzQLuGF8JMj7FsLXRzYBYeRMW7zT0mYnd
+NPd89tJgtG/U7WWDvze2DyZMSMGPvHJaCkysFvHjCQb5tgjnk6fdlehrRykq6+Aq
+bvZ4so/tDVvoW7DNMLwwPFfwacYB/fk7nHa/e3af05TUSlT97P8oVnQYUfTPmp1R
+0bjJClAdaUpf3vaODgRW8QRVSxMcBiBmCG3TmIS62bs+cToFYoP0VyeeSIduPNYZ
+77CdmWrb7iSGFW9GijlXBi2kh3ft8x2c0sfpaSVBA67RTIxjkt5w7qlUjzjbJEwK
+k/xgodtrmdkcN89a11xVo8hgkh/5VGmyNQZR4YYerZrQ2SrM8EiPPKMiSGiGOVtB
+JdaslM0CC5MiTBWt4YqOpqC5+7ppUmpIehFMAP5ViLb/rEadb79RGC2gIwABT5np
+580cWfGndc4YLW/z005bFeDhoT/9uQh4cSZlUL2do8wuwW+a9VjYzoKAwsLPTgYN
+7fTabZkniJrJlMMQ4/+pTSJehDPMJchCZxXiVUh1CCx8noEO29dyGkZMkCFkBoes
+f/4vXMr0VX5C5lrYigBZsDBd16kaA8w2tFYBldGGVVzVB5F4FM1/fseDoUvmuXZu
+XRy3MF+QwuJQqYp3Mr3e
+=Py9Q
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moodle/moodle-2.2.7.ebuild b/www-apps/moodle/moodle-2.2.7.ebuild
deleted file mode 100644
index 709c04a4e61c..000000000000
--- a/www-apps/moodle/moodle-2.2.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.2.7.ebuild,v 1.1 2013/01/12 22:09:09 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.3.4.ebuild b/www-apps/moodle/moodle-2.3.4.ebuild
deleted file mode 100644
index 993b4c88eaa1..000000000000
--- a/www-apps/moodle/moodle-2.3.4.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.4.ebuild,v 1.1 2013/01/12 22:09:09 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.1.ebuild b/www-apps/moodle/moodle-2.4.1.ebuild
deleted file mode 100644
index 04760a6c0631..000000000000
--- a/www-apps/moodle/moodle-2.4.1.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.1.ebuild,v 1.1 2013/01/12 22:09:09 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
-}