jer 14/07/22 11:11:54 Modified: libpcap-1.6.1.ebuild ChangeLog Log: Check for bluetooth/mgmt.h (net-wireless/bluez-4) before use (bug #517772). Convert sed scripts to patches. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 net-libs/libpcap/libpcap-1.6.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/libpcap-1.6.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/libpcap-1.6.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/libpcap-1.6.1.ebuild?r1=1.1&r2=1.2 Index: libpcap-1.6.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.6.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libpcap-1.6.1.ebuild 22 Jul 2014 10:23:59 -0000 1.1 +++ libpcap-1.6.1.ebuild 22 Jul 2014 11:11:54 -0000 1.2 @@ -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 @@ 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 @@ 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 } 1.196 net-libs/libpcap/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/ChangeLog?rev=1.196&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/ChangeLog?rev=1.196&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libpcap/ChangeLog?r1=1.195&r2=1.196 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- ChangeLog 22 Jul 2014 10:23:58 -0000 1.195 +++ ChangeLog 22 Jul 2014 11:11:54 -0000 1.196 @@ -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 <[email protected]> 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)
