public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-misc/googleearth: ChangeLog googleearth-5.1.3533.1731-r1.ebuild
@ 2009-11-22 10:50 Vlastimil Babka (caster)
  0 siblings, 0 replies; 3+ messages in thread
From: Vlastimil Babka (caster) @ 2009-11-22 10:50 UTC (permalink / raw
  To: gentoo-commits

caster      09/11/22 10:50:29

  Modified:             ChangeLog
  Added:                googleearth-5.1.3533.1731-r1.ebuild
  Log:
  Revbump with patch to prevent locales with comma decimal separator from killing the saved places. Thanks to András <cucaracha@loco.hu> in bug #262780.
  (Portage version: 2.2_rc50/cvs/Linux x86_64)

Revision  Changes    Path
1.52                 x11-misc/googleearth/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?r1=1.51&r2=1.52

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog	18 Nov 2009 23:35:47 -0000	1.51
+++ ChangeLog	22 Nov 2009 10:50:29 -0000	1.52
@@ -1,6 +1,14 @@
 # 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.51 2009/11/18 23:35:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.52 2009/11/22 10:50:29 caster Exp $
+
+*googleearth-5.1.3533.1731-r1 (22 Nov 2009)
+
+  22 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +googleearth-5.1.3533.1731-r1.ebuild, +files/decimal-separator.patch:
+  Revbump with patch to prevent locales with comma decimal separator from
+  killing the saved places. Thanks to András <cucaracha@loco.hu> in bug
+  #262780.
 
 *googleearth-5.1.3533.1731 (18 Nov 2009)
 



1.1                  x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?rev=1.1&content-type=text/plain

Index: googleearth-5.1.3533.1731-r1.ebuild
===================================================================
# Copyright 1999-2009 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.1 2009/11/22 10:50:29 caster Exp $

EAPI=2

inherit eutils fdo-mime versionator toolchain-funcs

DESCRIPTION="A 3D interface to the planet"
HOMEPAGE="http://earth.google.com/"
# no upstream versioning, version determined from help/about
# incorrect digest means upstream bumped and thus needs version bump
SRC_URI="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin
			-> GoogleEarthLinux-${PV}.bin"

LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RESTRICT="mirror strip"
IUSE=""

GCC_NEEDED="4.2"

RDEPEND=">=sys-devel/gcc-${GCC_NEEDED}[-nocxx]
	x86? (
		media-libs/fontconfig
		media-libs/freetype
		virtual/opengl
		x11-libs/libICE
		x11-libs/libSM
		x11-libs/libX11
		x11-libs/libXi
		x11-libs/libXext
		x11-libs/libXrender
		x11-libs/libXau
		x11-libs/libXdmcp
		sys-libs/zlib
		dev-libs/glib:2
	)
	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
		)
	)
	media-fonts/ttf-bitstream-vera"

S="${WORKDIR}"

QA_TEXTRELS="opt/googleearth/libgps.so
opt/googleearth/libgooglesearch.so
opt/googleearth/libevll.so
opt/googleearth/librender.so
opt/googleearth/libinput_plugin.so
opt/googleearth/libflightsim.so
opt/googleearth/libcollada.so
opt/googleearth/libminizip.so
opt/googleearth/libauth.so
opt/googleearth/libbasicingest.so
opt/googleearth/libmeasure.so
opt/googleearth/libgoogleearth_lib.so
opt/googleearth/libmoduleframework.so
"

QA_DT_HASH="opt/${PN}/.*"

pkg_setup() {
	GCC_VER="$(gcc-version)"
	if ! version_is_at_least ${GCC_NEEDED} ${GCC_VER}; then
		ewarn "${PN} needs libraries from gcc-${GCC_NEEDED} or higher to run"
		ewarn "Your active gcc version is only ${GCC_VER}"
		ewarn "Please consult the GCC upgrade guide to set a higher version:"
		ewarn "http://www.gentoo.org/doc/en/gcc-upgrading.xml"
	fi
}

src_unpack() {
	unpack_makeself
}

src_prepare() {
	# make the postinst script only create the files; it's  installation
	# are too complicated and inserting them ourselves is easier than
	# hacking around it
	sed -i -e 's:$SETUP_INSTALLPATH/::' \
		-e 's:$SETUP_INSTALLPATH:1:' \
		-e "s:^xdg-desktop-icon.*$::" \
		-e "s:^xdg-desktop-menu.*$::" \
		-e "s:^xdg-mime.*$::" postinstall.sh
}

src_install() {
	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
	./postinstall.sh
	insinto /usr/share/mime/packages
	doins ${PN}-mimetypes.xml
	domenu Google-${PN}.desktop
	doicon ${PN}-icon.png
	dodoc README.linux

	cd bin
	tar xf "${WORKDIR}"/${PN}-linux-x86.tar
	# bug #262780
	epatch "${FILESDIR}/decimal-separator.patch"
	exeinto /opt/${PN}
	doexe *

	cd "${D}"/opt/${PN}
	tar xf "${WORKDIR}"/${PN}-data.tar

	fowners -R root:root /opt/${PN}
	fperms -R a-x,a+X /opt/googleearth/resources
}

