Remove dev-libs/atk dependency by Nikoli (bug #479618). Add x11-libs/gdk-pixbuf dependency.

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

4 files changed, 16 insertions, 15 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index c8f17c1fb864..279d3f2426cb 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.534 2013/08/04 11:59:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.535 2013/08/04 13:28:08 jer Exp $
+
+  04 Aug 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.1.ebuild,
+  wireshark-1.10.1-r1.ebuild:
+  Remove dev-libs/atk dependency by Nikoli (bug #479618). Add
+  x11-libs/gdk-pixbuf dependency.
 
   04 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> wireshark-1.10.1-r1.ebuild:
   Restore ability to build wireshark GUI-less, wrt bug #479692. Thanks to
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d41960c54f06..20af896fb8b7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,19 +6,15 @@ AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a5
 AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2feea59c8c709eb7065e0c4d9bf741967 SHA512 8c37c020e1addcff70f631b710a15de040eb7af5fa43c0faad6729a090be180fb9d52ebd10a3aac6ad6e49344f795d27e093b9e7e3f591c835a0883ad9066ee6 WHIRLPOOL 59646ef16e7042cbcfa827525cae0f0de7e8cd7f9ccc01324e73b91c1dfd454ca7f7156bc477bdd601bd908969d217c251a33d91d9f6b334b0737035b5d55b66
 DIST wireshark-1.10.1.tar.bz2 26815901 SHA256 06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc SHA512 ae80b4959bd224ce0458055fdb7e8bd5e2395da09b658e1b2a3136540cb2b7d283b10f636cd2f534dd20dc2fc65892e2be4acb65ffa6e259a0539a1f8ee74cbd WHIRLPOOL deb3e8fde197af1cc6991b886b789b02c99f967acb977da42309038f6cf4804e7a500f3727e8bd69a8af8e680510a81cbeb261fab9546219e452038e28c6a1b1
 DIST wireshark-1.8.9.tar.bz2 24287215 SHA256 0addfba198111e8120ec529cfb7d29232427e87efa0424d2b047d5f30d12c930 SHA512 4bab81eb75ed52fef084acbe3c693bd24cb96c30fccc795709bec29bcde0f24c6766fe10ca0361cca59367dbeeca8a509f28bca1bc0b9bc52440d959852ab471 WHIRLPOOL 2044b284d51674293c7a5753d9d1c5db9a18aa3a2bd8de861b7ed1b961ca0aa1879c20d682d32c74a13366a18b4def47ff7eafa7c359222536032b61a14b1927
-EBUILD wireshark-1.10.1-r1.ebuild 5660 SHA256 e93db8dcefe5724d1b25add6abb93b4f50b922384e44133c382090ea17be786f SHA512 1baf56944261e7a6e7a0dba532210502e2ca3beba15e649699425775ca171526f9efb8f88d7a51adabbc0ea381fc4b3c1f208972162dc27901fb071c57f0b641 WHIRLPOOL 61216cd945581d91cf05283690c1d5ca5113245936abfa2bed40e25acbccdc71216e0f3d4172c64aed23fa6ea123b51150b032db66a4fc473efa60220879c7d4
-EBUILD wireshark-1.10.1.ebuild 5704 SHA256 1d5300769903612168c2454ad44175115a1b301ee05452b0434de362084fd28b SHA512 8244ae48b29e4e3452a18d9ef88645fc4d740e6b59dc19fa83d69a4adaeadded1d7b982ebdc49045f8e95dcf6eadd82955c814f61bdc9e1d3c6230f93ffbe397 WHIRLPOOL 50a8c88ec12b1dfd942dd9d63f883ec142608e6b86e13c5d4d6558a96c6c01e65f8d0ca0dfc42e9cd1c78ea1f63ed233b0bd6d72371190b4553c13c94a1cdaf2
+EBUILD wireshark-1.10.1-r1.ebuild 5662 SHA256 3a2eefdc94afaa9d81a94a527cfa4236458109c07d99b82cb9475ae841235b18 SHA512 8dc0f2d2610cc9d962d1878f967130f53beef46be6e3e25bff3d7faa09e8f39d58945c3e2084e14a500f6ae0811f90ee77613a0a79b21aaeb546161bdf7536ca WHIRLPOOL f1dfe6659ed182c1d7ccb46c2e587e329b725c205de547d2ba52e604b6027c464dbe2c3afc975f4f71062cfe20a7ad58fa50abfbca7bd8599fc4b09b7e5309b7
+EBUILD wireshark-1.10.1.ebuild 5711 SHA256 3d5c08b1cba3bb567d2c5eea7401d088f346058826c7637ee32d41b12cc69a55 SHA512 e0cf634c4cc470a030ef9167c8f1260802c8486f9dbc78df4261569f912188218012c7fa6a317780a87c700374d4582477aac3211c57d09692247d878de94134 WHIRLPOOL ebd5429fe7adc6521ad06bfedf918eec593a51949dd7e4d05f854ad7ed12a8fac5c2d760a710ae8d3e49de43f0902c35ce37f4fba9fa61b4cb3722b43bbe4487
 EBUILD wireshark-1.8.9.ebuild 5711 SHA256 dcd8ca52a5398ad596803de88505842ee0b8fb185444c6a1a195a84b8696e31b SHA512 fb7e8c4146f4ba16ca648614c7f820783857c730f05c74c8a2227197ae3725b9b40456292beafe55fb869fce3583db2ff88211c7ec5f9cee3744720c97420aa8 WHIRLPOOL 78362e8ecb71921a0ea02b3d042fa4c243b73214205647eecbaca3f4f8df43cb79f774d253c38b3c8b101df6f2d944010d84e97201724b52dc5b0844a575562f
-MISC ChangeLog 77876 SHA256 3b25fe2fbf7ea467cd34d252c2081c00a67f2fa5649907322a4a05a501e746d9 SHA512 7f4ba6881f86c699ccc3a4819e3ea20ba5f6020ac624adb60c3bbef94669f6cd6be4a73e21e053a0890b152603b9b667303857f06557c7531450a5946cdd5fff WHIRLPOOL dc0f5cc622a599336909fce70d846466ca2a6fbf7cac825fa97c26c91c200e10cf4be8c3c1633b13a0c194bae21196640edcd81d8711a4a7e235f63c427fa60d
+MISC ChangeLog 78070 SHA256 8d48c00accc9a6dc1a9ce000de77b87d6a45dc6e58c4b2cd019842da6cc5b2d6 SHA512 501170c55ccfdf9c8dfed029266f9f7adca05e02b274da4e90342f4871b52f7b8ace4e1eb93b5709fd76f819656f07eda2594ab17831a4b6b109340416e07afb WHIRLPOOL b209a1364e9861c7287d318916235330ecf664fab2be1824cde3608e6e327736bc94a1cd11579420d576c0604211ed7240b63bd25e82d7de48ea26a38ae06ac2
 MISC metadata.xml 2662 SHA256 aa3e958ce2704697a912374dfd9df72310353b54883e63de57b1f4e925f804eb SHA512 2eaf02dbd17d346b42dd2ecbb10318c08f8cba0e6bf0cd0dd76f145cc37c1eb35788c4a60d90c42b92c8b7e554315a40046b3b94c5d1a004ebb88650eb296dda WHIRLPOOL 21d6545372ed8aae96efb37f295904a3b14a721e754daf3bab74284d2e7527944fa6c75dc34c3229dea0c815641574f46f72b4b173d0653c6a92bf06341b81a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR/kIrAAoJECo/aRed9267QtsH/233GrNlV5Y1lDaYXbQTDDQP
-61qcaEX1GQ6mvyipZKrfXxHfUhgBxe4nVBaIGcRYyotVMoFrPUz2EcHSWjqihgo2
-D5vd4H9jXQrIW9NjEFT9Gja0KzwHXKvS5ydT3DPoddYFbX+jdu97Fr5/JA35QwXH
-1yzMsSfonPzou7eGP7hIvbo+MMy5hOPl2ZDLVAh2MuAXFxCifPt4H6VUdirFuoJg
-Wh5cWzCCnIHu+WsVbusFiTmlo46W0yQivNKBDV29RrrvzIWHnvFLNapIv3cPH3zG
-t1ycYSr6qYgsGFQE66fydxsys3TeAPmLvL4oBSgJpO5t1VopQztY2j6ozQL65Z8=
-=Y1Ot
+iEYEAREIAAYFAlH+VuoACgkQVWmRsqeSphMivwCcD5v9gtIU94UBE59WtKVfV//B
+aNoAn2/8KAScQ8tx9vkjTqEyQXbslznF
+=81KN
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild b/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild
index f0b85d0eb32e..4bec8db456a8 100644
--- a/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.3 2013/08/04 11:59:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.4 2013/08/04 13:28:08 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps user
@@ -23,7 +23,7 @@ REQUIRED_USE="
 "
 
 GTK_COMMON_DEPEND="
-	dev-libs/atk
+	x11-libs/gdk-pixbuf
 	x11-libs/pango
 	x11-misc/xdg-utils
 "
diff --git a/net-analyzer/wireshark/wireshark-1.10.1.ebuild b/net-analyzer/wireshark/wireshark-1.10.1.ebuild
index 5c8dd60398af..48e70b2daa05 100644
--- a/net-analyzer/wireshark/wireshark-1.10.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild,v 1.10 2013/08/01 13:02:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild,v 1.11 2013/08/04 13:28:08 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps flag-o-matic user
@@ -31,7 +31,7 @@ RDEPEND="
 	geoip? ( dev-libs/geoip )
 	gtk? (
 		>=x11-libs/gtk+-2.4.0:2
-		dev-libs/atk
+		x11-libs/gdk-pixbuf
 		x11-libs/pango
 		x11-misc/xdg-utils
 	)