summaryrefslogtreecommitdiff
path: root/net-firewall
diff options
context:
space:
mode:
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/Manifest.gzbin4721 -> 4720 bytes
-rw-r--r--net-firewall/firewalld/Manifest4
-rw-r--r--net-firewall/firewalld/firewalld-0.6.3-r1.ebuild (renamed from net-firewall/firewalld/firewalld-0.6.3.ebuild)18
-rw-r--r--net-firewall/firewalld/firewalld-0.7.1-r1.ebuild (renamed from net-firewall/firewalld/firewalld-0.7.1.ebuild)18
-rw-r--r--net-firewall/fwknop/Manifest4
-rw-r--r--net-firewall/fwknop/fwknop-2.6.10-r1.ebuild (renamed from net-firewall/fwknop/fwknop-2.6.10.ebuild)10
-rw-r--r--net-firewall/fwknop/fwknop-2.6.9-r1.ebuild10
7 files changed, 40 insertions, 24 deletions
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 7d920559308f..1c788ba70605 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
Binary files differ
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 1a2f91aefed7..1430feeceaf6 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,6 +1,6 @@
AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
-EBUILD firewalld-0.6.3.ebuild 2549 BLAKE2B 568f2cca76e45714bbc137d977ff626725200943c29efaafe45237a700af162c2fda6c58f582d6937b11c6ddd82cea0532f377b7b46943587ff801944735e00f SHA512 26904a7bfc9ce31d972466ad8e25bd8d8cd2cd4b3885c89e8b0fa77e1a6bc208fde6886102698ab3927f8793302b1b3bbf66b2dc0824f9eb179a6e46cd8fc0aa
-EBUILD firewalld-0.7.1.ebuild 2540 BLAKE2B 7ad7acc7c1f796603c21f33f5b2da9500d2ba19909f0f9758b51a3bdf3abb9d8eafc61a4e15b504df06a81d67a390969885040243d36b91544803ebc234a9124 SHA512 d5a2d14001a75af6808b53026aa10a4d418d0732df6874505c130550633865191e6c67d2c2ec1e8f0417c82a47397d585376ca9ca244d2d8dbe03a5c2c9ba205
+EBUILD firewalld-0.6.3-r1.ebuild 2616 BLAKE2B 598544370854bed198fbc79d45c2b8160cfc382174bb2554e4f451f2fee8208461b7163be17ec0b5badb65de9644e68bb7e8d07735fa718d5bbecee2d1a96ab1 SHA512 6ee2e5f1433bd6fe021528188eabf5fccc1db7ea14c076c8951f22be85aaad67ba22530386517632297cef2f799bbe7d47c225223cf7d20198c9259c644097f0
+EBUILD firewalld-0.7.1-r1.ebuild 2607 BLAKE2B d1d08d05aca74180e838722fd7470316d13f6d34fddc02c612a1f26efac66851609d5ffb5d10817a262beea99f3e67798e17696bcaab1c7dbd29d1b0d2712af3 SHA512 0daf8e834f117c67f2f900a42c48b037febb53eaa4e17e485843f0340343bd5983c0167b4968a39197e6f8a0321a1365dcce56d6f851311be4ab7bace33ce810
MISC metadata.xml 271 BLAKE2B 0ac34325897226d2062f0b77cc069fcacd6026432b276adcdc2e7c9ef532cc1900855dd821d0b6314ac77488fd0695f916e821fc11148f3b9f2753bc97afbe2f SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
index 1623b9983834..3035cef8c28a 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
@@ -18,19 +18,21 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
!!net-firewall/gshield
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
|| ( net-firewall/ebtables net-firewall/iptables[nftables] )
net-firewall/iptables[ipv6]
net-firewall/ipset
net-firewall/nftables
|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
- gui? (
- x11-libs/gtk+:3
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- )"
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ gui? (
+ x11-libs/gtk+:3
+ dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+ )
+ ')"
DEPEND="${RDEPEND}
dev-libs/glib:2
>=dev-util/intltool-0.35
diff --git a/net-firewall/firewalld/firewalld-0.7.1.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild
index 2e7f5223fef9..af7ce3dfdc23 100644
--- a/net-firewall/firewalld/firewalld-0.7.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild
@@ -18,19 +18,21 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
!!net-firewall/gshield
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
net-firewall/iptables[ipv6]
|| ( net-firewall/iptables[nftables] net-firewall/ebtables )
net-firewall/ipset
net-firewall/nftables
|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
- gui? (
- x11-libs/gtk+:3
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- )"
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ gui? (
+ x11-libs/gtk+:3
+ dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+ )
+ ')"
DEPEND="${RDEPEND}
dev-libs/glib:2
>=dev-util/intltool-0.35
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index e6f0abbc8143..e41549df490c 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -4,6 +4,6 @@ AUX fwknopd.service 235 BLAKE2B c46c01121a745ee46a5415654c0ba422531008ed52915833
AUX fwknopd.tmpfiles.conf 31 BLAKE2B 81d88d9bb1fd826c242b2815e1a6c0e5a300f22e19dd65ad67e114d692731cb532162ac877f0239879ebfcf0432d61053adcddd2c234d85ed60bf33720b22dcc SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae
DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
DIST fwknop-2.6.9.tar.gz 3043542 BLAKE2B 11440fa0fe5e990a269587fa9ee1da0242f3dc939d6dc185d6adff9e9c995a8ffe902a6351a057c619cb6ff056519caea38f7b865978fe5ac810a39281bb3fc3 SHA512 4706560d44c911c8604059d88dded9c1b8c333399d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
-EBUILD fwknop-2.6.10.ebuild 3547 BLAKE2B 6e8fe513e25749fad0dde47ea4e28cdfb0c2f878684dc2b8c8adf74d88678afd4316ad63c60770044e33e584cc2a9844204ce4e2d1af5a3865959ae79caab06f SHA512 18ec5b1ce8632f81b3bbf13d08d2275120b9e364d2d764446393840b5ba7003842a2f3df74cc35d48b4a90167d2c7f56a3878af53e52cd0a704465fc180d6c7c
-EBUILD fwknop-2.6.9-r1.ebuild 3691 BLAKE2B babb21cf1329d59180d03fca97865bdee9d50cb3e10ab3e837784078ebbd4110791c7832f9db32ed9126518cae0c5d74a9bac13d0f0409ddce36aaa8e9bed62f SHA512 ee6a6065e916cf745dfa9e8903166ab0de571138720134568349767f9f63ea0b00d5991a2b29206279f17d0e2968fb573195d3191c89bd0d1b2ca34c21a18473
+EBUILD fwknop-2.6.10-r1.ebuild 3645 BLAKE2B e189a429bbd503641c4ea4ffe7c8f8069935952b1412e751106f73454df3ac5e8749066446634524160353820af1ee03989acc67a3f990b39b92a3694204084b SHA512 8811954807de2f3b050f19c184aceb5c56d339b1e2ea40d73a9edc65492c4b473db02b901b1d42c8d58b9203ab76e74545c260c1240bc916feabbaf0490b1a46
+EBUILD fwknop-2.6.9-r1.ebuild 3786 BLAKE2B 6bde6bb8b8920323552afe41f86e0ad6bb3854e39d141035667d471892cf50ec3d85e71833c15ed00224fe8675857658eddafba969af67c6bb286b122a4c87be SHA512 73a9c3165cdec867f3926c1c17e085df665a83659422c9442d2ab08ad1c1d7122d57feffc48c527aad9c8e101c6150335415e4d3d882d02a4b4bff0547760021
MISC metadata.xml 1217 BLAKE2B 2b44d1d81f7d4bc625c3130cf29328fce6d85fbeedfb5376146dad93b020f03440f620e68187fa1ffd496fdff0cedaa6f02d015578ec0620070ea97029b9eec8 SHA512 b215b1ad55f6ba7e9f4ac316916241ec2084bcd2e3e5ca6a7d81c935df6affdbc36066914b1bb4d984333e005a57f54c6c8f07013a4e14e465f9dd6dbc6c93d2
diff --git a/net-firewall/fwknop/fwknop-2.6.10.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
index 41a07f7c1a83..52c57d2312c0 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 5c86df5bfb0c..03699570bd46 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