Remove themes from RDEPEND that do not satisfy the dependency fully (i.e. the Downloads page does not have icons). I discovered this while working on bug #352263.

Package-Manager: portage-2.1.9.25/cvs/Linux i686

6 files changed, 17 insertions, 20 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 12a069af9a8d..d9b82af6d6d8 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.287 2011/02/22 13:33:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.288 2011/02/22 18:24:22 phajdan.jr Exp $
+
+  22 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-10.0.648.82.ebuild, chromium-11.0.672.2.ebuild,
+  chromium-11.0.672.2-r1.ebuild, chromium-9999.ebuild:
+  Remove themes from RDEPEND that do not satisfy the dependency fully (i.e.
+  the Downloads page does not have icons). I discovered this while working
+  on bug #352263.
 
 *chromium-11.0.672.2-r1 (22 Feb 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4b6d5e5b8e5e..28b4d3098b44 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -18,13 +18,11 @@ DIST chromium-10.0.648.82.tar.bz2 144519973 RMD160 91560d901c81a2ba23bba24bdf2a1
 DIST chromium-11.0.672.2.tar.bz2 143663792 RMD160 963fe31fa7496dce30c523950fcaf214d7e9ef0b SHA1 fedd1d98b05cea6bd25df597ab460f27eb9320ea SHA256 d58a58812a9277c3320fde86b9f53d2783a47818da7c77d906d52be3064d2be0
 DIST chromium-9.0.597.94.tar.bz2 140800844 RMD160 5816c28ddfaeb31c5b8aa882de2248c780f8cb0c SHA1 4a870da41ae25781e4806ec2c95703282fccc4d8 SHA256 7194d999a03bb54813cc49f978dd88f5b08cdd40cee4dcbe4ff5639c0ca3e8d5
 DIST chromium-9.0.597.98.tar.bz2 141115336 RMD160 5d0f3b83048363533919932a84a95fefd278cd42 SHA1 ea129fd68d78e84a573e25aef94a1f8697a22476 SHA256 48f7d849d3bfec40d6f7e5c76a964a36e9203127bafcb8068bcd63817c706d5f
-EBUILD chromium-10.0.648.82.ebuild 10092 RMD160 180acd552eb15f7e77bc562f869eacb8142a76ea SHA1 f812d1435140d36ed154242025b0655f19715b9f SHA256 b06934dab7c4675f935dce327460f0033687c9eae7aa2d4be68a414b4c9fdd0c
-EBUILD chromium-11.0.672.2-r1.ebuild 10598 RMD160 e26ff6a2e2a904debcce64435ce798004c20857e SHA1 b8ab81219e6fdc65708418a9c2084415cd41af1a SHA256 672d8f704cff3efe30d840e98998a2ad0d7caa2e6b563d57e9e92c8ec4122986
-EBUILD chromium-11.0.672.2.ebuild 10372 RMD160 6d912e03dcdb0c7cf6ccf512f3a4f794df89d28f SHA1 f67594834d4b8337661d467940faf3c1f18b1519 SHA256 9f9e3ee76f2a29bee2072e9d651670e0552a1096c7ec2157b728541c1ae2466b
+EBUILD chromium-10.0.648.82.ebuild 10037 RMD160 e88e2ee92669c5b8e0304eed35925f37bad781c1 SHA1 9d93878122e190a693dbf0d5c4ce62d95052a237 SHA256 5647ce435a464d3f876d4bacce3a8e7c7406ae18fa095f6b26b1440e365941c7
+EBUILD chromium-11.0.672.2-r1.ebuild 10539 RMD160 8cb2b99caa8a59f3a8411e49da0d14229f809321 SHA1 7ed8118282ba93aa5673adaab3455d59730c998e SHA256 d686c5233a0693c64799150507dd22eca36eb7ce7335c27da45f2f1e95764d1f
+EBUILD chromium-11.0.672.2.ebuild 10313 RMD160 99cb427b4aa0212b8844297dadab71902126f79f SHA1 b41bbfb6577841d7c044455137b95ca687fee050 SHA256 e342753b873a7407f786af30863158d32a00bfd47935203fb66eb8cd725319f7
 EBUILD chromium-9.0.597.94.ebuild 9115 RMD160 2256e35af13b40686d634b586e091f60337942b5 SHA1 020d7ad4422ac6c6368a6bbda4046c774164007e SHA256 3d772bd92e13f79112a67196743dff420ad2bcaac1371c7dfcb448d2e87ba234
 EBUILD chromium-9.0.597.98.ebuild 9108 RMD160 6941b2d97130441aa454d4b75d281ef1b06eb843 SHA1 0881ab232a67e4645946acd4f75d31c3333f65c1 SHA256 dca284a5cd96af522542ce0eb493f23ab80097f28d0c0fc9292e5262c00478e5
-EBUILD chromium-9999.ebuild 12042 RMD160 02de7f27d392afcc8f4d76c90625c72eaebf586a SHA1 891b497461f40a2e9508f152f7b56e2eb83dac4b SHA256 f43c7136947da066fd1b7009290e33bbb47bd09445c0ef50c15f3fc280f5b61e
-MISC ChangeLog 63459 RMD160 0d645f9157ac9794572a0988220b53f9ccb784b5 SHA1 4a6c4f368e2df30ed0b395e711318616b5975b86 SHA256 357c2f2487f5e7d9a104ff2edd284fbbe74e3a6f9daa8411d686efe84b5d12a0
-MISC chromium-9999.ebuild.orig 11819 RMD160 105abaa7184277c6c90e5b17c9e43fff076915e1 SHA1 06bcb99fff8aff0bfb5d1c8276878a095a35263b SHA256 3537354fe08cdcf5582f49c8624bcc046ec80c129fd00a39117723efe63ed05d
-MISC chromium-9999.ebuild.rej 503 RMD160 068469eacf5ed469148b53c4049e447b858894f2 SHA1 d4cb7f01962d3bcc094d731eaec20510560d974d SHA256 509704d2604a8529cf12d0cbc079ec36444204fadbefb6a176cb0c9523caaf80
+EBUILD chromium-9999.ebuild 11983 RMD160 66958ec6c6cc06636c8f4ad3cae9acd9a514a901 SHA1 04706d5472eeb4d934ec1452d8c0721211c3cccd SHA256 0a79db7b597948d366b955c9ea4f843ee5a3325067c093a05ec34ea890fc0967
+MISC ChangeLog 63798 RMD160 441d486193f448e09270d6e2570c567ca2b59971 SHA1 f45a67cc6dcc4018e452e072b613db4f3905677f SHA256 d3f62a48ae233ef53038f29c201925cde1cc2b6ae11106b39fc781d694229e64
 MISC metadata.xml 483 RMD160 f460db8d828791caa3496ad57a3c059a89912cf8 SHA1 2de8750f401b4e1f427545b5310a98716d719638 SHA256 ebc3ca0074799466d0f7485e6afca1dcd0a0ecf5768b3c2f9aabe64a1ec52759
diff --git a/www-client/chromium/chromium-10.0.648.82.ebuild b/www-client/chromium/chromium-10.0.648.82.ebuild
index 0a99f38d6483..ee5463fd16e0 100644
--- a/www-client/chromium/chromium-10.0.648.82.ebuild
+++ b/www-client/chromium/chromium-10.0.648.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.82.ebuild,v 1.3 2011/02/20 17:37:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.82.ebuild,v 1.4 2011/02/22 18:24:22 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -50,8 +50,6 @@ DEPEND="${RDEPEND}
 RDEPEND+="
 	|| (
 		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
 		x11-themes/xfce4-icon-theme
 	)
 	x11-misc/xdg-utils
diff --git a/www-client/chromium/chromium-11.0.672.2-r1.ebuild b/www-client/chromium/chromium-11.0.672.2-r1.ebuild
index 0392ea5280b1..e728d0914b8c 100644
--- a/www-client/chromium/chromium-11.0.672.2-r1.ebuild
+++ b/www-client/chromium/chromium-11.0.672.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2-r1.ebuild,v 1.1 2011/02/22 13:33:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2-r1.ebuild,v 1.2 2011/02/22 18:24:22 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -50,8 +50,6 @@ DEPEND="${RDEPEND}
 RDEPEND+="
 	|| (
 		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
 		x11-themes/xfce4-icon-theme
 	)
 	x11-misc/xdg-utils
diff --git a/www-client/chromium/chromium-11.0.672.2.ebuild b/www-client/chromium/chromium-11.0.672.2.ebuild
index 736dfd9d5d5f..1867ce1fb2a4 100644
--- a/www-client/chromium/chromium-11.0.672.2.ebuild
+++ b/www-client/chromium/chromium-11.0.672.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2.ebuild,v 1.1 2011/02/18 10:46:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2.ebuild,v 1.2 2011/02/22 18:24:22 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -50,8 +50,6 @@ DEPEND="${RDEPEND}
 RDEPEND+="
 	|| (
 		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
 		x11-themes/xfce4-icon-theme
 	)
 	x11-misc/xdg-utils
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index a1cc73e6fe42..8a802a990793 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.134 2011/02/22 13:33:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.135 2011/02/22 18:24:22 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -51,8 +51,6 @@ DEPEND="${RDEPEND}
 RDEPEND+="
 	|| (
 		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
 		x11-themes/xfce4-icon-theme
 	)
 	x11-misc/xdg-utils