1 |
commit: bc7526794a5c9d0d3dc039a34a7153ba62c44ffc |
2 |
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 11 16:51:05 2020 +0000 |
4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 11 16:51:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc752679 |
7 |
|
8 |
www-servers/uwsgi: ebuilds cleanup fix #721528 #710582 |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org> |
12 |
|
13 |
www-servers/uwsgi/metadata.xml | 1 - |
14 |
www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild | 28 +- |
15 |
www-servers/uwsgi/uwsgi-2.0.17.1.ebuild | 408 ----------------------------- |
16 |
www-servers/uwsgi/uwsgi-2.0.17.ebuild | 28 +- |
17 |
www-servers/uwsgi/uwsgi-2.0.18.ebuild | 28 +- |
18 |
5 files changed, 9 insertions(+), 484 deletions(-) |
19 |
|
20 |
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml |
21 |
index d7c339a2f35..8981ee1518d 100644 |
22 |
--- a/www-servers/uwsgi/metadata.xml |
23 |
+++ b/www-servers/uwsgi/metadata.xml |
24 |
@@ -8,7 +8,6 @@ |
25 |
<flag name="embedded">Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag> |
26 |
<flag name="go">Build the gccgo plugin to run Go applications.</flag> |
27 |
<flag name="json">Support json as a configuration file format.</flag> |
28 |
- <flag name="pypy">Build the pypy plugin to run your code using <pkg>dev-python/pypy</pkg>.</flag> |
29 |
<flag name="python_asyncio">Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag> |
30 |
<flag name="python_gevent">Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag> |
31 |
<flag name="routing">Enable routing support</flag> |
32 |
|
33 |
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild |
34 |
index 92346204f3c..e0ae7ed0b2c 100644 |
35 |
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild |
36 |
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild |
37 |
@@ -12,7 +12,7 @@ USE_RUBY="ruby23 ruby24 ruby25" |
38 |
PHP_EXT_INI="no" |
39 |
PHP_EXT_NAME="dummy" |
40 |
PHP_EXT_OPTIONAL_USE="php" |
41 |
-USE_PHP="php5-6 php7-1 php7-2 php7-3" # deps must be registered separately below |
42 |
+USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below |
43 |
|
44 |
MY_P="${P/_/-}" |
45 |
|
46 |
@@ -42,7 +42,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron |
47 |
systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix ) |
48 |
|
49 |
LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process |
50 |
-LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby ) |
51 |
+LANG_SUPPORT_EXTENDED=( go lua php python python_asyncio python_gevent ruby ) |
52 |
|
53 |
# plugins to be ignored (for now): |
54 |
# cheaper_backlog2: example plugin |
55 |
@@ -67,7 +67,6 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) |
56 |
uwsgi_plugins_emperor_zeromq? ( zeromq ) |
57 |
uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) |
58 |
uwsgi_plugins_router_xmldir? ( xml !expat ) |
59 |
- pypy? ( python_targets_python2_7 ) |
60 |
python? ( ${PYTHON_REQUIRED_USE} ) |
61 |
python_asyncio? ( || ( $(python_gen_useflags -3) ) ) |
62 |
python_gevent? ( python ) |
63 |
@@ -116,12 +115,10 @@ CDEPEND=" |
64 |
mono? ( dev-lang/mono:= ) |
65 |
perl? ( dev-lang/perl:= ) |
66 |
php? ( |
67 |
- php_targets_php5-6? ( dev-lang/php:5.6[embed] ) |
68 |
- php_targets_php7-1? ( dev-lang/php:7.1[embed] ) |
69 |
php_targets_php7-2? ( dev-lang/php:7.2[embed] ) |
70 |
php_targets_php7-3? ( dev-lang/php:7.3[embed] ) |
71 |
+ php_targets_php7-4? ( dev-lang/php:7.4[embed] ) |
72 |
) |
73 |
- pypy? ( dev-python/pypy ) |
74 |
python? ( ${PYTHON_DEPS} ) |
75 |
python_asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] ) |
76 |
python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] ) |
77 |
@@ -245,11 +242,6 @@ python_compile_plugins() { |
78 |
EPYV=${EPYTHON/.} |
79 |
PYV=${EPYV/python} |
80 |
|
81 |
- if [[ ${EPYTHON} == pypy* ]]; then |
82 |
- einfo "skipping because pypy is not meant to build plugins on its own" |
83 |
- return |
84 |
- fi |
85 |
- |
86 |
${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" |
87 |
|
88 |
if use python_asyncio ; then |
89 |
@@ -265,15 +257,6 @@ python_compile_plugins() { |
90 |
if use python_gevent || use python_asyncio; then |
91 |
${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed" |
92 |
fi |
93 |
- |
94 |
- if use pypy ; then |
95 |
- if [[ "${PYV}" == "27" ]] ; then |
96 |
- # TODO: do some proper patching ? The wiki didn't help... I gave up for now. |
97 |
- # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so |
98 |
- append-ldflags -Wl,-z,noexecstack |
99 |
- ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed" |
100 |
- fi |
101 |
- fi |
102 |
} |
103 |
|
104 |
python_install_symlinks() { |
105 |
@@ -367,11 +350,6 @@ pkg_postinst() { |
106 |
EPYV=${EPYTHON/.} |
107 |
PYV=${EPYV/python} |
108 |
|
109 |
- if [[ ${EPYTHON} == pypy* ]] ; then |
110 |
- elog " '--plugins pypy' for pypy" |
111 |
- return |
112 |
- fi |
113 |
- |
114 |
elog " " |
115 |
elog " '--plugins ${EPYV}' for ${EPYTHON}" |
116 |
if use python_asyncio ; then |
117 |
|
118 |
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild |
119 |
deleted file mode 100644 |
120 |
index 27d9201c28b..00000000000 |
121 |
--- a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild |
122 |
+++ /dev/null |
123 |
@@ -1,408 +0,0 @@ |
124 |
-# Copyright 1999-2020 Gentoo Authors |
125 |
-# Distributed under the terms of the GNU General Public License v2 |
126 |
- |
127 |
-EAPI=6 |
128 |
- |
129 |
-PYTHON_COMPAT=( python2_7 python3_{6,7} ) |
130 |
-PYTHON_REQ_USE="threads(+)" |
131 |
- |
132 |
-RUBY_OPTIONAL="yes" |
133 |
-USE_RUBY="ruby23 ruby24" |
134 |
- |
135 |
-PHP_EXT_INI="no" |
136 |
-PHP_EXT_NAME="dummy" |
137 |
-PHP_EXT_OPTIONAL_USE="php" |
138 |
-USE_PHP="php5-6 php7-1 php7-2 php7-3" # deps must be registered separately below |
139 |
- |
140 |
-MY_P="${P/_/-}" |
141 |
- |
142 |
-inherit apache-module eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng versionator |
143 |
- |
144 |
-DESCRIPTION="uWSGI server for Python web applications" |
145 |
-HOMEPAGE="http://projects.unbit.it/uwsgi/" |
146 |
-SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz" |
147 |
- |
148 |
-LICENSE="GPL-2" |
149 |
-SLOT="0" |
150 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux" |
151 |
- |
152 |
-UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool |
153 |
- http ugreen signal syslog rsyslog |
154 |
- router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics} |
155 |
- {core,fast,raw,ssl}router |
156 |
- redislog mongodblog log{file,socket} |
157 |
- spooler cheaper_busyness symcall |
158 |
- transformation_{chunked,gzip,offload,tofile} |
159 |
- zergpool ) |
160 |
-UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron |
161 |
- dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter |
162 |
- geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam |
163 |
- rados router_{access,radius,spnego,xmldir} |
164 |
- sqlite ssi stats_pusher_statsd |
165 |
- systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix ) |
166 |
- |
167 |
-LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process |
168 |
-LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby ) |
169 |
- |
170 |
-# plugins to be ignored (for now): |
171 |
-# cheaper_backlog2: example plugin |
172 |
-# coroae: TODO |
173 |
-# cplusplus: partially example code, needs explicit class |
174 |
-# dummy: no idea |
175 |
-# example: example plugin |
176 |
-# exception_log: example plugin |
177 |
-# *java*: TODO |
178 |
-# v8: TODO |
179 |
-# matheval: TODO |
180 |
-IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq" |
181 |
- |
182 |
-for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done |
183 |
-for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done |
184 |
-IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}" |
185 |
- |
186 |
-REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) |
187 |
- uwsgi_plugins_logcrypto? ( ssl ) |
188 |
- uwsgi_plugins_sslrouter? ( ssl ) |
189 |
- routing? ( pcre ) |
190 |
- uwsgi_plugins_emperor_zeromq? ( zeromq ) |
191 |
- uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) |
192 |
- uwsgi_plugins_router_xmldir? ( xml !expat ) |
193 |
- pypy? ( python_targets_python2_7 ) |
194 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
195 |
- python_asyncio? ( || ( $(python_gen_useflags -3) ) python_gevent ) |
196 |
- python_gevent? ( python ) |
197 |
- expat? ( xml )" |
198 |
- |
199 |
-# util-linux is required for libuuid when requesting zeromq support |
200 |
-# Order: |
201 |
-# 1. Unconditional |
202 |
-# 2. General features |
203 |
-# 3. Plugins |
204 |
-# 4. Language/app support |
205 |
-CDEPEND="sys-libs/zlib |
206 |
- caps? ( sys-libs/libcap ) |
207 |
- json? ( !yajl? ( dev-libs/jansson ) |
208 |
- yajl? ( dev-libs/yajl ) ) |
209 |
- pcre? ( dev-libs/libpcre:3 ) |
210 |
- ssl? ( |
211 |
- !libressl? ( dev-libs/openssl:0 ) |
212 |
- libressl? ( dev-libs/libressl ) |
213 |
- ) |
214 |
- xml? ( !expat? ( dev-libs/libxml2 ) |
215 |
- expat? ( dev-libs/expat ) ) |
216 |
- yaml? ( dev-libs/libyaml ) |
217 |
- zeromq? ( net-libs/zeromq sys-apps/util-linux ) |
218 |
- uwsgi_plugins_alarm_curl? ( net-misc/curl ) |
219 |
- uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) |
220 |
- uwsgi_plugins_curl_cron? ( net-misc/curl ) |
221 |
- uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) |
222 |
- uwsgi_plugins_geoip? ( dev-libs/geoip ) |
223 |
- uwsgi_plugins_ldap? ( net-nds/openldap ) |
224 |
- uwsgi_plugins_pam? ( sys-libs/pam ) |
225 |
- uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) |
226 |
- uwsgi_plugins_rados? ( sys-cluster/ceph ) |
227 |
- uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) |
228 |
- uwsgi_plugins_router_spnego? ( virtual/krb5 ) |
229 |
- uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) |
230 |
- uwsgi_plugins_webdav? ( dev-libs/libxml2 ) |
231 |
- uwsgi_plugins_xslt? ( dev-libs/libxslt ) |
232 |
- go? ( sys-devel/gcc:=[go] ) |
233 |
- lua? ( dev-lang/lua:= ) |
234 |
- mono? ( =dev-lang/mono-4* ) |
235 |
- perl? ( dev-lang/perl:= ) |
236 |
- php? ( |
237 |
- php_targets_php5-6? ( dev-lang/php:5.6[embed] ) |
238 |
- php_targets_php7-1? ( dev-lang/php:7.1[embed] ) |
239 |
- php_targets_php7-2? ( dev-lang/php:7.2[embed] ) |
240 |
- php_targets_php7-3? ( dev-lang/php:7.3[embed] ) |
241 |
- ) |
242 |
- pypy? ( dev-python/pypy ) |
243 |
- python? ( ${PYTHON_DEPS} ) |
244 |
- python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] ) |
245 |
- ruby? ( $(ruby_implementations_depend) )" |
246 |
-DEPEND="${CDEPEND} |
247 |
- virtual/pkgconfig" |
248 |
-RDEPEND="${CDEPEND} |
249 |
- selinux? ( sec-policy/selinux-uwsgi ) |
250 |
- uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )" |
251 |
- |
252 |
-want_apache2 |
253 |
- |
254 |
-S="${WORKDIR}/${MY_P}" |
255 |
-APXS2_S="${S}/apache2" |
256 |
-APACHE2_MOD_CONF="42_mod_uwsgi-r2 42_mod_uwsgi" |
257 |
- |
258 |
-src_unpack() { |
259 |
- default |
260 |
-} |
261 |
- |
262 |
-pkg_setup() { |
263 |
- python_setup |
264 |
- use ruby && ruby-ng_pkg_setup |
265 |
- depend.apache_pkg_setup |
266 |
-} |
267 |
- |
268 |
-src_prepare() { |
269 |
- default |
270 |
- |
271 |
- sed -i \ |
272 |
- -e "s|'-O2', ||" \ |
273 |
- -e "s|'-Werror', ||" \ |
274 |
- -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \ |
275 |
- uwsgiconfig.py || die "sed failed" |
276 |
- |
277 |
- sed -i \ |
278 |
- -e "s|/lib|/$(get_libdir)|" \ |
279 |
- plugins/php/uwsgiplugin.py || die "sed failed" |
280 |
-} |
281 |
- |
282 |
-src_configure() { |
283 |
- local embedded_plugins=() |
284 |
- local plugins=() |
285 |
- local malloc_impl="libc" |
286 |
- local json="false" |
287 |
- local xml="false" |
288 |
- |
289 |
- for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do |
290 |
- use uwsgi_plugins_${p} && embedded_plugins+=("${p}") |
291 |
- done |
292 |
- for p in ${LANG_SUPPORT_SIMPLE[@]} ; do |
293 |
- use ${p} && plugins+=("${p}") |
294 |
- done |
295 |
- |
296 |
- # do not embed any plugins |
297 |
- if ! use embedded; then |
298 |
- plugins=( ${plugins[@]} ${embedded_plugins[@]} ) |
299 |
- embedded_plugins=() |
300 |
- fi |
301 |
- |
302 |
- # flatten the arrays |
303 |
- plugins=${plugins[@]} |
304 |
- embedded_plugins=${embedded_plugins[@]} |
305 |
- |
306 |
- # rename some of the use flags, language plugins are always real plugins |
307 |
- plugins="${plugins/perl/psgi}" |
308 |
- plugins="${plugins/sqlite/sqlite3}" |
309 |
- embedded_plugins="${embedded_plugins/sqlite/sqlite3}" |
310 |
- |
311 |
- # override defaults as requested by the user |
312 |
- if use xml; then |
313 |
- use expat && xml="expat" || xml="libxml2" |
314 |
- fi |
315 |
- if use json; then |
316 |
- use yajl && json="yajl" || json="jansson" |
317 |
- fi |
318 |
- use jemalloc && malloc_impl="jemalloc" |
319 |
- |
320 |
- # prepare the buildconf for gentoo |
321 |
- cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die |
322 |
- sed -i \ |
323 |
- -e "s|VAR_XML|${xml}|" \ |
324 |
- -e "s|VAR_YAML|$(usex yaml libyaml true)|" \ |
325 |
- -e "s|VAR_JSON|${json}|" \ |
326 |
- -e "s|VAR_SSL|$(usex ssl true false)|" \ |
327 |
- -e "s|VAR_PCRE|$(usex pcre true false)|" \ |
328 |
- -e "s|VAR_ZMQ|$(usex zeromq true false)|" \ |
329 |
- -e "s|VAR_ROUTING|$(usex routing true false)|" \ |
330 |
- -e "s|VAR_DEBUG|$(usex debug true false)|" \ |
331 |
- -e "s|VAR_MALLOC|${malloc_impl}|" \ |
332 |
- -e "s|VAR_PLUGINS|${plugins// /, }|" \ |
333 |
- -e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \ |
334 |
- -e "s|VAR_BUILD_DIR|${T}/plugins|" \ |
335 |
- -e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \ |
336 |
- buildconf/gentoo.ini || die "sed failed" |
337 |
- |
338 |
- if ! use caps; then |
339 |
- sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed" |
340 |
- fi |
341 |
- |
342 |
- if ! use zeromq; then |
343 |
- sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed" |
344 |
- fi |
345 |
- |
346 |
- if use uwsgi_plugins_emperor_pg ; then |
347 |
- PGPV="$(best_version dev-db/postgresql)" |
348 |
- PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})" |
349 |
- sed -i \ |
350 |
- -e "s|pg_config|pg_config${PGSLOT/.}|" \ |
351 |
- plugins/emperor_pg/uwsgiplugin.py || die "sed failed" |
352 |
- fi |
353 |
-} |
354 |
- |
355 |
-each_ruby_compile() { |
356 |
- cd "${WORKDIR}/${MY_P}" || die "sed failed" |
357 |
- |
358 |
- UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed" |
359 |
- UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed" |
360 |
- UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed" |
361 |
-} |
362 |
- |
363 |
-python_compile_plugins() { |
364 |
- local EPYV |
365 |
- local PYV |
366 |
- EPYV=${EPYTHON/.} |
367 |
- PYV=${EPYV/python} |
368 |
- |
369 |
- if [[ ${EPYTHON} == pypy* ]]; then |
370 |
- einfo "skipping because pypy is not meant to build plugins on its own" |
371 |
- return |
372 |
- fi |
373 |
- |
374 |
- ${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" |
375 |
- |
376 |
- if use python_asyncio ; then |
377 |
- if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then |
378 |
- ${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed" |
379 |
- fi |
380 |
- fi |
381 |
- |
382 |
- if use python_gevent ; then |
383 |
- ${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed" |
384 |
- fi |
385 |
- |
386 |
- if use pypy ; then |
387 |
- if [[ "${PYV}" == "27" ]] ; then |
388 |
- # TODO: do some proper patching ? The wiki didn't help... I gave up for now. |
389 |
- # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so |
390 |
- append-ldflags -Wl,-z,noexecstack |
391 |
- ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed" |
392 |
- fi |
393 |
- fi |
394 |
-} |
395 |
- |
396 |
-python_install_symlinks() { |
397 |
- dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.} |
398 |
-} |
399 |
- |
400 |
-src_compile() { |
401 |
- mkdir -p "${T}/plugins" || die |
402 |
- |
403 |
- python uwsgiconfig.py --build gentoo || die "building uwsgi failed" |
404 |
- |
405 |
- if use go ; then |
406 |
- python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed" |
407 |
- fi |
408 |
- |
409 |
- if use lua ; then |
410 |
- # setting the name for the pkg-config file to lua, since we don't have |
411 |
- # slotted lua |
412 |
- UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed" |
413 |
- fi |
414 |
- |
415 |
- if use php ; then |
416 |
- for s in $(php_get_slots); do |
417 |
- UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed" |
418 |
- done |
419 |
- fi |
420 |
- |
421 |
- if use python ; then |
422 |
- python_foreach_impl python_compile_plugins |
423 |
- fi |
424 |
- |
425 |
- if use ruby ; then |
426 |
- ruby-ng_src_compile |
427 |
- fi |
428 |
- |
429 |
- if use apache2 ; then |
430 |
- for m in proxy_uwsgi Ruwsgi uwsgi ; do |
431 |
- APXS2_ARGS="-c mod_${m}.c" |
432 |
- apache-module_src_compile |
433 |
- done |
434 |
- fi |
435 |
-} |
436 |
- |
437 |
-src_install() { |
438 |
- dobin uwsgi |
439 |
- pax-mark m "${D}"/usr/bin/uwsgi |
440 |
- |
441 |
- insinto /usr/$(get_libdir)/uwsgi |
442 |
- doins "${T}/plugins"/*.so |
443 |
- |
444 |
- use cgi && dosym uwsgi /usr/bin/uwsgi_cgi |
445 |
- use go && dosym uwsgi /usr/bin/uwsgi_go |
446 |
- use lua && dosym uwsgi /usr/bin/uwsgi_lua |
447 |
- use mono && dosym uwsgi /usr/bin/uwsgi_mono |
448 |
- use perl && dosym uwsgi /usr/bin/uwsgi_psgi |
449 |
- |
450 |
- if use php ; then |
451 |
- for s in $(php_get_slots); do |
452 |
- dosym uwsgi /usr/bin/uwsgi_${s/.} |
453 |
- done |
454 |
- fi |
455 |
- |
456 |
- if use python ; then |
457 |
- python_foreach_impl python_install_symlinks |
458 |
- python_foreach_impl python_domodule uwsgidecorators.py |
459 |
- fi |
460 |
- |
461 |
- if use apache2; then |
462 |
- for m in proxy_uwsgi Ruwsgi uwsgi ; do |
463 |
- APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so" |
464 |
- apache-module_src_install |
465 |
- done |
466 |
- fi |
467 |
- |
468 |
- newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi |
469 |
- newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi |
470 |
- keepdir /etc/"${PN}".d |
471 |
- use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}" |
472 |
-} |
473 |
- |
474 |
-pkg_postinst() { |
475 |
- if use apache2 ; then |
476 |
- elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi." |
477 |
- elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2." |
478 |
- elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols." |
479 |
- elog "Therefore you can enable only one of them at a time." |
480 |
- elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky." |
481 |
- elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported." |
482 |
- elog "mod_proxy_uwsgi is a proxy module, considered stable and is now the recommended module." |
483 |
- fi |
484 |
- |
485 |
- elog "Append the following options to the uwsgi call to load the respective language plugin:" |
486 |
- use cgi && elog " '--plugins cgi' for cgi" |
487 |
- use lua && elog " '--plugins lua' for lua" |
488 |
- use mono && elog " '--plugins mono' for mono" |
489 |
- use perl && elog " '--plugins psgi' for perl" |
490 |
- |
491 |
- if use php ; then |
492 |
- for s in $(php_get_slots); do |
493 |
- elog " '--plugins ${s/.}' for ${s}" |
494 |
- done |
495 |
- fi |
496 |
- |
497 |
- python_pkg_postinst() { |
498 |
- local EPYV |
499 |
- local PYV |
500 |
- EPYV=${EPYTHON/.} |
501 |
- PYV=${EPYV/python} |
502 |
- |
503 |
- if [[ ${EPYTHON} == pypy* ]] ; then |
504 |
- elog " '--plugins pypy' for pypy" |
505 |
- return |
506 |
- fi |
507 |
- |
508 |
- elog " " |
509 |
- elog " '--plugins ${EPYV}' for ${EPYTHON}" |
510 |
- if use python_asyncio ; then |
511 |
- if [[ ${EPYV} == python34 ]] ; then |
512 |
- elog " '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}" |
513 |
- else |
514 |
- elog " (asyncio is only supported in python3.4)" |
515 |
- fi |
516 |
- fi |
517 |
- if use python_gevent ; then |
518 |
- elog " '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}" |
519 |
- fi |
520 |
- } |
521 |
- |
522 |
- use python && python_foreach_impl python_pkg_postinst |
523 |
- |
524 |
- if use ruby ; then |
525 |
- for ruby in $(ruby_get_use_implementations) ; do |
526 |
- elog " '--plugins rack_${ruby/.}' for ${ruby}" |
527 |
- elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" |
528 |
- elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" |
529 |
- done |
530 |
- fi |
531 |
-} |
532 |
|
533 |
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild |
534 |
index 3f85d6aa41a..f1a7b478018 100644 |
535 |
--- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild |
536 |
+++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild |
537 |
@@ -12,7 +12,7 @@ USE_RUBY="ruby23 ruby24" |
538 |
PHP_EXT_INI="no" |
539 |
PHP_EXT_NAME="dummy" |
540 |
PHP_EXT_OPTIONAL_USE="php" |
541 |
-USE_PHP="php5-6 php7-1 php7-2 php7-3" # deps must be registered separately below |
542 |
+USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below |
543 |
|
544 |
MY_P="${P/_/-}" |
545 |
|
546 |
@@ -42,7 +42,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron |
547 |
systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix ) |
548 |
|
549 |
LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process |
550 |
-LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby ) |
551 |
+LANG_SUPPORT_EXTENDED=( go lua php python python_asyncio python_gevent ruby ) |
552 |
|
553 |
# plugins to be ignored (for now): |
554 |
# cheaper_backlog2: example plugin |
555 |
@@ -67,7 +67,6 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) |
556 |
uwsgi_plugins_emperor_zeromq? ( zeromq ) |
557 |
uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) |
558 |
uwsgi_plugins_router_xmldir? ( xml !expat ) |
559 |
- pypy? ( python_targets_python2_7 ) |
560 |
python? ( ${PYTHON_REQUIRED_USE} ) |
561 |
python_asyncio? ( || ( $(python_gen_useflags -3) ) python_gevent ) |
562 |
python_gevent? ( python ) |
563 |
@@ -111,12 +110,10 @@ CDEPEND="sys-libs/zlib |
564 |
mono? ( =dev-lang/mono-4* ) |
565 |
perl? ( dev-lang/perl:= ) |
566 |
php? ( |
567 |
- php_targets_php5-6? ( dev-lang/php:5.6[embed] ) |
568 |
- php_targets_php7-1? ( dev-lang/php:7.1[embed] ) |
569 |
php_targets_php7-2? ( dev-lang/php:7.2[embed] ) |
570 |
php_targets_php7-3? ( dev-lang/php:7.3[embed] ) |
571 |
+ php_targets_php7-4? ( dev-lang/php:7.4[embed] ) |
572 |
) |
573 |
- pypy? ( dev-python/pypy ) |
574 |
python? ( ${PYTHON_DEPS} ) |
575 |
python_gevent? ( >=dev-python/gevent-1.2.1[${PYTHON_USEDEP}] ) |
576 |
ruby? ( $(ruby_implementations_depend) )" |
577 |
@@ -248,11 +245,6 @@ python_compile_plugins() { |
578 |
EPYV=${EPYTHON/.} |
579 |
PYV=${EPYV/python} |
580 |
|
581 |
- if [[ ${EPYTHON} == pypy* ]]; then |
582 |
- einfo "skipping because pypy is not meant to build plugins on its own" |
583 |
- return |
584 |
- fi |
585 |
- |
586 |
${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" |
587 |
|
588 |
if use python_asyncio ; then |
589 |
@@ -264,15 +256,6 @@ python_compile_plugins() { |
590 |
if use python_gevent ; then |
591 |
${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed" |
592 |
fi |
593 |
- |
594 |
- if use pypy ; then |
595 |
- if [[ "${PYV}" == "27" ]] ; then |
596 |
- # TODO: do some proper patching ? The wiki didn't help... I gave up for now. |
597 |
- # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so |
598 |
- append-ldflags -Wl,-z,noexecstack |
599 |
- ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed" |
600 |
- fi |
601 |
- fi |
602 |
} |
603 |
|
604 |
python_install_symlinks() { |
605 |
@@ -382,11 +365,6 @@ pkg_postinst() { |
606 |
EPYV=${EPYTHON/.} |
607 |
PYV=${EPYV/python} |
608 |
|
609 |
- if [[ ${EPYTHON} == pypy* ]] ; then |
610 |
- elog " '--plugins pypy' for pypy" |
611 |
- return |
612 |
- fi |
613 |
- |
614 |
elog " " |
615 |
elog " '--plugins ${EPYV}' for ${EPYTHON}" |
616 |
if use python_asyncio ; then |
617 |
|
618 |
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild |
619 |
index 90852dcf06c..53316bf30aa 100644 |
620 |
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild |
621 |
+++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild |
622 |
@@ -12,7 +12,7 @@ USE_RUBY="ruby23 ruby24 ruby25 ruby26" |
623 |
PHP_EXT_INI="no" |
624 |
PHP_EXT_NAME="dummy" |
625 |
PHP_EXT_OPTIONAL_USE="php" |
626 |
-USE_PHP="php5-6 php7-1 php7-2 php7-3" # deps must be registered separately below |
627 |
+USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below |
628 |
|
629 |
MY_P="${P/_/-}" |
630 |
|
631 |
@@ -42,7 +42,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron |
632 |
systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix ) |
633 |
|
634 |
LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process |
635 |
-LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby ) |
636 |
+LANG_SUPPORT_EXTENDED=( go lua php python python_asyncio python_gevent ruby ) |
637 |
|
638 |
# plugins to be ignored (for now): |
639 |
# cheaper_backlog2: example plugin |
640 |
@@ -67,7 +67,6 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) |
641 |
uwsgi_plugins_emperor_zeromq? ( zeromq ) |
642 |
uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) |
643 |
uwsgi_plugins_router_xmldir? ( xml !expat ) |
644 |
- pypy? ( python_targets_python2_7 ) |
645 |
python? ( ${PYTHON_REQUIRED_USE} ) |
646 |
python_asyncio? ( || ( $(python_gen_useflags -3) ) ) |
647 |
python_gevent? ( python ) |
648 |
@@ -117,12 +116,10 @@ CDEPEND=" |
649 |
perl? ( dev-lang/perl:= ) |
650 |
php? ( |
651 |
net-libs/libnsl |
652 |
- php_targets_php5-6? ( dev-lang/php:5.6[embed] ) |
653 |
- php_targets_php7-1? ( dev-lang/php:7.1[embed] ) |
654 |
php_targets_php7-2? ( dev-lang/php:7.2[embed] ) |
655 |
php_targets_php7-3? ( dev-lang/php:7.3[embed] ) |
656 |
+ php_targets_php7-4? ( dev-lang/php:7.4[embed] ) |
657 |
) |
658 |
- pypy? ( dev-python/pypy ) |
659 |
python? ( ${PYTHON_DEPS} ) |
660 |
python_asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] ) |
661 |
python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] ) |
662 |
@@ -246,11 +243,6 @@ python_compile_plugins() { |
663 |
EPYV=${EPYTHON/.} |
664 |
PYV=${EPYV/python} |
665 |
|
666 |
- if [[ ${EPYTHON} == pypy* ]]; then |
667 |
- einfo "skipping because pypy is not meant to build plugins on its own" |
668 |
- return |
669 |
- fi |
670 |
- |
671 |
${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" |
672 |
|
673 |
if use python_asyncio ; then |
674 |
@@ -266,15 +258,6 @@ python_compile_plugins() { |
675 |
if use python_gevent || use python_asyncio; then |
676 |
${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed" |
677 |
fi |
678 |
- |
679 |
- if use pypy ; then |
680 |
- if [[ "${PYV}" == "27" ]] ; then |
681 |
- # TODO: do some proper patching ? The wiki didn't help... I gave up for now. |
682 |
- # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so |
683 |
- append-ldflags -Wl,-z,noexecstack |
684 |
- ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed" |
685 |
- fi |
686 |
- fi |
687 |
} |
688 |
|
689 |
python_install_symlinks() { |
690 |
@@ -368,11 +351,6 @@ pkg_postinst() { |
691 |
EPYV=${EPYTHON/.} |
692 |
PYV=${EPYV/python} |
693 |
|
694 |
- if [[ ${EPYTHON} == pypy* ]] ; then |
695 |
- elog " '--plugins pypy' for pypy" |
696 |
- return |
697 |
- fi |
698 |
- |
699 |
elog " " |
700 |
elog " '--plugins ${EPYV}' for ${EPYTHON}" |
701 |
if use python_asyncio ; then |