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 47BD3138334 for ; Tue, 10 Jul 2018 18:18:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9486E0839; Tue, 10 Jul 2018 18:18:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 59D83E0839 for ; Tue, 10 Jul 2018 18:18:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 999B4335C99 for ; Tue, 10 Jul 2018 18:18:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 815432E3 for ; Tue, 10 Jul 2018 18:18:32 +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: <1531246662.daae04a15c88a7fb8997cf7c21f66d7a1e379c7f.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.12.ebuild www-apps/moodle/moodle-3.1.13.ebuild www-apps/moodle/moodle-3.2.9.ebuild www-apps/moodle/moodle-3.3.6.ebuild www-apps/moodle/moodle-3.3.7.ebuild www-apps/moodle/moodle-3.4.3.ebuild www-apps/moodle/moodle-3.4.4.ebuild www-apps/moodle/moodle-3.5.1.ebuild www-apps/moodle/moodle-3.5.ebuild X-VCS-Directories: www-apps/moodle/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: daae04a15c88a7fb8997cf7c21f66d7a1e379c7f X-VCS-Branch: master Date: Tue, 10 Jul 2018 18:18:32 +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-Archives-Salt: 9ddc931c-67af-4920-bf4f-f0384f40904e X-Archives-Hash: 74b1a967952fb4b3d0ed881c4d03129b commit: daae04a15c88a7fb8997cf7c21f66d7a1e379c7f Author: Anthony G. Basile gentoo org> AuthorDate: Tue Jul 10 18:17:42 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Jul 10 18:17:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daae04a1 www-apps/moodle: version bumps to 3.1.13, 3.3.7, 3.4.4, 3.5.1 Package-Manager: Portage-2.3.40, Repoman-2.3.9 www-apps/moodle/Manifest | 9 +- .../{moodle-3.1.12.ebuild => moodle-3.1.13.ebuild} | 0 www-apps/moodle/moodle-3.2.9.ebuild | 121 --------------------- .../{moodle-3.3.6.ebuild => moodle-3.3.7.ebuild} | 0 .../{moodle-3.4.3.ebuild => moodle-3.4.4.ebuild} | 0 .../{moodle-3.5.ebuild => moodle-3.5.1.ebuild} | 0 6 files changed, 4 insertions(+), 126 deletions(-) diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest index 19bcffc0097..11ce46b5536 100644 --- a/www-apps/moodle/Manifest +++ b/www-apps/moodle/Manifest @@ -1,5 +1,4 @@ -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 +DIST moodle-3.1.13.tgz 38042777 BLAKE2B 5454680057c83792340d553da198a0e4a607129cb951b0f00d298ff3838ddca4b3681d9d9d96f6f954c31df16aa47c80a564c56a7b4f271cff97cb8aaf1eb3d2 SHA512 f969842b7067ee24b34d4328f728da75ab8518916b2562f337405c34f3756e2b53f2710aab6e6623b3cd3487594116f3c0b85e33320d32361eb253801f347393 +DIST moodle-3.3.7.tgz 44868352 BLAKE2B efb6ff909996d58df055db437df02029246df7239649f728283c7a50a5a085e7c8902a2935f06baab09b8675ce6d5b399007c6dea737539d47e24465211c78d2 SHA512 b6844b4a4f13263cc56dd94137beb1ab314f3cbf6549061c4c48227710e6be4c838562651a41ed161f5ebebd611bfc7b3c29af49cf2501d0e568c5ae20e88867 +DIST moodle-3.4.4.tgz 45538017 BLAKE2B 720b9b26ae5140a975619ce638050f60ba4ae77e0a9370d2843d3d15b1c882019dfc0187d570f440e9d4f7261d29fa5b1853086270bca2ed0b5e980e14bcf12e SHA512 14af33e41276c070faf6b4ae38915826dd3c80ef9f248a8d00bcabaeb32740383939c9097d8ae1ceabf4f86e27d70548fa7a9e5a75275384a2eb6c17670bda1a +DIST moodle-3.5.1.tgz 46387467 BLAKE2B cc05d51be7d8da8f3c3126c46094fe6c57f4c3f8664348e7e5d915cb5a297fe605b81422e226171edbf6bfc11cc9afaca9831fc9b24a7acf1893ab0cc9d7c9a8 SHA512 4e6dbf2140a40351ff3285e54f58f711d018f812a5885a3219d9e18abdc3232aeae71ac4bec9a26f78bbe8dbf78c121b6850c2254e9371dc34ed576e985eceb4 diff --git a/www-apps/moodle/moodle-3.1.12.ebuild b/www-apps/moodle/moodle-3.1.13.ebuild similarity index 100% rename from www-apps/moodle/moodle-3.1.12.ebuild rename to www-apps/moodle/moodle-3.1.13.ebuild diff --git a/www-apps/moodle/moodle-3.2.9.ebuild b/www-apps/moodle/moodle-3.2.9.ebuild deleted file mode 100644 index f3cbddcacb6..00000000000 --- a/www-apps/moodle/moodle-3.2.9.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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.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 -} - -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.3.6.ebuild b/www-apps/moodle/moodle-3.3.7.ebuild similarity index 100% rename from www-apps/moodle/moodle-3.3.6.ebuild rename to www-apps/moodle/moodle-3.3.7.ebuild diff --git a/www-apps/moodle/moodle-3.4.3.ebuild b/www-apps/moodle/moodle-3.4.4.ebuild similarity index 100% rename from www-apps/moodle/moodle-3.4.3.ebuild rename to www-apps/moodle/moodle-3.4.4.ebuild diff --git a/www-apps/moodle/moodle-3.5.ebuild b/www-apps/moodle/moodle-3.5.1.ebuild similarity index 100% rename from www-apps/moodle/moodle-3.5.ebuild rename to www-apps/moodle/moodle-3.5.1.ebuild