1 |
commit: 0c172006fa4df0a9b35bed388213211b722d9383 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 14 14:17:31 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 14 14:17:52 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c172006 |
7 |
|
8 |
www-apps/moodle: bump to 3.1.16, 3.4.7, 3.5.4, 3.6.2 |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
www-apps/moodle/Manifest | 9 +- |
14 |
.../{moodle-3.1.15.ebuild => moodle-3.1.16.ebuild} | 2 +- |
15 |
www-apps/moodle/moodle-3.3.9.ebuild | 123 --------------------- |
16 |
.../{moodle-3.5.3.ebuild => moodle-3.4.7.ebuild} | 2 +- |
17 |
.../{moodle-3.6.1.ebuild => moodle-3.5.4.ebuild} | 2 +- |
18 |
.../{moodle-3.4.6.ebuild => moodle-3.6.2.ebuild} | 2 +- |
19 |
6 files changed, 8 insertions(+), 132 deletions(-) |
20 |
|
21 |
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest |
22 |
index 0f54d954082..bce00339cf2 100644 |
23 |
--- a/www-apps/moodle/Manifest |
24 |
+++ b/www-apps/moodle/Manifest |
25 |
@@ -1,5 +1,4 @@ |
26 |
-DIST moodle-3.1.15.tgz 38055035 BLAKE2B d55f523fce2f7193330665132b4d7faf6a7a698ca8f297d7e2dbc03e859ed43aef34292666e931e6c86aee2f414097accfd8ece7f5ecf53a8439697fdb28ba31 SHA512 17100ad6caa3a7ca5dc8f09b12215700061ead3a30701985e89d39e1e063d6142391c01c2dc0d1c7f4b86bd80b8d1ccc1d0477389691d6545b3be590b0508912 |
27 |
-DIST moodle-3.3.9.tgz 45123816 BLAKE2B 0e23668fb6ac536a1a87067fc9574424c33934402184ffc6f25f48f7e87c70fb0d9b25bb12b46320d54968ddb8b337471be7b5795369585ce4c488f93168f6d9 SHA512 6150a4c0f4a85ac508d2da9b35fd506eca614c3a44d582096fdecd113899a72481507ce85101505570e0e8237f7af744e3d7a8cf990cf8b250f5ac335ebae1de |
28 |
-DIST moodle-3.4.6.tgz 45961570 BLAKE2B 49a20412b386cc3f463dd3be58dc56f50821298d36109889b3eb092d39f4dfe477dfbbf1ea3f1b6ce8076b4d4dca21efc00e7d772b0ced395139d76e56759482 SHA512 2afa7facb2068c63d0a1bd42da40a1cb688a1bcdedc5287e59633bb085f96c65598396f03b99b35c9aa3769463dea316584ce3793978101989fc53f53140ff04 |
29 |
-DIST moodle-3.5.3.tgz 46645219 BLAKE2B bd1aa2ae73f807c3b8a0e341893c7b004761e147fe42eac615153ae1ee7fa4bf9268e160a14ab1ac62dfe2c5e462d042cb30b725d6a28844e4749492b6a9b193 SHA512 130d1c30acb78452021f4fd5c0d29bfc4c938993e7d0cf3b2fdf13061fa993f9cebc7214f287e62ceb13bfd5999c12132a45fd4aec5efe8c25078dfe97bee861 |
30 |
-DIST moodle-3.6.1.tgz 47660920 BLAKE2B 3dba1adb2a2c9926a0efb1942df4239a020c2c2d661a6a2a6825acc70b6e7aab69afb4f0f297cd316fd5f693ab711cccea8bc5c68fa1b72288297b8d00791088 SHA512 79cf5127748e6511101b9f802165eefbe6dafbe89806e8616902765d14481af0b6ba06757be5fecd343bda7dde261c58018f940254549decc66452415a99ab9d |
31 |
+DIST moodle-3.1.16.tgz 38057145 BLAKE2B 09995a5ff87069e47b891e0e19a038d10af820d37b756803ceb2dcebad9a04a827a5b2548a3dd205d07eb4d9e116a15a12fa3d6832e524dde76450b5170e979a SHA512 46ed0cd702e86529dda32b128604acc7c6bc13530bb3acab402d5c36f59a55dd35e0ffaa827aef85f7e75b0b9939514f868c0dc8ddc1b5f8aa49637acdf89c5c |
32 |
+DIST moodle-3.4.7.tgz 46051440 BLAKE2B 2b6a2eb7c071da56236a0a8d08b944fa9f5028bf9f22de259302885804cbb7e3e5bc5f1e18524a183fea362c8809ee38590dfcd836bef9de976fd7ab89b2fbdd SHA512 6819a20cd477b37744786793b74dcf258098640e453345cc940fae02789cca31b43730dc421715be411ce77ef23fa876189a2c481efb5e643282355b4fdf043b |
33 |
+DIST moodle-3.5.4.tgz 46648296 BLAKE2B 2ed589f46061beb81e558b96461729aafe0624237c99b2e306c57da04ca6bff709d8377012bcfbb73a9a03dabf12dfa5d2a21e47139702b067f3fde0b99794f8 SHA512 03d0821f0863ed360129f00dda834618ae6b5dbb5794ee1a993eaaecbbac4dae8e6085f83cd86674bd93104a17229cb662db57a5500c3eff09f1480fbef9772d |
34 |
+DIST moodle-3.6.2.tgz 47673889 BLAKE2B f81844f933ec3bc2ebd92957d16a9e59c43678b9ee548767bfacc443a68f574792c641787722cad8fe3007fd0c8d279ac097c361843089441bbe21b4af5b7492 SHA512 30e48e6fff788294db83d7889e32caf12fa07459dbd61a5cb0495f3c5b6bc005e41faee447a0cd6441e5120dbd04ee02056425c67a118755d45bc29e32867d74 |
35 |
|
36 |
diff --git a/www-apps/moodle/moodle-3.1.15.ebuild b/www-apps/moodle/moodle-3.1.16.ebuild |
37 |
similarity index 98% |
38 |
rename from www-apps/moodle/moodle-3.1.15.ebuild |
39 |
rename to www-apps/moodle/moodle-3.1.16.ebuild |
40 |
index 13576b6f03f..b96de5d5680 100644 |
41 |
--- a/www-apps/moodle/moodle-3.1.15.ebuild |
42 |
+++ b/www-apps/moodle/moodle-3.1.16.ebuild |
43 |
@@ -1,4 +1,4 @@ |
44 |
-# Copyright 1999-2018 Gentoo Authors |
45 |
+# Copyright 1999-2019 Gentoo Authors |
46 |
# Distributed under the terms of the GNU General Public License v2 |
47 |
|
48 |
EAPI="5" |
49 |
|
50 |
diff --git a/www-apps/moodle/moodle-3.3.9.ebuild b/www-apps/moodle/moodle-3.3.9.ebuild |
51 |
deleted file mode 100644 |
52 |
index e7b7c22a19e..00000000000 |
53 |
--- a/www-apps/moodle/moodle-3.3.9.ebuild |
54 |
+++ /dev/null |
55 |
@@ -1,123 +0,0 @@ |
56 |
-# Copyright 1999-2018 Gentoo Authors |
57 |
-# Distributed under the terms of the GNU General Public License v2 |
58 |
- |
59 |
-EAPI="6" |
60 |
- |
61 |
-inherit versionator webapp |
62 |
- |
63 |
-AVC=( $(get_version_components) ) |
64 |
-MY_BRANCH="stable${AVC[0]}${AVC[1]}" |
65 |
- |
66 |
-DESCRIPTION="The Moodle Course Management System" |
67 |
-HOMEPAGE="https://moodle.org" |
68 |
-SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz" |
69 |
-S="${WORKDIR}/${PN}" |
70 |
- |
71 |
-LICENSE="GPL-2" |
72 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
73 |
-#SLOT empty due to webapp |
74 |
- |
75 |
-DB_FLAGS="mysqli?,mssql?,postgres?" |
76 |
-DB_TYPES=${DB_FLAGS//\?/} |
77 |
-DB_TYPES=${DB_TYPES//,/ } |
78 |
- |
79 |
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?" |
80 |
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/} |
81 |
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ } |
82 |
- |
83 |
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip" |
84 |
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc" |
85 |
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}" |
86 |
- |
87 |
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts" |
88 |
-REQUIRED_USE="|| ( ${DB_TYPES} )" |
89 |
- |
90 |
-# No forced dependency on |
91 |
-# mssql? - lives on a windows server |
92 |
-# mysql? ( virtual/mysql ) |
93 |
-# postgres? ( dev-db/postgresql-server-9* ) |
94 |
-# which may live on another server. These USE flags affect the configuration |
95 |
-# file and the dependency on php. However other dbs are possible. See config.php |
96 |
-# and the moodle documentation for other possibilities. |
97 |
-DEPEND="" |
98 |
-RDEPEND=" |
99 |
- >=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}] |
100 |
- virtual/httpd-php |
101 |
- virtual/cron" |
102 |
- |
103 |
-pkg_setup() { |
104 |
- webapp_pkg_setup |
105 |
- |
106 |
- # How many dbs were selected? If one and only one, which one is it? |
107 |
- MYDB="" |
108 |
- DB_COUNT=0 |
109 |
- for db in ${DB_TYPES}; do |
110 |
- if use ${db}; then |
111 |
- MYDB=${db} |
112 |
- DB_COUNT=$(($DB_COUNT+1)) |
113 |
- fi |
114 |
- done |
115 |
- |
116 |
- # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero |
117 |
- #if [[ ${DB_COUNT} -eq 0 ]]; then |
118 |
- # eerror |
119 |
- # eerror "No database selected in your USE flags," |
120 |
- # eerror "You must select at least one." |
121 |
- # eerror |
122 |
- # die |
123 |
- #fi |
124 |
- |
125 |
- if [[ ${DB_COUNT} -gt 1 ]]; then |
126 |
- MYDB="" |
127 |
- ewarn |
128 |
- ewarn "Multiple databases selected in your USE flags," |
129 |
- ewarn "You will have to choose your database manually." |
130 |
- ewarn |
131 |
- fi |
132 |
-} |
133 |
- |
134 |
-src_prepare() { |
135 |
- rm COPYING.txt |
136 |
- cp "${FILESDIR}"/config-r1.php config.php |
137 |
- |
138 |
- # Moodle expect pgsql, not postgres |
139 |
- MYDB=${MYDB/postgres/pgsql} |
140 |
- |
141 |
- if [[ ${DB_COUNT} -eq 1 ]] ; then |
142 |
- sed -i -e "s|mydb|${MYDB}|" config.php |
143 |
- fi |
144 |
- |
145 |
- eapply_user |
146 |
-} |
147 |
- |
148 |
-src_install() { |
149 |
- webapp_src_preinst |
150 |
- |
151 |
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle |
152 |
- dodir ${MOODLEDATA} |
153 |
- webapp_serverowned -R "${MOODLEDATA}" |
154 |
- |
155 |
- local MOODLEROOT="${MY_HTDOCSDIR}" |
156 |
- insinto ${MOODLEROOT} |
157 |
- doins -r * |
158 |
- |
159 |
- webapp_configfile "${MOODLEROOT}"/config.php |
160 |
- |
161 |
- if [[ ${DB_COUNT} -eq 1 ]]; then |
162 |
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt |
163 |
- else |
164 |
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt |
165 |
- fi |
166 |
- |
167 |
- webapp_src_install |
168 |
-} |
169 |
- |
170 |
-pkg_postinst() { |
171 |
- einfo |
172 |
- einfo |
173 |
- einfo "To see the post install instructions, do" |
174 |
- einfo |
175 |
- einfo " webapp-config --show-postinst ${PN} ${PVR}" |
176 |
- einfo |
177 |
- einfo |
178 |
-} |
179 |
|
180 |
diff --git a/www-apps/moodle/moodle-3.5.3.ebuild b/www-apps/moodle/moodle-3.4.7.ebuild |
181 |
similarity index 98% |
182 |
rename from www-apps/moodle/moodle-3.5.3.ebuild |
183 |
rename to www-apps/moodle/moodle-3.4.7.ebuild |
184 |
index dea9710e1e6..1c5e865ec67 100644 |
185 |
--- a/www-apps/moodle/moodle-3.5.3.ebuild |
186 |
+++ b/www-apps/moodle/moodle-3.4.7.ebuild |
187 |
@@ -1,4 +1,4 @@ |
188 |
-# Copyright 1999-2018 Gentoo Authors |
189 |
+# Copyright 1999-2019 Gentoo Authors |
190 |
# Distributed under the terms of the GNU General Public License v2 |
191 |
|
192 |
EAPI="6" |
193 |
|
194 |
diff --git a/www-apps/moodle/moodle-3.6.1.ebuild b/www-apps/moodle/moodle-3.5.4.ebuild |
195 |
similarity index 98% |
196 |
rename from www-apps/moodle/moodle-3.6.1.ebuild |
197 |
rename to www-apps/moodle/moodle-3.5.4.ebuild |
198 |
index dea9710e1e6..1c5e865ec67 100644 |
199 |
--- a/www-apps/moodle/moodle-3.6.1.ebuild |
200 |
+++ b/www-apps/moodle/moodle-3.5.4.ebuild |
201 |
@@ -1,4 +1,4 @@ |
202 |
-# Copyright 1999-2018 Gentoo Authors |
203 |
+# Copyright 1999-2019 Gentoo Authors |
204 |
# Distributed under the terms of the GNU General Public License v2 |
205 |
|
206 |
EAPI="6" |
207 |
|
208 |
diff --git a/www-apps/moodle/moodle-3.4.6.ebuild b/www-apps/moodle/moodle-3.6.2.ebuild |
209 |
similarity index 98% |
210 |
rename from www-apps/moodle/moodle-3.4.6.ebuild |
211 |
rename to www-apps/moodle/moodle-3.6.2.ebuild |
212 |
index dea9710e1e6..1c5e865ec67 100644 |
213 |
--- a/www-apps/moodle/moodle-3.4.6.ebuild |
214 |
+++ b/www-apps/moodle/moodle-3.6.2.ebuild |
215 |
@@ -1,4 +1,4 @@ |
216 |
-# Copyright 1999-2018 Gentoo Authors |
217 |
+# Copyright 1999-2019 Gentoo Authors |
218 |
# Distributed under the terms of the GNU General Public License v2 |
219 |
|
220 |
EAPI="6" |