Drop obsolete patch.

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

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index d0f8a5b352a6901b2977f103e06d1da4d5f77889..52bc5484aca278344ec680f3b76219fefa0ff4ed 100644 (file)
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.691 2015/01/16 14:45:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.692 2015/01/20 08:17:42 jer Exp $
+
+  20 Jan 2015; Jeroen Roovers <jer@gentoo.org> wireshark-99999999.ebuild:
+  Drop obsolete patch.
 
   16 Jan 2015; Jeroen Roovers <jer@gentoo.org> -wireshark-1.12.2.ebuild:
   Old.

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d7b19b07de5739cca105809d7ca30a337e817fa6..818d0fc2c63b5c3feb72dcd99d5387d173209c41 100644 (file)
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,13 +12,13 @@ DIST wireshark-1.12.3.tar.bz2 29211228 SHA256 69950b9dcb1a630982b5f680554d73d27e
 DIST wireshark-1.99.1.tar.bz2 29981374 SHA256 59d9fdff72a64626c0bb68bcfb0002d1441a9d6cfe8ec0ec72d23c1d862a4b3f SHA512 055ba559da47441346bbfeb5192884701c8731ab33868b94f432fac02e3d2181f86b3e810d6ec9710297e3a75368a507472157389150cf9c3f79d21e283793d7 WHIRLPOOL 697a2e318f02ad7214e2fe1f8684f70bf2f7cd91fbc715d16f36a72fc9d8275e96da22de6c66ba16c7c9f509eb91fa48017593d929b6f0e1458ca78bb01423eb
 EBUILD wireshark-1.12.3.ebuild 6160 SHA256 15bfcb8012983ff5c18948554c4762eb0a75d9ae61e9cbb34ec489881423a7b3 SHA512 58b8805b3b4f02f9c6debfe479e159718c383d8518b5231fe9ef5c02c04b0b92703e33d776ffe7c37cbee035abfa5c41c9a3d7d4aae90a68e43c4da906e91ce1 WHIRLPOOL 40c5c8b0904dee397fc59a1cd5e3c42c3b64ed40381fe35128f2a1f8b9bba2166d2b2735df331ea71ec955655bf1b7b1a89f5d464ca95dd0a5ea9c4e9798bc60
 EBUILD wireshark-1.99.1.ebuild 6250 SHA256 a9988a51256e96d3682f5f0d847c2596b0d12bd9f5bf898280f2965e9ea7792f SHA512 048498347fd936e176abd5f40a5dcb686fa9edbcda413da76ad02a57ede6b3c018fd9a831b4f5b6aefcc2f692fe9bb0296edabd8b1566f6633e2b3113f22462c WHIRLPOOL 5381f8435daaabf8c9eaf66367ddd81c1d45036a576ce300520d3627d392a85b1086f6575d0653ed8c95b4c0b884155fb262b3c62dac08ed8f166048c597aa52
-EBUILD wireshark-99999999.ebuild 6296 SHA256 bce59f02eb584b18056bce59607a4a4dd288bb327623eaeb8dbe4581715bdfad SHA512 8fc0f029b38663ac4f439aebb476cebde3c777dfd3bea2e46e2afaa91e5207eb52b02d14045165155f3c9b86df5d6a029bd1de37d066a6191ee3b0a2c2213fd0 WHIRLPOOL ab01cc5630bb8d78fd9c1cc624d5e456ce388c743e20a37fe11c79d3a1af22a3a2e199105c6b03558bdb3f4e5312af43260073f4d9eb15c453e849f3cf247450
-MISC ChangeLog 100719 SHA256 5c26547d12d760c3d5203f3cc3a66a6787657dfb7fb4bcd63b4785566be49441 SHA512 069799f633b3a43fff0760e780796be52e36840bc41e18a9eff6188a85353f3a0465cf3998b752c3ef6ceeb90a1f4dc76a385d1fde8ee07a1914ad4fc92e596d WHIRLPOOL 7322c7eec8105be6682893d6330c67bd7ef999930caba91b19043c9ceeb4ae3925f3bea912edcfa58fcdc8b4d8eefeb88daf88792df18383e84653331895deb9
+EBUILD wireshark-99999999.ebuild 6255 SHA256 7c99effebba3f6a7c70d674425315a892601f9985c63ed66854baf483a8fe610 SHA512 200b2301012f02a2e9c040c7b00b75964d5fd84eb43bfb870cf189b6c3169afa3cd94129d4635de17751699c25fec06342d54b2320e6aa13aba8298cd684b595 WHIRLPOOL 00d1290e6c2273d90940b323cd0ed3422e52d50b75e6127b68c4c086d9b9d87ea3894246567294ba4d8adcab9e1a5473d3093d93784ca17b3d62690c01371dc0
+MISC ChangeLog 100817 SHA256 15cbfa12e4d0741bb16b9f7cf90d0d7167763c766cc1b3dd2344ff9e7fb2237b SHA512 5cc49a9e90b943a8954548bb9ae37d003e2dbfcb9f2ee407c72328e441796b2603df2fedc634947c5bc160b2bb359c72df9c0a24b65b7a642c633a48912453d8 WHIRLPOOL 42fe99d2f9368fa0e9401d3a97f317328f5e4ea59ed2d9d817aa473715093166cd3577e9a9799710ffe66ce18cdc68c3c10002b9b760ae7f6e07b0277cbe4cc3
 MISC metadata.xml 2551 SHA256 043959725e25c500c4f38597224b0fa0da62c4a2db3e34dd1a3947f199829cab SHA512 532d03e6258a65b5462b884b6cdb7cdb230914aa595258c05c2be6fd6a01c9ac859e87ed39542a3106764e9c66c166e400df86bbde453b225c577d514a67e676 WHIRLPOOL e7132f0ba9d29b227e0fa76315951d826a31b78cff3d01a488018e1a826820abe1a67cbdb561e6b5b1da469384e6923172032f9da21a03bbcee64b758915a2ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS5I/EACgkQVWmRsqeSphMPkACfZOQnisAUjbJ7a0bTyfbIgX0d
-qgcAn1vfTBgx4c4/VDhR7nAJYrp41/9H
-=CCfl
+iEYEAREIAAYFAlS+DycACgkQVWmRsqeSphOHmQCfVWg9qlicIJwzAv/9b7G1WtLP
+XE0AnRhrbg1hcDlAEJTujagzTluy9A3S
+=UK50
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 8a1e06d67ad9e23a8dd2aea211b38e2277987c99..90d8b617057f7dd0bf8f03d68fd937d75b5b9a57 100644 (file)
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.6 2015/01/13 10:35:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.7 2015/01/20 08:17:42 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps git-r3 multilib qt4-r2 user
@@ -100,8 +100,7 @@ src_prepare() {
                "${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \
                "${FILESDIR}"/${PN}-1.99.0.1975-gcc_option.patch \
                "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
-               "${FILESDIR}"/${PN}-1.99.0-qt5.patch \
-               "${FILESDIR}"/${PN}-1.99.1-sbc.patch
+               "${FILESDIR}"/${PN}-1.99.0-qt5.patch
 
        epatch_user