Make dev-libs/icu optional as requested in bug 411091.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 34 insertions, 20 deletions

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 55e189a50ee9..db498ab0d19b 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.141 2012/04/05 15:47:39 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.142 2012/04/12 17:13:12 pesa Exp $
+
+  12 Apr 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.1.ebuild:
+  Make dev-libs/icu optional as requested in bug 411091.
 
   05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-webkit-4.8.0-r1.ebuild:
   Drop Qt-4.8.0
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index 6bddf7e4f678..4e037503464e 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -14,17 +14,23 @@ EBUILD qt-webkit-4.6.3-r2.ebuild 1495 RMD160 3d26caa52863803b6641a03d0eb4229e5aa
 EBUILD qt-webkit-4.6.3.ebuild 1402 RMD160 bdc781c1073a100fe46532f4de77c93eb4357870 SHA1 e4330e7e9b66c25ac78e705d34f2c0c2bf5719d0 SHA256 74269a78728a2029c5b6b34a4ba9c4b3a4324bf0aa154733e4edf069ec2d0c27
 EBUILD qt-webkit-4.7.2.ebuild 1432 RMD160 1527244b7e58d0a2ad890c0a7e21602797d74251 SHA1 2a2d2e50e0b3edc419c93e3138a0121e4ed5bff4 SHA256 bb2bc83c40c2fddff5ba68c3a73169decc66052b1860fd4f30d415fb765135af
 EBUILD qt-webkit-4.7.4.ebuild 1434 RMD160 cbde9a9941e4e8e9ec0ac07b787ee39944063b7f SHA1 eb960db0749193aa99643db2920827dd4281c67d SHA256 7e4d9ad6bd55c204cebeecb4a961cca108d6b09afd23d3874fcbd2c540ef41c3
-EBUILD qt-webkit-4.8.1.ebuild 2012 RMD160 41c8709ab39bac767b648f29853df28e016daf09 SHA1 22b725949a1a31c6140f268c382acfcacc361372 SHA256 1c851436844dfc48e15fe6d555ce6956c459db83f1f800050fb23644b040c9f6
-MISC ChangeLog 20993 RMD160 bee78d956ed198b8ed1126dad711ff99592ff11b SHA1 c3da21178896f6293069fd9584fb9e7a64ccb758 SHA256 5317c63a0a0761bb1dcb4360b6434095557e8d1d1cf17379f0d27986c1ff16ac
+EBUILD qt-webkit-4.8.1.ebuild 2049 RMD160 77222281f7772d9610bd688325d50fca5bccdf02 SHA1 e6803ee23f87f426c0cf1f9deaa6b539c4ecfa32 SHA256 0b99f7293268a2f6c45f94a9f8af2a46d847e2ec7fe2270abf25c29e49f2bc51
+MISC ChangeLog 21125 RMD160 65631d131e29035688201226ed79e19a756d7d8b SHA1 509c2118797df4646cea25a6f3802527b358cf8a SHA256 e1c6c174c99afb618ccacc3938042971e5f7616fb39d9fc7132dbd981c4cab9f
 MISC metadata.xml 739 RMD160 dc601459869cc7369c2a5abfe7c5ec1f078d277a SHA1 0303b5284bc0d788074b1ba33cbfab768651dea4 SHA256 86ce6ed256d328d3471b43fdb45a97102ff3acbcd69b29a8b95fd1547c925722
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfb6uAAoJEO+t9ga+3I3adt4H/0HOeVpTbKwg8KEUX5kSd8Uw
-5H5TL1KFOkzAVpDTmgDZ6zFFqDiFIB4RDQxmTfJcoPx9ja8kfN4Ef19edy2tgS5d
-mKzS0ghU2SI5ex+Ax5Ywsok3MePWQJYe+rttsRpGGnymg2wJmZjuYAo2XQcPFW45
-8CGJa7Qeaj7b6Ed4ZyNfyCTXm+Qg797G33+4R+xT6nIHAxMk7852iZl8Zu05asdC
-9tj+DKPwraSNS5Wlx/BbguS+2PbgaJABAObx5b0F041SXPeyv+FVATERQpcPYR+b
-M3L6nlaBUIFDLz7OhfqJBBmnlgu9aWfSg2B5DimPYMfZ/BCHj4lmE4xHMfuCcio=
-=Edav
+iQIcBAEBCgAGBQJPhw0vAAoJENXLsxwXqFxyvCwP/1NZbAlwWsxZNpIw74ehFLQx
+okhOsgy1C5pzv3WDDp2KPOABc0UR3WE1vzAfEmRIH11h6aAHpZeG40rFgSa0ViQ8
+JBzl+tamtRzRs5Xb2CUfZqPuhAQEVQMx5oqLHCekvXawAlnaJSaB37w7pz9Dja7A
+8aBNAEANTVG+dHaFbwaCyJwwoRTw5EIhLRt1cqU21cDhJvi24Q9ifhMc2Ym8zfpn
+pTtHw6wDAr80d5mplmwWcuHOIFGXqrJgRyh1t4LaqYA4ho1oXMm+1mHQ7TQ1lAHF
+8GT9a0Ua0p0UIe0GFhIvol3mY1TGSEt+T1xV5oNg6zfT+G7xRZT9G+xQK3CSS0TY
+nkCUJWiSzz0ntISNMii7yW3NZtU13o3NIBUIquoMg5aEqmAJrCwEWgpHRhwkM8qE
+iqX5RYfuKXc80+AFsoDWAM4hGXgQN6ISMIFtXHQypv3IULtE8ClkIJaW7ZvF6Ysx
+DqZY1iKdzHqVN9KcRufnbOHgGswxDjCVxqAQKqp8uw+Raeb/kbz5+rwF/YC5DsCu
+SasYkF8sEPgoO31FmXVdtP57mvTSql7vgOGOidK4AV6nlw311QNV4sY3EXtbhSAc
+nGCspFIT8VHOolc8Ax2y56Y80fIFLC+zqyn6Nbj3HmCAMCDayEtvfVNtOOYNUFBD
+u45Yf4QbZWIOhPNyiNew
+=COsq
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild
index b85345474a15..bd1c40f2a940 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.1.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/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild,v 1.2 2012/04/04 13:29:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild,v 1.3 2012/04/12 17:13:12 pesa Exp $
 
 EAPI=4
 
@@ -9,11 +9,12 @@ inherit qt4-build flag-o-matic
 DESCRIPTION="The WebKit module for the Qt toolkit"
 SLOT="4"
 KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+gstreamer +jit"
+IUSE="+gstreamer +icu +jit"
+
+REQUIRED_USE="gstreamer? ( icu )" #407315
 
 DEPEND="
 	dev-db/sqlite:3
-	dev-libs/icu
 	x11-libs/libX11
 	x11-libs/libXrender
 	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,ssl,qpa=]
@@ -23,7 +24,9 @@ DEPEND="
 		dev-libs/glib:2
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
-	)"
+	)
+	icu? ( dev-libs/icu )
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -56,21 +59,23 @@ src_prepare() {
 	sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
 		src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
 
-	# Always enable icu to avoid build failure, bug 407315
-	sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
-		src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
-
 	# Remove -Werror from CXXFLAGS
 	sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
 		src/3rdparty/webkit/Source/WebKit.pri || die
 
+	if use icu; then
+		sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
+			src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
+	fi
+
 	qt4-build_src_prepare
 }
 
 src_configure() {
 	myconf+="
 		-webkit
-		-icu -system-sqlite
+		-system-sqlite
+		$(qt_use icu)
 		$(qt_use jit javascript-jit)
 		$(use gstreamer || echo -DENABLE_VIDEO=0)"