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 F3796138350 for ; Sun, 9 Feb 2020 15:54:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE380E086B; Sun, 9 Feb 2020 15:54:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 98834E0863 for ; Sun, 9 Feb 2020 15:54:31 +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 8346834E8B5 for ; Sun, 9 Feb 2020 15:54:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0155312F for ; Sun, 9 Feb 2020 15:54:27 +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: <1581263660.9d879855acc071405b2442bf5e221a39836221f1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/fwknop/fwknop-2.6.10-r1.ebuild net-firewall/fwknop/fwknop-2.6.10.ebuild net-firewall/fwknop/fwknop-2.6.9-r1.ebuild X-VCS-Directories: net-firewall/fwknop/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9d879855acc071405b2442bf5e221a39836221f1 X-VCS-Branch: master Date: Sun, 9 Feb 2020 15:54:27 +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: d770587d-3eca-44a2-8834-265c6f5393c7 X-Archives-Hash: 5bf5595feefb959de2d59e4f5e589cad commit: 9d879855acc071405b2442bf5e221a39836221f1 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 8 11:59:34 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 15:54:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d879855 net-firewall/fwknop: Switch to python-single-r1 Switch to python-single-r1 since the dependency net-firewall/firewalld is single-r1. Signed-off-by: Michał Górny gentoo.org> .../fwknop/{fwknop-2.6.10.ebuild => fwknop-2.6.10-r1.ebuild} | 10 ++++++++-- net-firewall/fwknop/fwknop-2.6.9-r1.ebuild | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net-firewall/fwknop/fwknop-2.6.10.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild similarity index 94% rename from net-firewall/fwknop/fwknop-2.6.10.ebuild rename to net-firewall/fwknop/fwknop-2.6.10-r1.ebuild index 41a07f7c1a8..52c57d2312c 100644 --- a/net-firewall/fwknop/fwknop-2.6.10.ebuild +++ b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,6 +6,7 @@ EAPI=7 # Python extension supports only Python 2. # See https://github.com/mrash/fwknop/issues/167 PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=1 DISTUTILS_OPTIONAL=1 inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd @@ -21,7 +22,7 @@ IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-ser DEPEND=" client? ( net-misc/wget[ssl] ) - firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] ) + firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme @@ -54,6 +55,11 @@ You can set the desired backend via FIREWALL_EXE option in fwknopd.conf instead of the default one chosen at compile time. " +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + src_prepare() { default_src_prepare diff --git a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild index 5c86df5bfb0..03699570bd4 100644 --- a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild +++ b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,6 +7,7 @@ EAPI=6 # See https://github.com/mrash/fwknop/issues/167 PYTHON_COMPAT=( python2_7 ) DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd @@ -21,7 +22,7 @@ IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-ser DEPEND=" client? ( net-misc/wget[ssl] ) - firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] ) + firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme @@ -54,6 +55,11 @@ You can set the desired backend via FIREWALL_EXE option in fwknopd.conf instead of the default one chosen at compile time. " +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + src_prepare() { default_src_prepare