jer 14/09/18 19:17:33 Modified: wireshark-1.12.1.ebuild ChangeLog Log: Fix configuring without libnl (bug #523154 by Stuart Shelton). (Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.5 net-analyzer/wireshark/wireshark-1.12.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1.ebuild?r1=1.4&r2=1.5 Index: wireshark-1.12.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wireshark-1.12.1.ebuild 18 Sep 2014 13:18:52 -0000 1.4 +++ wireshark-1.12.1.ebuild 18 Sep 2014 19:17:33 -0000 1.5 @@ -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-analyzer/wireshark/wireshark-1.12.1.ebuild,v 1.4 2014/09/18 13:18:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1.ebuild,v 1.5 2014/09/18 19:17:33 jer Exp $ EAPI=5 inherit autotools eutils fcaps qt4-r2 user @@ -126,7 +126,6 @@ $(use_with gtk3) \ $(use_with kerberos krb5) \ $(use_with lua) \ - $(use_with netlink libnl=3) \ $(use_with pcap dumpcap-group wireshark) \ $(use_with pcap) \ $(use_with portaudio) \ @@ -134,6 +133,7 @@ $(use_with smi libsmi) \ $(use_with ssl gnutls) \ $(use_with zlib) \ + $(usex netlink --with-libnl=3 --without-libnl) \ --disable-profile-build \ --disable-usr-local \ --sysconfdir="${EPREFIX}"/etc/wireshark \ 1.650 net-analyzer/wireshark/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.650&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.650&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.649&r2=1.650 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v retrieving revision 1.649 retrieving revision 1.650 diff -u -r1.649 -r1.650 --- ChangeLog 18 Sep 2014 13:18:52 -0000 1.649 +++ ChangeLog 18 Sep 2014 19:17:33 -0000 1.650 @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.649 2014/09/18 13:18:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.650 2014/09/18 19:17:33 jer Exp $ + + 18 Sep 2014; Jeroen Roovers <j...@gentoo.org> wireshark-1.12.1.ebuild: + Fix configuring without libnl (bug #523154 by Stuart Shelton). 18 Sep 2014; Agostino Sarubbo <a...@gentoo.org> wireshark-1.12.1.ebuild: Stable for x86, wrt bug #522968