Version bump.

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

6 files changed, 124 insertions, 17 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index fd0634f5dfb0..cb55d88ffff1 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.217 2015/03/02 09:29:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.218 2015/03/11 08:58:46 jer Exp $
+
+*libpcap-1.7.2 (11 Mar 2015)
+
+  11 Mar 2015; Jeroen Roovers <jer@gentoo.org> +libpcap-1.7.2.ebuild,
+  libpcap-9999.ebuild, +files/libpcap-1.7.2-libnl.patch,
+  +files/libpcap-1.7.2-scanner.patch:
+  Version bump.
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> libpcap-1.6.2-r1.ebuild:
   Stable for ppc, wrt bug #526030
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index de3a7b2f5fca..abf4aabf3daf 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -5,29 +5,23 @@ AUX libpcap-1.2.0-cross-linux.patch 555 SHA256 6e405b3ba8a5eb079b12bb529a16f645c
 AUX libpcap-1.6.1-configure.patch 395 SHA256 dd61d36cfc89bd5c5f67f4b91cde2063f874de8e1456f5e8f426d3faa4109916 SHA512 e9a4ddf9d4102b1b6e450a7a5c9c1e00ea08edfa2d04772d877a209e2292dae14531b51b2c25a80b6bd2a00a76bcfa4d7e4672b399a2c9b7f1f5ff931da70ee6 WHIRLPOOL f6370b1e55411ad906c152fc03201dcccc57b1568efb25d58439956980ccba4fb4f4b8a4fcbe6188782970a81ea790bd71b8855ae3c95b3333a63848271529e8
 AUX libpcap-1.6.1-prefix-solaris.patch 807 SHA256 c5bd1a5e0945e6ad06c4455045cf50f251ba6d2ba0386c6bdb20f809c5afffcd SHA512 af76d741784d123d7c2534c85018a102736889f0456420c5ae4b53b6568ec3054de30c4ce755ff6f9ae83abefd2275b379794e5a7cac65ef483ca676bf8883b3 WHIRLPOOL 1049da0979b52c71d783e5979e4b3ea0776f609725c1c288a6c75e8afe102db85f58af1d3f31249c7938d818e68bb569ef18f2c54dcb121b87fbe3c00a089cc3
 AUX libpcap-1.6.2-dbus.patch 418 SHA256 115b2ebdfa9b58cda56a8f88c0736258eaa1a8367e57aa5b63173076227fa8b2 SHA512 59626b7ffbb1914feec8950fb6a5694cf8fc9833e07319f95e6608312aa04fca6a519a5b88d1ae365c14aeef188794271995d2e5b4d5bbaea733e81f3b8b8950 WHIRLPOOL 08c496bda4b01b5f3c7fcdd354d0cab0658940f9631a4af4b54a3630270cdc114c4a0eeb3dcda9c6ffcdcac758362ee6a0b93af0888d26ed8f20d6f9edd7bd61
