Since index.theme has Inherits=gnome and tango-icon-theme is a dead package thesedays, pull in x11-themes/gnome-icon-theme for the missing icons by USE="-minimal" wrt #518294

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

3 files changed, 23 insertions, 16 deletions

diff --git a/x11-themes/tango-icon-theme/ChangeLog b/x11-themes/tango-icon-theme/ChangeLog
index 54ddaf5c9c2a..254578eee678 100644
--- a/x11-themes/tango-icon-theme/ChangeLog
+++ b/x11-themes/tango-icon-theme/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/tango-icon-theme
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/ChangeLog,v 1.58 2013/09/19 20:27:09 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/ChangeLog,v 1.59 2014/07/29 21:32:16 ssuominen Exp $
+
+  29 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  tango-icon-theme-0.8.90.ebuild:
+  Since index.theme has Inherits=gnome and tango-icon-theme is a dead package
+  thesedays, pull in x11-themes/gnome-icon-theme for the missing icons by
+  USE="-minimal" wrt #518294
 
   19 Sep 2013; Samuli Suominen <ssuominen@gentoo.org>
   tango-icon-theme-0.8.90.ebuild:
diff --git a/x11-themes/tango-icon-theme/Manifest b/x11-themes/tango-icon-theme/Manifest
index 6a788e005689..a15a80ce2dbd 100644
--- a/x11-themes/tango-icon-theme/Manifest
+++ b/x11-themes/tango-icon-theme/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST tango-icon-theme-0.8.90.tar.gz 1790489 SHA256 6e98d8032d57d818acc907ec47e6a718851ff251ae7c29aafb868743eb65c88e SHA512 78b909bfc8b126060f8a320f5465ee6af98533b5229ebe46952469ba9f08796189b1ad8110e0ffa1e5745d083cad292396af887c4f8792595b0b8d2891258a52 WHIRLPOOL 112b50fac26ee53e2815f10204d209656d26f7b8fe7582a0d0b1c64aa1c2a55495d4f5e5f67c39b549b84f1e422bf6deb61461a3182a633511c579220561a4c2
-EBUILD tango-icon-theme-0.8.90.ebuild 1532 SHA256 bcf8770436961a9f0e577a673c71f504f15acb2ae96f9ed1b28ba48a10c050b8 SHA512 9a4451f9f39e34c5a577b45a6ad3dda07fe988fd80d3387672f19574fa18b2e4f00027bc4a0512286fa10195954530884650e2c3f1f1a6694aa1fd9749258d2f WHIRLPOOL ef28ab0ae71430ed8bfa5c7eb2ca966578cc8204952c73fd7f8c3261b5739d5d20d6a72015c289df07243c3943c9d08a64b31ad0d5a776c655a8faf65df64ff7
-MISC ChangeLog 7574 SHA256 0d59984a95b08bc3e156c02ce511202866d8f7b31c407551a83e83ebe1867679 SHA512 6b8ebb322926ce8b7210840ab5740e3336a3e04ca6db9b4ec7596d59789cbde13023144ecd2bce173424068747379e9ee63a3fa91fd7bd6cec153a1281c5227f WHIRLPOOL 977224eca9ba7a86073023896f87a6dd1a754b4d757ca57f654e53468face6e04e6c7f0cb60ab581ea27c987a3438adacd0af2718a5fcb2c2afe4a1db0b74860
+EBUILD tango-icon-theme-0.8.90.ebuild 1594 SHA256 d0a179c53c96aaea94b380b9e7ee7d7b8da2d33775c07872a7775fc8ad6a051a SHA512 125af96e7cd34711a38a536ddc30adb0eb9e486f4a0c3fc4849a0f9749199c9504e10aa42d113a13203900d79f385e7de7aced1cfb357a642c987f15453e00bf WHIRLPOOL 51c1e37131f0e43ffbe9044d7d0726114793b38bd87032c8c7f8f59bb479f833734f5cc25a5a21c010192a1bcfc808f7de120cb04d5dd452649ad2a177d18c2c
+MISC ChangeLog 7844 SHA256 96dc2be2e14debeb433c025b895e6901c583f64261f3d714bbf92a3777bde5f1 SHA512 4c74e295f6ddfe929845b4d95b783346cc3a4ded5681c93e1921730c52c08cf1873449e5fa8098fd1b496799db4b7ab20b8ded8cdb993948d2fed3bc48c55627 WHIRLPOOL f851d7676a03037ad1716bc142456a560cc4b4fa32fbd9ba081b0f1b15b8406efbc2e9fe0597f294a4493c1a73000f3139aa9e9213c0f63ce54875a78259b0cc
 MISC metadata.xml 239 SHA256 5d929c534d63615358eacbd035a386109d5deebdc7bb562511b4a6338ee2bbb8 SHA512 ab6b74388bf69a67b0d1f4283475f97eb5a731f31b5c9db4ee50b819a846c77d4ef09f63856e31a68b0bfdf18ee3baa6c76720d4345ccadf154385caaf1033bb WHIRLPOOL bcac6415c046557e53bf04579e077fed4d694dee8f7c0faeecf15f3f036137a2c9f0eaa0c492cecef23a45bd5af2c45542acd26641209d3c9be3108bf1ff09a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJSO13vAAoJEEdUh39IaPFNyKsH/A1hUlU4NxRCNqgo/aD8rZTo
