[gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-1.12.0_rc2.ebuild

[Jeroen Roovers (jer)]

jer         14/06/20 13:51:07

  Modified:             ChangeLog wireshark-1.12.0_rc2.ebuild
  Log:
  Remove net-libs/adns support (bug #513982).
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.627                net-analyzer/wireshark/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.627&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.627&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.626&r2=1.627

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- ChangeLog	19 Jun 2014 19:24:06 -0000	1.626
+++ ChangeLog	20 Jun 2014 13:51:07 -0000	1.627
@@ -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.626 2014/06/19 19:24:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.627 2014/06/20 13:51:07 jer Exp $
+
+  20 Jun 2014; Jeroen Roovers <jer@g.o> wireshark-1.12.0_rc2.ebuild:
+  Remove net-libs/adns support (bug #513982).
 
   19 Jun 2014; Jeroen Roovers <jer@g.o> wireshark-1.12.0_rc2.ebuild,
   +files/wireshark-1.12.0_rc2-va_list.patch:



1.3                  net-analyzer/wireshark/wireshark-1.12.0_rc2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.0_rc2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.0_rc2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.0_rc2.ebuild?r1=1.2&r2=1.3

Index: wireshark-1.12.0_rc2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.0_rc2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wireshark-1.12.0_rc2.ebuild	19 Jun 2014 19:24:06 -0000	1.2
+++ wireshark-1.12.0_rc2.ebuild	20 Jun 2014 13:51:07 -0000	1.3
@@ -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.0_rc2.ebuild,v 1.2 2014/06/19 19:24:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.0_rc2.ebuild,v 1.3 2014/06/20 13:51:07 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps qt4-r2 user
@@ -13,8 +13,8 @@
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos libadns lua
-	+netlink +pcap portaudio +qt4 selinux smi ssl zlib
+	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
+	portaudio +qt4 selinux smi ssl zlib
 "
 REQUIRED_USE="
 	ssl? ( crypt )
@@ -28,7 +28,7 @@
 RDEPEND="
 	>=dev-libs/glib-2.14:2
 	netlink? ( dev-libs/libnl )
-	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
+	adns? ( >=net-dns/c-ares-1.5 )
 	crypt? ( dev-libs/libgcrypt:0 )
 	caps? ( sys-libs/libcap )
 	geoip? ( dev-libs/geoip )
@@ -37,7 +37,6 @@
 		x11-libs/gtk+:3
 	)
 	kerberos? ( virtual/krb5 )
-	libadns? ( net-libs/adns )
 	lua? ( >=dev-lang/lua-5.1 )
 	pcap? ( net-libs/libpcap[-netlink] )
 	portaudio? ( media-libs/portaudio )
@@ -95,20 +94,6 @@
 src_configure() {
 	local myconf
 
-	if use adns; then
-		if use libadns; then
-			myconf+=( "--with-adns --without-c-ares" )
-		else
-			myconf+=( "--without-adns --with-c-ares" )
-		fi
-	else
-		if use libadns; then
-			myconf+=( "--with-adns --without-c-ares" )
-		else
-			myconf+=( "--without-adns --without-c-ares" )
-		fi
-	fi
-
 	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
 	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
 	if use kerberos; then
@@ -137,6 +122,7 @@
 	# --disable-profile-build bugs #215806, #292991, #479602
 	econf \
 		$(use_enable ipv6) \
+		$(use_with adns c-ares) \
 		$(use_with caps libcap) \
 		$(use_with crypt gcrypt) \
 		$(use_with geoip) \
@@ -154,6 +140,7 @@
 		--disable-profile-build \
 		--disable-usr-local \
 		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		--without-adns \
 		${myconf[@]}
 }