* [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: ChangeLog googleearth-5.1.3535.3218-r1.ebuild
@ 2010-06-07 14:48 Vlastimil Babka (caster)
0 siblings, 0 replies; 3+ messages in thread
From: Vlastimil Babka (caster) @ 2010-06-07 14:48 UTC (permalink / raw
To: gentoo-commits
caster 10/06/07 14:48:17
Modified: ChangeLog
Added: googleearth-5.1.3535.3218-r1.ebuild
Log:
Revbump to fix lib unbundling, broken when changing the unpack logic. Thanks to Simone Scanzoni in bug #212373.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.10 sci-geosciences/googleearth/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 22 May 2010 18:30:42 -0000 1.9
+++ ChangeLog 7 Jun 2010 14:48:17 -0000 1.10
@@ -1,6 +1,13 @@
# 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.9 2010/05/22 18:30:42 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.10 2010/06/07 14:48:17 caster Exp $
+
+*googleearth-5.1.3535.3218-r1 (07 Jun 2010)
+
+ 07 Jun 2010; Vlastimil Babka <caster@gentoo.org>
+ +googleearth-5.1.3535.3218-r1.ebuild:
+ Revbump to fix lib unbundling, broken when changing the unpack logic.
+ Thanks to Simone Scanzoni in bug #212373.
22 May 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
Remove genstef from metadata.xml (#66339)
1.1 sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild?rev=1.1&content-type=text/plain
Index: googleearth-5.1.3535.3218-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2010/06/07 14:48:17 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 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RESTRICT="mirror strip"
IUSE="mdns-bundled qt-bundled"
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
!qt-bundled? (
>=x11-libs/qt-core-4.5.3
>=x11-libs/qt-gui-4.5.3
>=x11-libs/qt-webkit-4.5.3
)
net-misc/curl
sci-libs/gdal
!mdns-bundled? ( sys-auth/nss-mdns )
)
amd64? (
>=app-emulation/emul-linux-x86-xlibs-20081109
>=app-emulation/emul-linux-x86-baselibs-20081109
app-emulation/emul-linux-x86-opengl
!qt-bundled? (
>=app-emulation/emul-linux-x86-qtlibs-20091231-r1
)
)
virtual/ttf-fonts"
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
cd "${WORKDIR}"/bin || die
unpack ./../${PN}-linux-x86.tar
mkdir "${WORKDIR}"/data && cd "${WORKDIR}"/data || die
unpack ./../${PN}-data.tar
cd "${WORKDIR}"/bin || die
if ! use qt-bundled; then
rm -v libQt{Core,Gui,Network,WebKit}.so.4 ../data/qt.conf || die
rm -frv ../data/plugins/imageformats || die
fi
rm -v libGLU.so.1 libcurl.so.4 || die
if ! use mdns-bundled; then
rm -v libnss_mdns4_minimal.so.2 || die
fi
if use x86; then
# no 32 bit libs for gdal
rm -v libgdal.so.1 || die
fi
}
src_prepare() {
cd "${WORKDIR}"/bin || die
# bug #262780
epatch "${FILESDIR}/decimal-separator.patch"
# 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.*$::" "${WORKDIR}"/postinstall.sh || die
}
src_install() {
make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
./postinstall.sh
insinto /usr/share/mime/packages
doins ${PN}-mimetypes.xml || die
domenu Google-${PN}.desktop || die
doicon ${PN}-icon.png || die
dodoc README.linux || die
cd bin || die
exeinto /opt/${PN}
doexe * || die
cp -pPR "${WORKDIR}"/data/* "${D}"/opt/${PN} || die
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 sci-geosciences/googleearth: ChangeLog googleearth-5.1.3535.3218-r1.ebuild
@ 2010-06-14 9:50 Christoph Mende (angelos)
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Mende (angelos) @ 2010-06-14 9:50 UTC (permalink / raw
To: gentoo-commits
angelos 10/06/14 09:50:32
Modified: ChangeLog googleearth-5.1.3535.3218-r1.ebuild
Log:
Stable on amd64 wrt bug #320065
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.11 sci-geosciences/googleearth/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 7 Jun 2010 14:48:17 -0000 1.10
+++ ChangeLog 14 Jun 2010 09:50:32 -0000 1.11
@@ -1,6 +1,10 @@
# 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.10 2010/06/07 14:48:17 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.11 2010/06/14 09:50:32 angelos Exp $
+
+ 14 Jun 2010; Christoph Mende <angelos@gentoo.org>
+ googleearth-5.1.3535.3218-r1.ebuild:
+ Stable on amd64 wrt bug #320065
*googleearth-5.1.3535.3218-r1 (07 Jun 2010)
1.2 sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild?r1=1.1&r2=1.2
Index: googleearth-5.1.3535.3218-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- googleearth-5.1.3535.3218-r1.ebuild 7 Jun 2010 14:48:17 -0000 1.1
+++ googleearth-5.1.3535.3218-r1.ebuild 14 Jun 2010 09:50:32 -0000 1.2
@@ -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-r1.ebuild,v 1.1 2010/06/07 14:48:17 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild,v 1.2 2010/06/14 09:50:32 angelos Exp $
EAPI=2
@@ -15,7 +15,7 @@
LICENSE="googleearth GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RESTRICT="mirror strip"
IUSE="mdns-bundled qt-bundled"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: ChangeLog googleearth-5.1.3535.3218-r1.ebuild
@ 2010-06-20 16:41 Christian Faulhammer (fauli)
0 siblings, 0 replies; 3+ messages in thread
From: Christian Faulhammer (fauli) @ 2010-06-20 16:41 UTC (permalink / raw
To: gentoo-commits
fauli 10/06/20 16:41:06
Modified: ChangeLog googleearth-5.1.3535.3218-r1.ebuild
Log:
stable x86, bug 320065
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.15 sci-geosciences/googleearth/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 20 Jun 2010 08:51:30 -0000 1.14
+++ ChangeLog 20 Jun 2010 16:41:06 -0000 1.15
@@ -1,6 +1,10 @@
# 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.14 2010/06/20 08:51:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.15 2010/06/20 16:41:06 fauli Exp $
+
+ 20 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
+ googleearth-5.1.3535.3218-r1.ebuild:
+ stable x86, bug 320065
20 Jun 2010; Vlastimil Babka <caster@gentoo.org>
googleearth-5.1.3533.1731-r1.ebuild:
1.4 sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild?r1=1.3&r2=1.4
Index: googleearth-5.1.3535.3218-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- googleearth-5.1.3535.3218-r1.ebuild 15 Jun 2010 07:56:06 -0000 1.3
+++ googleearth-5.1.3535.3218-r1.ebuild 20 Jun 2010 16:41:06 -0000 1.4
@@ -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-r1.ebuild,v 1.3 2010/06/15 07:56:06 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild,v 1.4 2010/06/20 16:41:06 fauli Exp $
EAPI=2
@@ -15,7 +15,7 @@
LICENSE="googleearth GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RESTRICT="mirror strip"
IUSE="mdns-bundled qt-bundled"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-06-20 16:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-20 16:41 [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: ChangeLog googleearth-5.1.3535.3218-r1.ebuild Christian Faulhammer (fauli)
-- strict thread matches above, loose matches on Subject: below --
2010-06-14 9:50 Christoph Mende (angelos)
2010-06-07 14:48 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