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.

(Portage version: 2.1.10.49/cvs/Linux i686)

7 files changed, 23 insertions, 17 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/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