Version bump.

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

3 files changed, 16 insertions, 15 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 01058b3add6a..5fc324f2b490 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.658 2014/10/03 08:30:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.659 2014/10/07 22:04:08 jer Exp $
+
+*wireshark-1.99.0 (07 Oct 2014)
+
+  07 Oct 2014; Jeroen Roovers <jer@gentoo.org> +wireshark-1.99.0.ebuild,
+  -wireshark-1.99.0.1989.ebuild:
+  Version bump.
 
 *wireshark-1.99.0.1989 (03 Oct 2014)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 89cc12a8b2a6..8c5ed2eace70 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,15 +7,15 @@ AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a5
 AUX wireshark-1.99.0.1975-gcc_option.patch 2939 SHA256 4d534da5b4a45f311a622108a0a4313d1581925a8cdf35d8429d5f46baab0963 SHA512 a48204408b05cd61ee9e1beb36dcb4d11b49bdb150c13fbdf490f9bb4a14fee3fc5113c501c03e294a944ae3fb36ad9d37a406eeb09ea87e02f2ce44ab6b6568 WHIRLPOOL 0c7d944840a93931fc95d5deb53e45b3e43e6129d9af51a9ac53c1a0f190b202c02b9abf89b04e863f3d803a52d91c5496cf357cb3e5bd244a49c0fa7c56e8b0
 AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b373264e2a89f212f6db773ad02f3a6bedf SHA512 5086b36ecf9b1dd3292011602c8824a572dc759a0e35049a39f0da8045a93738a8f2c2b4c053a0f1d999dc8cdb7bfec3b33f2780d8795135dd65984355485578 WHIRLPOOL 55301e3ff688fbe7df405d40dd8a6e942d1613ee0e4543f46fa83ac6f0688170753fe1cfc67bbe00b9bd7a46cf73513530cc746ee29ba7845e3a45d12ed07743
 DIST wireshark-1.12.1.tar.bz2 29059989 SHA256 82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b SHA512 840f348c8cdaa0e4d96c34e0a752f3d575d975ac8e61b31f6456a0eba4b484268651c96b943cfe213a6c40edcb18670ec921564413c052fcafdf32b2c8523929 WHIRLPOOL f98131bde6680370943cf6070cb44c6ad96d42060573e521051b81ad9d934b03741bb4d75a1d30762eebf5f22387f9eb7158acee4caee2503c4eafff52a12ada
-DIST wireshark-1.99.0-1989-g6621b1f.tar.bz2 29619804 SHA256 87a7522020b77dd3a59aded0d889735b7739307cd91ca8618e48fac0ab0e081d SHA512 e9259d440d5653123cb56734a6f2a7b9d3c14b8bedb73e3a77304476ba53b3ac07641421b83cfca3a20a0840ab1e56e7c3ae3fa99a9b24392e3d79bf082c844f WHIRLPOOL 530d88a02d6a19f28ea3f83b22796e73e2d7016fa6dc583b2b83426c1fd74e5cc15df4984b8ddfecdcc523ec16e456e4a3f9df73eb0303d275716195773a923c
+DIST wireshark-1.99.0.tar.bz2 29782811 SHA256 9454180264c288c0ae03dfc3856310e319acf29f7b2e8a8ea2fd91665b606364 SHA512 021d4adfe8a6a326def81daa79ede1fea8a214f6d9f9c3f1cb008a36e82fe42655cc6c6f4de2a425181e03e61f3dba5cad2ebb11605d29f4bbc0623f66f0d3db WHIRLPOOL 04e22741d28b4576bfceb1c0507fd8cce7b7781999245e1cc8cd1ae2063f62fa518c007f42826a445acf99f18c61b7b9f3deb67629438e7e3c9276d2282a5793
 EBUILD wireshark-1.12.1.ebuild 5439 SHA256 85e392623cbf466e784386f781471c315ca14e19c6c7260c7b82d992934fed8b SHA512 9eac78d3911bcb471cc61dfcb191d9a62627c5b05235633b0d1aad4a4f2f36889f62426bcb67a5de5d7a9966989fe7770f0cc191fa3180d517f33f9ab69f9452 WHIRLPOOL 06110f7000b4385d6607b30cd4cce44c2efe46d881c9916d6be7ced180674fcc8e90483cf8a25f8b7c9f6bce8afa5b7ac5d76f8430509b165bc6693b21c5716e
