* [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: ChangeLog googleearth-7.0.2.8415-r1.ebuild
@ 2013-02-04 23:32 Julian Ospald (hasufell)
0 siblings, 0 replies; 3+ messages in thread
From: Julian Ospald (hasufell) @ 2013-02-04 23:32 UTC (permalink / raw
To: gentoo-commits
hasufell 13/02/04 23:32:34
Modified: ChangeLog
Added: googleearth-7.0.2.8415-r1.ebuild
Log:
revbump to fix bug #455124
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.40 sci-geosciences/googleearth/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.39&r2=1.40
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog 2 Feb 2013 13:26:49 -0000 1.39
+++ ChangeLog 4 Feb 2013 23:32:34 -0000 1.40
@@ -1,6 +1,12 @@
# ChangeLog for sci-geosciences/googleearth
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.39 2013/02/02 13:26:49 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.40 2013/02/04 23:32:34 hasufell Exp $
+
+*googleearth-7.0.2.8415-r1 (04 Feb 2013)
+
+ 04 Feb 2013; Julian Ospald <hasufell@gentoo.org>
+ +googleearth-7.0.2.8415-r1.ebuild:
+ revbump to fix bug #455124
02 Feb 2013; Julian Ospald <hasufell@gentoo.org>
googleearth-7.0.2.8415.ebuild:
1.1 sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild?rev=1.1&content-type=text/plain
Index: googleearth-7.0.2.8415-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild,v 1.1 2013/02/04 23:32:34 hasufell Exp $
EAPI=5
inherit eutils unpacker fdo-mime versionator gnome2-utils 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="x86? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb
-> GoogleEarthLinux-${PV}_i386.deb )
amd64? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_amd64.deb
-> GoogleEarthLinux-${PV}_amd64.deb )
http://dev.gentoo.org/~hasufell/distfiles/googleearth-libexpat-2.1.0-novisibility.tar.xz"
LICENSE="googleearth GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RESTRICT="mirror strip"
IUSE="mdns-bundled +qt-bundled"
GCC_NEEDED="4.2"
QA_PREBUILT="*"
RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=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:4
>=x11-libs/qt-gui-4.5.3:4
>=x11-libs/qt-webkit-4.5.3:4
)
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"
DEPEND="dev-util/patchelf"
S=${WORKDIR}/opt/google/earth/free
pkg_nofetch() {
einfo "Wrong checksum or file size means that Google silently replaced the distfile with a newer version."
einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for googleearth first!)."
einfo "By redigesting the file yourself, you will install a different version than the ebuild says, untested!"
}
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() {
# default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
unpack_deb GoogleEarthLinux-${PV}_$(usex amd64 "amd64" "i386").deb
cd opt/google/earth/free || die
unpack googleearth-libexpat-2.1.0-novisibility.tar.xz
if ! use qt-bundled; then
rm -v libQt{Core,Gui,Network,WebKit}.so.4 qt.conf || die
rm -rv plugins/imageformats || die
fi
rm -v 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() {
# bug #262780 is hopefully now solved upstream
# epatch "${FILESDIR}/decimal-separator.patch"
# we have no ld-lsb.so.3 symlink
# thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
patchelf --set-interpreter /lib/ld-linux.so.2 ${PN}-bin || die "patchelf failed"
# Set RPATH for preserve-libs handling (bug #265372).
local x
for x in * ; do
# Use \x7fELF header to separate ELF executables and libraries
[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
patchelf --set-rpath '$ORIGIN' "${x}" ||
die "patchelf failed on ${x}"
done
for x in plugins/imageformats/*.so ; do
[[ -f ${x} ]] || continue
patchelf --set-rpath /opt/${PN} "${x}" ||
die "patchelf failed on ${x}"
done
epatch "${FILESDIR}"/${P}-desktopfile.patch
}
src_install() {
make_wrapper ${PN} ./${PN} /opt/${PN} .
# install binaries and remove them
binaries="${PN} ${PN}-bin *.so *.so.*"
exeinto /opt/${PN}
doexe ${binaries}
rm ${binaries} || die
insinto /usr/share/mime/packages
doins "${FILESDIR}/${PN}-mimetypes.xml" || die
domenu google-earth.desktop
for size in 16 22 24 32 48 64 128 256 ; do
newicon -s ${size} product_logo_${size}.png google-earth.png
done
rm -r product_logo_* xdg-mime xdg-settings google-earth google-earth.desktop || die
# just copy everything that's left
cp -pPR * "${D}"/opt/${PN} || die
# some files are executable and shouldn't
fperms -R a-x,a+X /opt/googleearth/resources
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
elog "The qt-bundled flag is now enabled by default due to crashes on startup with system Qt."
elog "Testing and reporting outcome with/without the flag is welcome (bug #319813)."
elog "If it crashes in both cases, disabling tips is reported to help (bug #354281):"
elog ""
elog "When you get a crash starting Google Earth, try adding a file ~./config/Google/GoogleEarthPlus.conf"
elog "the following options:"
elog "lastTip = 4"
elog "enableTips = false"
elog ""
elog "In addition, the use of free video drivers may be problems associated with using the Mesa"
elog "library. In this case, Google Earth 6x likely only works with the Gallium3D variant."
elog "To select the 32bit graphic library use the command:"
elog " eselect mesa list"
elog "For example, for Radeon R300 (x86):"
elog " eselect mesa set r300 2"
elog "For Intel Q33 (amd64):"
elog " eselect mesa set 32bit i965 2"
elog "You may need to restart X afterwards"
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: ChangeLog googleearth-7.0.2.8415-r1.ebuild
@ 2013-02-10 15:27 Julian Ospald (hasufell)
0 siblings, 0 replies; 3+ messages in thread
From: Julian Ospald (hasufell) @ 2013-02-10 15:27 UTC (permalink / raw
To: gentoo-commits
hasufell 13/02/10 15:27:40
Modified: ChangeLog googleearth-7.0.2.8415-r1.ebuild
Log:
fix prefix installation
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.43 sci-geosciences/googleearth/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.42&r2=1.43
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog 10 Feb 2013 15:25:09 -0000 1.42
+++ ChangeLog 10 Feb 2013 15:27:40 -0000 1.43
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/googleearth
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.42 2013/02/10 15:25:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.43 2013/02/10 15:27:40 hasufell Exp $
+
+ 10 Feb 2013; Julian Ospald <hasufell@gentoo.org>
+ googleearth-7.0.2.8415-r1.ebuild:
+ fix prefix installation
10 Feb 2013; Julian Ospald <hasufell@gentoo.org> metadata.xml:
update metadata.xml
1.2 sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild?r1=1.1&r2=1.2
Index: googleearth-7.0.2.8415-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- googleearth-7.0.2.8415-r1.ebuild 4 Feb 2013 23:32:34 -0000 1.1
+++ googleearth-7.0.2.8415-r1.ebuild 10 Feb 2013 15:27:40 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild,v 1.1 2013/02/04 23:32:34 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild,v 1.2 2013/02/10 15:27:40 hasufell Exp $
EAPI=5
@@ -148,7 +148,7 @@
rm -r product_logo_* xdg-mime xdg-settings google-earth google-earth.desktop || die
# just copy everything that's left
- cp -pPR * "${D}"/opt/${PN} || die
+ cp -pPR * "${ED}"/opt/${PN} || die
# some files are executable and shouldn't
fperms -R a-x,a+X /opt/googleearth/resources
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: ChangeLog googleearth-7.0.2.8415-r1.ebuild
@ 2013-02-10 15:45 Julian Ospald (hasufell)
0 siblings, 0 replies; 3+ messages in thread
From: Julian Ospald (hasufell) @ 2013-02-10 15:45 UTC (permalink / raw
To: gentoo-commits
hasufell 13/02/10 15:45:05
Modified: ChangeLog googleearth-7.0.2.8415-r1.ebuild
Log:
pax-mark for hardened wrt #437336
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.44 sci-geosciences/googleearth/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.43&r2=1.44
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog 10 Feb 2013 15:27:40 -0000 1.43
+++ ChangeLog 10 Feb 2013 15:45:05 -0000 1.44
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/googleearth
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.43 2013/02/10 15:27:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.44 2013/02/10 15:45:05 hasufell Exp $
+
+ 10 Feb 2013; Julian Ospald <hasufell@gentoo.org>
+ googleearth-7.0.2.8415-r1.ebuild:
+ pax-mark for hardened wrt #437336
10 Feb 2013; Julian Ospald <hasufell@gentoo.org>
googleearth-7.0.2.8415-r1.ebuild:
1.3 sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild?r1=1.2&r2=1.3
Index: googleearth-7.0.2.8415-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- googleearth-7.0.2.8415-r1.ebuild 10 Feb 2013 15:27:40 -0000 1.2
+++ googleearth-7.0.2.8415-r1.ebuild 10 Feb 2013 15:45:05 -0000 1.3
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild,v 1.2 2013/02/10 15:27:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild,v 1.3 2013/02/10 15:45:05 hasufell Exp $
EAPI=5
-inherit eutils unpacker fdo-mime versionator gnome2-utils toolchain-funcs
+inherit pax-utils eutils unpacker fdo-mime versionator gnome2-utils toolchain-funcs
DESCRIPTION="A 3D interface to the planet"
HOMEPAGE="http://earth.google.com/"
@@ -152,6 +152,8 @@
# some files are executable and shouldn't
fperms -R a-x,a+X /opt/googleearth/resources
+
+ pax-mark -m "${ED}/opt/googleearth/googleearth-bin"
}
pkg_preinst() {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-10 15:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-10 15:27 [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: ChangeLog googleearth-7.0.2.8415-r1.ebuild Julian Ospald (hasufell)
-- strict thread matches above, loose matches on Subject: below --
2013-02-10 15:45 Julian Ospald (hasufell)
2013-02-04 23:32 Julian Ospald (hasufell)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox