Version bump. Dropped unused patches.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 13 insertions, 46 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/Manifest b/net-analyzer/wireshark/Manifest
index a908d517f66f..1935444c624c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,12 +3,10 @@ AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf
 AUX wireshark-1.0-sigpipe.patch 850 RMD160 a240a1317681516d207ca1694b0e44584008530b SHA1 8f127c22daa77ce9f658f3b1d3f897e428ee9dde SHA256 3a5130838a48b65cb21b4e25913347cee05689b4641c1dfb407facf9fa4f9f59
 AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508c04455111de300 SHA1 432751cd931baefba3bd13cfa07c3d9863b7c82e SHA256 991e12325670c81f4927c6dc2b665eb8c8938d8f3f0cdfab58601dd37a00d8a4
 AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf4e2f65c3 SHA1 7a743a42542fa59423870a0205e8ed7aa6bde70e SHA256 34aa27c611021c9a515cc4fed9778148395761bf6f4272130d3e83abcc13a499
-AUX wireshark-1.1.2-misc-warnings.patch 823 RMD160 20a13891425581b1799c38d946128fd4f5293358 SHA1 19b70ea3eb86085d8292a461e4f50506a2b9c01e SHA256 3dd5bda276b072ebe44f4e4973e517149149e2b7efadcca2a0eb6c03f9a0fb4c
-AUX wireshark-1.1.3-misc-warnings.patch 390 RMD160 a3128e2d7a34478999611e6b30d38732e95ffdc8 SHA1 c539da3e579e67eeb2721251efa26412d1d4d091 SHA256 c97cb7ab34552ceb077bb77c1772a7931201728c984ab60d2f1488ef87fb90fe
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.0.8.tar.bz2 13347689 RMD160 a702e78da673435361344ffda13c753386aee1a4 SHA1 cfd4ac05eb9c0d13236003deaeabfffc21f7c9e9 SHA256 c07b7ec145c77be6ca7d011e4340ee283d021052c44958da18e87d55e896f894
-DIST wireshark-1.2.0pre1.tar.gz 18936505 RMD160 f2cee0367a5434f1424edc6ac0c33af52b945726 SHA1 6576fccf92a8202d6428c26bb4723701753065ff SHA256 de2aab17925dcde0557e136d1401d8a508b8e3282804d9f2decf2c7196bbb47c
+DIST wireshark-1.2.0.tar.gz 19493201 RMD160 f8231ae1958c1b41dd7fc0f06834355f23860ccf SHA1 42e3200ffd39b979ae1bd1334c72e3889b008f49 SHA256 74607d5fde2766e64a9be6f94f1f9bc5a6df64a6c522bfbcba9235af77b44b72
 EBUILD wireshark-1.0.8.ebuild 4903 RMD160 89e398013c984ee746aeee5d2f64b688da80f677 SHA1 6e29529c4dde652b20e2157413d336b793ba36a3 SHA256 beada3cb9db93b50077d74a570a4a5d8124c318973521acbe682a1f74b0f8394
-EBUILD wireshark-1.2.0_rc1.ebuild 4471 RMD160 322bbae527b5ab33e56643f33a5b075f77eee8e4 SHA1 7e6fc2323e056452eee92b59459f6dd1f997ca01 SHA256 4dfb0e8dcdcff9e05120fbe459cff79907174e5fec914d727002ab110a0100a4
-MISC ChangeLog 26316 RMD160 f49c2ff18f41d3713ad692f7ff4b877a453fb4ea SHA1 73a72a6ad6b2b10868b61a90258583d2e2395a38 SHA256 8bdbd82b79282097b14aa1d09ba6fbc9caf383925167073533f65c0920e2e8e4
+EBUILD wireshark-1.2.0.ebuild 4467 RMD160 05f8499b115afe61327a092724d1589c6f2404fc SHA1 f9ecaf7e195e32a3f19869258ff8e0af3020f55f SHA256 a523a60d7d57fb71e17e3e911e74d7cd01185d067c007327edf36b6a09483395
+MISC ChangeLog 26582 RMD160 bf9b3519e79d36e3a9d7d95b79ae07e41eb178e0 SHA1 48b2f15d373a878738c56abebd4753b7d86c2249 SHA256 826325183c40e9de3a685a7e78161420c502254c7c79b91a267f4eb9aa43ae98
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
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