+AUX libpcap-1.7.2-libnl.patch 688 SHA256 62d6202ed5c9f4ce1ff1ffb693b847999e216ffb1ea3317c1945106d420da1a1 SHA512 7860a2c02faf79b71b2804f9c14b5f9d4eb341e6c94d86835ea40eaaa83beebee643c362644aacd3b414d7cbd0bd3bdfab96cc721135e9c0a02acfaa2d138114 WHIRLPOOL 0911a148f7a76c0539499d1d626cca656f957d1cd3fa484b1c353e26d4697be56f97e50932245daad28142f4b4aa1ce0568f4448267b8efed82a789a6a50a034
+AUX libpcap-1.7.2-scanner.patch 249 SHA256 11092e1de395d23bc50c60140d321bfc753906ace349789191e7888c6aedddd6 SHA512 2877afb971f2cc18ab48acae5ee362d189deabfb8ddeb801d64dc5bee891769487b465d2c783fd6cc511f23d00dc69df89c3c572b141dcfb3aa3ef9da81f475c WHIRLPOOL 753ea2208685a2bbd9472b5da92a9ee6b1a9a96de1b77fab2b3a548e4bc343eff56a5b6e04bd6a564f574034502e373e97fce246e7f0d14f3ea73958dae27902
 AUX mgmt.h 1066 SHA256 fda9bf6721c986db93a084049c796b8de4f6a9ac7a21406bf22c68ebb9427729 SHA512 071ed2d22ed122e060be4c7dfcfbc6d8b019f47900560a40128c0af18bd7d45c16b7043681c000ccbfd681295a0811d68b18b675deb7f63fe4a2035bee4309eb WHIRLPOOL eb70d761b195326c29f6475f8312f16d019f69f2a213d4f9ab9fde306a18d77f88834fbd57d958fc3460a047487f67c79b71632f0a123b8e24a16b0a75d106b4
 DIST libpcap-1.5.3.tar.gz 642352 SHA256 9ae92159c1060f15e6a90f2c4ad227268b6aaa382c316fa49a31c496b9979e93 SHA512 ee487b81ef3c8cd9e0173a252f620bdf2ebfde87bd7a95b38ea4658b47982d09ca86502d4a3473ffeb4388fb19e33d1f614236e22b420077b7ab40d3481f18a3 WHIRLPOOL 3d71f4c5134b2a0eba4d5e47952ddfad784bcde37332a926b68a799226f7fadd45e0e7fc2c12ede3724e89c2470f18ed35768dc12445950116e3b745b867020b
 DIST libpcap-1.6.2.tar.gz 651237 SHA256 5db3e2998f1eeba2c76da55da5d474248fe19c44f49e15cac8a796a2c7e19690 SHA512 e84fc2192b3ca34df679db6405205aff110d46bc7499b50f6da0c6f4c00381b403a03b632edc33d9314e3b2a17ba7fb876a6e391a2f06b3bd759372d62de485d WHIRLPOOL 4395bd80b02f53d80c4069df0eaa8abbb821b0454f522b468991093269c074a95d2dff360c77db6c9639d5c6558c575b5f7fa571af04e4b0f4f77cf65271e9c2
+DIST libpcap-1.7.2.tar.gz 662162 SHA256 1a4abc1f268b68f97e69a497f53695c9acc7a13f1d522a4d940dea276e6698ae SHA512 60cc31ef3654a601ac780e8b609806b1cdb28cb8c6140130716ce456fb49441b644aceb90d0d1222db0713f1f15d2c7b4f3caa766ff616073567b7154de26b89 WHIRLPOOL a28ca325b1aef46e78ee78127e367f4d16dbb1915ebb5fabfdbd8e1a31ac682fa2c2a9a4a1572450d4c0549722f607b4cb42ed517eaf437fc8572134b95c8e73
 EBUILD libpcap-1.5.3.ebuild 1911 SHA256 9390a217529863e1066a9d861bf03b1f69a9e0b6cfbcace9d04c481087247a2a SHA512 5128112a46f6dcd284ba44c0a22686e0bab3d73603cc1edaa3b3073bed6045ef0cc602c7f95336d5c558741c18235f776d4cf7c7ffc033cceede719c0ac0ded1 WHIRLPOOL ff7a767a24d85e7e97af522e3ba651739b1c75cba7090cba07d968f76d3ffc499a236f38c2195a02f88e4a875574da555dae0fb7f7943efdbb34348445161e2b
 EBUILD libpcap-1.6.2-r1.ebuild 2021 SHA256 f000d9bac12e928cb7aba4b6acef51a42468cd49f123cff02a7c2445b9fb520f SHA512 8243a9e6a123b189b35a8877d7d0d4c8cf2bd46fabf6d2271b55d68368170285808c5a1f28dc5fad83c1af2848d71aefa6313b0b1b25190b158325a518774092 WHIRLPOOL 4206384e21f124a589ea4f8cdca5d5ff462a7804617f42a3f3b081a27352eb47f898ff100a1961dccfb2a131177c000233daecbe645c40721d480e3817e5d66a
 EBUILD libpcap-1.6.2.ebuild 1852 SHA256 165e2f4ccda09648aa7c1dc2234fd9e61e7a3e66f884d4b3382e308442ba1cb1 SHA512 2c4f801e5d6d7c77f3a5875e98f239ca9405b105b0f418b00becf48b8120e8d008b892035d0656c9712e1757bb2dd17e6ff12e39081dbe16e98ac2355e9a59e0 WHIRLPOOL 9b0288f3043fc28aa6b1537be88944d1152bee54129a47fec0366a7a6551720617240a12a42a17239dcd37988bb8b17a7bb682118972cebf0c9fb62d100566b0
