| 1 |
commit: 9d879855acc071405b2442bf5e221a39836221f1 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 11:59:34 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 15:54:20 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d879855 |
| 7 |
|
| 8 |
net-firewall/fwknop: Switch to python-single-r1 |
| 9 |
|
| 10 |
Switch to python-single-r1 since the dependency net-firewall/firewalld |
| 11 |
is single-r1. |
| 12 |
|
| 13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 14 |
|
| 15 |
.../fwknop/{fwknop-2.6.10.ebuild => fwknop-2.6.10-r1.ebuild} | 10 ++++++++-- |
| 16 |
net-firewall/fwknop/fwknop-2.6.9-r1.ebuild | 10 ++++++++-- |
| 17 |
2 files changed, 16 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-firewall/fwknop/fwknop-2.6.10.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild |
| 20 |
similarity index 94% |
| 21 |
rename from net-firewall/fwknop/fwknop-2.6.10.ebuild |
| 22 |
rename to net-firewall/fwknop/fwknop-2.6.10-r1.ebuild |
| 23 |
index 41a07f7c1a8..52c57d2312c 100644 |
| 24 |
--- a/net-firewall/fwknop/fwknop-2.6.10.ebuild |
| 25 |
+++ b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2019 Gentoo Authors |
| 28 |
+# Copyright 1999-2020 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=7 |
| 32 |
@@ -6,6 +6,7 @@ EAPI=7 |
| 33 |
# Python extension supports only Python 2. |
| 34 |
# See https://github.com/mrash/fwknop/issues/167 |
| 35 |
PYTHON_COMPAT=( python2_7 ) |
| 36 |
+DISTUTILS_SINGLE_IMPL=1 |
| 37 |
DISTUTILS_OPTIONAL=1 |
| 38 |
|
| 39 |
inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd |
| 40 |
@@ -21,7 +22,7 @@ IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-ser |
| 41 |
|
| 42 |
DEPEND=" |
| 43 |
client? ( net-misc/wget[ssl] ) |
| 44 |
- firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] ) |
| 45 |
+ firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] ) |
| 46 |
gdbm? ( sys-libs/gdbm ) |
| 47 |
gpg? ( |
| 48 |
app-crypt/gpgme |
| 49 |
@@ -54,6 +55,11 @@ You can set the desired backend via FIREWALL_EXE option in fwknopd.conf |
| 50 |
instead of the default one chosen at compile time. |
| 51 |
" |
| 52 |
|
| 53 |
+pkg_setup() { |
| 54 |
+ linux-info_pkg_setup |
| 55 |
+ python-single-r1_pkg_setup |
| 56 |
+} |
| 57 |
+ |
| 58 |
src_prepare() { |
| 59 |
default_src_prepare |
| 60 |
|
| 61 |
|
| 62 |
diff --git a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild |
| 63 |
index 5c86df5bfb0..03699570bd4 100644 |
| 64 |
--- a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild |
| 65 |
+++ b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2017 Gentoo Foundation |
| 68 |
+# Copyright 1999-2020 Gentoo Authors |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=6 |
| 72 |
@@ -7,6 +7,7 @@ EAPI=6 |
| 73 |
# See https://github.com/mrash/fwknop/issues/167 |
| 74 |
PYTHON_COMPAT=( python2_7 ) |
| 75 |
DISTUTILS_OPTIONAL=1 |
| 76 |
+DISTUTILS_SINGLE_IMPL=1 |
| 77 |
|
| 78 |
inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd |
| 79 |
|
| 80 |
@@ -21,7 +22,7 @@ IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-ser |
| 81 |
|
| 82 |
DEPEND=" |
| 83 |
client? ( net-misc/wget[ssl] ) |
| 84 |
- firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] ) |
| 85 |
+ firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] ) |
| 86 |
gdbm? ( sys-libs/gdbm ) |
| 87 |
gpg? ( |
| 88 |
app-crypt/gpgme |
| 89 |
@@ -54,6 +55,11 @@ You can set the desired backend via FIREWALL_EXE option in fwknopd.conf |
| 90 |
instead of the default one chosen at compile time. |
| 91 |
" |
| 92 |
|
| 93 |
+pkg_setup() { |
| 94 |
+ linux-info_pkg_setup |
| 95 |
+ python-single-r1_pkg_setup |
| 96 |
+} |
| 97 |
+ |
| 98 |
src_prepare() { |
| 99 |
default_src_prepare |
Archives