pkg_postinst() {
	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-misc/googleearth: ChangeLog googleearth-5.1.3533.1731-r1.ebuild
@ 2009-11-22 10:54 Vlastimil Babka (caster)
  0 siblings, 0 replies; 3+ messages in thread
From: Vlastimil Babka (caster) @ 2009-11-22 10:54 UTC (permalink / raw
  To: gentoo-commits

caster      09/11/22 10:54:53

  Modified:             ChangeLog googleearth-5.1.3533.1731-r1.ebuild
  Log:
  Add dejavu font alternative as suggested in bug #262780.
  (Portage version: 2.2_rc50/cvs/Linux x86_64)

Revision  Changes    Path
1.53                 x11-misc/googleearth/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?r1=1.52&r2=1.53

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog	22 Nov 2009 10:50:29 -0000	1.52
+++ ChangeLog	22 Nov 2009 10:54:53 -0000	1.53
@@ -1,6 +1,10 @@
 # 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.52 2009/11/22 10:50:29 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.53 2009/11/22 10:54:53 caster Exp $
+
+  22 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  googleearth-5.1.3533.1731-r1.ebuild:
+  Add dejavu font alternative as suggested in bug #262780.
 
 *googleearth-5.1.3533.1731-r1 (22 Nov 2009)
 



1.2                  x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?r1=1.1&r2=1.2

Index: googleearth-5.1.3533.1731-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- googleearth-5.1.3533.1731-r1.ebuild	22 Nov 2009 10:50:29 -0000	1.1
+++ googleearth-5.1.3533.1731-r1.ebuild	22 Nov 2009 10:54:53 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.1 2009/11/22 10:50:29 caster Exp $
+# $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 $
 
 EAPI=2
 
@@ -46,7 +46,10 @@
 			<x11-drivers/ati-drivers-8.28.8
 		)
 	)
-	media-fonts/ttf-bitstream-vera"
+	|| (
+		media-fonts/dejavu
+		media-fonts/ttf-bitstream-vera
+	)"
 
 S="${WORKDIR}"
 






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-misc/googleearth: ChangeLog googleearth-5.1.3533.1731-r1.ebuild
@ 2010-02-19  8:51 Vlastimil Babka (caster)
  0 siblings, 0 replies; 3+ messages in thread
From: Vlastimil Babka (caster) @ 2010-02-19  8:51 UTC (permalink / raw
  To: gentoo-commits

caster      10/02/19 08:51:53

  Modified:             ChangeLog googleearth-5.1.3533.1731-r1.ebuild
  Log:
  Add dependency on qt-core also for amd64 - workaround for bug #303789 until #305825 is solved.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.56                 x11-misc/googleearth/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?r1=1.55&r2=1.56

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog	11 Feb 2010 15:47:30 -0000	1.55
+++ ChangeLog	19 Feb 2010 08:51:53 -0000	1.56
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/googleearth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.55 2010/02/11 15:47:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.56 2010/02/19 08:51:53 caster Exp $
+
+  19 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  googleearth-5.1.3533.1731-r1.ebuild:
+  Add dependency on qt-core also for amd64 - workaround for bug #303789
+  until #305825 is solved.
 
   11 Feb 2010; Ulrich Mueller <ulm@gentoo.org>
   googleearth-4.2.205.5730.ebuild, googleearth-4.3.7284.3916.ebuild,



1.5                  x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?r1=1.4&r2=1.5

Index: googleearth-5.1.3533.1731-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- googleearth-5.1.3533.1731-r1.ebuild	11 Feb 2010 15:47:30 -0000	1.4
+++ googleearth-5.1.3533.1731-r1.ebuild	19 Feb 2010 08:51:53 -0000	1.5
@@ -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/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v 1.4 2010/02/11 15:47:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v 1.5 2010/02/19 08:51:53 caster Exp $
 
 EAPI=2
 
@@ -21,6 +21,8 @@
 
 GCC_NEEDED="4.2"
 
+# the 64bit qt-core is needed to put the emul package on LDPATH
+# - workaround for bug #303789
 RDEPEND=">=sys-devel/gcc-${GCC_NEEDED}[-nocxx]
 	x86? (
 		media-libs/fontconfig
@@ -46,6 +48,7 @@
 		>=app-emulation/emul-linux-x86-xlibs-20081109
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		!qt-bundled? (
+			x11-libs/qt-core
 			>=app-emulation/emul-linux-x86-qtlibs-20091231
 		)
 	)






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-02-19  8:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-22 10:54 [gentoo-commits] gentoo-x86 commit in x11-misc/googleearth: ChangeLog googleearth-5.1.3533.1731-r1.ebuild Vlastimil Babka (caster)
  -- strict thread matches above, loose matches on Subject: below --
2010-02-19  8:51 Vlastimil Babka (caster)
2009-11-22 10:50 Vlastimil Babka (caster)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox