Bump development version.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

4 files changed, 53 insertions, 16 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index e51c030ff8b0..e74a13cb923a 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.120 2008/09/10 14:14:04 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.121 2008/09/17 14:27:38 pva Exp $
+
+*wireshark-1.1.0 (17 Sep 2008)
+
+  17 Sep 2008; Peter Volkov <pva@gentoo.org>
+  +files/wireshark-1.1.0-as-needed.patch, metadata.xml,
+  -wireshark-1.0.2.ebuild, +wireshark-1.1.0.ebuild:
+  Bump development version.
 
   10 Sep 2008; Olivier Crête <tester@gentoo.org> wireshark-1.0.3.ebuild:
   amd64 stable, bug #236515
diff --git a/net-analyzer/wireshark/files/wireshark-1.1.0-as-needed.patch b/net-analyzer/wireshark/files/wireshark-1.1.0-as-needed.patch
new file mode 100644
index 000000000000..58bccc247618
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.1.0-as-needed.patch
@@ -0,0 +1,23 @@
+--- wiretap/Makefile.am	2008-09-16 15:03:24 +0000
++++ wiretap/Makefile.am	2008-09-16 15:12:01 +0000
+@@ -68,7 +68,7 @@
+ 	$(GENERATOR_FILES) 	\
+ 	$(GENERATED_FILES)
+ 
+-libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS)
++libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la
+ libwiretap_la_DEPENDENCIES = libwiretap_generated.la
+ 
+ RUNLEX = $(top_srcdir)/tools/runlex.sh
+
+--- epan/dissectors/Makefile.am	2008-09-16 16:16:16 +0000
++++ epan/dissectors/Makefile.am	2008-09-16 16:27:30 +0000
+@@ -42,6 +42,7 @@
+ 	$(PIDL_DISSECTOR_SRC) \
+ 	$(DISSECTOR_SUPPORT_SRC)
+ libdissectors_la_CFLAGS = $(AM_CLEAN_CFLAGS)
++libdissectors_la_LIBADD = $(top_builddir)/wiretap/libwiretap.la
+ 
+ 
+ EXTRA_DIST = \
+
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index cea3aab913e4..dd7231c7866d 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -30,6 +30,7 @@
 </longdescription>
 <use>
 <flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt SSL traffic</flag>
+<flag name='c-ares'>Use GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
 <flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
 </use>
diff --git a/net-analyzer/wireshark/wireshark-1.0.2.ebuild b/net-analyzer/wireshark/wireshark-1.1.0.ebuild
index 6b783208f158..6114a92ea6df 100644
--- a/net-analyzer/wireshark/wireshark-1.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.2.ebuild,v 1.7 2008/08/03 16:22:03 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild,v 1.1 2008/09/17 14:27:39 pva Exp $
 
 EAPI=1
 WANT_AUTOMAKE="1.9"
@@ -13,13 +13,12 @@ HOMEPAGE="http://www.wireshark.org/"
 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && {
 SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz";
 S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \
-SRC_URI="http://www.wireshark.org/download/src/all-versions/${P}.tar.bz2
-		mirror://gentoo/gtk-2.0-for-wireshark.m4.bz2"
+SRC_URI="http://www.wireshark.org/download/src/all-versions/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="adns gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="adns gtk ipv6 lua portaudio gnutls c-ares gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
 
 RDEPEND="zlib? ( sys-libs/zlib )
 	smi? ( net-libs/libsmi )
@@ -33,7 +32,8 @@ RDEPEND="zlib? ( sys-libs/zlib )
 	pcap? ( net-libs/libpcap )
 	pcre? ( dev-libs/libpcre )
 	caps? ( sys-libs/libcap )
-	adns? ( net-libs/adns )
+	c-ares? ( net-dns/c-ares )
+	!c-ares? ( adns? ( net-libs/adns ) )
 	kerberos? ( virtual/krb5 )
 	portaudio? ( media-libs/portaudio )
 	lua? ( >=dev-lang/lua-5.1 )
@@ -52,8 +52,17 @@ pkg_setup() {
 		ewarn "only command line utils are available"
 	fi
 
+	if use c-ares && use adns; then
+		einfo "c-ares supersedes adns resolver. Using c-ares."
+		myconf="$(use_with c-ares) --without-adns"
+	elif use adns; then
+		myconf="$(use_with adns) --without-c-ares"
+	else
+		myconf="--without-adns --without-c-ares" # disable automatic detection
+	fi
+
 	# Add group for users allowed to sniff.
-	enewgroup wireshark || die "Failed to create wireshark group"
+	enewgroup wireshark
 }
 
 src_unpack() {
@@ -62,16 +71,15 @@ src_unpack() {
 	# Try to drop --as-needed patches for 1.0.1. All problems are supposed to be
 	# fixed there...
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch
-	epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch
+	#epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 
+	# again our hardened toolchain bug...
 	cd "${S}"/epan
 	epatch "${FILESDIR}"/wireshark-except-double-free.diff
 
 	cd "${S}"
-	# Add gtk m4 for bug #233158
-	mv "${WORKDIR}"/gtk-2.0-for-wireshark.m4 gtk-2.0.m4
-	AT_M4DIR="." eautoreconf
+	eautoreconf
 }
 
 src_compile() {
@@ -91,7 +99,6 @@ src_compile() {
 	# profile and -fomit-frame-pointer are incompatible, bug #215806
 	use profile && filter-flags -fomit-frame-pointer
 
-	local myconf
 	if use gtk; then
 		einfo "Building with gtk support"
 	else
@@ -116,7 +123,6 @@ src_compile() {
 		$(use_enable ipv6) \
 		$(use_enable threads) \
 		$(use_with lua) \
-		$(use_with adns) \
 		$(use_with kerberos krb5) \
 		$(use_with smi libsmi) \
 		$(use_with pcap) \
@@ -126,7 +132,7 @@ src_compile() {
 		$(use_with caps libcap) \
 		$(use_enable pcap setuid-install) \
 		--sysconfdir=/etc/wireshark \
-		${myconf} || die "econf failed"
+		${myconf}
 
 	emake || die "emake failed"
 }