Version bump to new branch

Package-Manager: portage-2.1.11.31/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 0d5e07ea1161..7529afd3c971 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/moodle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.34 2012/11/15 01:26:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.35 2012/12/07 04:52:09 blueness Exp $
+
+*moodle-2.4 (07 Dec 2012)
+
+  07 Dec 2012; Anthony G. Basile <blueness@gentoo.org> +moodle-2.4.ebuild:
+  Version bump to new branch
 
   15 Nov 2012; Anthony G. Basile <blueness@gentoo.org> -moodle-2.1.8.ebuild,
   -moodle-2.2.5.ebuild, -moodle-2.3.2.ebuild:
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index dff251ebf5b3..20f5cfb6ad18 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.1.9.tgz 24043343 SHA256 777da51f66c2df9f7c90d8b9221916ded360838ae774ec28694acf22f0018ef6 SHA512 17ae8cfdd80a2701afdb3bae101377f6f943151fc780dc01801387053169b2c0b42dc5c3a96aa207b66ce74b9f4ca2934e5508034de46a81aca9c5ba6e8ea22d WHIRLPOOL 9cfd15301b3748918f8b9732c76845e5891a512b06e7ff0c63dd4d24b26e27d2a8a7e9e9a44ab9b319e7191a51e8112617d1c3b3dfeb961eee82ab90d70a0b0e
 DIST moodle-2.2.6.tgz 25030820 SHA256 459c27815e153f69fa64a12f3500b3f4cca50cf44692d94b783d93e7b4d1a016 SHA512 5e07c8cbe0000276b3ccc26311f515154553258c3f3bf0c7cf724822ed1339964f0a037da38d36efe9c0b6a86a7f2eb0c4c845640b4cbdab942ccca646f259d6 WHIRLPOOL f6ba6e02fa0e80d9c88098242d629baacf95cfec49c342bdc3cf93a8ca9b6ba5ec50003c1ef6bcdfaf416cb8e171cfabb388788da3ca45b62220c1fdd9a4400e
 DIST moodle-2.3.3.tgz 28588101 SHA256 3bf8c0dfec616d4b15ba20f861ca42750576ff7ff7b2bed68f45c043611aeec0 SHA512 78564b84089a690334dd0836607444b7a02838d9720616cbf8a4a683716357305a097622f8491feb1099a29472c36fe7b93f1349435c1aca90a753ff3300527f WHIRLPOOL 9af712907df3e163fdc699cc12bfc29786acea4404de2d67fc2308abb66de9db7b2ede9eae0369ba118abf943520fce8aa9aeda6336e419db99a89837b666593
+DIST moodle-2.4.tgz 29861421 SHA256 c62c653159c52ca75515111ca889c8af41b9f46f15a22e600c9524528a4d3783 SHA512 a93aa6c50c8f5d10c05dba1bbca144effbf3a37d02db9033e8a69b4f8b5af40731803a573b9445d9e33719c8ec26822cf6237183ed418d52785b56c3de750ebe WHIRLPOOL a489cfed220a64dceba1b0ba5f072a82e78d054a55a762986468cfa2359388c35adfdd09ecf1dad8c80296c1d0c5ae28e3605b0689f388f7ed23844bd1c64681
 EBUILD moodle-2.1.9.ebuild 3375 SHA256 599ae379ae8e0611b7741f4c402f8ea18037fbb49ee42bb6701136450af32f8c SHA512 cfc42d6b7f3c0dc50a6319ee8c4ed0ebb2f7c173cf4dda90bc6612f9a114af761768638f16468ae3cc9115845d364380c6ad05cb62486ca5e41765fdaa6f0980 WHIRLPOOL ee4e75a18a45f50f56eb342dafba3fc23d90b04c4966b9bb626d63719d16cbe001650d2eff4f07048c3b5fdffb69c986b0e7f9ad82726bf25eb5e965c5c138f3
 EBUILD moodle-2.2.6.ebuild 3375 SHA256 69dfd806e53bb9187d181192c4ee1e630a7b8476f954568c19f0d7a799743915 SHA512 ccbce1e32a2a0cbeeda960ab2ee0a969bbb71e2ac60b1400c5bba940db6b2886c6f74a07f6ed30bd1d81f26ee81a7994e1eff8373f5c0adf3abb1ac3192cda9b WHIRLPOOL 47991da30e4451afa55febf366a3d1dcde1e3b06f5b6059088d62822f3c5f3a760df6f93f8f64edbcba7e3b54d65728d9030ce1382c5de00e6653f6c3b6b5171
 EBUILD moodle-2.3.3.ebuild 3375 SHA256 22eee39a2a77aea8dc334b0bbacf241f45d84ee7503e960963f4ce0c038893f4 SHA512 c3c87aee159b5f90dde323b59f4162ca73fb37c778eb9768595fce9ea199f09f91ce728cd7f76d375d74431d866ab65fb2d2a20971f30b53be20bbc56d30725d WHIRLPOOL 340e686c63944276f3f507027c71070396727f742abccb7d4a98dfc89cb0b64c637080f2fe7c996573b078a9e2bab70fb7ac309760819944bf46ce2750491c58
