Version bump. Dropped unused patches.

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 10 insertions, 41 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 392036dd820f..ab62065df37a 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.173 2009/05/29 11:53:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.174 2009/06/17 06:34:46 pva Exp $
+
+*wireshark-1.2.0 (17 Jun 2009)
+
+  17 Jun 2009; Peter Volkov <pva@gentoo.org>
+  -files/wireshark-1.1.2-misc-warnings.patch,
+  -files/wireshark-1.1.3-misc-warnings.patch, -wireshark-1.2.0_rc1.ebuild,
+  +wireshark-1.2.0.ebuild:
+  Version bump. Dropped unused patches.
 
 *wireshark-1.2.0_rc1 (29 May 2009)
 
diff --git a/net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch
deleted file mode 100644
index 2da9a5224ea4..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3314
-
-=== modified file 'epan/dissectors/packet-sflow.c'
---- epan/dissectors/packet-sflow.c	2009-03-08 10:18:22 +0000
-+++ epan/dissectors/packet-sflow.c	2009-03-08 10:22:32 +0000
-@@ -563,13 +563,13 @@
- {
- 	guint32 	header_proto, frame_length;
- 	volatile 	guint32 	header_length;
--	tvbuff_t 	*next_tvb;
--	proto_tree 	*sflow_header_tree;
-+	tvbuff_t 	*volatile next_tvb;
-+	proto_tree 	*volatile sflow_header_tree;
- 	proto_item 	*ti;
- 	/* stuff for saving column state before calling other dissectors.
- 	 * Thanks to Guy Harris for the tip. */
--	gboolean save_writable;
--	gboolean save_in_error_pkt;
-+	volatile gboolean save_writable;
-+	volatile gboolean save_in_error_pkt;
- 	volatile address 	save_dl_src;
- 	volatile address 	save_dl_dst;
- 	volatile address 	save_net_src;
-
diff --git a/net-analyzer/wireshark/files/wireshark-1.1.3-misc-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.1.3-misc-warnings.patch
deleted file mode 100644
index ba948803b1c8..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.1.3-misc-warnings.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3353
-
-=== modified file 'epan/dissectors/packet-mp2t.c'
---- epan/dissectors/packet-mp2t.c	2009-03-24 06:47:10 +0000
-+++ epan/dissectors/packet-mp2t.c	2009-03-24 06:58:38 +0000
-@@ -448,7 +448,7 @@
- 	guint32 header;
- 	guint afc;
- 	gint start_offset = offset;
--	gint payload_len;
-+	volatile gint payload_len;
- 
- 	guint32 pid;
- 	guint32 cc;
-
diff --git a/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-1.2.0.ebuild
index 6b0ff84a494c..56494d536c14 100644
--- a/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild,v 1.1 2009/05/29 11:53:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.0.ebuild,v 1.1 2009/06/17 06:34:46 pva Exp $
 
 EAPI=2
 inherit autotools libtool flag-o-matic eutils toolchain-funcs