EAPI=4, Bump to 2.0.2, and remove 0.5.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD25D95E3

7 files changed, 116 insertions, 82 deletions

diff --git a/net-libs/daq/ChangeLog b/net-libs/daq/ChangeLog
index 2efc48e9286d..55cf4a21e2b5 100644
--- a/net-libs/daq/ChangeLog
+++ b/net-libs/daq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/daq
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.24 2013/05/31 02:48:40 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.25 2014/02/03 07:33:22 kumba Exp $
+
+*daq-2.0.2 (03 Feb 2014)
+
+  03 Feb 2014; Joshua Kinard <kumba@gentoo.org> -daq-0.5.ebuild,
+  daq-0.6.2.ebuild, daq-0.6.2-r1.ebuild, daq-2.0.0.ebuild, +daq-2.0.2.ebuild:
+  EAPI=4, Bump to 2.0.2, and remove 0.5.
 
 *daq-2.0.0 (31 May 2013)
 
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index a74bf970932e..062d575463ac 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,9 +1,29 @@
-DIST daq-0.5.tar.gz 449703 SHA256 36f2954a5994e0047c43a6e48e033712a4f2dbabb63556aa07d6344f3f834eec SHA512 2c83d383550f75fd961b514681122ac5493ca99095820e4b701776a53a1d7b6f7edb839c9082b87a1902d0f4e6c6c6507fbcb6164215e1b2a4e2df860f6ddad1 WHIRLPOOL 0e900d8b7922326715fd054e311247ed78a7342c57186566dd26dd74a43cd428af6fe220335f30c8f34c61685fb307646c9a90510c693e2d96e1eaf83c39adba
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST daq-0.6.2.tar.gz 451581 SHA256 0159865b5dc127ed2faf8d6732d781939f27e38b7c7deabcd369a22ea9e42f26 SHA512 da19034f210d9c202f5e3ba7ddf60645498ed8bdaf28410811922ebb1338b56c55c8e992e46e1c7b9b89de6148b471129826a02ab2a45c7232bc4091a4e53125 WHIRLPOOL 01e7b47e27b71d11648936911bb9bd2657b387fd15eb41f5939b23b3e2da9753d66165eddd0831ba4e827ab67ee2f61ee963cb98788ad4a7ca9d03f921031ff6
 DIST daq-2.0.0.tar.gz 480030 SHA256 fbafc8e362a96fcadc69731f91203ef90845507aae0a4774d5c2825e9d2c1c38 SHA512 aa79e06473592c0ee57a3a2da60f01f35e6268a126fcb3a992ee7c6da48a079cf359db7439be3778997e774c340630d768712c9efea10c570feb4961f9a00b3c WHIRLPOOL c1eb41df6718a7ece0da95599f78f080a32337a3522181ad31db46a0285d584dfd46e2fffce5e73ef3ba0409bd033b59ac0b272df1d7ee104f6160edc69bc8be
