Check for bluetooth/mgmt.h (net-wireless/bluez-4) before use (bug #517772). Convert sed scripts to patches.

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

5 files changed, 82 insertions, 17 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 506ad0e34736..743292939fde 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.195 2014/07/22 10:23:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.196 2014/07/22 11:11:54 jer Exp $
+
+  22 Jul 2014; Jeroen Roovers <jer@gentoo.org> libpcap-1.6.1.ebuild,
+  +files/libpcap-1.6.1-configure.patch,
+  +files/libpcap-1.6.1-prefix-solaris.patch:
+  Check for bluetooth/mgmt.h (net-wireless/bluez-4) before use (bug #517772).
+  Convert sed scripts to patches.
 
 *libpcap-1.6.1 (22 Jul 2014)
 
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index e87bb2c499aa..d6dd28c5ac97 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -4,6 +4,8 @@ Hash: SHA256
 AUX libpcap-1.2.0-cross-linux.patch 583 SHA256 89344641676edfd9dc70b05569ac26a8ac79815fa5df0cf8e2ee77b3f9c5877f SHA512 4249129122f8ae382e086820ac4852d1413e3a7dd1f8db370aace1e94a1b0cf40d5f6d97213ca52e224e02472fed60b03c7f89d0ccd45e44ef0039a432595adb WHIRLPOOL 47598355e51ca3a15f1f817927aa73481c9a02ca15ca57ea487e1b42918a85b53aaa311be991dfc3362a2df3dd9ecee3059738e08760af8d6d9e4770578db3e3
 AUX libpcap-1.3.0-canusb.patch 290 SHA256 3518dc59be25c3092df6e133694b4d4372552ff8d25e2371f3fc0f587de83054 SHA512 c3d6138d58c268fcf0799bf74c65ff648f2f7c6e46d3534d3941b9ae678510463388518db3b688ca85e89d79e31dedb147a8cbc9710b8ca0ca4a766913ba8fbf WHIRLPOOL 33225aa8eea3eb74b4d81c6746034d7cf88a0b2fad352888362cf87e565935b326b5a2aa6c4f857c21c44971a0b6b616e33130dd906511ef874e16b2872c8dd1
 AUX libpcap-1.3.0-fix-systems-without-ipv6-support.patch 13183 SHA256 14973d5dc09e036281cf507ca7fead8bf352e17dcb949a90942d58e5affda29c SHA512 cdf61a8dfe2cba0a8f3bf84a749c48eb3e75e634880f86acf7225793c921577137eca7579812c0c38a6e128cca58214d0eb614b11ec47d5f6d25d53557d49185 WHIRLPOOL 49c7ac019e969bb18f384e11b77b986417da5d2e4b5986624efe8e4555982c629a68705c1a72c0761552acd7523653ffde426fcc9bbd61aa15a44bb4a38a2417
+AUX libpcap-1.6.1-configure.patch 892 SHA256 6e186e4c91d8a085b90c1fbb7e1cf59c5ec8aa167260525e7c87e8556b91b694 SHA512 7a9d5d65909166e5441aa22c86ea8c8acfdc9b37e389107302a82dcf8496ea82291a3c84e9c8b1f6739ffeeb3aeb8ce9d043d877ff3e0d131dcdca69cecc1498 WHIRLPOOL 111a8bfdaceb782ff4575afc7837f19045deae3201995e6b35c8a5881eba3c78c886a747ebbd45221865b87d088e2124ca45de94fa0acd78fd7f348e83be8059
+AUX libpcap-1.6.1-prefix-solaris.patch 807 SHA256 c5bd1a5e0945e6ad06c4455045cf50f251ba6d2ba0386c6bdb20f809c5afffcd SHA512 af76d741784d123d7c2534c85018a102736889f0456420c5ae4b53b6568ec3054de30c4ce755ff6f9ae83abefd2275b379794e5a7cac65ef483ca676bf8883b3 WHIRLPOOL 1049da0979b52c71d783e5979e4b3ea0776f609725c1c288a6c75e8afe102db85f58af1d3f31249c7938d818e68bb569ef18f2c54dcb121b87fbe3c00a089cc3
 DIST libpcap-1.3.0.tar.gz 608967 SHA256 41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9 SHA512 c023abb3da7b9f62835fa04ca43b50203d7e3da7b624d09a693c8b02fd531c3845e1c86cbc587ae02816614133f5342585f6a2985fdaf92889fcfaca7bfb8908 WHIRLPOOL 774897ce4dcd1655945313a145399da9db0063967ce246e1c7beb21f038ee4c5bcfe2b4ec7b08316a013fdb33b50781f5195bf169a2ca6f84ddc2bf5bca78f15
 DIST libpcap-1.4.0.tar.gz 619045 SHA256 7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406 SHA512 b7662867c6449c603a65c37e63ce881260dee80989ccb5b71b1e55fa437fb18ac9bb123a7b8ed68302baf4511b97bca40d9f08dea7b0dd0eb6a2ac4a7b73cf15 WHIRLPOOL d070b6dc298baa2474e5a268b3541f614dc7dc35463af57f5a8d9b4b4c453d4e8f0106a7d9ce7f77e632ddf76e6b738ee5a81198ca57fe701ad1bb95359e37c2
 DIST libpcap-1.5.1.tar.gz 640233 SHA256 259db4fe1e9f0b6b9c43a057ec5916dec7d0a821b00d6d6c4dff7db2445fa7e4 SHA512 c2b8b4771127278b7986650961efa0745789a33e717866a5ee4ee84333b7592738b12be12c1113075a5bf9e8edd03b3f6e6b3c018ef29383834608af5153ed39 WHIRLPOOL f3401ac2bbe717d8e96127f2ad87d9e13bb01430cf1e1c3e82a3606b32481059368b027fcba426f9c9ad688d0f5cc866a1d71369ca34421cff2937dadef3fd6c
@@ -15,13 +17,13 @@ EBUILD libpcap-1.4.0.ebuild 1692 SHA256 2f391d161593fb62e9b9e10e1c18ffc7efc8c5b5
 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
-EBUILD libpcap-1.6.1.ebuild 1920 SHA256 0ff0a6f8760997da53f75c2f75bda73968556920585391de30d8889f11f80fb4 SHA512 b9f11fcbd09be6c1d788a4387cd975afc13a9d6342e7d41c11fdf52cfae5d13f009a47f29050e1edab5b40c40a67eb2bb51dc4501c7119e981eb6558dfb571f8 WHIRLPOOL 5c1b882dacdcd87467118d962a2266e50a9e1ddf126e58c31643e4456b99289387b64b97baa04a5e45668e048611901e3144b5213b3e0ee5c3ef7f1da5544ca9
-MISC ChangeLog 26875 SHA256 36ca46853f36f0b751c5882e0925af68807be86650495c52847f86c5db9dc111 SHA512 8a0bbeb98e2b50e59e1ffae181ccbb70816051265f9fc17dacf48a3a341e2ea831b55df2936b19207f8c8d071058de8a93da3e34631a4a141edd60b00445cab7 WHIRLPOOL 92248f6b862f2e6f59b2c0dadb35c6d40d91fb13bda7fac5ae2742e2a7f05aeac94591c04ed72ef15c7b75f578ff4625a06e75070106f979039146f57cc338ff
+EBUILD libpcap-1.6.1.ebuild 1716 SHA256 4792716d835a8344cbc7ee1cb5428e2b7fedf2018ec2844e984179cd1082917e SHA512 d5ea97535a6719388f5b42e392760c8d1719e9db2c78b6d9ddc1bcfdb62b568935270fc48cc4adf2f5c0bd88cac4ce2d4a2962cd6b094ea4b50954825cf11241 WHIRLPOOL 05a2be5d47a8d5b5760022b4bb6bc8b1bdb28bbd1d104bd0943b08226062f03f37941e7a42d4995d1e271bdf8f354d9642890d775d12279ac9e701dbf9d67ea9
+MISC ChangeLog 27142 SHA256 ec9a031cf14688dd359e65c127827e577a613630ccb4a70f6742ef7f1635df79 SHA512 a3efaccb7d170f99281be8c15b3d5ffadd17b80ee798edbbecb02fa61514aff133027dc8685ea82ebd4fb8bd4bbe044585083e220b1d289b382a4b255d6fa9f6 WHIRLPOOL 7c26e6a6711210654bf725bfcc5011db1e9c4ec02d5ef2bebf959dc3524de380ae9bfa8aeb27d9de60380c23759b3902f6fbec76d6969192d2fc6a05574dd59c
 MISC metadata.xml 423 SHA256 d12419de9bd641cf78030dc7bdb2789c2c932f91ba9687a6073961eb8ff09e4f SHA512 61b591b21bd46a8ae6a20fde2d5cbe6f68250ce7616b11b55b3a270474fe1ac3b4aefcd3c98e9e6470a036ef3c685b3575464de81349137fdf7cd8082ea2d695 WHIRLPOOL a08d3ed4833b2725f68ad8fcca878047a6b7a36188462204dec1fe7f528b6ad4c8698bed8a87a03e52fe5ea7e30fd8464a881408c179e2d7ef085f511aad4475
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPOO8AACgkQVWmRsqeSphMA4gCdG3g/XGMIVfqPYreArDOBQDAd
-fJAAnjI1tzeR/Cs+GX+BbNAK7h7c7S6B
-=Pf89
+iEYEAREIAAYFAlPORvwACgkQVWmRsqeSphPaLQCfbNil4iV35sSVfP7bS+GZ6i7r
+rbkAn3LXopt/ADFeVUZuBSPpd4ZPtkxu
+=ZqQe
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-1.6.1-configure.patch b/net-libs/libpcap/files/libpcap-1.6.1-configure.patch
new file mode 100644
index 000000000000..a46ca293fbcf
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.6.1-configure.patch
@@ -0,0 +1,28 @@
+Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
+Check for bluetooth/mgmt.h before use
+
+
+--- a/configure.in
++++ b/configure.in
+@@ -1117,7 +1117,7 @@
+ 	if test "$enable_universal" != "no"; then
+ 		case "$host_os" in
+ 
+-		darwin[0-7].*)
++		darwin**)
+ 			#
+ 			# Pre-Tiger.  Build only for 32-bit PowerPC; no
+ 			# need for any special compiler or linker flags.
+@@ -1508,7 +1508,11 @@
+ 		      if test $ac_cv_lbl_hci_channel_monitor_is_defined = yes ; then
+ 			AC_DEFINE(PCAP_SUPPORT_BT_MONITOR,,
+ 			  [target host supports Bluetooth Monitor])
+-			BT_MONITOR_SRC=pcap-bt-monitor-linux.c
++			AC_CHECK_HEADER([bluetooth/mgmt.h],
++				BT_MONITOR_SRC=pcap-bt-monitor-linux.c,
++				AC_MSG_WARN([no support for pcap bt monitor]),
++				[#include <bluetooth/bluetooth.h>
++				 #include <bluetooth/hci.h>])
+ 		      fi
+ 		    fi
+ 		    ac_lbl_bluetooth_available=yes
diff --git a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
new file mode 100644
index 000000000000..7b5efb618230
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
@@ -0,0 +1,36 @@
+Prefix' Solaris uses GNU ld
+
+
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -415,7 +415,7 @@
+ 	    aix*)
+ 		    ;;
+ 
+-	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
++	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
+ 	    	    #
+ 		    # Platforms where the linker is the GNU linker
+ 		    # or accepts command-line arguments like
+@@ -429,10 +429,10 @@
+ 		    PIC_OPT=-fpic
+ 		    case "$host_cpu" in
+ 
+-		    sparc64*)
++		    sparc64*|sparcv9*)
+ 			case "$host_os" in
+ 
+-			freebsd*|openbsd*)
++			freebsd*|solaris*|openbsd*)
+ 			    PIC_OPT=-fPIC
+ 			    ;;
+ 			esac
+@@ -497,7 +497,7 @@
+ 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
+ 		    ;;
+ 
+-	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
++	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
+ 		    #
+ 		    # "cc" is GCC.
+ 		    #
diff --git a/net-libs/libpcap/libpcap-1.6.1.ebuild b/net-libs/libpcap/libpcap-1.6.1.ebuild
index 1d99fe025788..75a6c3f03fb3 100644
--- a/net-libs/libpcap/libpcap-1.6.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.6.1.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.1.ebuild,v 1.1 2014/07/22 10:23:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.6.1.ebuild,v 1.2 2014/07/22 11:11:54 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="bluetooth dbus ipv6 netlink static-libs canusb"
 
 RDEPEND="
-	bluetooth? ( <net-wireless/bluez-5 )
+	bluetooth? ( net-wireless/bluez:= )
 	dbus? ( sys-apps/dbus )
 	netlink? ( dev-libs/libnl )
 	canusb? ( virtual/libusb )
@@ -31,15 +31,8 @@ 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
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-prefix-solaris.patch
 
 	eautoreconf
 }