-6k0ElsSbtT8ptEPMHkIoiqY1JqNQ4KTqnWhE0RPSWSSKgypsKxLTAzY6A6tIVrXC
-w3zJ9vP/qNp5fcEsuTB3V3REQn7cDDYyK3mDeuOFnd9CBmDri2gtwrUiwHPxO3nT
-a/NDCretyg6GMCa9AXvqUdfhEhMBFMdFDCIwZAtJth6OT+m0vhZzc9/bEt6ejISd
-2sNfQVFlYeSQ/MNfXZsX3PDqyQJIAG06NV2pM817jz2Q3wyBTuIarXMcEtEjivmO
-+cmzEHFBby8o6VIw73As2YX/VMG/DavE+7dpvx8shxEdmVmIRtNZ2izKeslC1S4=
-=710z
+iQEcBAEBCAAGBQJT2BLLAAoJEEdUh39IaPFNBIAIAIaNqrnswOfPbTYPtNxbdSKZ
+lmj1CGiOuRKmj3qVxmwLCRnZSL05qCo/lSF9imNcBSoy36x+EQ0fR0shtDp2BrrI
+XmYeNlkO29c1J2ob11koO8ZSiPfL02DJS1Kjx6pr0EqnMgkuhTHniNMOZOZu57mK
+xceP8q5/cvvv/YXvplFgKxWZgS6jLTqGGPrYbNykeQVSF1gLaZHzFJ98XIap8HF7
+UymXXgxTFx5xZH8/WEphn59WD1VY0kFTn/NSQA5p08Orvg/Lknm2NkQ6/P5pu4c5
+z6NK8IuHjSQSfu8fw4ifOJO7ANsrlm1BlkTcGkhXehzMxcLtTQrYgBevgVIVc1U=
+=3lzv
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild
index 19a16aaeb69e..c3a0b5428425 100644
--- a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild
+++ b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild,v 1.16 2013/09/19 20:27:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild,v 1.17 2014/07/29 21:32:16 ssuominen Exp $
 
 EAPI=4
 inherit gnome2-utils
@@ -12,9 +12,10 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="png"
+IUSE="minimal png"
 
-RDEPEND=">=x11-themes/hicolor-icon-theme-0.12"
+RDEPEND="!hppa? ( !minimal? ( x11-themes/gnome-icon-theme ) )
+	>=x11-themes/hicolor-icon-theme-0.12"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig