From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF7CB138334 for ; Mon, 13 May 2019 13:35:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC6DDE089A; Mon, 13 May 2019 13:35:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADCAEE089A for ; Mon, 13 May 2019 13:35:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D8B93441EA for ; Mon, 13 May 2019 13:35:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0360C503 for ; Mon, 13 May 2019 13:35:34 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1557754528.34af7337bdf2251dc132b1a42b8e3ecc0e5480a5.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/moodle/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/moodle/Manifest www-apps/moodle/moodle-3.1.17.ebuild www-apps/moodle/moodle-3.4.8.ebuild www-apps/moodle/moodle-3.5.5.ebuild www-apps/moodle/moodle-3.5.6.ebuild www-apps/moodle/moodle-3.6.3.ebuild www-apps/moodle/moodle-3.6.4.ebuild X-VCS-Directories: www-apps/moodle/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 34af7337bdf2251dc132b1a42b8e3ecc0e5480a5 X-VCS-Branch: master Date: Mon, 13 May 2019 13:35:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 46977b82-7bce-4f8b-83d1-42ee3719d1f7 X-Archives-Hash: 7ca2c521a87fbfe42eb3cbc5c808eb38 commit: 34af7337bdf2251dc132b1a42b8e3ecc0e5480a5 Author: Anthony G. Basile gentoo org> AuthorDate: Mon May 13 13:35:13 2019 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon May 13 13:35:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34af7337 www-apps/moodle: bump to 3.5.6 and 3.6.4, remove unsupported Signed-off-by: Anthony G. Basile gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 www-apps/moodle/Manifest | 6 +- www-apps/moodle/moodle-3.1.17.ebuild | 121 -------------------- .../{moodle-3.4.8.ebuild => moodle-3.5.6.ebuild} | 0 www-apps/moodle/moodle-3.6.3.ebuild | 123 --------------------- .../{moodle-3.5.5.ebuild => moodle-3.6.4.ebuild} | 0 5 files changed, 2 insertions(+), 248 deletions(-) diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest index bae1a673daf..5efb32e5aef 100644 --- a/www-apps/moodle/Manifest +++ b/www-apps/moodle/Manifest @@ -1,4 +1,2 @@ -DIST moodle-3.1.17.tgz 38056353 BLAKE2B 4192ff89f745a465c8fbbc3979e2359471c31240be8baa3be452da99377f3200292a359fc9b524994bccec3534056042adc2ff33f7423fbf59999c6b7c41138a SHA512 2f93b091600c9ad91e6e4f2ef5e246c442081333ecdbc1b4a26f9bea95bbc8e12fae05f484c04dd1330140be086681acde4f18ae45153c8c91d33798c7588ebd -DIST moodle-3.4.8.tgz 46052218 BLAKE2B ac7b0aab7212a2c6af3ae8ecc4f90dc30163f47c0cb6dfdffc719b50211132a8c75b77141aa6da97abda2c1456ee685562d37de47f3c7ad9efdfe4a622d9922f SHA512 e16c818c0cdb778af0364997410545bbbcc78b45015806306e0241b32d7a3e23564e3afe47cc13cb55e7a12418012583f985633700bedfe0c210127de3aa2ac5 -DIST moodle-3.5.5.tgz 46684330 BLAKE2B 00df00e62c922211f010ae38a759e33f250e74028dd66cf51690debd3c43a2afe5200e320dc0d258a8624784fce8436cd20923ccaacb01f3190f6b67bad10e0f SHA512 9e3fa3551e1cdfef0b2b31421ca625fcf38f90a2121c05247b60987da81cc9a44cc0fbc5d35ee6d7b91fb81317c2b9b0c3ef76988f656e67008f73331004167a -DIST moodle-3.6.3.tgz 47707084 BLAKE2B 5bdfca625fe4c96a700524fcaaa36719712b32f37f2ecc4038116accb82ba48438fd8683f0feb67af323567daad32c6a0e8714b648f24d10c304b5ad6f93aca8 SHA512 9a583064321ee0929e3df2b194c783dd5322b6d6e7642fdbf9d18cc511b82f73e8007e234998ea2553cb8147dc22fa4d178f2104c6eb2ebc322a9850afba19c5 +DIST moodle-3.5.6.tgz 46703461 BLAKE2B edd438ffd4f1def04f9619150d8ef486323a5e9f458124d317d36e01eb79e2d0ed0039d8dba43a3956aafc8e92c8d2276b6be730607031ba0e561b62a24488ef SHA512 0a08359576665f78d2370d3f2796dd53cba692c5fe68de7cdf8478bb1f24136c4e78149fa6a3c37118015fdf7a401c50913d151b4b38d9928989255688df73f3 +DIST moodle-3.6.4.tgz 47736743 BLAKE2B b3a41b0025651e161a1ee76ec1c121666e8dd0d830a05165b6c4419dff3caccb5fd006434f5e8284b81bd892a1c184d8a008e2b948d3b63c472f31cca55dc77e SHA512 b3b3b138f8a2779dc41f25656a5f2640afa2f3b933d9e2f99065e176d1f5b6c9c4f8bdf8af53af04957eb520043e1c7c53ff6309896e399f4a012f624481ae44 diff --git a/www-apps/moodle/moodle-3.1.17.ebuild b/www-apps/moodle/moodle-3.1.17.ebuild deleted file mode 100644 index b96de5d5680..00000000000 --- a/www-apps/moodle/moodle-3.1.17.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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.4.4[${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 -} - -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.4.8.ebuild b/www-apps/moodle/moodle-3.5.6.ebuild similarity index 100% rename from www-apps/moodle/moodle-3.4.8.ebuild rename to www-apps/moodle/moodle-3.5.6.ebuild diff --git a/www-apps/moodle/moodle-3.6.3.ebuild b/www-apps/moodle/moodle-3.6.3.ebuild deleted file mode 100644 index 1c5e865ec67..00000000000 --- a/www-apps/moodle/moodle-3.6.3.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2019 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-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 -} diff --git a/www-apps/moodle/moodle-3.5.5.ebuild b/www-apps/moodle/moodle-3.6.4.ebuild similarity index 100% rename from www-apps/moodle/moodle-3.5.5.ebuild rename to www-apps/moodle/moodle-3.6.4.ebuild