1 |
commit: f6e6bec3d4d96f82b68e116d5b0a050ae927373d |
2 |
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 7 12:20:31 2015 +0000 |
4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 7 12:20:31 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e6bec3 |
7 |
|
8 |
www-servers/uwsgi: ebuild qa thx to hasufell |
9 |
|
10 |
www-servers/uwsgi/uwsgi-2.0.11.2.ebuild | 12 ++++++------ |
11 |
1 file changed, 6 insertions(+), 6 deletions(-) |
12 |
|
13 |
diff --git a/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild b/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild |
14 |
index 53c5f52..cab9f47 100644 |
15 |
--- a/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild |
16 |
+++ b/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild |
17 |
@@ -4,7 +4,7 @@ |
18 |
|
19 |
EAPI="5" |
20 |
|
21 |
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) |
22 |
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) |
23 |
|
24 |
RUBY_OPTIONAL="yes" |
25 |
USE_RUBY="ruby19 ruby20 ruby21" |
26 |
@@ -203,7 +203,7 @@ src_configure() { |
27 |
-e "s|VAR_PLUGIN_DIR|/usr/$(get_libdir)/uwsgi|" \ |
28 |
-e "s|VAR_BUILD_DIR|${T}/plugins|" \ |
29 |
-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \ |
30 |
- buildconf/gentoo.ini |
31 |
+ buildconf/gentoo.ini || die "sed failed" |
32 |
|
33 |
use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed" |
34 |
use zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed" |
35 |
@@ -218,7 +218,7 @@ src_configure() { |
36 |
} |
37 |
|
38 |
each_ruby_compile() { |
39 |
- cd "${WORKDIR}/${MY_P}" |
40 |
+ cd "${WORKDIR}/${MY_P}" || die "sed failed" |
41 |
|
42 |
UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed" |
43 |
UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed" |
44 |
@@ -239,19 +239,19 @@ python_compile_plugins() { |
45 |
${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" |
46 |
|
47 |
if use python_asyncio ; then |
48 |
- if [ "${PYV}" == "34" ] ; then |
49 |
+ if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then |
50 |
${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed" |
51 |
fi |
52 |
fi |
53 |
|
54 |
if use python_gevent ; then |
55 |
- if [ "${PYV}" == "27" ] ; then |
56 |
+ if [[ "${PYV}" == "27" ]] ; then |
57 |
${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed" |
58 |
fi |
59 |
fi |
60 |
|
61 |
if use pypy ; then |
62 |
- if [ "${PYV}" == "27" ] ; then |
63 |
+ if [[ "${PYV}" == "27" ]] ; then |
64 |
# TODO: do some proper patching ? The wiki didn't help... I gave up for now. |
65 |
# QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so |
66 |
append-ldflags -Wl,-z,noexecstack |