1 |
commit: e16c606206ccd0f9fadf5a9c4c671e12d41a4aa0 |
2 |
Author: Corentin `nado` Pazdera <nado <AT> troglodyte <DOT> be> |
3 |
AuthorDate: Sat Dec 22 12:04:47 2018 +0000 |
4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 8 21:02:43 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e16c6062 |
7 |
|
8 |
www-servers/uwsgi-2.0.17.1-r1: ~arm keywording + conversion to eapi7-ver |
9 |
|
10 |
Closes: https://bugs.gentoo.org/655070 |
11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
12 |
Signed-off-by: Corentin `nado` Pazdera <nado <AT> troglodyte.be> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/10679 |
14 |
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org> |
15 |
|
16 |
profiles/arch/arm/package.use.mask | 4 ++++ |
17 |
www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild | 6 +++--- |
18 |
2 files changed, 7 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask |
21 |
index 04e76200a65..72082ef2ada 100644 |
22 |
--- a/profiles/arch/arm/package.use.mask |
23 |
+++ b/profiles/arch/arm/package.use.mask |
24 |
@@ -1,6 +1,10 @@ |
25 |
# Copyright 1999-2018 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
+# Corentin Pazdera <nado@××××××××××.be> (28 Dec 2018) |
29 |
+# Requires virtual/pypy which isn't keyworded for ARM. |
30 |
+www-servers/uwsgi pypy |
31 |
+ |
32 |
# Davide Pesavento <pesa@g.o> (27 Dec 2018) |
33 |
# The corresponding Qt5 modules are not keyworded on arm, and we don't want to |
34 |
# keyword them solely because of PyQt5 while there are no other in-tree users. |
35 |
|
36 |
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild |
37 |
index e9923f5a2eb..4baa3deaef8 100644 |
38 |
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild |
39 |
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild |
40 |
@@ -16,7 +16,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2" # deps must be registered separately below |
41 |
|
42 |
MY_P="${P/_/-}" |
43 |
|
44 |
-inherit eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng versionator |
45 |
+inherit eapi7-ver eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng |
46 |
|
47 |
DESCRIPTION="uWSGI server for Python web applications" |
48 |
HOMEPAGE="http://projects.unbit.it/uwsgi/" |
49 |
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz" |
50 |
|
51 |
LICENSE="GPL-2" |
52 |
SLOT="0" |
53 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux" |
54 |
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux" |
55 |
|
56 |
UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool |
57 |
http ugreen signal syslog rsyslog |
58 |
@@ -224,7 +224,7 @@ src_configure() { |
59 |
|
60 |
if use uwsgi_plugins_emperor_pg ; then |
61 |
PGPV="$(best_version dev-db/postgresql)" |
62 |
- PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})" |
63 |
+ PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})" |
64 |
sed -i \ |
65 |
-e "s|pg_config|pg_config${PGSLOT/.}|" \ |
66 |
plugins/emperor_pg/uwsgiplugin.py || die "sed failed" |