Version bump. Temporarily require lower net-wireless/bluez to satisfy expectations of certain features not present in later versions.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 88 insertions, 8 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index e958f95db989..506ad0e34736 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.194 2014/07/20 15:08:29 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.195 2014/07/22 10:23:58 jer Exp $
+
+*libpcap-1.6.1 (22 Jul 2014)
+
+  22 Jul 2014; Jeroen Roovers <jer@gentoo.org> +libpcap-1.6.1.ebuild:
+  Version bump. Temporarily require lower net-wireless/bluez to satisfy
+  expectations of certain features not present in later versions.
 
   20 Jul 2014; Tobias Klausmann <klausman@gentoo.org> libpcap-1.5.3.ebuild:
   Stable on alpha, bug #511502
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 28603134d65e..e87bb2c499aa 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -9,19 +9,19 @@ DIST libpcap-1.4.0.tar.gz 619045 SHA256 7c6a2a4f71e8ab09804e6b4fb3aff998c5583108
 DIST libpcap-1.5.1.tar.gz 640233 SHA256 259db4fe1e9f0b6b9c43a057ec5916dec7d0a821b00d6d6c4dff7db2445fa7e4 SHA512 c2b8b4771127278b7986650961efa0745789a33e717866a5ee4ee84333b7592738b12be12c1113075a5bf9e8edd03b3f6e6b3c018ef29383834608af5153ed39 WHIRLPOOL f3401ac2bbe717d8e96127f2ad87d9e13bb01430cf1e1c3e82a3606b32481059368b027fcba426f9c9ad688d0f5cc866a1d71369ca34421cff2937dadef3fd6c
 DIST libpcap-1.5.2.tar.gz 640308 SHA256 806d4ba23b126476d39a458ad1468f73dfe63c92f9586208f7e4e18c13e52ddd SHA512 c6184e8e1a4ab60c3e83d51edb9f0283e25423c58df16a045b68574e7aaff8afe3c57616d84714089c248810d469e373ae1aeeb8882900bfe11ceaa083e41eeb WHIRLPOOL 7ad323912f1024e842e0ce33c36963c2cb683e0ee299c5f42f19c8f17f18316eb042970d8543d8266119f6cfb781e0a9b3c961f26f3ad3a407b0159263bf1939
 DIST libpcap-1.5.3.tar.gz 642352 SHA256 9ae92159c1060f15e6a90f2c4ad227268b6aaa382c316fa49a31c496b9979e93 SHA512 ee487b81ef3c8cd9e0173a252f620bdf2ebfde87bd7a95b38ea4658b47982d09ca86502d4a3473ffeb4388fb19e33d1f614236e22b420077b7ab40d3481f18a3 WHIRLPOOL 3d71f4c5134b2a0eba4d5e47952ddfad784bcde37332a926b68a799226f7fadd45e0e7fc2c12ede3724e89c2470f18ed35768dc12445950116e3b745b867020b
+DIST libpcap-1.6.1.tar.gz 651061 SHA256 116cbb3ac9e96d5dd7b39638a2f894a67fa3dcf06d794e6dae2b9a942ad13476 SHA512 721f20ccf93d0a033945a8ed618dad2aeb7334eea26ee128f2eebf65e19bd6523698191e59e727adb83b96f4ca45f2f218f9af94af9923453c06a57cab36487b WHIRLPOOL 4b74a79ba7a3b846c890875f0940b6b7ea1ffdce735987ba2476f092eb635b7b2da45f98066b8e50bc8474898807e5b34b45556ffae536f33f0bc728552cbf0b
 EBUILD libpcap-1.3.0-r1.ebuild 1773 SHA256 499425b253a964b16d41f55cc3280a9ae474d6ba0432139fba89b9368bbc4517 SHA512 8ac9a85cf5a858bbf013818d5b7b4a4aa06eba10a836dd230f640ae3f014eb26534a73688e86d75ace96d85264404de0dc19d5e5dc2656f01d64ad6a0d0fcd6b WHIRLPOOL 2ab3c53041b718cf773ced0044de0de89dd3b9d842acb040d750f85dfe310d2a1864fe8d3854e42e48299230c42cedcce03cfe2b5663886d013bc016f3cf72d7
 EBUILD libpcap-1.4.0.ebuild 1692 SHA256 2f391d161593fb62e9b9e10e1c18ffc7efc8c5b50a7f18e7379fb0f6c95bdd28 SHA512 33669d0e438e63e32881fd4b24581876a54d9be58f92eaf26639105567571c187fa1e0ba5bc7fe4fa976cc0e609be0d78f84c153d10bb36354ff97d96a9b399f WHIRLPOOL 948e799d4de8644d26f91ee1cd3201bd120caa582e7be04fd71f627a5c0bd87717dc008d5d6e41b8c63afa87d06612525f144f933992b6ba1a8e54a0e9467b15
 EBUILD libpcap-1.5.1.ebuild 1927 SHA256 9acf40ba967273bc39454d9969d8270665717485a5bcd17dc00e6a31893a1b71 SHA512 38609f3679d731259da567518ad6bed2ad9bd5e52f8cbe206226d9273c2ca1733bfb2e0bad1bcf588fe82f445ef7eed2faf41a4781c3acf0084b63b5dab3daab WHIRLPOOL 99c74a59eb1fde594a1d7a28f1d56078bf31cd47366a60366dbe1c583cbc5b50cd111bf21c5bdd80c514ecc1a842426cb6cb7c263720fe0eec43474270344927
 EBUILD libpcap-1.5.2.ebuild 1929 SHA256 ddf7061afe1e92c2489f0ade8833b1b637e0a4a01bc391cac6e3050be2257a2b SHA512 2e4a1ac2e710776fd72778f6dc83f466f7cf88c4047f23182fa037503bf3c0c4c4a2cae20b68ac7bc125f0197ec73135794e5debf3295a1afcdcb3d5681cb58b WHIRLPOOL cedc2b280b002c78c32c5c783cd8a5655ed163d0ca07b5ce3c993811b570f04f6a377a3ad2e9ddb167a4727d2db7a9ac0a8b45cee8d68b459626d3ba55947f88
 EBUILD libpcap-1.5.3.ebuild 1917 SHA256 abbaa6a829dc1a8e0923a35d1b19cf6886316bdf05c75f529026a51e92275f09 SHA512 3945399aca99a73f3cda89a4193d0b58aa64bd1420ff1c18468b1ed2abf697c27fd1daedaa38732f59c7d454efc5fff4600377ff7ead51d5f189fbc448aa04b3 WHIRLPOOL ee2e163f71b43e7f4eb6a2f9368a68becd30953f98bf0749409f5ba509c00f22de6fc3e4147f08d6eb8463a2aff4959ae4e9eacf9e12f344efa813e185c4b3b4
