gentoo resync : 15.06.2021

4 files changed, 73 insertions, 3 deletions

diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 4de1eff2dff6..e10f0c6fc81d 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-firewall-5.21.5.tar.xz 331812 BLAKE2B 43a026a198fb61480e90c5a5235de1abbb106e3f78d4a81fe919ec8c65c4f5ca30b340436b28369d8797d9ad1eac87fd0a4e39b5e3670f68150992e6007c4a76 SHA512 93d36b12025f1918892ad02e6b92dc8c44c27d2c6426a19fb77d8b258940a25295acd923b3957d45eb1715dae097097368b0456bf27273c217b79b441dec55fd
-EBUILD plasma-firewall-5.21.5.ebuild 1394 BLAKE2B 52d9a0ecea9b59234ce4abdf59b7aaa26bf438ab00c32b7385c77cc24bc0a73d467c76003c16fa2635a73dc36ef05d808501bebc00b084670098925a0353ae65 SHA512 3825593fdf8f5a3944fe21070612621030339258e97a67b7cd5188148a40ca99088b901ddf5275bd7eeae7bddcc056d010ce69c53c98e927d39405163c254ffe
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+DIST plasma-firewall-5.22.0.tar.xz 339052 BLAKE2B 24838f427471415a0083c093b3d76803435d8c4a60fdf5780119fbaf77ac7aef5c29a9b7ee806cfd9bfdd69c1d96c07bf58a0e75ff0a407fd1d4b6a5c0b7de29 SHA512 500324331383c9aff899dbf9c78ec76c5ca468b1a06603b30d72763b88ed8f538b1c9d4cbae1e8b5777d0b1073710806db81601637d80f0fbead1471724cc5f5
+EBUILD plasma-firewall-5.21.5.ebuild 1391 BLAKE2B b5120092b36428f2458f26417c2190faafa856bc31e25a4499aa97fea14593b8f4fb26211b97871a8a65ae5c519f64a28aa2eb2d378872a402fee0579fe5ebb1 SHA512 7b7500aba94ca646d473fd7b7b76b20675257d72dbeb252c7d2f3187f093d705d49d1890a20f9b2b2e3699b2058954d7986f28056d7df5f9c66a95e53e4855f0
+EBUILD plasma-firewall-5.22.0.ebuild 1586 BLAKE2B 928f0fa99d12b2423fecac00e9cd881711e3575bfd082b54b77b7542176d531b43c0dd908f08e237666e0ae996ae272a9d3b98b4f2f49c7a5684769be553d760 SHA512 0eef5567bd32c2cb1e543fa7686579849ddb4a0f022387119cd93603845f5b78f487dcc0a3ec440ce2ca1edbb44876998745a708733b02d41b17a701636f54db
+MISC metadata.xml 412 BLAKE2B 738cc0553aa14a9337e41a7870ab733a78a2509b70eb4ff02f9783a9b89dd6b46830b23134abe528ed3a9fcceac7e2fe6166a6849f0675834e475c53352bbf9d SHA512 b13e2e68e403a2dad70657aa92b9ea6899716f1d74da9f4b8878909e990e1bc60431d80670ff4ead837beb4c1128871f7b9f63bc9517d1feb0bc14172c896e9d
diff --git a/kde-plasma/plasma-firewall/metadata.xml b/kde-plasma/plasma-firewall/metadata.xml
index 2fdbf33d963d..5a8c9ddc2e43 100644
--- a/kde-plasma/plasma-firewall/metadata.xml
+++ b/kde-plasma/plasma-firewall/metadata.xml
@@ -5,4 +5,8 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="firewalld">Build <pkg>net-firewall/firewalld</pkg> backend</flag>
+		<flag name="ufw">Build <pkg>net-firewall/ufw</pkg> backend</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
index a417fdd8672a..e4adf22c451c 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.22.0.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.22.0.ebuild
new file mode 100644
index 000000000000..5cbc21bbb764
--- /dev/null
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.22.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Plasma frontend for Firewalld or UFW"
+HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="firewalld +ufw"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	firewalld? ( net-firewall/firewalld )
+	ufw? ( net-firewall/ufw )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# this kind of cmake magic doesn't work for us at all.
+	sed -e "1 s:^.*$:\#\!/usr/bin/env python3.8:" \
+		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
+		-DBUILD_UFW_BACKEND=$(usex ufw)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if ! has_version sys-apps/systemd; then
+		ewarn "${PN} is not functional without sys-apps/systemd at this point."
+		ewarn "See also: https://bugs.gentoo.org/778527"
+	fi
+}