Unset LC_ALL along with setting LC_NUMERIC in the startup script to prevent breaking coordinates in stored kml files, bug #262780. Add mdns-bundled USE flag for using bundled library instead of sys-auth/nss-mdns with dependencies, bug #320371. Use the unpack script instead of unpack_makeself to avoid problems with pbzip2, bug #320313. Clean up LICENSE declaration. Note that googleearth license was added in the @EULA list and you need to unmask it by ACCEPT_LICENSE in make.conf if you agree with it.

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

4 files changed, 25 insertions, 8 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 16fc9df818a8..15167ddbc700 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sci-geosciences/googleearth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.5 2010/05/16 23:22:05 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.6 2010/05/19 20:19:20 caster Exp $
+
+  19 May 2010; Vlastimil Babka <caster@gentoo.org>
+  googleearth-5.1.3535.3218.ebuild, files/decimal-separator.patch,
+  metadata.xml:
+  Unset LC_ALL along with setting LC_NUMERIC in the startup script to
+  prevent breaking coordinates in stored kml files, bug #262780. Add
+  mdns-bundled USE flag for using bundled library instead of
+  sys-auth/nss-mdns with dependencies, bug #320371. Use the unpack script
+  instead of unpack_makeself to avoid problems with pbzip2, bug #320313.
+  Clean up LICENSE declaration. Note that googleearth license was added in
+  the @EULA list and you need to unmask it by ACCEPT_LICENSE in make.conf if
+  you agree with it.
 
   16 May 2010; Vlastimil Babka <caster@gentoo.org>
   googleearth-5.1.3535.3218.ebuild:
diff --git a/sci-geosciences/googleearth/files/decimal-separator.patch b/sci-geosciences/googleearth/files/decimal-separator.patch
index 7a75dde4914a..499a8ce47ae8 100644
--- a/sci-geosciences/googleearth/files/decimal-separator.patch
+++ b/sci-geosciences/googleearth/files/decimal-separator.patch
@@ -1,10 +1,11 @@
 --- googleearth.orig	2009-10-18 15:46:03.000000000 +0200
 +++ googleearth	2009-10-18 15:45:39.000000000 +0200
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,8 @@
  
  LD_LIBRARY_PATH=.:${GOOGLEEARTH_DATA_PATH}:${LD_LIBRARY_PATH}
  export LD_LIBRARY_PATH
 +export LC_NUMERIC=C
++unset LC_ALL
  
  # Let's boogie!
  if [ -x "${GOOGLEEARTH_DATA_PATH}/googleearth-bin" ]
diff --git a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
index aec6dbafebd1..e3f5752f5427 100644
--- a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
+++ b/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild,v 1.2 2010/05/16 23:22:05 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild,v 1.3 2010/05/19 20:19:20 caster Exp $
 
 EAPI=2
 
@@ -13,11 +13,11 @@ HOMEPAGE="http://earth.google.com/"
 SRC_URI="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin
 			-> GoogleEarthLinux-${PV}.bin"
 
-LICENSE="googleearth MIT SGI-B-1.1 openssl as-is ZLIB"
+LICENSE="googleearth GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="mirror strip"
-IUSE="qt-bundled"
+IUSE="mdns-bundled qt-bundled"
 
 GCC_NEEDED="4.2"
 
@@ -43,7 +43,7 @@ RDEPEND=">=sys-devel/gcc-${GCC_NEEDED}[-nocxx]
 		)
 		net-misc/curl
 		sci-libs/gdal
-		sys-auth/nss-mdns
+		!mdns-bundled? ( sys-auth/nss-mdns )
 	)
 	amd64? (
 		>=app-emulation/emul-linux-x86-xlibs-20081109
@@ -85,7 +85,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack_makeself
+	sh "${DISTDIR}/GoogleEarthLinux-${PV}.bin" --nox11 --nochown --keep --noexec --target .
 }
 
 src_prepare() {
@@ -121,7 +121,10 @@ src_install() {
 	if ! use qt-bundled; then
 		rm -rvf libQt{Core,Gui,Network,WebKit}.so.4 plugins/imageformats qt.conf || die
 	fi
-	rm -rvf libGLU.so.1 libcurl.so.4 libnss_mdns4_minimal.so.2 || die
+	rm -rvf libGLU.so.1 libcurl.so.4 || die
+	if ! use mdns-bundled; then
+		rm -rfv libnss_mdns4_minimal.so.2 || die
+	fi
 	if use x86; then
 		# no 32 bit libs for gdal
 		rm -rvf libgdal.so.1 || die
diff --git a/sci-geosciences/googleearth/metadata.xml b/sci-geosciences/googleearth/metadata.xml
index 0586678fa6e5..a9cb0484cf11 100644
--- a/sci-geosciences/googleearth/metadata.xml
+++ b/sci-geosciences/googleearth/metadata.xml
@@ -14,5 +14,6 @@
   </maintainer>
   <use>
     <flag name="qt-bundled">Use bundled Qt4 libraries instead of system ones. Recommended only for troubleshooting.</flag>
+    <flag name="mdns-bundled">Use bundled nss-mdns library instead of depending on sys-auth/nss-mdns. Enable this if you want to avoid the deptree.</flag>
   </use>
 </pkgmetadata>