1 |
commit: ec794c2b300d8fb3a1269820dc9b4f3442bfd7ce |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 24 21:14:23 2021 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 24 21:14:55 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec794c2b |
7 |
|
8 |
www-apps/moodle: bump to 3.9.7 and 3.10.4, drop older |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
www-apps/moodle/Manifest | 6 +- |
14 |
...oodle-3.10.3-r1.ebuild => moodle-3.10.4.ebuild} | 0 |
15 |
www-apps/moodle/moodle-3.5.18-r1.ebuild | 120 --------------------- |
16 |
www-apps/moodle/moodle-3.8.9-r1.ebuild | 120 --------------------- |
17 |
...{moodle-3.9.6-r1.ebuild => moodle-3.9.7.ebuild} | 0 |
18 |
5 files changed, 2 insertions(+), 244 deletions(-) |
19 |
|
20 |
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest |
21 |
index 2d14e2de188..63e6b7863ec 100644 |
22 |
--- a/www-apps/moodle/Manifest |
23 |
+++ b/www-apps/moodle/Manifest |
24 |
@@ -1,5 +1,3 @@ |
25 |
-DIST moodle-3.10.3.tgz 57483053 BLAKE2B a5129f45c4fdf101df7c96885a8c5cec7cad797a545d5a3fae621f5868cafcf3e9f1cdf06f16e689ccfe0e2bcab6fabd65a5fd45ef178f313176ca5e23350cd9 SHA512 934d42b6fc29c2c9ebcddf788c3e983c3bade77f5d2dbb28a612b17d263a67fd08c0f2a5983bbc1a87054d965cabc3c7257a940febec73f1df72bc7e586cd321 |
26 |
+DIST moodle-3.10.4.tgz 57525833 BLAKE2B c95ec10571d6841059f59f311e7d003b7b5d1b54f08c76bb90edc4efa9abda96b826064e80d5ec86bbdb9299148d8b261bd6183b49d47e69a586165e759da962 SHA512 c524f1940f9b0631f3cd53d1a8f1c43ac05e98e9293ffac649603b9665f3ac78db96152d23b3f8350ebd9ab6264bd544fbf69c164f93d9374a2f0f81af075660 |
27 |
DIST moodle-3.11.tgz 59365522 BLAKE2B f9a2f77dd851efd740b924e51de6b882955101834ca4201bf2fd243ddd8dbe403d1054dcebb5c3022e941fe9f7d119b285d6e955cdb871288cb3b0e40eb9de07 SHA512 69509d57990bf9cca7a262b78f6beb0d90d89e5d93018fd306f662d32303dd39cc0a14b2eee0d58e8f420766cf0acbeeaf6e1f7d43de6b99d0999747b438ee5a |
28 |
-DIST moodle-3.5.18.tgz 46812954 BLAKE2B fc13835e9d40236b2d572f344870999cd9ea60d11a043428acacc34362fbf114c2253083a6165dc800bca9c5cbb9cefeb4f7f76111a880348bf7b0988cdda8c7 SHA512 8336ba4dd638410e0697e1ee0c9715f166d934ae1325079e5b14e6e7959e32426103bb1af1e1e80ced3764e5c49ccea254de590f729762e417b21dab3f1b849c |
29 |
-DIST moodle-3.8.9.tgz 53320016 BLAKE2B 5c0c54f5a57eea97c591d75088fe89e8e12df1e233f99c7025fb4e3720a27aa8133ccd25b25876faf2335497827ca748579607dbb2d52c01043fd59854f6dba4 SHA512 ec0bc22d82ae2afb69d491df75011568dba771cc2cbab988dbfe9bc1c4daa6d5e947ca8b9d71acabecd9c57d25202d79321abf1cdda6908ad32511db6c107289 |
30 |
-DIST moodle-3.9.6.tgz 57105713 BLAKE2B 26b5334eda2fac641020459b8471db692f7202acc62b72e11a43fdb3893dadcf2150af7c82659c408ab9ee4660b766498c2c3005f8b43ed980ecefd60263e581 SHA512 0c66070f9cf422a6ed11ac6ff067aba294bc7f4d4b5a17f729c4e4fbb060b59ee232a4a87996557afaa7c6646bfcc3c14736ff4cb18b20a8a31386cc40a61d7f |
31 |
+DIST moodle-3.9.7.tgz 57157463 BLAKE2B 359d93fdfe62e1470fd7036d2c1d778ce7643c90e70e48a70033bf341833616b8909e6b36d54ddd8f63d38239bfffb709b6fdb50800440c9fc86329132e54f6f SHA512 71caf4408237ae59a5c70be7cbcc245580ed8eb382f03fb4d5284d946f1190fc48aa6562486fa9538c374b760fd05a0bdb95cac5ae182e7787d2e379e51caad6 |
32 |
|
33 |
diff --git a/www-apps/moodle/moodle-3.10.3-r1.ebuild b/www-apps/moodle/moodle-3.10.4.ebuild |
34 |
similarity index 100% |
35 |
rename from www-apps/moodle/moodle-3.10.3-r1.ebuild |
36 |
rename to www-apps/moodle/moodle-3.10.4.ebuild |
37 |
|
38 |
diff --git a/www-apps/moodle/moodle-3.5.18-r1.ebuild b/www-apps/moodle/moodle-3.5.18-r1.ebuild |
39 |
deleted file mode 100644 |
40 |
index 0e98b0c6fc9..00000000000 |
41 |
--- a/www-apps/moodle/moodle-3.5.18-r1.ebuild |
42 |
+++ /dev/null |
43 |
@@ -1,120 +0,0 @@ |
44 |
-# Copyright 1999-2021 Gentoo Authors |
45 |
-# Distributed under the terms of the GNU General Public License v2 |
46 |
- |
47 |
-EAPI="7" |
48 |
- |
49 |
-inherit webapp |
50 |
- |
51 |
-MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)" |
52 |
- |
53 |
-DESCRIPTION="The Moodle Course Management System" |
54 |
-HOMEPAGE="https://moodle.org" |
55 |
-SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz" |
56 |
-S="${WORKDIR}/${PN}" |
57 |
- |
58 |
-LICENSE="GPL-3+" |
59 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
60 |
-#SLOT empty due to webapp |
61 |
- |
62 |
-DB_FLAGS="mysqli?,mssql?,postgres?" |
63 |
-DB_TYPES=${DB_FLAGS//\?/} |
64 |
-DB_TYPES=${DB_TYPES//,/ } |
65 |
- |
66 |
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?" |
67 |
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/} |
68 |
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ } |
69 |
- |
70 |
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json(+),session,simplexml,xml,zip" |
71 |
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc" |
72 |
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}" |
73 |
- |
74 |
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts" |
75 |
- |
76 |
-# No forced dependency on |
77 |
-# mssql? - lives on a windows server |
78 |
-# mysql? ( virtual/mysql ) |
79 |
-# postgres? ( dev-db/postgresql-server-9* ) |
80 |
-# which may live on another server. These USE flags affect the configuration |
81 |
-# file and the dependency on php. However other dbs are possible. See config.php |
82 |
-# and the moodle documentation for other possibilities. |
83 |
-DEPEND="" |
84 |
-RDEPEND=" |
85 |
- >=dev-lang/php-7.0[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}] |
86 |
- virtual/httpd-php |
87 |
- virtual/cron" |
88 |
- |
89 |
-pkg_setup() { |
90 |
- webapp_pkg_setup |
91 |
- |
92 |
- # How many dbs were selected? If one and only one, which one is it? |
93 |
- MYDB="" |
94 |
- DB_COUNT=0 |
95 |
- for db in ${DB_TYPES}; do |
96 |
- if use ${db}; then |
97 |
- MYDB=${db} |
98 |
- DB_COUNT=$(($DB_COUNT+1)) |
99 |
- fi |
100 |
- done |
101 |
- |
102 |
- if [[ ${DB_COUNT} -eq 0 ]]; then |
103 |
- eerror |
104 |
- eerror "No database selected in your USE flags," |
105 |
- eerror "You must select at least one." |
106 |
- eerror |
107 |
- die |
108 |
- fi |
109 |
- |
110 |
- if [[ ${DB_COUNT} -gt 1 ]]; then |
111 |
- MYDB="" |
112 |
- ewarn |
113 |
- ewarn "Multiple databases selected in your USE flags," |
114 |
- ewarn "You will have to choose your database manually." |
115 |
- ewarn |
116 |
- fi |
117 |
-} |
118 |
- |
119 |
-src_prepare() { |
120 |
- rm COPYING.txt |
121 |
- cp "${FILESDIR}"/config-r1.php config.php |
122 |
- |
123 |
- # Moodle expect pgsql, not postgres |
124 |
- MYDB=${MYDB/postgres/pgsql} |
125 |
- |
126 |
- if [[ ${DB_COUNT} -eq 1 ]] ; then |
127 |
- sed -i -e "s|mydb|${MYDB}|" config.php |
128 |
- fi |
129 |
- |
130 |
- eapply_user |
131 |
-} |
132 |
- |
133 |
-src_install() { |
134 |
- webapp_src_preinst |
135 |
- |
136 |
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle |
137 |
- dodir ${MOODLEDATA} |
138 |
- webapp_serverowned -R "${MOODLEDATA}" |
139 |
- |
140 |
- local MOODLEROOT="${MY_HTDOCSDIR}" |
141 |
- insinto ${MOODLEROOT} |
142 |
- doins -r * |
143 |
- |
144 |
- webapp_configfile "${MOODLEROOT}"/config.php |
145 |
- |
146 |
- if [[ ${DB_COUNT} -eq 1 ]]; then |
147 |
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt |
148 |
- else |
149 |
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt |
150 |
- fi |
151 |
- |
152 |
- webapp_src_install |
153 |
-} |
154 |
- |
155 |
-pkg_postinst() { |
156 |
- einfo |
157 |
- einfo |
158 |
- einfo "To see the post install instructions, do" |
159 |
- einfo |
160 |
- einfo " webapp-config --show-postinst ${PN} ${PVR}" |
161 |
- einfo |
162 |
- einfo |
163 |
-} |
164 |
|
165 |
diff --git a/www-apps/moodle/moodle-3.8.9-r1.ebuild b/www-apps/moodle/moodle-3.8.9-r1.ebuild |
166 |
deleted file mode 100644 |
167 |
index 8b7fe571d39..00000000000 |
168 |
--- a/www-apps/moodle/moodle-3.8.9-r1.ebuild |
169 |
+++ /dev/null |
170 |
@@ -1,120 +0,0 @@ |
171 |
-# Copyright 1999-2021 Gentoo Authors |
172 |
-# Distributed under the terms of the GNU General Public License v2 |
173 |
- |
174 |
-EAPI="7" |
175 |
- |
176 |
-inherit webapp |
177 |
- |
178 |
-MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)" |
179 |
- |
180 |
-DESCRIPTION="The Moodle Course Management System" |
181 |
-HOMEPAGE="https://moodle.org" |
182 |
-SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz" |
183 |
-S="${WORKDIR}/${PN}" |
184 |
- |
185 |
-LICENSE="GPL-3+" |
186 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
187 |
-#SLOT empty due to webapp |
188 |
- |
189 |
-DB_FLAGS="mysqli?,mssql?,postgres?" |
190 |
-DB_TYPES=${DB_FLAGS//\?/} |
191 |
-DB_TYPES=${DB_TYPES//,/ } |
192 |
- |
193 |
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?" |
194 |
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/} |
195 |
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ } |
196 |
- |
197 |
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json(+),session,simplexml,xml,zip" |
198 |
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc" |
199 |
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}" |
200 |
- |
201 |
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts" |
202 |
- |
203 |
-# No forced dependency on |
204 |
-# mssql? - lives on a windows server |
205 |
-# mysql? ( virtual/mysql ) |
206 |
-# postgres? ( dev-db/postgresql-server-9* ) |
207 |
-# which may live on another server. These USE flags affect the configuration |
208 |
-# file and the dependency on php. However other dbs are possible. See config.php |
209 |
-# and the moodle documentation for other possibilities. |
210 |
-DEPEND="" |
211 |
-RDEPEND=" |
212 |
- >=dev-lang/php-7.1[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}] |
213 |
- virtual/httpd-php |
214 |
- virtual/cron" |
215 |
- |
216 |
-pkg_setup() { |
217 |
- webapp_pkg_setup |
218 |
- |
219 |
- # How many dbs were selected? If one and only one, which one is it? |
220 |
- MYDB="" |
221 |
- DB_COUNT=0 |
222 |
- for db in ${DB_TYPES}; do |
223 |
- if use ${db}; then |
224 |
- MYDB=${db} |
225 |
- DB_COUNT=$(($DB_COUNT+1)) |
226 |
- fi |
227 |
- done |
228 |
- |
229 |
- if [[ ${DB_COUNT} -eq 0 ]]; then |
230 |
- eerror |
231 |
- eerror "No database selected in your USE flags," |
232 |
- eerror "You must select at least one." |
233 |
- eerror |
234 |
- die |
235 |
- fi |
236 |
- |
237 |
- if [[ ${DB_COUNT} -gt 1 ]]; then |
238 |
- MYDB="" |
239 |
- ewarn |
240 |
- ewarn "Multiple databases selected in your USE flags," |
241 |
- ewarn "You will have to choose your database manually." |
242 |
- ewarn |
243 |
- fi |
244 |
-} |
245 |
- |
246 |
-src_prepare() { |
247 |
- rm COPYING.txt |
248 |
- cp "${FILESDIR}"/config-r1.php config.php |
249 |
- |
250 |
- # Moodle expect pgsql, not postgres |
251 |
- MYDB=${MYDB/postgres/pgsql} |
252 |
- |
253 |
- if [[ ${DB_COUNT} -eq 1 ]] ; then |
254 |
- sed -i -e "s|mydb|${MYDB}|" config.php |
255 |
- fi |
256 |
- |
257 |
- eapply_user |
258 |
-} |
259 |
- |
260 |
-src_install() { |
261 |
- webapp_src_preinst |
262 |
- |
263 |
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle |
264 |
- dodir ${MOODLEDATA} |
265 |
- webapp_serverowned -R "${MOODLEDATA}" |
266 |
- |
267 |
- local MOODLEROOT="${MY_HTDOCSDIR}" |
268 |
- insinto ${MOODLEROOT} |
269 |
- doins -r * |
270 |
- |
271 |
- webapp_configfile "${MOODLEROOT}"/config.php |
272 |
- |
273 |
- if [[ ${DB_COUNT} -eq 1 ]]; then |
274 |
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt |
275 |
- else |
276 |
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt |
277 |
- fi |
278 |
- |
279 |
- webapp_src_install |
280 |
-} |
281 |
- |
282 |
-pkg_postinst() { |
283 |
- einfo |
284 |
- einfo |
285 |
- einfo "To see the post install instructions, do" |
286 |
- einfo |
287 |
- einfo " webapp-config --show-postinst ${PN} ${PVR}" |
288 |
- einfo |
289 |
- einfo |
290 |
-} |
291 |
|
292 |
diff --git a/www-apps/moodle/moodle-3.9.6-r1.ebuild b/www-apps/moodle/moodle-3.9.7.ebuild |
293 |
similarity index 100% |
294 |
rename from www-apps/moodle/moodle-3.9.6-r1.ebuild |
295 |
rename to www-apps/moodle/moodle-3.9.7.ebuild |