www-apps/moodle: version bumps to 3.1.9, 3.2.6, 3.3.3, 3.4

Package-Manager: Portage-2.3.8, Repoman-2.3.3

5 files changed, 127 insertions, 3 deletions

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index d33f72ada176..78fc9413ce75 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,3 +1,4 @@
-DIST moodle-3.1.8.tgz 38015937 SHA256 5209cdda1eaf3f88eb7e9eb852217ad5918607077251dab7fe29f088c76db35d SHA512 e35912f10fa98bdb0e392f2020fa48c21d077608a6877f4a35c019c34963cc14522664f6bf88a7e98f01e42d0c171c9dbd2f4403d330baab321645fdb1d60fe2 WHIRLPOOL f31973f6845203bad40d6cad6ab560263fa972a38d697d4bd8fae85d10ab63474472055365d90f1566c97cf299efcfeb07d7913af8b5e9660e2e8689c8689d41
-DIST moodle-3.2.5.tgz 39902419 SHA256 53a381988fc0aa0169c4e2af2364406614bc3cf0948631a1f3008df3ccbfa3c4 SHA512 f1773d0c118c4e0952ce2606d6982af2641d13d4a4d6630d8a4cb4d5ccaee6c8ecd8fb9d596e7b0947c3ca893efdd5ea4baf35b52832f71c021703b9cbfe2f4c WHIRLPOOL 7c9d48d6c0a28a47e6dd6f848cf07cf36efcc0b7ca2c5bd5e566213ac7928567afbec4e222ac01e56eb496acb6cd665c235ff84ce551d569f4f5a2114848bfb8
-DIST moodle-3.3.2.tgz 44171663 SHA256 1a34c8e85d05bb693a1f4f5e70b63f527cac655101236ab1e474aa295843fbf1 SHA512 58b97f3e8f9f5c8956acce77be1e75dcc49ca27bb7032bdc70e386d6dc39dfc843b450ade27061a547f766073ec21564767af50140ac18915ab6cf92a0250973 WHIRLPOOL b69714dae5305f140a6beb441414b79ee5040e58fd8e60e2c958314b5758dd352fdbfaf3e3df38dc2e3185494474eaabee83ad7e51e4fb19eda35996b696e9e5
+DIST moodle-3.1.9.tgz 38020777 SHA256 6c4b0afb71a96c9d0f532783e826ddc3f74df583b6c72fc30835c7f466f10be6 SHA512 c65e7373db49f98fe4493b9f6aa39bee46c2d49dd3b4cf1bad82e28a71a9932fff2ac24e9a1b9562d66deca28e354da41cd7c282ffba942f50c2b849ef003aef WHIRLPOOL ad586ec1132e340b0128c927b89f6d310dc66760e03bd6cfe98bca4cee078481ddaa3ad718eb6cd3ab67ec07e6b7dc26bac35e489b06f32cc3e1c40e1b380592
+DIST moodle-3.2.6.tgz 40314104 SHA256 d5372913c4b4920e55fdf16d93f6902d0517d30b10eb8f54c2912c927105f02c SHA512 afeacaf965ca6d80c7c4121ba4a74c15f1255175d0a4b056bd59e738180ff80dc431587ed98897602527a39f1f9a32a76a2dbd868445ba901fb8b7c0c3c48096 WHIRLPOOL 682ed6d551b68ce448282ba47201a6a7a149a84ab4190dfedd79d61a51daa1b13db1ad6c2030f5bf3eb3bc0e1dd80fbfad2045bc219230b50347bf564de248d9
+DIST moodle-3.3.3.tgz 44238027 SHA256 2c7acf7b8011bfb958ea558e6c33f2f5ccc95cf3f57a90f85d57303a8f766066 SHA512 9d0097b081b4f6ad4e5d4951696d552bf097e22f807bcf9ad3112388716fcc16ca4c5bd79074739689205c8f193901874f892b29f15c1cf4545cdcc38fc7c4c7 WHIRLPOOL 39c4fe73faca6092d0b9f71493ae7f441d2e4e30b1e38015f6c30645dce6a3ef0ee35429b8d3187bb6f5d532836c2f9beb2eb8efa8360f1f037a889f9fd98703
+DIST moodle-3.4.tgz 44875575 SHA256 06888238944d951009f19d2705c2fe8ed64fe6f5e526310f52646a4129612277 SHA512 72cc62864c7b8020af5b48d7af47afe763ce593f96749d149c3dcfd39f9eb3f8de383bc4684c6591ad5ad157c85f0ffea54eb70489e8312b8b09c63a73f32dba WHIRLPOOL 211118a71cac3ac412d246058112c50dc3708e14f07508a72e698b663124739a32035ba127a51288d3568af583620d26a77167a8950a3601b6cc0342a649c427
diff --git a/www-apps/moodle/moodle-3.1.8.ebuild b/www-apps/moodle/moodle-3.1.9.ebuild
index c64ab1ffbc71..c64ab1ffbc71 100644
--- a/www-apps/moodle/moodle-3.1.8.ebuild
+++ b/www-apps/moodle/moodle-3.1.9.ebuild
diff --git a/www-apps/moodle/moodle-3.2.5.ebuild b/www-apps/moodle/moodle-3.2.6.ebuild
index 37b176d93c22..37b176d93c22 100644
--- a/www-apps/moodle/moodle-3.2.5.ebuild
+++ b/www-apps/moodle/moodle-3.2.6.ebuild
diff --git a/www-apps/moodle/moodle-3.3.2.ebuild b/www-apps/moodle/moodle-3.3.3.ebuild
index 4c2d978ef8a6..4c2d978ef8a6 100644
--- a/www-apps/moodle/moodle-3.3.2.ebuild
+++ b/www-apps/moodle/moodle-3.3.3.ebuild
diff --git a/www-apps/moodle/moodle-3.4.ebuild b/www-apps/moodle/moodle-3.4.ebuild
new file mode 100644
index 000000000000..01e29039a3f8
--- /dev/null
+++ b/www-apps/moodle/moodle-3.4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-7.0[${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 "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		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
+
+	eapply_user
+}
+
+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
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}