diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-07-23 09:37:44 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-07-23 09:37:44 +0000 |
| commit | 4d391e5028ec2f796fac664a3e0999d439bdc65e (patch) | |
| tree | 1893ce1eb642e3849ff19a0466d3e12537c28f73 /net-libs | |
| parent | Make sure that --mpi is passed to setup.py during each stage (diff) | |
| download | gentoo-2-4d391e5028ec2f796fac664a3e0999d439bdc65e.tar.gz gentoo-2-4d391e5028ec2f796fac664a3e0999d439bdc65e.tar.bz2 gentoo-2-4d391e5028ec2f796fac664a3e0999d439bdc65e.zip | |
Remove insufficient net-wireless/bluez header patch (bug #517806).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/libpcap/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/libpcap/files/libpcap-1.6.1-configure.patch | 13 | ||||
| -rw-r--r-- | net-libs/libpcap/libpcap-1.6.1-r1.ebuild (renamed from net-libs/libpcap/libpcap-1.6.1.ebuild) | 4 |
3 files changed, 9 insertions, 16 deletions
diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog index 743292939fde..d347a419976a 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.196 2014/07/22 11:11:54 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.197 2014/07/23 09:37:44 jer Exp $ + +*libpcap-1.6.1-r1 (23 Jul 2014) + + 23 Jul 2014; Jeroen Roovers <jer@gentoo.org> -libpcap-1.6.1.ebuild, + +libpcap-1.6.1-r1.ebuild, files/libpcap-1.6.1-configure.patch: + Remove insufficient net-wireless/bluez header patch (bug #517806). 22 Jul 2014; Jeroen Roovers <jer@gentoo.org> libpcap-1.6.1.ebuild, +files/libpcap-1.6.1-configure.patch, diff --git a/net-libs/libpcap/files/libpcap-1.6.1-configure.patch b/net-libs/libpcap/files/libpcap-1.6.1-configure.patch index a46ca293fbcf..538e49d51d1f 100644 --- a/net-libs/libpcap/files/libpcap-1.6.1-configure.patch +++ b/net-libs/libpcap/files/libpcap-1.6.1-configure.patch @@ -13,16 +13,3 @@ Check for bluetooth/mgmt.h before use # # 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/libpcap-1.6.1.ebuild b/net-libs/libpcap/libpcap-1.6.1-r1.ebuild index 75a6c3f03fb3..dac5e87e4135 100644 --- a/net-libs/libpcap/libpcap-1.6.1.ebuild +++ b/net-libs/libpcap/libpcap-1.6.1-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.1.ebuild,v 1.2 2014/07/22 11:11:54 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.6.1-r1.ebuild,v 1.1 2014/07/23 09:37:44 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:= ) + bluetooth? ( <net-wireless/bluez-5:= ) dbus? ( sys-apps/dbus ) netlink? ( dev-libs/libnl ) canusb? ( virtual/libusb ) |