From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A20E13835A for ; Thu, 4 Mar 2021 11:48:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CA3DE0869; Thu, 4 Mar 2021 11:48:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 180A3E0869 for ; Thu, 4 Mar 2021 11:48:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CACE3335D7B for ; Thu, 4 Mar 2021 11:48:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DFBE478 for ; Thu, 4 Mar 2021 11:48:51 +0000 (UTC) From: "Alexys Jacob" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" Message-ID: <1614858410.bb9f0261f651e26f1c34cd4d5a9502cf9517f1a6.ultrabug@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild www-servers/uwsgi/uwsgi-2.0.19.1-r101.ebuild www-servers/uwsgi/uwsgi-2.0.19.1.ebuild X-VCS-Directories: www-servers/uwsgi/ X-VCS-Committer: ultrabug X-VCS-Committer-Name: Alexys Jacob X-VCS-Revision: bb9f0261f651e26f1c34cd4d5a9502cf9517f1a6 X-VCS-Branch: master Date: Thu, 4 Mar 2021 11:48:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4fa26536-747b-4e0f-b678-37cc487f0f1d X-Archives-Hash: 7221439537241bb159735d8aae48d951 commit: bb9f0261f651e26f1c34cd4d5a9502cf9517f1a6 Author: Alexys Jacob gentoo org> AuthorDate: Thu Mar 4 11:46:50 2021 +0000 Commit: Alexys Jacob gentoo org> CommitDate: Thu Mar 4 11:46:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb9f0261 www-servers/uwsgi: drop old and php7.2, support py3.9 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Alexys Jacob gentoo.org> www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild | 3 +-- ...-2.0.19.1.ebuild => uwsgi-2.0.19.1-r101.ebuild} | 28 ++++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild index 367e1207f41..e9cbeaa8d75 100644 --- a/www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild @@ -13,7 +13,7 @@ USE_RUBY="ruby23 ruby24 ruby25 ruby26" PHP_EXT_INI="no" PHP_EXT_NAME="dummy" PHP_EXT_OPTIONAL_USE="php" -USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below +USE_PHP="php7-3 php7-4" # deps must be registered separately below MY_P="${P/_/-}" @@ -118,7 +118,6 @@ CDEPEND=" perl? ( dev-lang/perl:= ) php? ( net-libs/libnsl - php_targets_php7-2? ( dev-lang/php:7.2[embed] ) php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r101.ebuild similarity index 94% rename from www-servers/uwsgi/uwsgi-2.0.19.1.ebuild rename to www-servers/uwsgi/uwsgi-2.0.19.1-r101.ebuild index adc1de637c1..72a449c8448 100644 --- a/www-servers/uwsgi/uwsgi-2.0.19.1.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r101.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="threads(+)" RUBY_OPTIONAL="yes" @@ -12,19 +13,19 @@ USE_RUBY="ruby23 ruby24 ruby25 ruby26" PHP_EXT_INI="no" PHP_EXT_NAME="dummy" PHP_EXT_OPTIONAL_USE="php" -USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below +USE_PHP="php7-3 php7-4" # deps must be registered separately below MY_P="${P/_/-}" -inherit eapi7-ver eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng +inherit flag-o-matic lua-single pax-utils php-ext-source-r3 python-r1 ruby-ng DESCRIPTION="uWSGI server for Python web applications" -HOMEPAGE="http://projects.unbit.it/uwsgi/" +HOMEPAGE="https://projects.unbit.it/uwsgi/" SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm x86 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux" UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool http ugreen signal syslog rsyslog @@ -67,6 +68,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) + lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) python-asyncio? ( || ( $(python_gen_useflags -3) ) ) python-gevent? ( python ) @@ -111,12 +113,11 @@ CDEPEND=" uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) - lua? ( dev-lang/lua:0= ) + lua? ( ${LUA_DEPS} ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( net-libs/libnsl - php_targets_php7-2? ( dev-lang/php:7.2[embed] ) php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) @@ -124,11 +125,11 @@ CDEPEND=" python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] ) python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] ) ruby? ( $(ruby_implementations_depend) )" -DEPEND="${CDEPEND} - virtual/pkgconfig" +DEPEND="${CDEPEND}" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" @@ -139,6 +140,7 @@ src_unpack() { pkg_setup() { python_setup + use lua && lua-single_pkg_setup use ruby && ruby-ng_pkg_setup } @@ -274,8 +276,8 @@ src_compile() { fi if use lua ; then - # setting the name for the pkg-config file to lua, since we don't have - # slotted lua + # setting the name for the pkg-config file to lua, since that is the name + # provided by the wrapper from Lua eclasses UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed" fi