gentoo resync : 08.01.2021

9 files changed, 101 insertions, 25 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index b9a08331378d..a8f59bdc593b 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index 153ea67eee86..e1ff6d21f741 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -4,5 +4,5 @@ DIST arno-iptables-firewall-2.1.0.tar.gz 140015 BLAKE2B 46ff89db6928bd4f86a5b26a
 DIST arno-iptables-firewall-2.1.1.tar.gz 141076 BLAKE2B d3f78767a3ac447841aa01becfd73434cfddc9f56142d5c6ac86072527c17a30449434b8cddba74bb45f8234268ba589ab2ea932db462317a2dfb714f31f2450 SHA512 55494c8a214c0b2dacfef23170ea596bf9ecdfc73d1a6b2bd703183278569f68103eb63580d1b18cae97a9460b95373f0091bbf5decf275c80803a1331555d79
 EBUILD arno-iptables-firewall-2.0.3.ebuild 2409 BLAKE2B 6dd74fa4f999915ad4d47731070e0a2d0490fbbdeaa1134d23c55b7b12c95f80cdd3ab9897ed294e0cfb97e033a464cb8948220e30877798df0fca22dadbde8c SHA512 45c09dd36c15dad8b20e28ff20f41504eab837fd72248dd8486382d42d7cafab4ed22a1d4fec4e2eaae6bbf5bbced8ab5c2c5322910c6a9216b8c948de46f467
 EBUILD arno-iptables-firewall-2.1.0.ebuild 2418 BLAKE2B 77ce5882577d617dc2187f2144d105301ca11fc0d42ea5f317d08ec9100fe536d450c99b0a9c3fa8dd858b313dab5af64f2c59a928103c603b6ed6c80792e5d5 SHA512 cbe407a4acef1220fcd76117cc4f456f9a30dd729c875803f503baa014fde5f8663f6afe51a7ae2e5be6b39f1b7ab943380a62b86d84814529874ef70bd53ce1
-EBUILD arno-iptables-firewall-2.1.1.ebuild 2667 BLAKE2B 2f45839c98f87165f1a2c92fecb7659ffcdb57e814f8797d6bd64e49f441a3b46dc46430c170e654740f126bf9452f20576ef94c175c76e253d16338045b281e SHA512 ae8df97440895a35c8933a8c67b770be5a3ee7d3b3457d5d77c29d58cffcf1b65dd290b17a0d0391ecc9aa09b9b3cbd4d2b9c27fe34e67a198903d4b8ddd7f7c
+EBUILD arno-iptables-firewall-2.1.1.ebuild 2665 BLAKE2B 41e15cc68ba3ba5b70a883e0f75060f578ebe3a47b28493efe8e71b99d621b4095d47ca63ed3041e4da02c2ed8e29fe140556edca41550f09d26bef90b8b3524 SHA512 14655be7f1370924e8441e5a5858ddc162009b64890da86036c722a212a0bafd7b4becb6a1ba38cd139c631cc78ce51f757a26e0bf2e643b7d6cf63e5a131437
 MISC metadata.xml 515 BLAKE2B c904370936eddef69630141ec61bdfe911a29bdc2425238b2a973ffcb89702183e0e36c42799cfc6cfaae403bdfb5a8fcefa1a576dd6a547a6b161ca9a967464 SHA512 c0d63d340e8fa318e276d3bd2e526dfa2dd5e8d810a75d75301cef8983d5bc851aae90e7f29685f8c2c21c21fadfa1c3d033156d44fb289eb9890465ea49e3bf
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild
index 0b622d4894c9..1d2ea185a64b 100644
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild
+++ b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/aif/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugins rsyslog"
 
 DEPEND=""
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 7a602d0b8654..3eccc6bdd3fa 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -3,5 +3,7 @@ AUX firehol.initd 1141 BLAKE2B 4bdeb545542780b4544c07ad675a2ab63c80177126841eaea
 AUX fireqos.confd 65 BLAKE2B 121c8df85e9c110e45633c84f3fd4ba9e006bb70dffbdee1507f92d763c13ae9ce370a5807753d31b0033e23d39004ea147d9fb75bf4f2fbadc6baf070ccaca3 SHA512 4dd394f3d896d8bf782cf1157f5bf420ca0e9b2c6238986f3fb17630ec0e12bfcad4ffc6fe2258a7d257e157fed11e01aef26965f3d97c78643c6467639a822c
 AUX fireqos.initd 829 BLAKE2B f09905f02189f155455886dd1896a183f2f529d0737939a7065bb52b57870f22805e3e6c029510cc5b57b36e596eb829bcc7651c6a80657ff4e399acc542fa90 SHA512 8364537d3e10c68d309fc40f4b2f88a2a593c38fd6f134b1c09cf937be00f7d96eeba05c83824c9460367bf892a8f79547321784c8f8a4708f856df9a88693f4
 DIST firehol-3.1.6.tar.xz 1484424 BLAKE2B aea45aa424b7b43ed0576916f52a785601a21489263c1b5c6abbf3b2b97db80bf2a2420ae8176cd55e335ab93c18a8209a47f467dba80a63cf2c319b3e3e27d8 SHA512 5ffa7e59d3f10a6c7d3f5b5ef9d93f1b2138063374a10cb0c1ac4e75578d6cf7755e154b51febf546563ba003f100af13f89bca3843b66a8d22b8fc2da3fadfe
