Fix USE=dbus (bug #524602).

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

5 files changed, 35 insertions, 9 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index fe571e1312aa..b8c5cd0600c8 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.210 2014/10/07 09:18:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.211 2014/10/07 09:34:37 jer Exp $
+
+  07 Oct 2014; Jeroen Roovers <jer@gentoo.org> libpcap-1.6.2.ebuild,
+  libpcap-1.6.2-r1.ebuild, +files/libpcap-1.6.2-dbus.patch:
+  Fix USE=dbus (bug #524602).
 
 *libpcap-1.6.2-r1 (07 Oct 2014)
 
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index f67f3eab8f80..849b279a453f 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -4,18 +4,19 @@ Hash: SHA256
 AUX libpcap-1.2.0-cross-linux.patch 555 SHA256 6e405b3ba8a5eb079b12bb529a16f645ceb6ae9421217798b5e61b6f05d40df5 SHA512 5ecdac2c7e872281ee402b89f5d4f2e70110bdf8208bc5b4546bcf754fe481895c7f3675682c7f4cff56c21ed4410a5f9ed9cb6bdb0e95c1f2385fe4e47d1cfe WHIRLPOOL 5003a8fbf954c4dce2297d47513ff5c0e1153e51be3b28d3e843317a9bfe51dfdcb03decad76a0b3a837a1d98e037bf3d27ed7e5dadc6341b3e13342e8013261
 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 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
 EBUILD libpcap-1.5.3.ebuild 1911 SHA256 9390a217529863e1066a9d861bf03b1f69a9e0b6cfbcace9d04c481087247a2a SHA512 5128112a46f6dcd284ba44c0a22686e0bab3d73603cc1edaa3b3073bed6045ef0cc602c7f95336d5c558741c18235f776d4cf7c7ffc033cceede719c0ac0ded1 WHIRLPOOL ff7a767a24d85e7e97af522e3ba651739b1c75cba7090cba07d968f76d3ffc499a236f38c2195a02f88e4a875574da555dae0fb7f7943efdbb34348445161e2b
-EBUILD libpcap-1.6.2-r1.ebuild 1983 SHA256 ef9dca9fbaa14dbc28b1f5ec4d3d2aed856e2a97882cf40610f795e29dd40853 SHA512 4dfe685b41bde4ef2c6c9464dfec04035ef0a6a7ac15e2ac51b8d84c01ed40710a93b5d78d19df605505982e810cf160b4fcad3d2e8264ce84696a77d1afba49 WHIRLPOOL 177a9dad1849e818e5c06fd61d8240abc57cfe2f6a027d494ddc838ac448d3fb2dd1f1302eb5b2e2c92636e7eb84d967d7e4b46c74ba3479e9ab6e1b8be946e6
-EBUILD libpcap-1.6.2.ebuild 1807 SHA256 093324633859936f02928a691bb6b71eb7ca975b38cfc32364ed33bb3d986dd3 SHA512 67fee3e9e5077dcd3dc29770b70299956d5a9b71d7f4b2565b511b88ab138e1504a8bbad88843dd14a51dd43d1817bf0a67d9c909cf00ca97b194344bef8eebc WHIRLPOOL c6b1a0521b9a4dcfe5bc944490fdcedddd3200bb7bf3a6af821dfac10b5cee1b8c08a9c8cff58fa88da07b178e0b387cfdf5332bcf550610e75603b6032fbce7
-MISC ChangeLog 29054 SHA256 4f499c59d9c755ad7c3c90e03af0a3a487b2d50d501b095f422b80eaa1a4fae8 SHA512 506c78327e66d7087911adde27f93f0fce59f2671d02ffa0810340ca9c01535555222e60752a5e307da48b0fbabcafc81ecb26c8f7fa3ea1b1ea0c1cca6e1255 WHIRLPOOL 49bd3d695f2b970c9e36c3a39e3df4629b8fa840a731d4c39fa34fb6fb2b57e01ddf028b7aac4b372e07512023c5054d1425c88b577222cb961c473500f13356
+EBUILD libpcap-1.6.2-r1.ebuild 2028 SHA256 58e178de2717c22aee967cd06a370ef2199a017060288439ef50609043404d70 SHA512 3f71c6ab28f2195d25f90196bc4ef3a94e90b6f94888a619778be51f062e321e15a46c23d688d037ded9439c1b2f40a219dfd23b835b84af6612ff762a5d121a WHIRLPOOL 0d0b7b2df8e6db7a2b314142e88fc98b660a7a03c84e62b45df9f134308507abf4fcad21e42002d50a719cbf213eabda9219add01c7e86bdd8f39138584de412
+EBUILD libpcap-1.6.2.ebuild 1852 SHA256 165e2f4ccda09648aa7c1dc2234fd9e61e7a3e66f884d4b3382e308442ba1cb1 SHA512 2c4f801e5d6d7c77f3a5875e98f239ca9405b105b0f418b00becf48b8120e8d008b892035d0656c9712e1757bb2dd17e6ff12e39081dbe16e98ac2355e9a59e0 WHIRLPOOL 9b0288f3043fc28aa6b1537be88944d1152bee54129a47fec0366a7a6551720617240a12a42a17239dcd37988bb8b17a7bb682118972cebf0c9fb62d100566b0
+MISC ChangeLog 29214 SHA256 6ab3eb44fe79aa7b9f749ca99c0676c93fb71f5e8960c865717aba22cf936e94 SHA512 2ad56aca7da3463727bd1794b8534fa154a0f2c2040d75e9a9335a601b1eea87b856300f6a9561431677d49e09853e719a158f36158d5891d4274719a0e78cf4 WHIRLPOOL 4054fb4db41590a0dab2fda8b9a2e20b38c978e2a7f5fcc3c9430b30f1c2affc3b9709b04110603f70633024943ec05a10f617760bc2d2f8f960e87ddaffef56
 MISC metadata.xml 423 SHA256 d12419de9bd641cf78030dc7bdb2789c2c932f91ba9687a6073961eb8ff09e4f SHA512 61b591b21bd46a8ae6a20fde2d5cbe6f68250ce7616b11b55b3a270474fe1ac3b4aefcd3c98e9e6470a036ef3c685b3575464de81349137fdf7cd8082ea2d695 WHIRLPOOL a08d3ed4833b2725f68ad8fcca878047a6b7a36188462204dec1fe7f528b6ad4c8698bed8a87a03e52fe5ea7e30fd8464a881408c179e2d7ef085f511aad4475
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQzr+MACgkQVWmRsqeSphO2yQCfXl+IN6254+8JjzKoK3q5B0DO
-7AcAmwUIIWOnpvAqN664pZYNh2daJ/Wp
-=0uow
+iEYEAREIAAYFAlQzs68ACgkQVWmRsqeSphObtgCePyi9lBVicTJQINJlO8njvdY7
+LdAAnR5gdatIVCe1Q4IqSWKNDlNouQPl
+=TWkb
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-1.6.2-dbus.patch b/net-libs/libpcap/files/libpcap-1.6.2-dbus.patch
new file mode 100644
index 000000000000..4855e6e78ffd
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.6.2-dbus.patch
@@ -0,0 +1,19 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1633,16 +1633,6 @@
+ 			#
+ 			AC_MSG_ERROR([Due to freedesktop.org bug 74029, D-Bus capture support is not available on OS X])
+ 			;;
+-		esac
+-	else		
+-		case "$host_os" in
+-
+-		darwin*)
+-			#
+-			# https://bugs.freedesktop.org/show_bug.cgi?id=74029
+-			#
+-			;;
+-
+ 		*)
+ 			AC_CHECK_PROG([PKGCONFIG], [pkg-config], [pkg-config], [no])
+ 			if test "x$PKGCONFIG" != "xno"; then
diff --git a/net-libs/libpcap/libpcap-1.6.2-r1.ebuild b/net-libs/libpcap/libpcap-1.6.2-r1.ebuild
index b46321b68da3..d77bbadd4756 100644
--- a/net-libs/libpcap/libpcap-1.6.2-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r1.ebuild,v 1.1 2014/10/07 09:18:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.6.2-r1.ebuild,v 1.2 2014/10/07 09:34:37 jer Exp $
 
 EAPI=5
 inherit autotools eutils multilib-minimal
@@ -33,6 +33,7 @@ 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.6.2-dbus.patch
 
 	mkdir bluetooth || die
 	cp "${FILESDIR}"/mgmt.h bluetooth/ || die
diff --git a/net-libs/libpcap/libpcap-1.6.2.ebuild b/net-libs/libpcap/libpcap-1.6.2.ebuild
index b4cb7118d9f3..e9f4e60085ab 100644
--- a/net-libs/libpcap/libpcap-1.6.2.ebuild
+++ b/net-libs/libpcap/libpcap-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2014/09/16 21:58:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.6.2.ebuild,v 1.3 2014/10/07 09:34:37 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -33,6 +33,7 @@ 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.6.2-dbus.patch
 
 	mkdir bluetooth || die
 	cp "${FILESDIR}"/mgmt.h bluetooth/ || die