-EBUILD libpcap-9999.ebuild 1750 SHA256 772a95286260ee2f1c1112126a27ff79448f715b2f99d42617bcade04f8aebf0 SHA512 ab32c8143960a0bb9cad53ebc12192bad3fae3c4f251eadf82e0636f89250106aa9339f1a1241329a470b3063bc4eed3c380a0f3f13076031d49d2ea225d173b WHIRLPOOL 8c05b461755a771850a0dcf82804b9ee4462fef560b4c25c79cf038cdfc18ae0fbe2222bb59158a30bcbfcd09280c5291dc44e1bf2fef4d188e4d6d8441af4fe
-MISC ChangeLog 29865 SHA256 b15a0f57f9e7125fb8824b10df8d5f2abd75542b842d8dedbe20964a2b63e015 SHA512 9c9408243d85d81c50d964f7a54e38b4fee48d9b21b371ba36e786b5190389b953da9dae6e52dcc0f403195defe28819f4c66ed475ee2dac8c4d87da9e3ba077 WHIRLPOOL 381ad5eaa115cb1eea8206bdf7ab695c4c5674843f6ec6ffa59946f03bcc28b1e68e6a9b67c32e4d42e4d69e4e54436585e71bd247db5015dc5c3c15bc214c5d
+EBUILD libpcap-1.7.2.ebuild 2072 SHA256 51606b412cd4d85d6aba0e7f59dd1c06580e8d6543016404ea33bdc6a6deabe8 SHA512 fc5834aa43a138db5b9472ab431b1bd7e952df57541dfc0df8219a4921159b3ca4d292044fba94754f9043f7eb8ae30e489e806944983ed78906de1b8e70e204 WHIRLPOOL 0e740bad6994c1f7ef33c053c7bce793db88ad118bfdffe321fa07396ed32c188a46c109c8144fa7f153e4ef1c8855450502e8bcc10013cf1e56a3d75ec33c9d
+EBUILD libpcap-9999.ebuild 1844 SHA256 b6be36d45fc1e9645ba7bdd740e2910e51ddc18b54a854e5553886ff8e3de03e SHA512 5c3eacf25cd5fe61bb0967f27528c8f29bc3ae10e2cf0f7837bbb574c89daf75c943d2ea815a3a341b8d04d749e03af0b7dc267b6461fbb423ea58b3672e9ea9 WHIRLPOOL a2122c843c610aee37245cb8e10f0f222d2e928a75bf47f56558a1ab864f891fde33d211f0d765e4b31a36eda307dc0271c66d4fd87960e0af45cd688499bfbe
+MISC ChangeLog 30077 SHA256 04b070a2783bbf771af4a32160f93d1a56f7341508400587ab50bd4ee00b0ecb SHA512 49916cebb8000a9aa1ddd50407774bf2aa4031cd0031b3872c4d57ed201349622b92ce23b4695991c215442c3eac61bc314a8c5ffe8cea441295eac62959106e WHIRLPOOL c3b5f07c30310f34aab6986baacd5ecac73188b3bd05b9a240862e94d7a03304a9e40e90792388b4161c586414e6dae5361f82237beacb64f66abf79453458d2
 MISC metadata.xml 423 SHA256 d12419de9bd641cf78030dc7bdb2789c2c932f91ba9687a6073961eb8ff09e4f SHA512 61b591b21bd46a8ae6a20fde2d5cbe6f68250ce7616b11b55b3a270474fe1ac3b4aefcd3c98e9e6470a036ef3c685b3575464de81349137fdf7cd8082ea2d695 WHIRLPOOL a08d3ed4833b2725f68ad8fcca878047a6b7a36188462204dec1fe7f528b6ad4c8698bed8a87a03e52fe5ea7e30fd8464a881408c179e2d7ef085f511aad4475
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9C1dAAoJELp701BxlEWfD10P/j11tjk2Nw8Hbx2/rSXSOAgQ
-r6hlxvS0AEe+pfZcAzbLgJenjM96dIih3y4ef+iAzGtTkLs5CfSXUBWc4JkXrD+K
-2Llxyi97dwml/VSmyFzP83KEA0onvtZhxMByJHgaUzUeiwElVZK4S9ELxl9diTpu
-1Uazir1C1rRJtWx7HsZTkA0nebEOAL+TAhp82pkF/86NmQw0ViR5nzff6n2zdyq6
-9CvqAYGDSyT6mXDN5rL1cZKApBVYNHZK9pMVY63VhL2Ep+x0eDmVk+3zetel5+TL
-zxcMS9UcaoUmpG3OrV7kgTg4n8GyYusQ60N7FZ7BZfWkHB6lWMWJaP5W3sG0zemC
-tR+ezid5A+e7KmZ7yo4txMdLg1dPkv+ZTBixzA63gEZNRGtMAtWicoIJ9f9y9E0n
-yRC43KYocMy8Tc1BZML4rAJFCsQH3WoTLexmPW/nCFmnjiXY4k4z3SjTVeazgrZR
-+DqFhqXkqnMh3vS4FFv0VX84HTKVwqvEWm/7R6evecRbH/7EIsB6twpE7KKA0DGr
-uw7YZ6Ta++H6CuEr24IEfwLjZgXsi5b7AVvuPZXZEn16dO4TdcS4xQGqHiZkuHS0
-n2TnOwBLhOqKWo4wB8MXzKoFbskyx9kKivh543LiHlUjAAmAp3HPyzz0gc5iNHKM
-A2hWH5YhwBgvTMM5HI8e
-=ijDV
+iEYEAREIAAYFAlUAA8cACgkQVWmRsqeSphPBZwCcC8N6Cb+l9pTP7VO86jfhjIv0
+pNcAmwRRRcyGogOfq0QqAzjPLdA7Ucmg
+=wmXF
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-1.7.2-libnl.patch b/net-libs/libpcap/files/libpcap-1.7.2-libnl.patch
new file mode 100644
index 000000000000..685453958762
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.7.2-libnl.patch
@@ -0,0 +1,22 @@
+--- a/configure.in
++++ b/configure.in
+@@ -453,10 +453,6 @@
+ 
+                 incdir=-I/usr/include/libnl3
+                 libnldir=
+-                if test x$withval != x ; then
+-                  libnldir=-L${withval}/lib/.libs
+-                  incdir=-I${withval}/include
+-                fi
+ 
+ 		#
+ 		# Try libnl 3.x first.
+@@ -471,7 +467,7 @@
+ 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
+ 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
+ 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
+-			V_INCLS="$V_INCLS ${incdir}"
++			V_INCLS="${incdir} $V_INCLS"
+ 			have_any_nl="yes"
+ 		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
+ 
diff --git a/net-libs/libpcap/files/libpcap-1.7.2-scanner.patch b/net-libs/libpcap/files/libpcap-1.7.2-scanner.patch
new file mode 100644
index 000000000000..4c8fb4ecb5bd
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.7.2-scanner.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -447,7 +447,7 @@
+ 	@rm -f $@ $@.bottom
+ 	$(srcdir)/runlex.sh $(LEX) -o$@ $<
+ 	mv $@ $@.bottom
+-	cat $@.top $@.bottom > $@
++	cat ${srcdir}/$@.top $@.bottom > $@
+ 	@rm $@.bottom
+ 
+ scanner.o: scanner.c tokdefs.h
diff --git a/net-libs/libpcap/libpcap-1.7.2.ebuild b/net-libs/libpcap/libpcap-1.7.2.ebuild
new file mode 100644
index 000000000000..d30da72d7a60
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.7.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.7.2.ebuild,v 1.1 2015/03/11 08:58:46 jer Exp $
+
+EAPI=5
+inherit autotools eutils multilib-minimal
+
+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 ~arm64 ~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:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	canusb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.0-cross-linux.patch
+	epatch "${FILESDIR}"/${PN}-1.6.1-configure.patch
+	epatch "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
+	epatch "${FILESDIR}"/${PN}-1.7.2-libnl.patch
+	epatch "${FILESDIR}"/${PN}-1.7.2-scanner.patch
+
+	mkdir bluetooth || die
+	cp "${FILESDIR}"/mgmt.h bluetooth/ || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable ipv6) \
+		$(use_enable canusb) \
+		$(use_enable dbus) \
+		$(use_with netlink libnl)
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+
+	# 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
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 668c921cee94..410643bd7f9a 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-9999.ebuild,v 1.1 2015/01/07 16:10:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-9999.ebuild,v 1.2 2015/03/11 08:58:46 jer Exp $
 
 EAPI=5
 inherit autotools eutils git-r3 multilib-minimal
@@ -30,6 +30,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.2.0-cross-linux.patch
 	epatch "${FILESDIR}"/${PN}-1.6.1-configure.patch
 	epatch "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
+	epatch "${FILESDIR}"/${PN}-1.7.2-libnl.patch
+	epatch "${FILESDIR}"/${PN}-1.7.2-scanner.patch
 
 	mkdir bluetooth || die
 	cp "${FILESDIR}"/mgmt.h bluetooth/ || die