gentoo resync : 17.05.2018

6 files changed, 133 insertions, 8 deletions

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index e2d58bbd37a7..6b662a741791 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,12 +2,14 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.1.11.tgz 38028187 BLAKE2B 00f9afc6da046c44245de0cdd5e498b116b99ecb58c8858556df5121a4ad8972c37930efea9f962239c6ba35ba35384977e3237e6806cc3ffba4de466b7a1abc SHA512 3dd87b982f8806884ffc78251b6ce63b73113f46da0637779ccf45f5eb06741b175cfce47dabf7ae0dcd17a87cd868ccf4a036abce6cc51d08c6b6cce727dcf8
-DIST moodle-3.2.8.tgz 40323405 BLAKE2B c593d04235c5e0f3b8eb53037e22b0245d0b7279484055720c35a42bad8cdb3e26c433355be34c96a19d2201f311f5e6d478246d49fcfad8c9d0788bd2a90dbf SHA512 f684e77f54c040ad3ab782b376db478da896e761e1dc07a6b00c82382b5c2a5c999bac4d7990c43bee2e06da3d7563e774302b51371606043ee4ced0fa7c0fb6
-DIST moodle-3.3.5.tgz 44374771 BLAKE2B 9a57ff007d5f78d084ca8c5ba4c121d95f627d1fa10e8d6e7dc8a3ecce40d6d1020bf5213905fea8fb3caed57397ec13a48209a03967f423b0b0b3ee0729621f SHA512 77ef398d0fff56a54d6fc3fbf05726c0442599a7b269903ed7cb7ffe4ff891a77347f448a6d35d7c700dedc233cb33a8eb6fe3eef7aac6f455ecf45b159091a6
-DIST moodle-3.4.2.tgz 45012231 BLAKE2B bc9f06a40118721fe31a57ccc52497f62e55f4a9a2728a2a1f377210cf3e8c873de88a8b7fce32a71f05e1d763f63af9bcba7c548dc229a4e3431ff1c7e6bcda SHA512 29d81dac0aff688d5ee9c2ddfdbba71a9dbfc8422923b950e8d3a5d8c4da45fa6a953f225c237250ee73324bce5ce55f42bd470f070a4ecf58ed746c80bdf643
-EBUILD moodle-3.1.11.ebuild 2940 BLAKE2B fd1e914e7f7e855cb50447fb213259116d4ad418253db19e4d05bb7dda22178df4c302eecc5b258c728a581088493c11bd70ea302049069ef38f90c6828900b9 SHA512 47d2571d4e7a8e6217edbb2a491427ec39067649d61aed699bb41ce4a7912ea2bdcc773d3e6ab75426f8c3c163339f1b49a54a6e18dfaa6715d230495d69fbac
-EBUILD moodle-3.2.8.ebuild 2940 BLAKE2B 8d5ae724882dd03edddcd58f582e3ca54426b9b5da1f75b3749a0eef4d83d305f4f4a30c4047313d8235470d6461eee1892b8b50ce552dee631244ceea30d255 SHA512 b48d12a304316cca3dfc2065f1adc03f5912af2ba78cce7e8c1af7c1016beabdddab620ad0a8f343e757a03abb141215ef2877107140afbdb10dc118639e6e08
-EBUILD moodle-3.3.5.ebuild 2954 BLAKE2B 537ddca9825bc9113b92ac1e32dd25bf045f0d9d7937a964260752d1d9114e68fe45cbde22a7d8c800ae2e89dd31db2e2b338fd3c363b765637178a735a8f3fe SHA512 190fea32bf4412a827f7e603bdc1c6a55433f19fa2181edba843527e95fec71d4133ee4e43e2fb4ea80688240905046920510851cc68bf61bebc4951af6b3ac2
-EBUILD moodle-3.4.2.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
+DIST moodle-3.1.12.tgz 38023724 BLAKE2B f6903d2603eaab37c2da3e53c00b942a00ecd28fc14b927dd3dad3785e1f64e71745ba207f9e12669b2b74c2406c314fd7eef4b61a9e9f7fe3b25f4657399854 SHA512 0c32fe968e2b676806e400bb57f0fc2cea29282ea27f8d13892ac804fbe77885afe83ccef9515224d1ee5f201de2bace620a5ff63aa94c9e5293e65a97608142
+DIST moodle-3.2.9.tgz 40333782 BLAKE2B 8ca8d01e2f15eafa11f06fa064e891f6d0669b788211c6b713c8dd73fd08eb6e728eced3d2f2d776218ddab1fc3e06797e9b6a05b6f63ddbd9ee6e2f9e3839e8 SHA512 983c7905123bb2c6a798ce7acc66f025e90fee937fa6d2811b56d3952e7a82daa3d9c6fb140deb525d931310f462d24b52bc7004ec8573ef920326058a59dfbb
+DIST moodle-3.3.6.tgz 44870790 BLAKE2B 4f603532043d853cc0bd95e77146487b279ac8957f807b7e386268a01e929385737d6995d3de9ffaf3eb8e94cf8abbed5494728d8d3fd3c2dd678bca3f945a2f SHA512 f0ef461b4863a03dcf258499302769a1dba807c9a5797c61f6feb8ed3e06cc9cff1ac2a8a17f48eb52084a91b0ecec18f45a10aa2197afc870ba8535b364193f
+DIST moodle-3.4.3.tgz 45524224 BLAKE2B fc4096875368b33774fb2751e91e32cb4c5796424c31f7fb3b6e547c6de051ad6ada4b0ea7b97d190830829e3e99eec105480d860b7d5caa98463c2450d40ec6 SHA512 c201f75584b39676d10e33c03a39fa7c73a757b8c6066df5299cdde9c9db68a4d58ebb98b6ec5b0d89b0c4f258a8114083b0bb71a32d04c55d1045dd66b9ce21
+DIST moodle-3.5.tgz 46268566 BLAKE2B 5bc4b309ab210942369d22c27cc3e79cec2d06e93a60b7977db9a493ec1257c877caea9b40f65c9151f1cf0e6356793fdd0843639819b77cb73db0cb3ab2307a SHA512 7c0b5a42f839953fbe9d90767aefb2df589b2ec67db3f99ef61d21e57282d430c06c2758a8153c58ff4aa7a5977618bac9bed47c2866b2ef33decfc08e68059e
+EBUILD moodle-3.1.12.ebuild 2940 BLAKE2B fd1e914e7f7e855cb50447fb213259116d4ad418253db19e4d05bb7dda22178df4c302eecc5b258c728a581088493c11bd70ea302049069ef38f90c6828900b9 SHA512 47d2571d4e7a8e6217edbb2a491427ec39067649d61aed699bb41ce4a7912ea2bdcc773d3e6ab75426f8c3c163339f1b49a54a6e18dfaa6715d230495d69fbac
+EBUILD moodle-3.2.9.ebuild 2940 BLAKE2B 8d5ae724882dd03edddcd58f582e3ca54426b9b5da1f75b3749a0eef4d83d305f4f4a30c4047313d8235470d6461eee1892b8b50ce552dee631244ceea30d255 SHA512 b48d12a304316cca3dfc2065f1adc03f5912af2ba78cce7e8c1af7c1016beabdddab620ad0a8f343e757a03abb141215ef2877107140afbdb10dc118639e6e08
+EBUILD moodle-3.3.6.ebuild 2954 BLAKE2B 537ddca9825bc9113b92ac1e32dd25bf045f0d9d7937a964260752d1d9114e68fe45cbde22a7d8c800ae2e89dd31db2e2b338fd3c363b765637178a735a8f3fe SHA512 190fea32bf4412a827f7e603bdc1c6a55433f19fa2181edba843527e95fec71d4133ee4e43e2fb4ea80688240905046920510851cc68bf61bebc4951af6b3ac2
+EBUILD moodle-3.4.3.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
+EBUILD moodle-3.5.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.1.11.ebuild b/www-apps/moodle/moodle-3.1.12.ebuild
index 0c8f962ab4a7..0c8f962ab4a7 100644
--- a/www-apps/moodle/moodle-3.1.11.ebuild
+++ b/www-apps/moodle/moodle-3.1.12.ebuild
diff --git a/www-apps/moodle/moodle-3.2.8.ebuild b/www-apps/moodle/moodle-3.2.9.ebuild
index f3cbddcacb6b..f3cbddcacb6b 100644
--- a/www-apps/moodle/moodle-3.2.8.ebuild
+++ b/www-apps/moodle/moodle-3.2.9.ebuild
diff --git a/www-apps/moodle/moodle-3.3.5.ebuild b/www-apps/moodle/moodle-3.3.6.ebuild
index 2a3db73f4d01..2a3db73f4d01 100644
--- a/www-apps/moodle/moodle-3.3.5.ebuild
+++ b/www-apps/moodle/moodle-3.3.6.ebuild
diff --git a/www-apps/moodle/moodle-3.4.2.ebuild b/www-apps/moodle/moodle-3.4.3.ebuild
index 201f542fb5c2..201f542fb5c2 100644
--- a/www-apps/moodle/moodle-3.4.2.ebuild
+++ b/www-apps/moodle/moodle-3.4.3.ebuild
diff --git a/www-apps/moodle/moodle-3.5.ebuild b/www-apps/moodle/moodle-3.5.ebuild
new file mode 100644
index 000000000000..201f542fb5c2
--- /dev/null
+++ b/www-apps/moodle/moodle-3.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 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="https://moodle.org"
+SRC_URI="https://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
+}