[gentoo-commits] repo/gentoo:master commit in: net-firewall/pglinux/

[Andreas Sturmlechner]

commit:     5d1ac316f534cca585af27a755f68c375cb391e9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 21:46:55 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 23:56:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1ac316

net-firewall/pglinux: EAPI-7, gnome2-utils->xdg-utils, use qmake-utils

Closes: https://bugs.gentoo.org/764341
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../pglinux/pglinux-2.3.1_p20171006.ebuild         | 35 ++++++++++++----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild 
b/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
index eafaafe2ee8..615e1a8fc7a 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)"
        )
@@ -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
 }