-MISC ChangeLog 7315 SHA256 13947c78cdf49cecb918ad0e0b06e3d6c995b7b7278b8d974a36254087096258 SHA512 49396f35810bb4e5f63a2303b59f4bacc090900a7a22354cbf4e64f7c035ba7e0c375f82b47a765e7defa137c3229c2b206c6cb7f3d53fb839a8e9a18eff7875 WHIRLPOOL f9a74b8011f0a650246c8f112f66755ee48ae9ffdfd2ab8404af531493fceaddd92f0c48dda5a6b901770f381f55c278c0920840fb051244e0383b5519978472
+EBUILD moodle-2.4.ebuild 3355 SHA256 9c95168bf9680e8ee04400bfe3a378d3809707cd5637368c4dd1ea0b676b1c2f SHA512 4591a1178c90480f3fa743dd6d7d5604375bfd0dbcb8e02006a74a30e8e2b4fd1cec7ecea16476d10922cd7e9551635486e07d575032eac3e637514c72d3221b WHIRLPOOL c5ecec44fce7cf1457833bfd72d95bd74b98f88d7eb0016669779c1a81ee003b8de16f293e03f17e5c1c8ee5c15fb09a04803f4bb2aa59c358c1e7922e5f021a
+MISC ChangeLog 7447 SHA256 ca5715975c79959433a7950dd7627d9edf30b2c129706455c96505ee045172f6 SHA512 dca435300252b7cd84d0ae6a40225a9c265beeb6237025dbe96ee158eefe760276aa4f20177ffe793226d248e4bbc817c2579425651a5418ae552224eb2fc3dd WHIRLPOOL 3aa1f18a46c3ac503034a8bf159afe22b193d9fc2bcc9555df4db36b9e22a04b94503deb9d414bd04c8b810c456d8ef5fdaeabecc880f55e75b549e36a08c28b
 MISC metadata.xml 256 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1 SHA512 b94120ce0ef0ab704cecc6b00d1e0460fe60159b4b7d2fedeefbc9e7b0917ead1637ba2cbe598c67cb9b86d7b0874603e555333f4bba1959e228d33a4cd1b2a5 WHIRLPOOL 8269d207868c3ea1efbf1aed77209b809488b66dc46d6304401435747aa527907fd37be2887d09e116409f1dd56f235d3812a6a7898d25701131a8305a6db5c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQpESxAAoJEJOE+m71LUu6vGMP/j8dhqC391pdNrb74Nt7mDbJ
-IoHUiKLG7b8NIJPhgISBzLiubzCVsb/8wwbGPBUu71edpzes5+P25N/Ushl+Tra+
-3Tx2WWHwntlbi20th1r161cxsXvcqqTGeZWd5kARBdKwTzj8WlxdlPS257mS2dP+
-vVhvoxIn50e5kwjS6wwTD/p64VV7q4yk34oi46AO+DdUxxG8iRTrtH7GlWyqwoAn
-saCw3ahJi1Wd5BBMEC+Vhn/+0XX2Vp3JRa08sIBV7eaY+eddTuatu5hGO96xhosq
-5Z2KNfYGXQ9qXHUx0akR///87C693Z+VV1ZnEcpviIMPVlBgUWXmtjjPs3uQE0eO
-uWG5gtBw5s0LRMTlCzUBcNT80hbv1b5hxOycrAmlLqM+3/Xeq6AssuZxDjEmRc2H
-j9/ZNOj+H7Si5Hz9B1/Vn2SPVqKCOnwK3wU2UV6UrKx5QUAjlkRXQ9AleUt8HpiD
-in7Az3TMjmrR0gI4wQSep2Jh8nT1XNDi2j8BzvEL7sFMhUThNvNBnkSzK4FzT4/Z
-LVUlD7M7g21EBsI4br398LfFxdZeBDdRXB44wc++IH1klqFBY4bkKmBVJC72Ls24
-HDhzWdAjgsah1wBjFvR8kno+VTe4pUR4fhseZUonefhn5AlQCFJAaay1CC61hrUT
-8fZ96PcWfSsLhs62Lub+
-=l0sj
+iQIcBAEBCAAGBQJQwXYDAAoJEJOE+m71LUu6Qr4P/2TKWteGeO8hU/hrUt/HnREW
+lFZ4MyJ3UB77pazOen/v36Goxf9KYuhKoVUXnTym86KcauvJ4exLXOG073szaN8T
+dLZagjYHcnYhTEePxSSbexgnj6euZN2LSNxh1HsUMPy9P5+jXLPTN/v3kfzb3pyK
+ZJVg1fMpVay1u/upnnMKL/BHgS29eSPJ1+SR9hQJ0WhPqZyBmB2cnOW6G5S5n2Ka
+cARVJbo8ME7Pur/wWMmfbmQB142mwblB7ADz390XI5o31ygizrO015bFsV8X2QP6
+3QSXAOd1vMQ9+XYkWVFQVqebctfHBu98FHB5qPgnSek4zHutgCyVmLIyIP3AZzd6
+6L1Y01JYfC/bZPSVvNShii06J1oIYjjw2P2paZdCOAhH9/axpiX3LTtZLMCwOOfD
+TwcCkKIffP3kmjMfd0t1vfCjJty+ep5yhJ8NsQp1boORvID8P7pUJlv0eRt8J3c4
+s/2axtnw2XTsVfhCcZmMPhc24Fumo9iLSUzdPbvbOlNjAe9M90EcehABOH/7PP4a
+Zx5GWAxASVBetUnP2FQs5ib7GI0sY6TwfogrL4Cuwz0Z3bga0l41fNVXMDGfnbFm
+83vwmFkXgh28E1vUZ9OM2f52MaGOP6F6RrDbzGAflknZqSvognjOlPdEBAqnxAb2
+bThIw4yiDJvH3P2c+Qx6
+=2EoN
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moodle/moodle-2.4.ebuild b/www-apps/moodle/moodle-2.4.ebuild
new file mode 100644
index 000000000000..f52eec33640d
--- /dev/null
+++ b/www-apps/moodle/moodle-2.4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.4.ebuild,v 1.1 2012/12/07 04:52: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
+}