+DIST firehol-3.1.7.tar.xz 1457932 BLAKE2B 9a861f2e9c900bce45d0dbd12f4546bc14eb4d74aea27a8d4cb0e5bfe8bea92d9bff3ccf008d46bd64212d689123273c99d0b0faaaadd34f0e1d85e22ee757c9 SHA512 b05cec806c2c8fc410bf9c7a30e3ad1d9f1c06fd2d501a7e5434010f6bb38722aac5b64de9b4285d2c71cacbf6b2f3c758685da5a70c05621df52879eb5148c2
 EBUILD firehol-3.1.6-r2.ebuild 1442 BLAKE2B c07be7c78a6c8d66f91a4c867d1358ae63d2c0444e19767d4e13256b82ab012e7f7b8be0c9c8457620520e107480bd8b130510642d388a609b520eddd4a3d78e SHA512 a2ff2a744fc8daa500c7c3cb45a4b92de946d905e58d7553d53b8237963959061d8aa03b18dd2624b59b48aa859eb491624ef9310b44ddd1c1fd2524896ca410
+EBUILD firehol-3.1.7.ebuild 1444 BLAKE2B 890830d467353129d7dc7e957972cdf8256e8b490ce0b8674513dc1ec57e20147ccf0d413e75973981d195b03cb616b8880f1a397da525352aa72c2466068cb1 SHA512 2ea459492ab538d88eab636678ed35d161d255f9fe78b9c2a18d1c365bf48bd0a3ea2c1d0344b71df286e74ea8affe54759d6350b49e49c645e5ded8afd37417
 MISC metadata.xml 464 BLAKE2B 67d0dfdaf7651eef96dcc00f6a89faf40593e79fa0885a85f27e3aefbfb4949648c0be652eaab8f1b38b4100e41a037c018677f81d3040dad0909c453fd49052 SHA512 5def437c908d4d5c76729fc8f50bd9a145a0c79d7154535ac9c39df585da4bf175b1b465690dbf05fb5536df97a9cbb2abaa0384fb45ebac5f53482d26a76607
diff --git a/net-firewall/firehol/firehol-3.1.7.ebuild b/net-firewall/firehol/firehol-3.1.7.ebuild
new file mode 100644
index 000000000000..3d7828d589f3
--- /dev/null
+++ b/net-firewall/firehol/firehol-3.1.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
+SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc ipv6 ipset"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2[-minimal,ipv6?]
+	sys-apps/kmod[tools]
+	net-misc/iputils[ipv6?]
+	net-misc/iprange
+	net-analyzer/traceroute
+	app-arch/gzip
+	ipset? (
+		net-firewall/ipset
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~IP_NF_FILTER \
+		~IP_NF_IPTABLES \
+		~IP_NF_MANGLE \
+		~IP_NF_TARGET_MASQUERADE
+		~IP_NF_TARGET_REDIRECT \
+		~IP_NF_TARGET_REJECT \
+		~NETFILTER_XT_CONNMARK \
+		~NETFILTER_XT_MATCH_HELPER \
+		~NETFILTER_XT_MATCH_LIMIT \
+		~NETFILTER_XT_MATCH_OWNER \
+		~NETFILTER_XT_MATCH_STATE \
+		~NF_CONNTRACK \
+		~NF_CONNTRACK_IPV4 \
+		~NF_CONNTRACK_MARK \
+		~NF_NAT \
+		~NF_NAT_FTP \
+		~NF_NAT_IRC \
+	"
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--disable-vnetbuild \
+		$(use_enable ipset update-ipsets) \
+		$(use_enable doc) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/firehol.confd firehol
+	newinitd "${FILESDIR}"/firehol.initd firehol
+	newconfd "${FILESDIR}"/fireqos.confd fireqos
+	newinitd "${FILESDIR}"/fireqos.initd fireqos
+}
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 77a0f4f3c18c..6dfd613a1d3c 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -13,5 +13,5 @@ DIST nftables-0.9.7.tar.bz2 872759 BLAKE2B 25218d97bd5a102b626a2c4beb37a59da2f6c
 EBUILD nftables-0.9.6-r1.ebuild 4231 BLAKE2B b1fdeb97da92be160d9822fa062d45926f28710c31f570e045984b3e89ec027e3c4b0e64e22b6538d1ebae3bdf5df3d65efb0fc969e5b9c75da9a61ec2d9b880 SHA512 d163480c49b3167da05cdd2384bbd3042fcdc6f4b0083a3bc07903286ab43abe169e3594536ca371430ef238fe07d76d3aab9662906422872a981b92ce0fad18
 EBUILD nftables-0.9.6.ebuild 4225 BLAKE2B f1138e820093a380fd9e4410e7dee42be398e1e59b15da5f93ab108d2b872c56a76b773745d682ba44b3af1aad9dc9f14c118c7a2600c19121a969fbdfdb45ec SHA512 10ed38eb158b2a55831da59ae392da2b41c6e57e296a7ab015f7d890ae21beb5d2aa03c584bb6637213f0e2fa5b07c2638a4587df838949224001f00cd2116ac
 EBUILD nftables-0.9.7-r1.ebuild 4232 BLAKE2B 86bad483fbfd191f1e98f875fa83849350fa1944f15f87fd0b6d64efc11bc7b447996765ce48f332d67ec1c8b3f3b2f333455c23c87430f69b8cfc8633ab9919 SHA512 380f8d040137eb8050c9d547bca641a6a3adcf57af2a9d3504bb269cc1a110a5bc3e9fa5c31462cb3983ffe42b690c25a276f6bb6ab7c8dc053dd9f2c382f0a2
