Add qt-bundled USE flag. If disabled (default), remove bundled Qt4 libraries and depend on system ones. Should fix font problems mentioned in bugs #262780 and #252419. Unbundling libs tracked in #212373.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 27 insertions, 11 deletions

diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index 57e62b5e8994..5f3b8061b422 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/googleearth
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.53 2009/11/22 10:54:53 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.54 2010/01/31 02:24:40 caster Exp $
+
+  31 Jan 2010; Vlastimil Babka <caster@gentoo.org>
+  googleearth-5.1.3533.1731-r1.ebuild, metadata.xml:
+  Add qt-bundled USE flag. If disabled (default), remove bundled Qt4
+  libraries and depend on system ones. Should fix font problems mentioned in
+  bugs #262780 and #252419. Unbundling libs tracked in #212373.
 
   22 Nov 2009; Vlastimil Babka <caster@gentoo.org>
   googleearth-5.1.3533.1731-r1.ebuild:
diff --git a/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild b/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild
index 1d1876661da5..5cab8f87e64a 100644
--- a/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild
+++ b/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v 1.2 2009/11/22 10:54:53 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v 1.3 2010/01/31 02:24:40 caster Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="mirror strip"
-IUSE=""
+IUSE="qt-bundled"
 
 GCC_NEEDED="4.2"
 
@@ -36,14 +36,17 @@ RDEPEND=">=sys-devel/gcc-${GCC_NEEDED}[-nocxx]
 		x11-libs/libXdmcp
 		sys-libs/zlib
 		dev-libs/glib:2
+		!qt-bundled? (
+			>=x11-libs/qt-core-4.5.3
+			>=x11-libs/qt-gui-4.5.3
+			>=x11-libs/qt-webkit-4.5.3
+		)
 	)
 	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-baselibs
-		|| (
-			>=app-emulation/emul-linux-x86-xlibs-7.0
-			x11-drivers/nvidia-drivers
-			<x11-drivers/ati-drivers-8.28.8
+		>=app-emulation/emul-linux-x86-xlibs-20081109
+		>=app-emulation/emul-linux-x86-baselibs-20081109
+		!qt-bundled? (
+			>=app-emulation/emul-linux-x86-qtlibs-20091231
 		)
 	)
 	|| (
@@ -114,6 +117,10 @@ src_install() {
 	cd "${D}"/opt/${PN}
 	tar xf "${WORKDIR}"/${PN}-data.tar
 
+	if ! use qt-bundled; then
+		rm -rvf libQt{Core,Gui,Network,WebKit}.so.4 plugins/imageformats qt.conf || die
+	fi
+
 	fowners -R root:root /opt/${PN}
 	fperms -R a-x,a+X /opt/googleearth/resources
 }
diff --git a/x11-misc/googleearth/metadata.xml b/x11-misc/googleearth/metadata.xml
index 6f7279f27c5e..0586678fa6e5 100644
--- a/x11-misc/googleearth/metadata.xml
+++ b/x11-misc/googleearth/metadata.xml
@@ -12,4 +12,7 @@
     <name>Stefan Schweizer</name>
     <description>Feel free to change what you want</description>
   </maintainer>
+  <use>
+    <flag name="qt-bundled">Use bundled Qt4 libraries instead of system ones. Recommended only for troubleshooting.</flag>
+  </use>
 </pkgmetadata>