-EBUILD wireshark-1.99.0.1989.ebuild 5746 SHA256 9fd6d0354741630bf2104c6888ddfb81b875a37950dcdedeb91aa726c50a5bb1 SHA512 1cebb1c741fa5887e8969e0bfbcd52f2f9964b36afd02b6b022d3a6148e6332d93aa3aa32f3f18c8a3643bb87781e0fc65749c6151b6346ac07d3180594775bb WHIRLPOOL b02391ae039e4356044eb1eb6d3c0a44d944ab77b966d2a1adb1e4eaf80ef4c81a2dbb2df1b23d7c1d2c70964a4a8caf000e3846a5963d4806184145ce49b28a
-MISC ChangeLog 96161 SHA256 61715425b894d5bf0ca58c081d541df0a4c940f0b6f6c40df31e4a4275d4737a SHA512 a9820ae7643bb060e0c3cd35f47fee7b35b6414c1c9e74d0e0b2a9a9cfcf941a32a8018d9abbbc6ffc6cdc3aaece7631a57161d3de3dd1f8c4bbfe05b87df5b3 WHIRLPOOL 66ad943294a06d60047ba6a7fbfe61d3747018a07badb0940d25850b414cf71f834f5837e58c3e02eb3cb8a2185eefa1b83c4586cff863ab8247e1bbab7d3c9e
+EBUILD wireshark-1.99.0.ebuild 5617 SHA256 cec593c8a0deab8adfc4e1580076bbb701e7575cec34ac47c82e39f09a7bf40b SHA512 d2edf3dfada08578b7ab18516f3d1669ba40a27631a3c5246d2b40f57bc3da7c9ee1df02f7c8857193d086726f7bf4dcedae97f7be11db8cb4bcdc38fc1db17d WHIRLPOOL 6616fc140347e816f6ad45ee953fb3d13c272928631e002b24029e36b5d24f38debba5922a1ad0e3f6d3fba08aaa2b7a52a58d569f24f24fde831259cde77ab5
+MISC ChangeLog 96317 SHA256 75d9a175303200c0aa61fa0b27d913f00ccd68994402a99809519289904eb6a3 SHA512 7fb23e2fd9327da703257a7e33a343879ed811be28dbcf12010d3e0430853fd49e874787f67723239c02192a6aa7588a696bd9db5a77212628f4c32aa3b3417e WHIRLPOOL a82ebe57c7a071a921f6a61174e43b8475bdc3f418822496d22a66997de30508bbe0ed27bf0336438aa2f80b3bc3e83ec1b34876da8d513d5a0ef0ce2aaefc97
 MISC metadata.xml 2460 SHA256 c764e8b164a3c24ee43cbbd46f3ce01b4015da62e9d29b1117868a3644497dc5 SHA512 f957bb3ce85ede2c8944581e116160fb601c1dddcc7cfdfa9b6a39fe5c9c7e51afe686369681a31ebc231a46aac33be5223730b1143f1895deb7569a606f2fd2 WHIRLPOOL 57259e5c67ec9d2dfd7ae69f17146a514915e4f3d0031eaebbdd9640f4b11ad9df25de71f223cf4df044bfa749a148ee5069faf790060761d800476e56619f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQuXrQACgkQVWmRsqeSphM96QCfZn7mbTPzUtsChb+FJjX5MFT3
-54AAnigYU9elHxEvRKD/xpPZSKCANbgP
-=BJDT
+iEUEAREIAAYFAlQ0Y1oACgkQVWmRsqeSphMH3QCeM/9/F3wNq01w4ltFi/KwoVm/
+eSgAmMM+uWi7JXmWmhlzn852v6TmHrk=
+=JR4Z
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.99.0.1989.ebuild b/net-analyzer/wireshark/wireshark-1.99.0.ebuild
index 7934885a0c75..c992f88c89b0 100644
--- a/net-analyzer/wireshark/wireshark-1.99.0.1989.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.0.ebuild
@@ -1,16 +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.99.0.1989.ebuild,v 1.1 2014/10/03 08:30:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.0.ebuild,v 1.1 2014/10/07 22:04:08 jer Exp $
 
 EAPI=5
-inherit autotools eutils fcaps qt4-r2 user versionator
+inherit autotools eutils fcaps qt4-r2 user
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
-
-WS_GIT="6621b1f"
-WS_PV="$(version_format_string '$1.$2.$3-$4-g${WS_GIT}')"
-SRC_URI="${HOMEPAGE}download/automated/src/${PN}-${WS_PV}.tar.bz2"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
@@ -72,8 +69,6 @@ DEPEND="
 	virtual/pkgconfig
 "
 
-S=${WORKDIR}/${PN}-${WS_PV}
-
 pkg_setup() {
 	enewgroup wireshark
 }