-EBUILD nftables-9999.ebuild 4425 BLAKE2B 8c6d1c5f3541146a6819029a8037e8644eb1e35fafa7a654496ad704e950e611caabf2c1f57bb27f26d52cd48d488fa7a271223b6651003611abbf1e2bc28e25 SHA512 c4ddd1e32cbeeba681b9919a442d2fbfb7b2b9c17cbf0618803843ea984b20e8b6b4c77fe6c09b90433a004816ac2a8555794dfca5e622f00953bd25696be9fe
+EBUILD nftables-9999.ebuild 4494 BLAKE2B 22255a4dee223162b3e029f9b5cf84e255e921718eadb564db8d18b3fbe18b1b9254650b428a75d1f4162f43df036a32963dbd353a1e4d6276419ae07d729f1e SHA512 94a5884e5be88bf23bf8c5927dd0293e12737082e820ad0d863b81b1a92a44642ab40da5fe286c60732ffc87754b59dc0602e978fba96d861e4c9731e278dfdd
 MISC metadata.xml 918 BLAKE2B 8c2c39f04e2c5591ea06788788d244bddc1cdc25780810b2a19e131d43d0bdf964d2129c01605fc536451cb9a3354420a1c2f656dad45c56dec4f360a95fe473 SHA512 08de9d11f48dcb132eb5423de56b458dd4c4122329b84b56c252436c882b7670233f2217cc01755649f27e14ff9346cf99e3a742224567e712f5cb3678165dcf
diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild
index 1cc0dea3eb82..c82ada83f01f 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,13 +25,13 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/1"
-IUSE="debug doc +gmp json +modern-kernel python +readline static-libs xtables"
+IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs xtables"
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.4:0=
-	>=net-libs/libnftnl-1.1.8:0=
+	>=net-libs/libnftnl-1.1.9:0=
 	gmp? ( dev-libs/gmp:0= )
-	json? ( dev-libs/jansson )
+	json? ( dev-libs/jansson:= )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
 	xtables? ( >=net-firewall/iptables-1.6.1 )
