summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-07-18 14:40:40 +0000
committerJeroen Roovers <jer@gentoo.org>2014-07-18 14:40:40 +0000
commit8715e51528f3195e8f6f4df9da02497c5cbfc184 (patch)
treeecafa51f880e2e543a0da348dba26d7feee80deb /net-libs
parentUSE=-caja fails to build without Caja, temporarily adjust the dependencies to... (diff)
downloadgentoo-2-8715e51528f3195e8f6f4df9da02497c5cbfc184.tar.gz
gentoo-2-8715e51528f3195e8f6f4df9da02497c5cbfc184.tar.bz2
gentoo-2-8715e51528f3195e8f6f4df9da02497c5cbfc184.zip
EAPI bump. Sort dependencies into neat piles.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/daq/ChangeLog5
-rw-r--r--net-libs/daq/daq-2.0.2.ebuild38
2 files changed, 23 insertions, 20 deletions
diff --git a/net-libs/daq/ChangeLog b/net-libs/daq/ChangeLog
index e8911a296ed4..cb0afded6a36 100644
--- a/net-libs/daq/ChangeLog
+++ b/net-libs/daq/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-libs/daq
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.26 2014/06/03 16:54:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.27 2014/07/18 14:40:40 jer Exp $
+
+ 18 Jul 2014; Jeroen Roovers <jer@gentoo.org> daq-2.0.2.ebuild:
+ EAPI bump. Sort dependencies into neat piles.
03 Jun 2014; Mike Frysinger <vapier@gentoo.org>
+files/daq-2.0.2-libpcap-check.patch, +files/daq-2.0.2-parallel-grammar.patch,
diff --git a/net-libs/daq/daq-2.0.2.ebuild b/net-libs/daq/daq-2.0.2.ebuild
index 75500cac7b04..d6e4001b6066 100644
--- a/net-libs/daq/daq-2.0.2.ebuild
+++ b/net-libs/daq/daq-2.0.2.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.2 2014/06/03 16:54:59 vapier Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.3 2014/07/18 14:40:40 jer Exp $
+EAPI=5
inherit eutils multilib autotools
DESCRIPTION="Data Acquisition library, for packet I/O"
@@ -15,14 +14,19 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
- dump? ( >=net-libs/libpcap-1.0.0 )
- nfq? ( dev-libs/libdnet
- >=net-firewall/iptables-1.4.10
- net-libs/libnetfilter_queue )
- ipq? ( dev-libs/libdnet
- >=net-firewall/iptables-1.4.10
- net-libs/libnetfilter_queue )"
+PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
+IPT_DEPEND="
+ >=net-firewall/iptables-1.4.10
+ dev-libs/libdnet
+ net-libs/libnetfilter_queue
+
+"
+DEPEND="
+ dump? ( ${PCAP_DEPEND} )
+ ipq? ( ${IPT_DEPEND} )
+ nfq? ( ${IPT_DEPEND} )
+ pcap? ( ${PCAP_DEPEND} )
+"
RDEPEND="${DEPEND}"
src_prepare() {
@@ -47,16 +51,12 @@ src_configure() {
--disable-bundled-modules
}
+DOCS=( ChangeLog README )
+
src_install() {
- emake DESTDIR="${D}" install
- dodoc ChangeLog README
+ default
- # Remove unneeded .la files
- rm \
- "${ED}"usr/$(get_libdir)/daq/*.la \
- "${ED}"usr/$(get_libdir)/libdaq*.la \
- "${ED}"usr/$(get_libdir)/libsfbpf.la \
- || die
+ prune_libtool_files
# If not using static-libs don't install the static libraries
# This has been bugged upstream