| 1 |
commit: 868a4432ae40853116a7679b243042e15209da03 |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 3 10:56:46 2016 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 3 11:19:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868a4432 |
| 7 |
|
| 8 |
net-firewall/pglinux: Drop .la files, we don't need to specify docdir with eapi6, fix init.d script to call openrc-run, set subslot for NM dep as it will be needed in the future |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
net-firewall/pglinux/pglinux-2.3.1.ebuild | 24 +++++++++++++++--------- |
| 13 |
1 file changed, 15 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-firewall/pglinux/pglinux-2.3.1.ebuild b/net-firewall/pglinux/pglinux-2.3.1.ebuild |
| 16 |
index a762801..7a3b7ba 100644 |
| 17 |
--- a/net-firewall/pglinux/pglinux-2.3.1.ebuild |
| 18 |
+++ b/net-firewall/pglinux/pglinux-2.3.1.ebuild |
| 19 |
@@ -3,8 +3,7 @@ |
| 20 |
# $Id$ |
| 21 |
|
| 22 |
EAPI=6 |
| 23 |
- |
| 24 |
-inherit gnome2-utils linux-info systemd |
| 25 |
+inherit eutils gnome2-utils linux-info systemd |
| 26 |
|
| 27 |
MY_P="pgl-${PV}" |
| 28 |
|
| 29 |
@@ -16,6 +15,7 @@ LICENSE="GPL-3" |
| 30 |
KEYWORDS="~amd64 ~x86" |
| 31 |
SLOT="0" |
| 32 |
IUSE="cron dbus logrotate networkmanager qt4 zlib" |
| 33 |
+REQUIRED_USE="qt4? ( dbus )" |
| 34 |
|
| 35 |
COMMON_DEPEND=" |
| 36 |
net-libs/libnetfilter_queue |
| 37 |
@@ -27,18 +27,19 @@ COMMON_DEPEND=" |
| 38 |
dev-qt/qtdbus:4 |
| 39 |
dev-qt/qtgui:4 |
| 40 |
|| ( kde-apps/kdesu x11-misc/ktsuss ) |
| 41 |
- )" |
| 42 |
+ ) |
| 43 |
+" |
| 44 |
DEPEND="${COMMON_DEPEND} |
| 45 |
virtual/pkgconfig |
| 46 |
- sys-devel/libtool:2" |
| 47 |
+ sys-devel/libtool:2 |
| 48 |
+" |
| 49 |
RDEPEND="${COMMON_DEPEND} |
| 50 |
net-firewall/iptables |
| 51 |
sys-apps/sysvinit |
| 52 |
cron? ( virtual/cron ) |
| 53 |
logrotate? ( app-admin/logrotate ) |
| 54 |
- networkmanager? ( net-misc/networkmanager )" |
| 55 |
- |
| 56 |
-REQUIRED_USE="qt4? ( dbus )" |
| 57 |
+ networkmanager? ( net-misc/networkmanager:= ) |
| 58 |
+" |
| 59 |
|
| 60 |
CONFIG_CHECK="~NETFILTER_NETLINK |
| 61 |
~NETFILTER_NETLINK_QUEUE |
| 62 |
@@ -55,12 +56,16 @@ CONFIG_CHECK="~NETFILTER_NETLINK |
| 63 |
~IP_NF_IPTABLES |
| 64 |
~IP_NF_TARGET_REJECT" |
| 65 |
|
| 66 |
-S=${WORKDIR}/${MY_P} |
| 67 |
+S="${WORKDIR}/${MY_P}" |
| 68 |
+ |
| 69 |
+src_prepare() { |
| 70 |
+ default |
| 71 |
+ sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' pglcmd/init/pgl.gentoo.in || die |
| 72 |
+} |
| 73 |
|
| 74 |
src_configure() { |
| 75 |
econf \ |
| 76 |
--localstatedir=/var \ |
| 77 |
- --docdir=/usr/share/doc/${PF} \ |
| 78 |
$(use_enable logrotate) \ |
| 79 |
$(use_enable cron) \ |
| 80 |
$(use_enable networkmanager) \ |
| 81 |
@@ -77,6 +82,7 @@ src_install() { |
| 82 |
default |
| 83 |
keepdir /var/{lib,log,spool}/pgl |
| 84 |
rm -rf "${ED%/}"/tmp || die |
| 85 |
+ prune_libtool_files --modules |
| 86 |
} |
| 87 |
|
| 88 |
pkg_preinst() { |
Archives