@@ -49,6 +49,7 @@ BDEPEND+="
 
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
+	libedit? ( !readline )
 "
 
 python_make() {
@@ -93,6 +94,7 @@ src_configure() {
 		$(use_enable doc man-doc)
 		$(use_with !gmp mini_gmp)
 		$(use_with json)
+		$(use_with libedit cli editline)
 		$(use_with readline cli readline)
 		$(use_enable static-libs static)
 		$(use_with xtables)
diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest
index 8be7e2f6b34d..f9260af2ad97 100644
--- a/net-firewall/pglinux/Manifest
+++ b/net-firewall/pglinux/Manifest
@@ -1,4 +1,4 @@
 AUX pglinux-2.3.1_p20171006-fno-common.patch 492 BLAKE2B 803ecc1c2089a873ef2df2901c3364ff4e9242c2b6758c0b2e8fee57c7a13e31d6fb2a5f10ee24f8452e453299112af3be4fb1500f472bdd8192ea1b2363f13e SHA512 dbeac2030b38a7e224a0d3221ebbb8b3199f8a7eca3d675c6516121c8a61c6834f25da93bab60fe3216745d6fde12f4342c8f9f94abab6efbdda45e7f0f697a6
 DIST pglinux-2.3.1_p20171006.zip 340253 BLAKE2B a39ecad1290dd31b126ed58c22f2de1162a4081e07f576509b5d77adffeb4a74b5aeb489f8f63134b0fc37d174e61b6631bdb350c3277729456092ba0ae3c600 SHA512 ea30076d7a21fa71d5e352c479cb1a463c9f244d675f5c7f9d5d25a33b27f4c7f1a39d173f2fd156e3f2cb0652da0a06c078fc38972275073f38d48f207e42f3
-EBUILD pglinux-2.3.1_p20171006.ebuild 2596 BLAKE2B 2b9185dd83a20c85f6a79b92be9f661bca488e84047d9c8ef265370d0251b6668969707e15795fddfa109de811c23bfec1422daac06fa104ad6cab48e7ab6719 SHA512 d732b18ee3e784c868e081b59f31462742b73cf5787a007a3b3df5696983fcff733b822ffad3f46d4ae1dcc2d632f42b917e407b40d85c2b7b66f1b4bfd97728
+EBUILD pglinux-2.3.1_p20171006.ebuild 2758 BLAKE2B 75b9c08ffa0005d2e1146511e8a4152bd3f1a10bf00cdf48c1e367a9381c1051217296dbd9c7d8209756c0526832a500df48854a5d636d03fdd53e401a0076ac SHA512 6062df4f5eae48e2ccef68c83d2e3a35d03854ad4b8b0a888aaab01bcb410c18515e4421cb295752f24d03fad3b0ce81cc2151bd11f3e8d5e2e2d1f26b47e8d5
 MISC metadata.xml 877 BLAKE2B 23f3f249945c9c606588fab5cb610e10a5adfa00bb9f9408f5dd373bc76b6a1b4b0cfff72de8b86d2b7de335d1730ee5cf15108b519e148f797ff2855fa16064 SHA512 6b9986e54aa2b6d75acabfc74e080d0e378b79f94178d7dec3c6b870fa90ccbf4840559942d29ce27f017a63b8f8760c21ac09fffb0040f9f624a053c489d8de
diff --git a/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild b/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
index eafaafe2ee81..89228dc61731 100644
--- a/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
+++ b/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
@@ -1,24 +1,24 @@
-# 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
 
 COMMIT=9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8
 MY_PN="peerguardian"
 MY_P="${MY_PN}-${PV}"
-inherit autotools gnome2-utils linux-info systemd
+inherit autotools qmake-utils linux-info systemd xdg-utils
 
 DESCRIPTION="Privacy oriented firewall application"
 HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
 SRC_URI="https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-${COMMIT}.zip -> ${P}.zip"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="cron dbus logrotate networkmanager qt5 zlib"
 REQUIRED_USE="qt5? ( dbus )"
 
-COMMON_DEPEND="
+DEPEND="
 	net-libs/libnetfilter_queue
 	net-libs/libnfnetlink
 	dbus? ( sys-apps/dbus )
@@ -31,17 +31,17 @@ COMMON_DEPEND="
 	)
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool:2
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	net-firewall/iptables
 	sys-apps/sysvinit
 	cron? ( virtual/cron )
 	logrotate? ( app-admin/logrotate )
 	networkmanager? ( net-misc/networkmanager:= )
 "
+BDEPEND="
+	sys-devel/libtool:2
+	virtual/pkgconfig
+"
 
 CONFIG_CHECK="~NETFILTER_NETLINK
 	~NETFILTER_NETLINK_QUEUE
@@ -58,9 +58,8 @@ CONFIG_CHECK="~NETFILTER_NETLINK
 	~IP_NF_IPTABLES
 	~IP_NF_TARGET_REJECT"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fno-common.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
 
 src_prepare() {
@@ -82,6 +81,12 @@ src_configure() {
 		$(use_enable logrotate)
 		$(use_enable networkmanager)
 		$(use_with qt5)
+		LRELEASE=$(qt5_get_bindir)/lrelease
+		LUPDATE=$(qt5_get_bindir)/lupdate
+		MOC=$(qt5_get_bindir)/moc
+		QMAKE=$(qt5_get_bindir)/qmake
+		RCC=$(qt5_get_bindir)/rcc
+		UIC=$(qt5_get_bindir)/uic
 		$(use_enable zlib)
 		--with-systemd="$(systemd_get_systemunitdir)"
 	)
@@ -91,7 +96,7 @@ src_configure() {
 src_install() {
 	default
 	keepdir /var/{lib,log,spool}/pgl
-	rm -rf "${ED%/}"/tmp || die
+	rm -rf "${ED}"/tmp || die
 	find "${ED}" -name '*.la' -delete || die
 }
 
@@ -102,9 +107,9 @@ pkg_postinst() {
 	elog "  virtual/mta (needed to send informational (blocklist updates) and"
 	elog "    warning mails (if pglcmd.wd detects a problem.))"
 
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }