Adjust dependencies for fixed dev-libs/icu (bug #410777 by biohazrd). Thanks to Heiko Przybyl for finding relevant ICU bug report and patch, Arfrever Frehtes Taifersar Arahesis for providing updated dev-libs/icu ebuild, Markos Chandras for committing the icu ebuild, Mike Gilbert (floppym) for initial bug response and testing the fix.

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

8 files changed, 33 insertions, 27 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index b0810a6f2627..e8e4268ab1fd 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.624 2012/05/05 19:06:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.625 2012/05/07 15:06:51 phajdan.jr Exp $
+
+  07 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-18.0.1025.168.ebuild, chromium-19.0.1084.36.ebuild,
+  chromium-19.0.1084.41.ebuild, chromium-20.0.1123.2.ebuild,
+  chromium-20.0.1123.4.ebuild, chromium-9999-r1.ebuild:
+  Adjust dependencies for fixed dev-libs/icu (bug #410777 by biohazrd). Thanks
+  to Heiko Przybyl for finding relevant ICU bug report and patch, Arfrever
+  Frehtes Taifersar Arahesis for providing updated dev-libs/icu ebuild, Markos
+  Chandras for committing the icu ebuild, Mike Gilbert (floppym) for initial
+  bug response and testing the fix.
 
 *chromium-20.0.1123.4 (05 May 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 683936c75c60..2648f6aa9bda 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -17,19 +17,19 @@ DIST chromium-19.0.1084.36.tar.bz2 183801020 RMD160 e596d6942dd8c16f3a3abf4fc5c9
 DIST chromium-19.0.1084.41.tar.bz2 183821502 RMD160 0d19a1dc09fef8264ac10a65ff77e882695a44ed SHA1 43a1c1863f9b43372e756cc6f0d23530e02a04dc SHA256 8a4302374978d84af996f82262644c83ac822411e186d73dbc82db54a22aa496
 DIST chromium-20.0.1123.2.tar.bz2 183824571 RMD160 a1f7a1a9533fc121969deb9b9e709498e8cc1ab2 SHA1 232e48e1ef07c16128e141f138da9829313696d2 SHA256 e5293acec0ffe8406314f1cd2b00857a7cac5e75c52bb2777147936a2ea8f758
 DIST chromium-20.0.1123.4.tar.bz2 183840254 RMD160 f43408a7cbd736104cdf7f28ea7c049c06737fa4 SHA1 0ed2737bcfd3df79c4be7d192ada6f764320046b SHA256 5b66ca3fb497d2644e6844f76370391f0c92f884c2d1406f0e53512005563ede
-EBUILD chromium-18.0.1025.168.ebuild 13986 RMD160 a05fe2f7a859b3378eb0301a060ba98fa4ec3f7a SHA1 2647dae6ba2dcfd6862130ae5d012cd2a16c8be7 SHA256 3ed650c25347ee5fec1cc207a31197b7496fb9436ee6349a62015c27c6064e3b
-EBUILD chromium-19.0.1084.36.ebuild 13493 RMD160 307d8d193f89fb933575b5fca251c3dacc3a271e SHA1 7e5d449a02c797da6e88ab6946670110e158b3c5 SHA256 3c6a3e5d4468dd87786de6a6943a8f689a59c7394fc417cff671c7e3e4af196c
-EBUILD chromium-19.0.1084.41.ebuild 13493 RMD160 4d21d52f0f79f16d64853c97c45b79c0d6795332 SHA1 0c0496390a555b2d1c4346b3f7173e4e0f982c41 SHA256 bf272b40ac1cd435facdc119429bfafceece247a03e05c9af01073c8250ecc7c
-EBUILD chromium-20.0.1123.2.ebuild 13754 RMD160 0b826a9d46b64465638c6c77b7f4f40ced7804ad SHA1 65c813479680bac08bfb287e976b5e836d03dae1 SHA256 cccf6d5f6c51362ac12a587469c5ff616f9e68955e98f6caa80a8065487a6701
-EBUILD chromium-20.0.1123.4.ebuild 13182 RMD160 65086d64b01ef99643ad9bb986acb132feb36692 SHA1 6b028909be102c23d20420b03bb7e4d5ee67586a SHA256 d29b9168e4e789f85284817b7dfc83cc362251a6c21f810f91ff85e4fca36e65
-EBUILD chromium-9999-r1.ebuild 14771 RMD160 66c205730824aae5b1f1ada21135e4657010dad3 SHA1 e89f0f06255c35c03ae8b8a8df7f65c14d9c2acd SHA256 3042bf3b7176fff0189ac6dc26952edf8c388d922745379efbbd69ba123f8004
-MISC ChangeLog 19234 RMD160 077800068cc166bcffd3dbf05f052b310ee60cf7 SHA1 578f6c242072d8a60cfe9773a03536b2d63b8875 SHA256 5d7f65732722fd92d08fdca55a81acd9886f51c9fb510c1d786bf5b35621eb68
+EBUILD chromium-18.0.1025.168.ebuild 14036 RMD160 bcef8b509c85f61eb1e2dada363620d3752405e7 SHA1 4a02d891ad214679d0b0393cf66c5071b4084aaf SHA256 9143e67592157fe9e9bac79609a69e4ac2c45f421dfe75558ae9e1deae3d0fae
+EBUILD chromium-19.0.1084.36.ebuild 13483 RMD160 f4a637fe43efde038dbe3cc7f6d71a5a0c6077a1 SHA1 55480585b21baaae684f7bdc32577c313784be56 SHA256 b962b2306bf6674f526c93abad1c5a609d0e7c31f9148b801e9cb643d5c39bd7
+EBUILD chromium-19.0.1084.41.ebuild 13483 RMD160 7cfb205cff001abedeefaa65cdf83ab8621f8442 SHA1 55877061f40181122b4be546af2bedfc55040256 SHA256 b32555e205cc73e550e3bf9fe5c9d3b0e0799699c8fee6a755dfa8b2453f317a
+EBUILD chromium-20.0.1123.2.ebuild 13740 RMD160 34a499b72c68615f4be232920c85e5d964d1aebb SHA1 5b7cbec54c0941549b9dd867a29a149f0d78159c SHA256 7f47518a48cefa01f4cf57425ef376a618b4ad9eca74189bda766472ca40ad75
+EBUILD chromium-20.0.1123.4.ebuild 13168 RMD160 083ce22efdb5014094f0b0643cf8c0bd892fbc29 SHA1 3256a0b420e1e85f258ed8dbc9f7ba9fb401e50a SHA256 117bd936a907003a81bea69a3c00774a4ddd011d20d3243e6e2ca6aee6751c59
+EBUILD chromium-9999-r1.ebuild 14757 RMD160 7064ee8698c7169503f57d8293d35a596f39ed38 SHA1 2f3d34b875fd07c968fbd7253f0b11348d8b106d SHA256 811b39246b7247cd56db952deea92daf8488e11ea13ab4d47ebcffba83d63687
+MISC ChangeLog 19816 RMD160 a24d85cb8a8d8fc25fff5d6df0c6d8234946bd60 SHA1 3d2367050507d2eb8d166a60592a8537a5d046a4 SHA256 c51ff3bcccf6a3e0dd9c6fa5a9e6a0d63ee6988e4c35b486e05e6b72d099bf54
 MISC ChangeLog-2011 114031 RMD160 819d2187b876e03ba1a5f23369eca56e554bcfe6 SHA1 c449259648a4f2633b8812e7761e8cdeaea7f948 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+lekEACgkQuUQtlDBCeQLbWACdGrcHFr6msVgPe56JY9SRa6JB
-ccUAn2vt9bO4VyTMuBzzpttlXQJygoQx
-=mUaL
+iEYEAREKAAYFAk+n5R8ACgkQuUQtlDBCeQKgSQCfcHpsgThADkg/3FqgF1xaOttD
+ijYAmwUuN+m/1H86GZ+CLsaVZEAC+SPM
+=F9GL
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-18.0.1025.168.ebuild b/www-client/chromium/chromium-18.0.1025.168.ebuild
index fb86d4dc6d74..e5f2c12a7919 100644
--- a/www-client/chromium/chromium-18.0.1025.168.ebuild
+++ b/www-client/chromium/chromium-18.0.1025.168.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-18.0.1025.168.ebuild,v 1.4 2012/05/03 06:01:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-18.0.1025.168.ebuild,v 1.5 2012/05/07 15:06:51 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -30,6 +30,7 @@ RDEPEND="app-arch/bzip2
 	dev-libs/dbus-glib
 	dev-libs/elfutils
 	>=dev-libs/icu-4.4.1
+	|| ( <dev-libs/icu-49 >=dev-libs/icu-4.4.1 )
 	<dev-libs/icu-49
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
diff --git a/www-client/chromium/chromium-19.0.1084.36.ebuild b/www-client/chromium/chromium-19.0.1084.36.ebuild
index ed622250193c..926e23c8de48 100644
--- a/www-client/chromium/chromium-19.0.1084.36.ebuild
+++ b/www-client/chromium/chromium-19.0.1084.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1084.36.ebuild,v 1.2 2012/05/03 06:01:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1084.36.ebuild,v 1.3 2012/05/07 15:06:51 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -29,8 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=dev-lang/v8-3.9.13
 	dev-libs/dbus-glib
 	dev-libs/elfutils
-	>=dev-libs/icu-4.4.1
-	<dev-libs/icu-49
+	>=dev-libs/icu-49.1.1-r1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
diff --git a/www-client/chromium/chromium-19.0.1084.41.ebuild b/www-client/chromium/chromium-19.0.1084.41.ebuild
index a9cdbb1d6c52..ea6c97006674 100644
--- a/www-client/chromium/chromium-19.0.1084.41.ebuild
+++ b/www-client/chromium/chromium-19.0.1084.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1084.41.ebuild,v 1.2 2012/05/03 06:01:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1084.41.ebuild,v 1.3 2012/05/07 15:06:51 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -29,8 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=dev-lang/v8-3.9.13
 	dev-libs/dbus-glib
 	dev-libs/elfutils
-	>=dev-libs/icu-4.4.1
-	<dev-libs/icu-49
+	>=dev-libs/icu-49.1.1-r1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
diff --git a/www-client/chromium/chromium-20.0.1123.2.ebuild b/www-client/chromium/chromium-20.0.1123.2.ebuild
index b39c78f01af4..ff1adcceb451 100644
--- a/www-client/chromium/chromium-20.0.1123.2.ebuild
+++ b/www-client/chromium/chromium-20.0.1123.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1123.2.ebuild,v 1.1 2012/05/03 14:22:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1123.2.ebuild,v 1.2 2012/05/07 15:06:51 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -29,8 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=dev-lang/v8-3.10.2.1
 	dev-libs/dbus-glib
 	dev-libs/elfutils
-	>=dev-libs/icu-4.4.1
-	<dev-libs/icu-49
+	>=dev-libs/icu-49.1.1-r1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
diff --git a/www-client/chromium/chromium-20.0.1123.4.ebuild b/www-client/chromium/chromium-20.0.1123.4.ebuild
index d7c55cedbe72..8fc1c3f90b8d 100644
--- a/www-client/chromium/chromium-20.0.1123.4.ebuild
+++ b/www-client/chromium/chromium-20.0.1123.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1123.4.ebuild,v 1.1 2012/05/05 19:06:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1123.4.ebuild,v 1.2 2012/05/07 15:06:51 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -29,8 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=dev-lang/v8-3.10.2.1
 	dev-libs/dbus-glib
 	dev-libs/elfutils
-	>=dev-libs/icu-4.4.1
-	<dev-libs/icu-49
+	>=dev-libs/icu-49.1.1-r1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 582b892f2279..1b9080cd0760 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.108 2012/05/05 19:06:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.109 2012/05/07 15:06:51 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -29,8 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=dev-lang/v8-3.10.2.1
 	dev-libs/dbus-glib
 	dev-libs/elfutils
-	>=dev-libs/icu-4.4.1
-	<dev-libs/icu-49
+	>=dev-libs/icu-49.1.1-r1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt