summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <tester@gentoo.org>2006-06-13 05:50:45 +0000
committerOlivier Crête <tester@gentoo.org>2006-06-13 05:50:45 +0000
commit62a9de2df2ae8bf11fd97a134c1f178a1eec6d38 (patch)
tree9cfe9142ca2f322ea4bc97fe8be8de0a8b359dbf /x11-misc
parentadded media-video/vdr:cmdsubmenu (diff)
downloadgentoo-2-62a9de2df2ae8bf11fd97a134c1f178a1eec6d38.tar.gz
gentoo-2-62a9de2df2ae8bf11fd97a134c1f178a1eec6d38.tar.bz2
gentoo-2-62a9de2df2ae8bf11fd97a134c1f178a1eec6d38.zip
Added ~amd64 keyword and deps, fixed digest
(Portage version: 2.1)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/googleearth/ChangeLog5
-rw-r--r--x11-misc/googleearth/files/digest-googleearth-4_beta6
-rw-r--r--x11-misc/googleearth/googleearth-4_beta.ebuild29
3 files changed, 25 insertions, 15 deletions
diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index 917aa70b2214..93907fc902da 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/googleearth
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.1 2006/06/13 00:47:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.2 2006/06/13 05:50:45 tester Exp $
+
+ 13 Jun 2006; Olivier Crête <tester@gentoo.org> googleearth-4_beta.ebuild:
+ Added ~amd64 keyword and deps, fixed digest
13 Jun 2006; Stefan Schweizer <genstef@gentoo.org> ChangeLog:
New Google Earth ebuild for bug 136584, thanks to Natanael Copa
diff --git a/x11-misc/googleearth/files/digest-googleearth-4_beta b/x11-misc/googleearth/files/digest-googleearth-4_beta
index 73a7c5d27e2f..db2b7bc433df 100644
--- a/x11-misc/googleearth/files/digest-googleearth-4_beta
+++ b/x11-misc/googleearth/files/digest-googleearth-4_beta
@@ -1,3 +1,3 @@
-MD5 109e99827b8c54d1b6b8549330027267 GoogleEarthLinux.bin 17077661
-RMD160 eba3f77917163e41aa4ba026efe4fd513b67cc26 GoogleEarthLinux.bin 17077661
-SHA256 104535a2744193c828cacadb59da0fd304d140fca90177caec0c8edd3b48548f GoogleEarthLinux.bin 17077661
+MD5 8a20af712531bdd358dfc738be605d8a GoogleEarthLinux.bin 16984110
+RMD160 dca35f2d992d2cdda95117ae67991e4949b54198 GoogleEarthLinux.bin 16984110
+SHA256 a4b5a6fbbcc5bac2faf5e13b3f138c012e395fd33e52f0619088115141c80cfb GoogleEarthLinux.bin 16984110
diff --git a/x11-misc/googleearth/googleearth-4_beta.ebuild b/x11-misc/googleearth/googleearth-4_beta.ebuild
index 2a53bc6d1766..da24cd879801 100644
--- a/x11-misc/googleearth/googleearth-4_beta.ebuild
+++ b/x11-misc/googleearth/googleearth-4_beta.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4_beta.ebuild,v 1.2 2006/06/13 01:11:45 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4_beta.ebuild,v 1.3 2006/06/13 05:50:45 tester Exp $
inherit eutils
@@ -10,22 +10,29 @@ SRC_URI="http://dl.google.com/earth/GE4/GoogleEarthLinux.bin"
LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
RESTRICT="mirror"
IUSE=""
-RDEPEND="media-libs/fontconfig
+RDEPEND="x86? (
+ media-libs/fontconfig
media-libs/freetype
virtual/opengl
|| ( ( x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXrender )
- virtual/x11
- )"
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrender )
+ virtual/x11 ) )
+ amd64? (
+ app-emulation/emul-linux-x86-xlibs
+ app-emulation/emul-linux-x86-baselibs
+ || (
+ >=app-emulation/emul-linux-x86-xlibs-7.0
+ >=media-video/nvidia-glx-1.0.6629-r3
+ >=x11-drivers/ati-drivers-8.8.25-r1 ) )"
S=${WORKDIR}