-EBUILD daq-0.5.ebuild 1663 SHA256 fc87be5f30b407272979052f0c5cd2e69f61857d5ad38516a8162d11c1334764 SHA512 67550e0ab77df0a67c7316f76413e40d3bfe67794c6c3961ed866ba270263d27aa8531799b837a10aa4cc04c6c248a4d43d514f84f174f7dd2e712a8d658dac8 WHIRLPOOL ed44fd4801a7a60029e2748ab83ef3ff3aa739405fb8aafd5e9cb08d187d8b2e14f11095116cfdc83dd98578eed6f2f4196389aabce1d2f63fef1a52e916d63b
-EBUILD daq-0.6.2-r1.ebuild 2035 SHA256 b0556caddfb3a6275b8d5bfce7095ca9a2d1058b6d2425b8452ae6f8c201d880 SHA512 77648a2e1ab474c70dd971f38dc8320f56ad3d5b1a42d2b3b794705ef4546c57a4267c5b940705fa1288586bdfc9386e6012f4caabe9650e56150359b46ea833 WHIRLPOOL 4add63ccc8e69fd5b0740b7d872553230f8adff6d9edc7f84f6029b215fec6a5e6614fff6facb6419e6095c5922dacf203baf40740c7f2f5934d8617da581f1a
-EBUILD daq-0.6.2.ebuild 2062 SHA256 d229097d090a37fd5223d402a87b977ca8168f8bc9957ecd5adb56df7376c6a1 SHA512 cb40f72232c4fe311665e761b5207b1016e4abdc408e555c559f9c9ecb7ce20d930152cec8a1ecb8d152a8b26768f4748f44fa9afcc0dfd67f9d355eb0721ab9 WHIRLPOOL 55732bb29a35395c473f1ef822e1db6c2bfe12225e2761d22c0c368e882bcb34c7cbd4d7927bfb7622a3c3f362ed80c9f8fddaabc38b7ed317422e57e8acb9a5
-EBUILD daq-2.0.0.ebuild 2036 SHA256 80995c7173a3ad007f388967a541e11bed4dd5d32a58f3a166b173b848b36f8b SHA512 a3d2e836274b5415c17c9f409253c150328bfc615f1337e5e466e7211e895298f79f4002bfcd096774ce2f41d7f2c26cd3cc8d6e71edca57be71c366402c23a0 WHIRLPOOL ccfe8f5c64648e85bc0edd93fd95a9512196028875201057150a4b2efc4bd6914cea929757213e2e1471b5fec2194483fbd4aba647f30118640fb4bf67514d66
-MISC ChangeLog 3026 SHA256 35a204525ba3f42ec8c39241dd791ed35c7454db03d31c6375f4a1c2532cffb7 SHA512 ea99b3da9245a545a5091ed3104828925d71acfb44e6945094482dd02c16ec752d1f0e1be01157f379988b2669d2ce1d2ac3073f9c36de8011cc434309315d9e WHIRLPOOL 582cb53d182dc75ea0e3ecdecd141234e769346d96298ea04624da1f8d339664d6c560c333e37e02071f402aae862bf10b4bf9c44ac567169121f33b76ad5527
+DIST daq-2.0.2.tar.gz 474447 SHA256 d65d1e67c4994e02c3142c49a648642e780b7e3d942b4a51f605309beac269a8 SHA512 b2a47e174155f21cb1c6f1e1c431ea7cca6aa9f7371228e77def3c526a67fd42d0e26e4c94263195e041b203cdf0c2aaef14f9035afb23dde0bd5df3bf422cbd WHIRLPOOL 3902ccda294c5967c509971abbbfb787f46792cd6bc286097e1d8b88c5d0f25c29019c918d41cabb8d52e4fcb1d99ae60e6eea3319aea2ee46aa8aa9b117e738
+EBUILD daq-0.6.2-r1.ebuild 2008 SHA256 ffb451043ea6824824ab21d09c85f2e284f13b88279a4eab6e0e9522b7515d0e SHA512 21bdc18f8ef572b152680fe1dc16b0fc8f8cdbcf541206befeb6e2ff0e560bf2aeda53a05af9ac6ea1b43d75c9af0d8803a823dbfc499d2a51dd064bfe108a25 WHIRLPOOL 036eb36545b69c3afce8b3d15a861f2785b901d6a76b7e5727f5c880a6977c196e7b7eba61846363b128bf96e71238b861f6074161b3da8f0fd767cd6128b057
+EBUILD daq-0.6.2.ebuild 2035 SHA256 81ee24ec7a96f07ff7c9b4ee3d7d4de28f1ef8786dce1359d56934180b4798c2 SHA512 0db8ef53177ae9aca4343b119c9f56a6c344ee03f75d3475cb2505253ba2aa662e6d77250a056098ab71f41db68225953b4f66346687831afb4348150838c003 WHIRLPOOL 49fa21b5fc3e9d4fa5ed53ec8b3926068b99465ab55a6f87854deb7c95ab8073fefacda77056f295a1a9fd94cb134ec7572adfd4ec5db9005c1d256dd5c9f293
+EBUILD daq-2.0.0.ebuild 2004 SHA256 cbaf150fe96f99178196439c9c20972c05470b7ad9c01dcfbecfed2f5c9ecb20 SHA512 4ab220b3487e502472d0c56defb5a4693ada33484c4b1b31fd47d508adf26c044d1b14de8b19f57f0bbf4960a770b185ebd8e12e227481c434813d04d44fd73a WHIRLPOOL 5c39c078db31d49c33bd38b7790545e5b575cd400836ca48b5515614e5af57e4a5588c31090f278fb863409e77a0f58ff37ce3e42f95fad6e99ad9543df4f620
+EBUILD daq-2.0.2.ebuild 2004 SHA256 8648dbaf41bb6d91c5efa4dc1c8ee8a5c666e141aa957b83f9ca2f71d0b4e1ef SHA512 fbb11a9ce418cba7274f5bb02df5bdd5bd0f5f4cbf381cd6e63332e551422e68702cd5e396d89dfa28809e539b194e1eb184c660023ce5039b9627b9689419f0 WHIRLPOOL bcac11df5841eb277602f55291917c20da924cb8964ed0ebf7f40738d43919e2c0b83bea7713f4ef5b90318cebb106317c21d512db89b1a4b7bfd4e0d4a7cac3
+MISC ChangeLog 3235 SHA256 7ad84a335ca0e4a8936c6d4676d4f1ff83a30b1e3e18f62a1ed985e7a8000083 SHA512 d020a042e3043c6d248ffc4419e7106e8a95b49eb899b453cd3d96505794ed4b9888fb257cd3e7053644ce8fffc7167741a9473dc81b6b3bf039aa506e1e6ba8 WHIRLPOOL 62a478250ccadc2022bc1f5c7c7ea6ee3df0127c2f462baed4b8f07bfd20e50bcbc5d9e5c558f5e6332c719502e9defb61f6c855a70a4c6b518bc02160f49e67
 MISC metadata.xml 1438 SHA256 ebc4236c947de55691e1ef1ce3b51b5b676e0725440b39a224f719d5c04a7000 SHA512 2d0b6e7801eb3d617c5c76b93ba86003b2f630f1143993918f2cec284a22fd7980e9a0a185f38fc31f771f657a8ecdf3da4f940b40eb418db3bb94100289d672 WHIRLPOOL 137d95c8bb539e54f0ff24f327eb1ab8868a2c2079510ebe35e8eedfc0967d2f560fa074ba46ba059157561c86557c2217108d35fbd741444722b6daf5958a01
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJS70YqAAoJENsjoH7SXZXjnFoQAKy1611P+8tWgmVJlVLoy1mq
+Tl1jNJ0BDRi/hlzaT3MqmrqdafMyt/rxfCMqsf/YBDNJuxP+o+HMhDgjkRcE83HU
+xk7B5wBEdnMz+HLyq/ytoj7SyDe+CsllEvizlX9jySctxajzBdYWuQnM2opd+6q2
+Bqp8r4cE/dodW7cCAiO6O4EsyBb/kfhJH/R9dJQ+udnVNiZZlLxgXa+O0jbuldIr
+m+UVpAm650gEoOJhd00Ad9BENqENn7/nhcxSu1iQxo6ZPK/y27iKdWrsrwLyv/Ge
+JHtkzyloMUV6N9eImb/Ctjokdo9kf9nzkiKB75X0fv0tph1xteSwNO3nkMVb/Wgs
+kzuOqbNspSt2nVt+V6Y1gT4gv7sk03lMNLcgxZqhTB+oigA4hrqGrZ1ePeq8pt0V
+JjWvzLyc6EPSsTj2XaH50Knw5/g1lYwnpsMcN9KX7uWhqvk9WSw/ypkTH1K6qrLk
+B2IyLSHfJH81iKnWPA1WaM3kMoNj/scnhKmduWz0/b3ILovbCuyhToC12rrOPLuJ
+jP0BsjIPp+e1fpjXT0400N+74dCgQXLakZsfethti301mO7ZHaeJiwUsRmdEzVEm
+skXL2cuI6KNau19c4Tcfiir0gHAaHnyu7SPpcr6HlfABOlL6t70ZtF2WnjEkecpC
+n3+WGV2W0SlGcsS55qNq
+=VVhx
+-----END PGP SIGNATURE-----
diff --git a/net-libs/daq/daq-0.5.ebuild b/net-libs/daq/daq-0.5.ebuild
deleted file mode 100644
index 822621aac6c9..000000000000
--- a/net-libs/daq/daq-0.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-0.5.ebuild,v 1.7 2011/07/24 12:07:15 xarthisius Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/630 -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="ipv6 +afpacket +dump +pcap"
-
-DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
-		dump? ( >=net-libs/libpcap-1.0.0 )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		--disable-ipfw-module \
-		--disable-bundled-modules
-
-}
-
-src_install() {
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ChangeLog README
-
-}
-
-pkg_postinst() {
-
-	elog
-	elog "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	elog "calls to PCAP functions with an abstraction layer that facilitates"
-	elog "operation on a variety of hardware and software interfaces without"
-	elog "requiring changes to application such as Snort."
-	elog
-	elog "The only DAQ modules supported with this ebuild are AFpacket, PCAP,"
-	elog "and Dump. IPQ and NFQ will be supported in future versions of this"
-	elog "package."
-	elog
-	elog "Please see the README file for DAQ for information about specific"
-	elog "DAQ modules."
-	ewarn
-	ewarn "If you are reinstalling this package, you should also reinstall"
-	ewarn "packages that use this library for packet capture."
-	ewarn
-
-}
diff --git a/net-libs/daq/daq-0.6.2-r1.ebuild b/net-libs/daq/daq-0.6.2-r1.ebuild
index a2c80d60e014..dc90900a53b2 100644
--- a/net-libs/daq/daq-0.6.2-r1.ebuild
+++ b/net-libs/daq/daq-0.6.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-0.6.2-r1.ebuild,v 1.3 2012/12/30 21:06:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-0.6.2-r1.ebuild,v 1.4 2014/02/03 07:33:22 kumba Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils multilib
 
