summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-06-13 16:29:45 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-06-13 16:29:45 +0000
commit7260931764a4832e486e42c82fc0d99f5123cd6c (patch)
treee231523cde8d06777154f190b8e3cdcaa40cbedd /x11-misc
parentVersion bump. (diff)
downloadgentoo-2-7260931764a4832e486e42c82fc0d99f5123cd6c.tar.gz
gentoo-2-7260931764a4832e486e42c82fc0d99f5123cd6c.tar.bz2
gentoo-2-7260931764a4832e486e42c82fc0d99f5123cd6c.zip
Ignore QA checks and RESTRICT=strip, thanks to Jon Hood <squinky86@gentoo.org> and Jakub Moc <jakub@gentoo.org> in bug 136610 and use google scripts for the .desktop files, no revbump
(Portage version: 2.1)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/googleearth/ChangeLog8
-rw-r--r--x11-misc/googleearth/googleearth-4_beta.ebuild24
2 files changed, 26 insertions, 6 deletions
diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index 93907fc902da..9607b4c740b1 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,12 @@
# 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.2 2006/06/13 05:50:45 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.3 2006/06/13 16:29:45 genstef Exp $
+
+ 13 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+ googleearth-4_beta.ebuild:
+ Ignore QA checks and RESTRICT=strip, thanks to Jon Hood
+ <squinky86@gentoo.org> and Jakub Moc <jakub@gentoo.org> in bug 136610 and
+ use google scripts for the .desktop files, no revbump
13 Jun 2006; Olivier Crête <tester@gentoo.org> googleearth-4_beta.ebuild:
Added ~amd64 keyword and deps, fixed digest
diff --git a/x11-misc/googleearth/googleearth-4_beta.ebuild b/x11-misc/googleearth/googleearth-4_beta.ebuild
index da24cd879801..f2532de62005 100644
--- a/x11-misc/googleearth/googleearth-4_beta.ebuild
+++ b/x11-misc/googleearth/googleearth-4_beta.ebuild
@@ -1,8 +1,8 @@
# 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.3 2006/06/13 05:50:45 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4_beta.ebuild,v 1.4 2006/06/13 16:29:45 genstef Exp $
-inherit eutils
+inherit eutils fdo-mime
DESCRIPTION="A 3D interface to the planet"
HOMEPAGE="http://earth.google.com/"
@@ -11,7 +11,8 @@ 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 ~amd64"
-RESTRICT="mirror"
+RESTRICT="mirror strip"
+QA_EXECSTACK_x86="opt/googleearth/libcrypto.so.0.9.8"
IUSE=""
RDEPEND="x86? (
@@ -32,19 +33,27 @@ RDEPEND="x86? (
|| (
>=app-emulation/emul-linux-x86-xlibs-7.0
>=media-video/nvidia-glx-1.0.6629-r3
- >=x11-drivers/ati-drivers-8.8.25-r1 ) )"
+ >=x11-drivers/ati-drivers-8.8.25-r1 ) )
+ media-fonts/ttf-bitstream-vera"
S=${WORKDIR}
src_unpack() {
unpack_makeself
+ # make the postinst scripts behave
+ sed -i -e 's:$SETUP_INSTALLPATH/::' -e "s: --user: --system:" \
+ -e 's:$SETUP_INSTALLPATH:1:' postinstall.sh
+ sed -i -e "s:/usr:${D}/usr:g" -e "s:^detectDE$::" \
+ -e 's:-x $x/update-mime:-d nonexis:' \
+ -e 's:-x $x/update-desktop:-d nonexis:' linux/xdg/xdg-m{ime,enu}
}
src_install() {
make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
+ dodir /usr/share/{appl{ications,nk},gnome/apps,mime/packages}
+ ./postinstall.sh
doicon ${PN}-icon.png
- make_desktop_entry ${PN} "Google Earth" ${PN}-icon.png
dodoc README.linux
@@ -56,3 +65,8 @@ src_install() {
cd ${D}/opt/${PN}
tar xpf ${WORKDIR}/${PN}-data.tar
}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}