[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, www-servers/uwsgi/

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, www-servers/uwsgi/

[Alexys Jacob]

commit:     e16c606206ccd0f9fadf5a9c4c671e12d41a4aa0
Author:     Corentin `nado` Pazdera <nado <AT> troglodyte <DOT> be>
AuthorDate: Sat Dec 22 12:04:47 2018 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Jan  8 21:02:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e16c6062

www-servers/uwsgi-2.0.17.1-r1: ~arm keywording + conversion to eapi7-ver

Closes: https://bugs.gentoo.org/655070
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Corentin `nado` Pazdera <nado <AT> troglodyte.be>
Closes: https://github.com/gentoo/gentoo/pull/10679
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 profiles/arch/arm/package.use.mask         | 4 ++++
 www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 04e76200a65..72082ef2ada 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Corentin Pazdera <nado@troglodyte.be> (28 Dec 2018)
+# Requires virtual/pypy which isn't keyworded for ARM.
+www-servers/uwsgi pypy
+
 # Davide Pesavento <pesa@gentoo.org> (27 Dec 2018)
 # The corresponding Qt5 modules are not keyworded on arm, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.

diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
index e9923f5a2eb..4baa3deaef8 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
@@ -16,7 +16,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2" # deps must be registered separately below
 
 MY_P="${P/_/-}"
 
-inherit eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng versionator
+inherit eapi7-ver eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng
 
 DESCRIPTION="uWSGI server for Python web applications"
 HOMEPAGE="http://projects.unbit.it/uwsgi/"
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog
@@ -224,7 +224,7 @@ src_configure() {
 
 	if use uwsgi_plugins_emperor_pg ; then
 		PGPV="$(best_version dev-db/postgresql)"
-		PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})"
+		PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})"
 		sed -i \
 			-e "s|pg_config|pg_config${PGSLOT/.}|" \
 			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"