[gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: googleearth-5.1.3535.3218.ebuild metadata.xml ChangeLog

[gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: googleearth-5.1.3535.3218.ebuild metadata.xml ChangeLog

[Vlastimil Babka (caster)]

caster      10/05/19 20:19:20

  Modified:             googleearth-5.1.3535.3218.ebuild metadata.xml
                        ChangeLog
  Log:
  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)

Revision  Changes    Path
1.3                  sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild?r1=1.2&r2=1.3

Index: googleearth-5.1.3535.3218.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- googleearth-5.1.3535.3218.ebuild	16 May 2010 23:22:05 -0000	1.2
+++ googleearth-5.1.3535.3218.ebuild	19 May 2010 20:19:20 -0000	1.3
@@ -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 @@
 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 @@
 		)
 		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 @@
 }
 
 src_unpack() {
-	unpack_makeself
+	sh "${DISTDIR}/GoogleEarthLinux-${PV}.bin" --nox11 --nochown --keep --noexec --target .
 }
 
 src_prepare() {
@@ -121,7 +121,10 @@
 	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



1.2                  sci-geosciences/googleearth/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	16 Mar 2010 09:14:19 -0000	1.1
+++ metadata.xml	19 May 2010 20:19:20 -0000	1.2
@@ -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>



1.6                  sci-geosciences/googleearth/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	16 May 2010 23:22:05 -0000	1.5
+++ ChangeLog	19 May 2010 20:19:20 -0000	1.6
@@ -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: