From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 741491395E1 for ; Thu, 3 Nov 2016 11:19:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8EF0E0BF5; Thu, 3 Nov 2016 11:19:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1403E0BF5 for ; Thu, 3 Nov 2016 11:19:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C09363410CD for ; Thu, 3 Nov 2016 11:19:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC97A24B4 for ; Thu, 3 Nov 2016 11:19:28 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1478171943.868a4432ae40853116a7679b243042e15209da03.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/pglinux/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/pglinux/pglinux-2.3.1.ebuild X-VCS-Directories: net-firewall/pglinux/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 868a4432ae40853116a7679b243042e15209da03 X-VCS-Branch: master Date: Thu, 3 Nov 2016 11:19:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a6cd3064-6f58-4f9d-b569-cd5eb10a19e9 X-Archives-Hash: 233969bbf0d1b2bcb2ad37f157a9f8f3 commit: 868a4432ae40853116a7679b243042e15209da03 Author: Pacho Ramos gentoo org> AuthorDate: Thu Nov 3 10:56:46 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Thu Nov 3 11:19:03 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868a4432 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 Package-Manager: portage-2.3.2 net-firewall/pglinux/pglinux-2.3.1.ebuild | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/net-firewall/pglinux/pglinux-2.3.1.ebuild b/net-firewall/pglinux/pglinux-2.3.1.ebuild index a762801..7a3b7ba 100644 --- a/net-firewall/pglinux/pglinux-2.3.1.ebuild +++ b/net-firewall/pglinux/pglinux-2.3.1.ebuild @@ -3,8 +3,7 @@ # $Id$ EAPI=6 - -inherit gnome2-utils linux-info systemd +inherit eutils gnome2-utils linux-info systemd MY_P="pgl-${PV}" @@ -16,6 +15,7 @@ LICENSE="GPL-3" KEYWORDS="~amd64 ~x86" SLOT="0" IUSE="cron dbus logrotate networkmanager qt4 zlib" +REQUIRED_USE="qt4? ( dbus )" COMMON_DEPEND=" net-libs/libnetfilter_queue @@ -27,18 +27,19 @@ COMMON_DEPEND=" dev-qt/qtdbus:4 dev-qt/qtgui:4 || ( kde-apps/kdesu x11-misc/ktsuss ) - )" + ) +" DEPEND="${COMMON_DEPEND} virtual/pkgconfig - sys-devel/libtool:2" + sys-devel/libtool:2 +" RDEPEND="${COMMON_DEPEND} net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) - networkmanager? ( net-misc/networkmanager )" - -REQUIRED_USE="qt4? ( dbus )" + networkmanager? ( net-misc/networkmanager:= ) +" CONFIG_CHECK="~NETFILTER_NETLINK ~NETFILTER_NETLINK_QUEUE @@ -55,12 +56,16 @@ CONFIG_CHECK="~NETFILTER_NETLINK ~IP_NF_IPTABLES ~IP_NF_TARGET_REJECT" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' pglcmd/init/pgl.gentoo.in || die +} src_configure() { econf \ --localstatedir=/var \ - --docdir=/usr/share/doc/${PF} \ $(use_enable logrotate) \ $(use_enable cron) \ $(use_enable networkmanager) \ @@ -77,6 +82,7 @@ src_install() { default keepdir /var/{lib,log,spool}/pgl rm -rf "${ED%/}"/tmp || die + prune_libtool_files --modules } pkg_preinst() {