@@ -39,7 +39,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 	dodoc ChangeLog README
 
 	# Remove unneeded .la files
diff --git a/net-libs/daq/daq-0.6.2.ebuild b/net-libs/daq/daq-0.6.2.ebuild
index d57dd7c45fb7..39885faeeff3 100644
--- a/net-libs/daq/daq-0.6.2.ebuild
+++ b/net-libs/daq/daq-0.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-0.6.2.ebuild,v 1.6 2012/07/18 19:45:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-0.6.2.ebuild,v 1.7 2014/02/03 07:33:22 kumba Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils multilib
 
@@ -39,7 +39,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 	dodoc ChangeLog README
 
 	# Remove unneeded .la files
diff --git a/net-libs/daq/daq-2.0.0.ebuild b/net-libs/daq/daq-2.0.0.ebuild
index 9c88032a78a7..cc42d08e7b7c 100644
--- a/net-libs/daq/daq-2.0.0.ebuild
+++ b/net-libs/daq/daq-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2013/05/31 02:48:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.0.ebuild,v 1.2 2014/02/03 07:33:22 kumba Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils multilib
 
@@ -39,7 +39,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 	dodoc ChangeLog README
 
 	# Remove unneeded .la files
@@ -47,7 +47,7 @@ src_install() {
 		"${D}"usr/$(get_libdir)/daq/*.la \
 		"${D}"usr/$(get_libdir)/libdaq*.la \
 		"${D}"usr/$(get_libdir)/libsfbpf.la \
-		|| die
+	|| die
 
 	# If not using static-libs don't install the static libraries
 	# This has been bugged upstream
diff --git a/net-libs/daq/daq-2.0.2.ebuild b/net-libs/daq/daq-2.0.2.ebuild
new file mode 100644
index 000000000000..f4800613ac53
--- /dev/null
+++ b/net-libs/daq/daq-2.0.2.ebuild
@@ -0,0 +1,69 @@
+# 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.1 2014/02/03 07:33:22 kumba Exp $
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="Data Acquisition library, for packet I/O"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/downloads/2778 -> ${P}.tar.gz"
+LICENSE="GPL-2"
+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 )"
+
+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
+	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."
+}