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.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 29 insertions, 12 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/Manifest b/sci-geosciences/googleearth/Manifest
index 92f84ce129af..768a4a0fa896 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -1,4 +1,4 @@
-AUX decimal-separator.patch 310 RMD160 730861674fc8f07aa13ad5577840fcce34a3f9d2 SHA1 85552fc1988791f44c22ca355839d0f358076437 SHA256 0a5bf3024562484ff95ae369c956ee126d6ae59f201e65ef8e72695bda0946a0
+AUX decimal-separator.patch 324 RMD160 88c5c41517d4195a1f6ad03f58762021fe9ff255 SHA1 82b6920a3ac9ffd4481fe31f60bc72e22e0d4093 SHA256 5c1ffe3cb7b7328245d92c627f8b8d963a9a2aab67c70b5387b151f78b04c051
 AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6689a0f970cfc677749e1ee3aeeaa3b8f5605fc SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12
 DIST GoogleEarthLinux-4.3.7284.3916.bin 20554977 RMD160 de8f92a45b72d37ba66bc33dd20b2bd59df79fad SHA1 35b883f75ca0da4cc4b5888d345ed5ec2a53123e SHA256 aeb71c8e191df4b3689ef45e6b2346b4b7c3910738f92deadb265a044e68277e
 DIST GoogleEarthLinux-5.0.11733.9347.bin 25606194 RMD160 ba61c88c38eefad655cf0de4b17f033640783a2c SHA1 4aa2b565523dc6ee9592a0f96760297fc06f762c SHA256 fde44633607cb762810e14e8fe7c9755a1c9b04c10fbb712c2ab899274716b9a
@@ -9,6 +9,6 @@ EBUILD googleearth-4.2.205.5730.ebuild 2061 RMD160 cc75ccf1886e5f55e6f523a6defa2
 EBUILD googleearth-4.3.7284.3916.ebuild 2147 RMD160 78c1b7c4c8c59097d8a8058df9f149c530512d8d SHA1 9d088ab4f4faf42be813ad0db9d597b38472f15a SHA256 44163550eda61ec3528b892f2e6c017fae1f4bcec81c909db3883bb5ce8b3f16
 EBUILD googleearth-5.0.11733.9347.ebuild 2530 RMD160 00d41a87cd831a78d08e888c706c18c73b0dfa88 SHA1 ebc64b053aa0ae76451a317214986bf4384f81b3 SHA256 57b67c2f630e40011128d69e53c98e2c8144ded973ab7ee483b20309abc434e4
 EBUILD googleearth-5.1.3533.1731-r1.ebuild 3321 RMD160 f02f2e4ef6db95fadc74d90d78dea48f44591544 SHA1 efb8ecd1e7a581519f332f93353c32b7e7281a97 SHA256 89e2a46541f947038a65d6ce06a06c48bdbd24fe6911adcab80ac2b470bab4b3
-EBUILD googleearth-5.1.3535.3218.ebuild 3606 RMD160 9975793d21335ca502773282d92a0457bea4e453 SHA1 c41b65273641ceea83d366a8728d8e48f0029683 SHA256 d71dcd9478af519df57ff75ab562365ba17ef324027bd0c095fb549730b451ef
-MISC ChangeLog 11669 RMD160 9f9540cd0e2a337f6d380a9fed002499743e2c11 SHA1 061f5cc9ac2df1ef1f1f30c1bf0d24f0c8c64349 SHA256 65577e07a4b3e89230e2690b552512d8f76838e6af6f5bd091036005044be7e5
-MISC metadata.xml 626 RMD160 a86edde5c7fb06ad02761f159bc05239b2507521 SHA1 8bc7bd3f1767aea50d396a696a83ddbc660f3fbd SHA256 cbe80f8dd2f6cf2dc88c03bc2765a171f705502c6f1513cdd41b285aac87660c
+EBUILD googleearth-5.1.3535.3218.ebuild 3733 RMD160 9cd98175ffde23a0f7861a135c076e0ab2168eb4 SHA1 7ac10570aece756b12e1c67874549a00e579e1d6 SHA256 a98319f85300f994005d5fce14ae21ef7fe172332fe9a6acf7f0bfead8fc388b
+MISC ChangeLog 12324 RMD160 a95d5335997a1ace45e2d30831e865effdc368b6 SHA1 19527af58a67bf2aa3e3256db10b5e41e084249d SHA256 b526dd94601d6906abe183fd8b800cb7e11b373ed8c16fdcd42d449082032b85
+MISC metadata.xml 781 RMD160 2e83a40de89567fbe455fc38e371e33f5516bed8 SHA1 e53e1ca79ff89f723a882a3813af4916ae307ef5 SHA256 21a5f5931406461b48ab291298c654a7e25d81ee0e47e8ab1d4b5cad82698c73
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>