Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/pglinux/
Date: Fri, 08 Jan 2021 00:00:15
Message-Id: 1610063809.5d1ac316f534cca585af27a755f68c375cb391e9.asturm@gentoo
1 commit: 5d1ac316f534cca585af27a755f68c375cb391e9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 7 21:46:55 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 7 23:56:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1ac316
7
8 net-firewall/pglinux: EAPI-7, gnome2-utils->xdg-utils, use qmake-utils
9
10 Closes: https://bugs.gentoo.org/764341
11 Package-Manager: Portage-3.0.12, Repoman-3.0.2
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../pglinux/pglinux-2.3.1_p20171006.ebuild | 35 ++++++++++++----------
15 1 file changed, 20 insertions(+), 15 deletions(-)
16
17 diff --git a/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild b/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
18 index eafaafe2ee8..615e1a8fc7a 100644
19 --- a/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
20 +++ b/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
21 @@ -1,24 +1,24 @@
22 -# Copyright 1999-2020 Gentoo Authors
23 +# Copyright 1999-2021 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI=6
27 +EAPI=7
28
29 COMMIT=9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8
30 MY_PN="peerguardian"
31 MY_P="${MY_PN}-${PV}"
32 -inherit autotools gnome2-utils linux-info systemd
33 +inherit autotools qmake-utils linux-info systemd xdg-utils
34
35 DESCRIPTION="Privacy oriented firewall application"
36 HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
37 SRC_URI="https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-${COMMIT}.zip -> ${P}.zip"
38
39 LICENSE="GPL-3"
40 -KEYWORDS="~amd64 ~x86"
41 SLOT="0"
42 +KEYWORDS="~amd64 ~x86"
43 IUSE="cron dbus logrotate networkmanager qt5 zlib"
44 REQUIRED_USE="qt5? ( dbus )"
45
46 -COMMON_DEPEND="
47 +DEPEND="
48 net-libs/libnetfilter_queue
49 net-libs/libnfnetlink
50 dbus? ( sys-apps/dbus )
51 @@ -31,17 +31,17 @@ COMMON_DEPEND="
52 )
53 zlib? ( sys-libs/zlib )
54 "
55 -DEPEND="${COMMON_DEPEND}
56 - virtual/pkgconfig
57 - sys-devel/libtool:2
58 -"
59 -RDEPEND="${COMMON_DEPEND}
60 +RDEPEND="${DEPEND}
61 net-firewall/iptables
62 sys-apps/sysvinit
63 cron? ( virtual/cron )
64 logrotate? ( app-admin/logrotate )
65 networkmanager? ( net-misc/networkmanager:= )
66 "
67 +BDEPEND="
68 + sys-devel/libtool:2
69 + virtual/pkgconfig
70 +"
71
72 CONFIG_CHECK="~NETFILTER_NETLINK
73 ~NETFILTER_NETLINK_QUEUE
74 @@ -58,9 +58,8 @@ CONFIG_CHECK="~NETFILTER_NETLINK
75 ~IP_NF_IPTABLES
76 ~IP_NF_TARGET_REJECT"
77
78 -PATCHES=(
79 - "${FILESDIR}"/${P}-fno-common.patch
80 -)
81 +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
82 +
83 S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
84
85 src_prepare() {
86 @@ -82,6 +81,12 @@ src_configure() {
87 $(use_enable logrotate)
88 $(use_enable networkmanager)
89 $(use_with qt5)
90 + LRELEASE=$(qt5_get_bindir)/lrelease
91 + LUPDATE=$(qt5_get_bindir)/lupdate
92 + MOC=$(qt5_get_bindir)/moc
93 + QMAKE=$(qt5_get_bindir)/qmake
94 + RCC=$(qt5_get_bindir)/rcc
95 + UIC=$(qt5_get_bindir)/uic
96 $(use_enable zlib)
97 --with-systemd="$(systemd_get_systemunitdir)"
98 )
99 @@ -102,9 +107,9 @@ pkg_postinst() {
100 elog " virtual/mta (needed to send informational (blocklist updates) and"
101 elog " warning mails (if pglcmd.wd detects a problem.))"
102
103 - gnome2_icon_cache_update
104 + xdg_icon_cache_update
105 }
106
107 pkg_postrm() {
108 - gnome2_icon_cache_update
109 + xdg_icon_cache_update
110 }