gentoo resync : 22.01.2019

6 files changed, 12 insertions, 137 deletions

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index a2c7fd57e872..d65409ec1329 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,14 +2,12 @@ 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.15.tgz 38055035 BLAKE2B d55f523fce2f7193330665132b4d7faf6a7a698ca8f297d7e2dbc03e859ed43aef34292666e931e6c86aee2f414097accfd8ece7f5ecf53a8439697fdb28ba31 SHA512 17100ad6caa3a7ca5dc8f09b12215700061ead3a30701985e89d39e1e063d6142391c01c2dc0d1c7f4b86bd80b8d1ccc1d0477389691d6545b3be590b0508912
-DIST moodle-3.3.9.tgz 45123816 BLAKE2B 0e23668fb6ac536a1a87067fc9574424c33934402184ffc6f25f48f7e87c70fb0d9b25bb12b46320d54968ddb8b337471be7b5795369585ce4c488f93168f6d9 SHA512 6150a4c0f4a85ac508d2da9b35fd506eca614c3a44d582096fdecd113899a72481507ce85101505570e0e8237f7af744e3d7a8cf990cf8b250f5ac335ebae1de
-DIST moodle-3.4.6.tgz 45961570 BLAKE2B 49a20412b386cc3f463dd3be58dc56f50821298d36109889b3eb092d39f4dfe477dfbbf1ea3f1b6ce8076b4d4dca21efc00e7d772b0ced395139d76e56759482 SHA512 2afa7facb2068c63d0a1bd42da40a1cb688a1bcdedc5287e59633bb085f96c65598396f03b99b35c9aa3769463dea316584ce3793978101989fc53f53140ff04
-DIST moodle-3.5.3.tgz 46645219 BLAKE2B bd1aa2ae73f807c3b8a0e341893c7b004761e147fe42eac615153ae1ee7fa4bf9268e160a14ab1ac62dfe2c5e462d042cb30b725d6a28844e4749492b6a9b193 SHA512 130d1c30acb78452021f4fd5c0d29bfc4c938993e7d0cf3b2fdf13061fa993f9cebc7214f287e62ceb13bfd5999c12132a45fd4aec5efe8c25078dfe97bee861
-DIST moodle-3.6.1.tgz 47660920 BLAKE2B 3dba1adb2a2c9926a0efb1942df4239a020c2c2d661a6a2a6825acc70b6e7aab69afb4f0f297cd316fd5f693ab711cccea8bc5c68fa1b72288297b8d00791088 SHA512 79cf5127748e6511101b9f802165eefbe6dafbe89806e8616902765d14481af0b6ba06757be5fecd343bda7dde261c58018f940254549decc66452415a99ab9d
-EBUILD moodle-3.1.15.ebuild 2937 BLAKE2B b978bb074ad0cfa0ce5b7708616feb918be5dfe1979d8f4783683bf348d3c7ad3ba7fcbf1b72f1b65404ec3ab5d8d8324292a81b5cd4d9c80a5309e3f1698540 SHA512 48dac3a85860059458fe7fc69f061c0d2897fe3504082484c1cdfe0edd2b090659c04df4eb2c73d9f5a3c9ea568032fa99aa0378c050cc6b2dcb8e6ca82d123e
-EBUILD moodle-3.3.9.ebuild 2951 BLAKE2B 4df5f122a1d05be0cebe8b5d8e135520e1c172704b658ee1b49422acd271f347d0d0c90004053a5f798a5f52cbbfb2c153007b0a0031ffbfffabaefa3b574571 SHA512 039354ff6df864e155b061f0ef5c4125ffb3c8b179ffd6dc7dd1039b7c61092f22db5de5414175581776e3482a9ef8c63f6d0739841cfaef4f62ac45ea4a2d92
-EBUILD moodle-3.4.6.ebuild 2949 BLAKE2B 3931582d8ca9407ae580bb91b7c8d6f9b109fc1f10d5182f8b75d3525272f10bc10e53349f397f981b78c938e8508d2ac633e03e1b695aa5736183657ed4b78b SHA512 e76b4d0a5cf53e116c47b1eedd1aabedb52331904f92a7e824cca4db5273c7d83c8e7de0341ef261833c868c803180c3b53a446dc6924a50e27d31d109a5638c
-EBUILD moodle-3.5.3.ebuild 2949 BLAKE2B 3931582d8ca9407ae580bb91b7c8d6f9b109fc1f10d5182f8b75d3525272f10bc10e53349f397f981b78c938e8508d2ac633e03e1b695aa5736183657ed4b78b SHA512 e76b4d0a5cf53e116c47b1eedd1aabedb52331904f92a7e824cca4db5273c7d83c8e7de0341ef261833c868c803180c3b53a446dc6924a50e27d31d109a5638c
-EBUILD moodle-3.6.1.ebuild 2949 BLAKE2B 3931582d8ca9407ae580bb91b7c8d6f9b109fc1f10d5182f8b75d3525272f10bc10e53349f397f981b78c938e8508d2ac633e03e1b695aa5736183657ed4b78b SHA512 e76b4d0a5cf53e116c47b1eedd1aabedb52331904f92a7e824cca4db5273c7d83c8e7de0341ef261833c868c803180c3b53a446dc6924a50e27d31d109a5638c
+DIST moodle-3.1.16.tgz 38057145 BLAKE2B 09995a5ff87069e47b891e0e19a038d10af820d37b756803ceb2dcebad9a04a827a5b2548a3dd205d07eb4d9e116a15a12fa3d6832e524dde76450b5170e979a SHA512 46ed0cd702e86529dda32b128604acc7c6bc13530bb3acab402d5c36f59a55dd35e0ffaa827aef85f7e75b0b9939514f868c0dc8ddc1b5f8aa49637acdf89c5c
+DIST moodle-3.4.7.tgz 46051440 BLAKE2B 2b6a2eb7c071da56236a0a8d08b944fa9f5028bf9f22de259302885804cbb7e3e5bc5f1e18524a183fea362c8809ee38590dfcd836bef9de976fd7ab89b2fbdd SHA512 6819a20cd477b37744786793b74dcf258098640e453345cc940fae02789cca31b43730dc421715be411ce77ef23fa876189a2c481efb5e643282355b4fdf043b
+DIST moodle-3.5.4.tgz 46648296 BLAKE2B 2ed589f46061beb81e558b96461729aafe0624237c99b2e306c57da04ca6bff709d8377012bcfbb73a9a03dabf12dfa5d2a21e47139702b067f3fde0b99794f8 SHA512 03d0821f0863ed360129f00dda834618ae6b5dbb5794ee1a993eaaecbbac4dae8e6085f83cd86674bd93104a17229cb662db57a5500c3eff09f1480fbef9772d
+DIST moodle-3.6.2.tgz 47673889 BLAKE2B f81844f933ec3bc2ebd92957d16a9e59c43678b9ee548767bfacc443a68f574792c641787722cad8fe3007fd0c8d279ac097c361843089441bbe21b4af5b7492 SHA512 30e48e6fff788294db83d7889e32caf12fa07459dbd61a5cb0495f3c5b6bc005e41faee447a0cd6441e5120dbd04ee02056425c67a118755d45bc29e32867d74
+EBUILD moodle-3.1.16.ebuild 2937 BLAKE2B e6dc81392ce7de27765e68363f7b4f772f3ce9f8fafa2fa1139a78a34d8a5ec60441d40d52f4698ba48914dc3ef22bb340b590db24552224e680c11790f9f738 SHA512 ac9fa234a15f04f9ff25fd33f3f8004c80cedc1d54620f483cc9b3b30ac46aa71d80827f4520efad73084d07e7741311413b4b596730b5bef37428e2e066ac9e
+EBUILD moodle-3.4.7.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+EBUILD moodle-3.5.4.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+EBUILD moodle-3.6.2.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.1.15.ebuild b/www-apps/moodle/moodle-3.1.16.ebuild
index 13576b6f03f7..b96de5d5680f 100644
--- a/www-apps/moodle/moodle-3.1.15.ebuild
+++ b/www-apps/moodle/moodle-3.1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/www-apps/moodle/moodle-3.3.9.ebuild b/www-apps/moodle/moodle-3.3.9.ebuild
deleted file mode 100644
index e7b7c22a19e2..000000000000
--- a/www-apps/moodle/moodle-3.3.9.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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-5.6.5[${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
-}
diff --git a/www-apps/moodle/moodle-3.6.1.ebuild b/www-apps/moodle/moodle-3.4.7.ebuild
index dea9710e1e62..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.6.1.ebuild
+++ b/www-apps/moodle/moodle-3.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/moodle/moodle-3.4.6.ebuild b/www-apps/moodle/moodle-3.5.4.ebuild
index dea9710e1e62..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.4.6.ebuild
+++ b/www-apps/moodle/moodle-3.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/moodle/moodle-3.5.3.ebuild b/www-apps/moodle/moodle-3.6.2.ebuild
index dea9710e1e62..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.5.3.ebuild
+++ b/www-apps/moodle/moodle-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"