-MISC ChangeLog 26641 SHA256 ab03ecb90b15367dd1dca1272d4ce23b0a1c312884d07ee10bd17cb8840d241b SHA512 a54db40895567262db8b9489f109192b3af1b02b22d2ec02225daea39174b3a3504c19ba806d9a2b6c1b43f24820e00834ed8910f745ee28e2f959b4cbf9790b WHIRLPOOL 1f0d1a2a26a7648e5292428d5333d8a81d9d79921e4817d244e4faadc1b67f113bccd3052955edb98a892152f2f0d135843e920a053ef6bf14d184972c2c3ec0
+EBUILD libpcap-1.6.1.ebuild 1920 SHA256 0ff0a6f8760997da53f75c2f75bda73968556920585391de30d8889f11f80fb4 SHA512 b9f11fcbd09be6c1d788a4387cd975afc13a9d6342e7d41c11fdf52cfae5d13f009a47f29050e1edab5b40c40a67eb2bb51dc4501c7119e981eb6558dfb571f8 WHIRLPOOL 5c1b882dacdcd87467118d962a2266e50a9e1ddf126e58c31643e4456b99289387b64b97baa04a5e45668e048611901e3144b5213b3e0ee5c3ef7f1da5544ca9
+MISC ChangeLog 26875 SHA256 36ca46853f36f0b751c5882e0925af68807be86650495c52847f86c5db9dc111 SHA512 8a0bbeb98e2b50e59e1ffae181ccbb70816051265f9fc17dacf48a3a341e2ea831b55df2936b19207f8c8d071058de8a93da3e34631a4a141edd60b00445cab7 WHIRLPOOL 92248f6b862f2e6f59b2c0dadb35c6d40d91fb13bda7fac5ae2742e2a7f05aeac94591c04ed72ef15c7b75f578ff4625a06e75070106f979039146f57cc338ff
 MISC metadata.xml 423 SHA256 d12419de9bd641cf78030dc7bdb2789c2c932f91ba9687a6073961eb8ff09e4f SHA512 61b591b21bd46a8ae6a20fde2d5cbe6f68250ce7616b11b55b3a270474fe1ac3b4aefcd3c98e9e6470a036ef3c685b3575464de81349137fdf7cd8082ea2d695 WHIRLPOOL a08d3ed4833b2725f68ad8fcca878047a6b7a36188462204dec1fe7f528b6ad4c8698bed8a87a03e52fe5ea7e30fd8464a881408c179e2d7ef085f511aad4475
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlPL225fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOhX1wCglhyD2Hc7G3RJj1d/eef2SHI0
-GmgAnA8FwMgSGpZ0mcbjWDei1l0BJViA
-=naMn
+iEYEAREIAAYFAlPOO8AACgkQVWmRsqeSphMA4gCdG3g/XGMIVfqPYreArDOBQDAd
+fJAAnjI1tzeR/Cs+GX+BbNAK7h7c7S6B
+=Pf89
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/libpcap-1.6.1.ebuild b/net-libs/libpcap/libpcap-1.6.1.ebuild
new file mode 100644
index 000000000000..1d99fe025788
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.6.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.6.1.ebuild,v 1.1 2014/07/22 10:23:59 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="http://www.tcpdump.org/"
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+	http://www.jp.tcpdump.org/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus ipv6 netlink static-libs canusb"
+
+RDEPEND="
+	bluetooth? ( <net-wireless/bluez-5 )
+	dbus? ( sys-apps/dbus )
+	netlink? ( dev-libs/libnl )
+	canusb? ( virtual/libusb )
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.0-cross-linux.patch
+
+	# Prefix' Solaris uses GNU ld
+	sed -e 's/freebsd\*/freebsd*|solaris*/' \
+		-e 's/sparc64\*/sparc64*|sparcv9*/'  \
+		-i aclocal.m4 || die
+	# Prefix' Darwin systems are single arch, hijack Darwin7 case which
+	# assumes this setup
+	sed -e 's/darwin\[0-7\]\./darwin*/' \
+		-i configure.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable ipv6) \
+		$(use_enable canusb) \
+		$(use_enable dbus) \
+		$(use_with netlink libnl)
+}
+
+src_compile() {
+	emake all shared
+}
+
+src_install() {
+	default
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+	prune_libtool_files
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h
+	fi
+}