From cbcaeee5b3b3d1a1ab0a428f880aa9f7bcb7023e Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 18 Jul 2012 19:42:28 +0000 Subject: Use get_libdir instead of hard-coded lib64 (bug #384691). (Portage version: 2.2.0_alpha119/cvs/Linux x86_64) --- net-libs/daq/ChangeLog | 8 ++++- net-libs/daq/daq-0.6.2-r1.ebuild | 69 +++++++++++++++++++++++++++++++++++++++ net-libs/daq/daq-0.6.2.ebuild | 70 ---------------------------------------- 3 files changed, 76 insertions(+), 71 deletions(-) create mode 100644 net-libs/daq/daq-0.6.2-r1.ebuild delete mode 100644 net-libs/daq/daq-0.6.2.ebuild (limited to 'net-libs/daq') diff --git a/net-libs/daq/ChangeLog b/net-libs/daq/ChangeLog index a473786b6efe..aa7a58fb0ecb 100644 --- a/net-libs/daq/ChangeLog +++ b/net-libs/daq/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/daq # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.17 2012/06/27 18:14:47 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.18 2012/07/18 19:42:28 jer Exp $ + +*daq-0.6.2-r1 (18 Jul 2012) + + 18 Jul 2012; Jeroen Roovers -daq-0.6.2.ebuild, + +daq-0.6.2-r1.ebuild: + Use get_libdir instead of hard-coded lib64 (bug #384691). 27 Jun 2012; Markus Meier daq-0.6.2.ebuild: add ~arm, bug #407799 diff --git a/net-libs/daq/daq-0.6.2-r1.ebuild b/net-libs/daq/daq-0.6.2-r1.ebuild new file mode 100644 index 000000000000..d70e6422058a --- /dev/null +++ b/net-libs/daq/daq-0.6.2-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-0.6.2-r1.ebuild,v 1.1 2012/07/18 19:42:28 jer Exp $ + +EAPI="2" + +inherit eutils multilib + +DESCRIPTION="Data Acquisition library, for packet I/O" +HOMEPAGE="http://www.snort.org/" +SRC_URI="http://www.snort.org/downloads/1339 -> ${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~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 )" + +RDEPEND="${DEPEND}" + +src_configure() { + econf \ + $(use_enable ipv6) \ + $(use_enable pcap pcap-module) \ + $(use_enable afpacket afpacket-module) \ + $(use_enable dump dump-module) \ + $(use_enable nfq nfq-module) \ + $(use_enable ipq ipq-module) \ + $(use_enable static-libs static) \ + --disable-ipfw-module \ + --disable-bundled-modules +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc ChangeLog README + + # Remove unneeded .la files + rm \ + "${D}"usr/$(get_libdir)/daq/*.la \ + "${D}"usr/$(get_libdir)/libdaq*.la \ + "${D}"usr/$(get_libdir)/libsfbpf.la \ + || die + + # If not using static-libs don't install the static libraries + # This has been bugged upstream + if ! use static-libs; then + for z in libdaq_static libdaq_static_modules; do + rm "${D}"usr/$(get_libdir)/${z}.a + done + fi +} + +pkg_postinst() { + einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct" + einfo "calls to PCAP functions with an abstraction layer that facilitates" + einfo "operation on a variety of hardware and software interfaces without" + einfo "requiring changes to application such as Snort." + einfo + einfo "Please see the README file for DAQ for information about specific" + einfo "DAQ modules." +} diff --git a/net-libs/daq/daq-0.6.2.ebuild b/net-libs/daq/daq-0.6.2.ebuild deleted file mode 100644 index f48b7c7e54d2..000000000000 --- a/net-libs/daq/daq-0.6.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-0.6.2.ebuild,v 1.4 2012/06/27 18:14:47 maekke Exp $ - -EAPI="2" - -inherit eutils multilib - -DESCRIPTION="Data Acquisition library, for packet I/O" -HOMEPAGE="http://www.snort.org/" -SRC_URI="http://www.snort.org/downloads/1339 -> ${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~mips ~ppc 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 )" - -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - $(use_enable ipv6) \ - $(use_enable pcap pcap-module) \ - $(use_enable afpacket afpacket-module) \ - $(use_enable dump dump-module) \ - $(use_enable nfq nfq-module) \ - $(use_enable ipq ipq-module) \ - $(use_enable static-libs static) \ - --disable-ipfw-module \ - --disable-bundled-modules -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc ChangeLog README - - # Remove unneeded .la files - for x in pcap afpacket dump nfq ipq; do - rm "${D}"usr/lib64/daq/daq_${x}.la - done - for y in libdaq libdaq_static libdaq_static_modules libsfbpf; do - rm "${D}"usr/lib64/${y}.la - done - - # If not using static-libs don't install the static libraries - # This has been bugged upstream - if ! use static-libs; then - for z in libdaq_static libdaq_static_modules; do - rm "${D}"usr/lib64/${z}.a - done - fi -} - -pkg_postinst() { - einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct" - einfo "calls to PCAP functions with an abstraction layer that facilitates" - einfo "operation on a variety of hardware and software interfaces without" - einfo "requiring changes to application such as Snort." - einfo - einfo "Please see the README file for DAQ for information about specific" - einfo "DAQ modules." -} -- cgit v1.2.3-65-gdbad