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 8AF64138334 for ; Mon, 30 Jul 2018 20:23:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EE07E08A2; Mon, 30 Jul 2018 20:23:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 3180FE08A2 for ; Mon, 30 Jul 2018 20:23:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E3B2A335C8E for ; Mon, 30 Jul 2018 20:23:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 589A8387 for ; Mon, 30 Jul 2018 20:23:02 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1532982179.a781960b31e293725e20ed04279a6684883c9e9c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild X-VCS-Directories: www-servers/nginx-unit/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a781960b31e293725e20ed04279a6684883c9e9c X-VCS-Branch: master Date: Mon, 30 Jul 2018 20:23:02 +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-Archives-Salt: b1f8a4c6-751b-4f80-be08-1894cdc5f5e6 X-Archives-Hash: 2f841083faa7ebdc509e61d0f37f4f19 commit: a781960b31e293725e20ed04279a6684883c9e9c Author: Ralph Seichter seichter de> AuthorDate: Sat Jul 28 13:04:43 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jul 30 20:22:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a781960b www-servers/nginx-unit: Fixed modules directory, Python dependencies Also added pkg_setup() to conditionally support Python and fixed contents of REQUIRED_USE. Closes: https://github.com/gentoo/gentoo/pull/9278 www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild index 9a9a22e39cd..304602c948a 100644 --- a/www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild +++ b/www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild @@ -3,8 +3,11 @@ EAPI=7 -MY_P="unit-${PV}" +PYTHON_COMPAT=(python2_7 python3_{3,4,5,6}) + +inherit python-single-r1 +MY_P="unit-${PV}" DESCRIPTION="A dynamic web and application server" HOMEPAGE="https://unit.nginx.org" SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" @@ -12,23 +15,29 @@ SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -IUSE="perl python ruby" -REQUIRED_USE="|| ( ${IUSE} )" +MY_IUSE="perl python ruby" +IUSE="${MY_IUSE}" +REQUIRED_USE="|| ( ${MY_IUSE} ) python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="perl? ( dev-lang/perl:= ) - python? ( dev-lang/python:= ) + python? ( ${PYTHON_DEPS} ) ruby? ( dev-lang/ruby:= )" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" +pkg_setup() { + use python && python-single-r1_pkg_setup +} + src_configure() { ./configure \ --prefix=/usr \ + --modules=$(get_libdir)/${PN} \ --log=/var/log/${PN} \ --state=/var/lib/${PN} \ --pid=/run/${PN}.pid \ --control=unix:/run/${PN}.sock || die "Core configuration failed" - for flag in ${IUSE} ; do + for flag in ${MY_IUSE} ; do if use ${flag} ; then ./configure ${flag} || die "Module configuration failed: ${flag}" fi