Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-firewall/
Date: Fri, 14 May 2021 12:09:06
Message-Id: 1620989856.f975fcb101a9ff20e169d48f0dac02f7649f4402.asturm@gentoo
1 commit: f975fcb101a9ff20e169d48f0dac02f7649f4402
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 13 20:27:47 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri May 14 10:57:36 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f975fcb1
7
8 kde-plasma/plasma-firewall: Add IUSE=firewalld,ufw
9
10 Upstream commit 07811d9a53edcf1e9406897b4d6b8eee6562a56f
11
12 Package-Manager: Portage-3.0.18, Repoman-3.0.3
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-plasma/plasma-firewall/metadata.xml | 4 ++++
16 kde-plasma/plasma-firewall/plasma-firewall-9999.ebuild | 18 ++++++++++++------
17 2 files changed, 16 insertions(+), 6 deletions(-)
18
19 diff --git a/kde-plasma/plasma-firewall/metadata.xml b/kde-plasma/plasma-firewall/metadata.xml
20 index 2fdbf33d96..5a8c9ddc2e 100644
21 --- a/kde-plasma/plasma-firewall/metadata.xml
22 +++ b/kde-plasma/plasma-firewall/metadata.xml
23 @@ -5,4 +5,8 @@
24 <email>kde@g.o</email>
25 <name>Gentoo KDE Project</name>
26 </maintainer>
27 + <use>
28 + <flag name="firewalld">Build <pkg>net-firewall/firewalld</pkg> backend</flag>
29 + <flag name="ufw">Build <pkg>net-firewall/ufw</pkg> backend</flag>
30 + </use>
31 </pkgmetadata>
32
33 diff --git a/kde-plasma/plasma-firewall/plasma-firewall-9999.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-9999.ebuild
34 index 525e35fc9c..9c6ad2e987 100644
35 --- a/kde-plasma/plasma-firewall/plasma-firewall-9999.ebuild
36 +++ b/kde-plasma/plasma-firewall/plasma-firewall-9999.ebuild
37 @@ -14,9 +14,9 @@ HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
38 LICENSE="GPL-2+"
39 SLOT="5"
40 KEYWORDS=""
41 -IUSE=""
42 +IUSE="firewalld +ufw"
43
44 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
45 +REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
46
47 DEPEND="
48 >=dev-qt/qtdbus-${QTMIN}:5
49 @@ -35,10 +35,8 @@ DEPEND="
50 "
51 RDEPEND="${DEPEND}
52 ${PYTHON_DEPS}
53 - || (
54 - net-firewall/firewalld
55 - net-firewall/ufw
56 - )
57 + firewalld? ( net-firewall/firewalld )
58 + ufw? ( net-firewall/ufw )
59 "
60
61 src_prepare() {
62 @@ -48,6 +46,14 @@ src_prepare() {
63 -i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
64 }
65
66 +src_configure() {
67 + local mycmakeargs=(
68 + -DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
69 + -DBUILD_UFW_BACKEND=$(usex ufw)
70 + )
71 + ecm_src_configure
72 +}
73 +
74 pkg_postinst () {
75 ecm_pkg_postinst