Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 18 insertions, 61 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 6c84868abf9b..fa08246b487d 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # 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.634 2014/06/29 13:29:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.635 2014/07/23 09:16:06 jer Exp $
+
+*wireshark-1.12.0_rc3 (23 Jul 2014)
+
+  23 Jul 2014; Jeroen Roovers <jer@gentoo.org> -wireshark-1.12.0_rc2-r1.ebuild,
+  +wireshark-1.12.0_rc3.ebuild, -files/wireshark-1.12.0_rc2-va_list.patch:
+  Version bump.
 
   29 Jun 2014; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.0_rc2-r1.ebuild:
   Install headers at wsutil/*.h too.
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 96b7e564bdb9..3b66bf5e1c44 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,23 +5,22 @@ AUX wireshark-1.10.1-oldlibs.patch 795 SHA256 2ae88c478ea5c76cbb6eeb6fabb93ed85e
 AUX wireshark-1.10.6-gtk-deprecated-warnings.patch 1011 SHA256 8942ead656bc599957344fc00856fcc6abd9ac115a11f3b111dc132c3f0d394b SHA512 eaa454c11ba59d768e14dc726b824f0c8372a68e0697860b4d1a69b2127a166c86a0b97054cd84af43cacd6227dfab7a96036322e686bf91fcb0bd82627a22d2 WHIRLPOOL 39d3c525fa4521c69d64024800e52d91be1bc619c4375119505454fcd52089a93a5ba354cf7d44cc2c7a559c6c7c5dfda904e8af082e83d684b6edc2629e4c81
 AUX wireshark-1.11.0-oldlibs.patch 776 SHA256 0b4b23ad3ce7022809187ce970733a4c6bdb9fed31099853b399498fde8dee66 SHA512 dde2cbfd839409c594562b71783204279c37697939d44ee56ce4966d7dd43d04ab5837bd51551c416ec789b56f8efd0016e6ecc2311af8b3109e987da301bef6 WHIRLPOOL 57fb7f67166440208c5fe023f8c7e62a4f860ae5fecf02df6e9b8b45fe31c999f7eeeee83914bbfc26c656c69bfceee75c94f9ac80c64ebd0c1d6db792b66665
 AUX wireshark-1.11.3-gtk-deprecated-warnings.patch 1068 SHA256 0211d3f345617554add63f3101a548a990e26219b31b28003e4dbf607d38de88 SHA512 9ea643e8f707d9f9fe3ce61b875ae1828c77cd81c636423fc5572420fd3b103042e078f89541c5145db49f133828d333c55d1c2c3b9a162f0756051ef9d946b9 WHIRLPOOL b04cad3b70bc37b9cbc833227bdf9c32c17e67ad067902d3fb35f467fb76520546ecd508de1805ef810b76ebe4f0b686e483817c790cb4ede75c229505596502
-AUX wireshark-1.12.0_rc2-va_list.patch 1631 SHA256 b12c1e708caedf27097fdb32b2a29785a6271a755f47b308fd6be17620da0365 SHA512 babdb5796ea331f88dfcd031315738d00502563bc4fae0c7f45ac9db0dac8b1a177cdd765c6f93f7e4964af3bd418997efe3a72bdcb104fc55e9ef7c53cf3085 WHIRLPOOL ed2cfd637a024691750c4fa54b67653079c09d0eebf7ac6f8fa64f31861387cd5293a3871aa66c74170b5b8ff6fc21967a8734ccc483f6cb8de3154af5df839c
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
 AUX wireshark-1.8.12-gtk-deprecated-warnings.patch 940 SHA256 9969d68caeb0277ef78b4fa2078aafe6ffb2452de68b17bea5882a1b474ccf00 SHA512 e4bb971475ed019d6231179213f6fc9641d0ea91bac89ae0871e351b4def31741c6d3a9e0ff45fbc741e82804d1db5b1ff3f902d9aa22f598292009716a2f3b0 WHIRLPOOL d482ee4e9c74867e01104a1f85804535e791350006ad90e64c51887904c389d684223c3de1569e0261372e7cb3fa186b0d9cdc75831246644761f170751fca73
 DIST wireshark-1.10.8.tar.bz2 26715025 SHA256 27d9cf4f0ca1ac436104b7f27caf8ad65f73db09edc8df0742ce9688c7d38763 SHA512 4a892f04b6864033dd95f574c26c6fb414517a660d2c726953cef2a36884aba59ec87d65908eda38175013ea2af44f29cbbcdffab17390763da13bdb4f8e4221 WHIRLPOOL f92bb4dcc91bf870efad4eb4cfb456be092713e4e21b03302d8f99e1b7014ab4a4bbc5d56e48e826d031e594e4f09b6e2ae1262c53f8788bc72a8a5330e8f70e
-DIST wireshark-1.12.0-rc2.tar.bz2 28977769 SHA256 31009bb450126e9b12808267419f31016d14e6fde7b5e39c85ad37459908cffb SHA512 869b2cdb331eb13ffa37a67d761b854410b9dd162ab67b624778ed4954dbd2d0cf53455f32cca205cf1baebe86508b3119858fdaccc78314d4db6679eb513c96 WHIRLPOOL aea33e2811f285cd67b096b3b33e7c639dec5e5e3895a008ce50edd45e43cfc1c1c1e4cea48ff8a6a4a37209358d41e0899b98fa25ae73064abb35954dc146d6
+DIST wireshark-1.12.0rc3.tar.bz2 29141784 SHA256 8d5b40ec63e392fe9cce7894c40dd90fec4a945b1950a43ee16e07706005561e SHA512 c6fe045cb84700c6561dcf1335b45d1c52664e1225231f0569492940c97441fb6ff5b20ebbe8332912681fa2ab30f4286e2c2b273f62b21e219f7febb5d31887 WHIRLPOOL 11821a635d93401b9b3fcc69788839143081442f2897f8677ce4b6cce965a2b081b314589a295d2dc7c5a3532c0cb1270d582de42ae543cd0e1b5f6fa992a1c6
 DIST wireshark-1.8.15.tar.bz2 24193769 SHA256 e71fab6909a67e6b1d5d21f93e731488fb0343e5206799105e5fdc34923d3e76 SHA512 38306d568017bf12f7db15507e209a74bdd600d4ae02fba63cc5f3639bcba5d07e5ef3dd50fcda3415d30647debdf3a63149a0ef8243898a789e14a8b456a667 WHIRLPOOL 121dc025ef198a6b60a710af370b97834c6b73feea8b314a320b94e47e14c199c76e247868b9be40852b26d8a9d726d3e0d5c85b671e3e71944f8f65f4916a9c
 EBUILD wireshark-1.10.8-r1.ebuild 5537 SHA256 1ad6046a4db23c409920fb54d5a173dc74dff20fd933a135424b229f58c9d4e9 SHA512 a9f13530f15e3602e97dda3e1572ae2453e3597c1554ea7e25364080ae053ed31916c3fc606b175073e7ed606d1d228dce1fb252ce2e2096dad34cac8c883490 WHIRLPOOL 6d0fe39ea4df48a7944ce7c4feeb98c452049a6eeaf81ca1f8d6134b82e17c64db386f64e357b3b8292ef53f45d0bb57d11c7772e72d539ec8f6db867bd69b15
 EBUILD wireshark-1.10.8.ebuild 5820 SHA256 d97445a9696d788ef023d66bd28b8e658df4e667d6d2b929fa6ec74239fb6b02 SHA512 91180c2c8e156ba42fb923166c107395593a85ac1a05aceda65e99f16b96c6b09965e65ab9196beec83316bf44667e920b0b74fc2338fd9e51181c472d37f350 WHIRLPOOL 9cbf92e589d10a0a050ce9e58ff23e1791c22a7d4f71ed64a4362140246221e5be86b03735fb6415f9d40857311c933c52c8f8c9d706518109718d177c37a7c2
-EBUILD wireshark-1.12.0_rc2-r1.ebuild 5516 SHA256 5abd8596030c8f0a4db61b010520842f1ec27394f35b291069b622bc681706d8 SHA512 0beaa89335ceaacf42b3c6804a5c9d0b7692ac894e56be8e2d4e07570ab9cf56540331de7538b388259a917247b36475feb8495162cb2ed30706066da8479254 WHIRLPOOL d5f8865c1647b9ebe61e86bfb16c218efa0549bbacc294769147d82efb3a258c5155002a6316748811b8e4e1d17524d363422ed55295897b3ef02e1b864641a5
+EBUILD wireshark-1.12.0_rc3.ebuild 5460 SHA256 9671612a875bb33c8a8f4d7a2bdd05c91206d2d87465389dad1ac911e4e02987 SHA512 faca84d95df1b2114a351a5d844d4698426b068d984c8b440c2e3df9612caa460a0e8085a3521de8c156231af492b9e609faa4a8f946d98f5d45ac024fcd26bb WHIRLPOOL 2ac85377ac4aab956695141bfcfe720c9efb19418a4cfc61d559c5582c09157ed360a94bb9108bdfd760d0274d8dc097940e9433f032e3d3a011ae09206c3f78
 EBUILD wireshark-1.8.15-r1.ebuild 5703 SHA256 ad944f5fb763ffe993681d084212a5d928145cc6e3d0da5969219cfe118b3464 SHA512 3aa3d24b28607967101308ff46e296fefc075277a6145207fbcefec13ddc02fa975f9624cb949e77f104bf89a5b0bcce219e6fe609d13c9bb8569d3a0ba2238e WHIRLPOOL f9468c8f47ee306005099c5adabd4c172e2f3c4feadd60fcac583483ed9eb88709613d9ee265206a048fe9a949514fbda0ce588230a16af785cad468395f9805
 EBUILD wireshark-1.8.15.ebuild 5987 SHA256 b86e571fe7a611ab97c800f25ba3b58bf7f6392c6ab8baf9ed0172dff061f6cd SHA512 72c593831cfe802f13ce2c205386a746b3ad1dd8dd798a4ec7245b091b0fd9cc8be0e91979d53660da745b9a02b93340bb2e3a6a2d8d92d20bcd5c3e5fc77504 WHIRLPOOL 4379e55c55d1dc532759ada08cf6213ed52475dc9161cfa58c2707469d50705c8687cfa86eef71c37db6f38c64fa1e6520553754d6644be57bb7248835632c38
-MISC ChangeLog 92804 SHA256 a086d7a30e5367fe4f7d422c38791fa3ba8201f6316541b014adc53409691ded SHA512 ddf5b0f7d2e8e2f433606920635876617c3ac7438aba401a8b8b8a3912fc1a6a23b5502b065d5ec3e3bf529a2be0eccdfd6c8c78ad777e5a7f303c431c7203f5 WHIRLPOOL d2a0cfde2d057fc2ffdc3440be3fc5c5688bc8e4c8df70629b0e818d7a47995244d4ed0923f4a7842519bf67ab81085ecca5290de939ab0c68f8c8a66cb38783
+MISC ChangeLog 93013 SHA256 66b8f23dd28e74cc89210e9c233ceefe5af008995753ef57f97345f61f36e253 SHA512 9e25ce9421c6e57cb9e3d0928193035d20020f719b9338a921f8831c3f92de33d59feb9791d5167e466dcf300c668717ef9594776d395075674cf688902bf0e4 WHIRLPOOL 59f10f694626b9fb13dd0aacdb5be8a4c51b7471213869914de19322619a086b15a3bc30e02627b49bdcac6c066ab1062317b0e3cce580ff5b3baef1889c4c74
 MISC metadata.xml 2662 SHA256 aa3e958ce2704697a912374dfd9df72310353b54883e63de57b1f4e925f804eb SHA512 2eaf02dbd17d346b42dd2ecbb10318c08f8cba0e6bf0cd0dd76f145cc37c1eb35788c4a60d90c42b92c8b7e554315a40046b3b94c5d1a004ebb88650eb296dda WHIRLPOOL 21d6545372ed8aae96efb37f295904a3b14a721e754daf3bab74284d2e7527944fa6c75dc34c3229dea0c815641574f46f72b4b173d0653c6a92bf06341b81a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOwFNYACgkQVWmRsqeSphMIlQCePHcpPYH4NolGr3Jg/E0jEyJR
-6t4An3c83N8LJaGl8bX58YfRlTFGT+xQ
-=Pq/6
+iEYEAREIAAYFAlPPfVcACgkQVWmRsqeSphN4mACfRxjaxBSWuvjMRVkuZ58DbOFA
+Q6oAn3TxU5BnCKGCAenV/GleiPT6PmNV
+=HwHA
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.12.0_rc2-va_list.patch b/net-analyzer/wireshark/files/wireshark-1.12.0_rc2-va_list.patch
deleted file mode 100644
index a2b19b8f27b6..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.12.0_rc2-va_list.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2cec3c824fdea93efd74c7f5fd85d04f60fe9863 Mon Sep 17 00:00:00 2001
-From: Steev Klimaszewski <steev@gentoo.org>
-Date: Thu, 19 Jun 2014 09:08:22 -0500
-Subject: [PATCH] va_list can't be NULL on ARM.
-
-Signed-off-by: Steev Klimaszewski <steev@gentoo.org>
----
- epan/expert.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/epan/expert.c b/epan/expert.c
-index 46be838..2adf01f 100644
---- a/epan/expert.c
-+++ b/epan/expert.c
-@@ -384,12 +384,13 @@ expert_set_info_vformat(packet_info *pinfo, proto_item *pi, int group, int sever
- void
- expert_add_info(packet_info *pinfo, proto_item *pi, expert_field *expindex)
- {
-+	va_list unused;
- 	expert_field_info* eiinfo;
- 
- 	/* Look up the item */
- 	EXPERT_REGISTRAR_GET_NTH(expindex->ei, eiinfo);
- 
--	expert_set_info_vformat(pinfo, pi, eiinfo->group, eiinfo->severity, *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, NULL);
-+	expert_set_info_vformat(pinfo, pi, eiinfo->group, eiinfo->severity, *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, unused);
- }
- 
- void
-@@ -412,12 +413,13 @@ proto_tree_add_expert(proto_tree *tree, packet_info *pinfo, expert_field* expind
- {
- 	expert_field_info* eiinfo;
- 	proto_item *ti;
-+	va_list unused;
- 
- 	/* Look up the item */
- 	EXPERT_REGISTRAR_GET_NTH(expindex->ei, eiinfo);
- 
- 	ti = proto_tree_add_text(tree, tvb, start, length, "%s", eiinfo->summary);
--	expert_set_info_vformat(pinfo, ti, eiinfo->group, eiinfo->severity, *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, NULL);
-+	expert_set_info_vformat(pinfo, ti, eiinfo->group, eiinfo->severity, *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, unused);
- 	return ti;
- }
- 
--- 
-1.8.5.5
-
diff --git a/net-analyzer/wireshark/wireshark-1.12.0_rc2-r1.ebuild b/net-analyzer/wireshark/wireshark-1.12.0_rc3.ebuild
index b023e9ecb0e1..79833df70567 100644
--- a/net-analyzer/wireshark/wireshark-1.12.0_rc2-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.0_rc3.ebuild
@@ -1,13 +1,13 @@
 # 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-r1.ebuild,v 1.2 2014/06/29 13:29:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.0_rc3.ebuild,v 1.1 2014/07/23 09:16:06 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps qt4-r2 user
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/-}.tar.bz2"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
@@ -69,7 +69,7 @@ DEPEND="
 	virtual/pkgconfig
 "
 
-S=${WORKDIR}/${P/_/-}
+S=${WORKDIR}/${P/_}
 
 pkg_setup() {
 	enewgroup wireshark
@@ -79,8 +79,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
 		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-		"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \
-		"${FILESDIR}"/${PN}-1.12.0_rc2-va_list.patch
+		"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch
 
 	# Qt5 support is broken since the build system does not determine
 	# properly which `moc' it ought to use