[gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: metadata.xml ChangeLog googleearth-7.1.2.2041.ebuild googleearth-7.1.1.1871.ebuild googleearth-7.1.1.1580.ebuild googleearth-5.1.3535.3218-r1.ebuild googleearth-7.0.3.8542.ebuild googleearth-5.2.1.1588.ebuild googleearth-6.2.2.6613.ebuild googleearth-7.0.2.8415-r2.ebuild googleearth-7.1.1.1888.ebuild googleearth-6.0.3.2197.ebuild googleearth-6.0.2.2074.ebuild googleearth-7.0.2.8415.ebuild

[Marc Schiffbauer (mschiff)]

mschiff     14/02/08 15:56:20

  Modified:             metadata.xml ChangeLog
  Added:                googleearth-7.1.2.2041.ebuild
  Removed:              googleearth-7.1.1.1871.ebuild
                        googleearth-7.1.1.1580.ebuild
                        googleearth-5.1.3535.3218-r1.ebuild
                        googleearth-7.0.3.8542.ebuild
                        googleearth-5.2.1.1588.ebuild
                        googleearth-6.2.2.6613.ebuild
                        googleearth-7.0.2.8415-r2.ebuild
                        googleearth-7.1.1.1888.ebuild
                        googleearth-6.0.3.2197.ebuild
                        googleearth-6.0.2.2074.ebuild
                        googleearth-7.0.2.8415.ebuild
  Log:
  Bump version. Remove old ebuilds.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)

Revision  Changes    Path
1.13                 sci-geosciences/googleearth/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/metadata.xml?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/metadata.xml?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/metadata.xml?r1=1.12&r2=1.13

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/metadata.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- metadata.xml	31 Jan 2014 10:14:46 -0000	1.12
+++ metadata.xml	8 Feb 2014 15:56:20 -0000	1.13
@@ -6,9 +6,5 @@
 	</maintainer>
 	<use>
 		<flag name='bundled-libs'>Use bundled libraries.</flag>
-		<flag name="qt-bundled">Use bundled Qt4 libraries instead of system ones. Recommended only for troubleshooting.</flag>
-		<flag name="mdns-bundled">Use bundled nss-mdns library instead of depending on sys-auth/nss-mdns. Enable this if you want to avoid the deptree.</flag>
-	    <flag name="system-qt">Use Qt4 libraries from portage instead of the bundled ones.</flag>
-	    <flag name="system-mdns">Use nss-mdns library from portage instead of the bundled one.</flag>
 	</use>
 </pkgmetadata>



1.58                 sci-geosciences/googleearth/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.57&r2=1.58

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ChangeLog	31 Jan 2014 10:14:46 -0000	1.57
+++ ChangeLog	8 Feb 2014 15:56:20 -0000	1.58
@@ -1,6 +1,23 @@
 # ChangeLog for sci-geosciences/googleearth
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.57 2014/01/31 10:14:46 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.58 2014/02/08 15:56:20 mschiff Exp $
+
+*googleearth-7.1.2.2041 (08 Feb 2014)
+
+  08 Feb 2014; Marc Schiffbauer <mschiff@g.o>
+  -googleearth-5.1.3535.3218-r1.ebuild, -googleearth-5.2.1.1588.ebuild,
+  -googleearth-6.0.2.2074.ebuild, -googleearth-6.0.3.2197.ebuild,
+  -googleearth-6.2.2.6613.ebuild, -googleearth-7.0.2.8415.ebuild,
+  -googleearth-7.0.2.8415-r2.ebuild, -googleearth-7.0.3.8542.ebuild,
+  -googleearth-7.1.1.1580.ebuild, -googleearth-7.1.1.1871.ebuild,
+  -googleearth-7.1.1.1888.ebuild, +googleearth-7.1.2.2041.ebuild,
+  -files/googleearth-7.0.2.8415-desktopfile.patch,
+  -files/googleearth-7.0.3.8542-desktopfile.patch,
+  -files/googleearth-7.1.1.1580-desktopfile.patch,
+  -files/googleearth-7.1.1.1871-desktopfile.patch,
+  +files/googleearth-7-desktopfile.patch, -files/decimal-separator.patch,
+  -files/mime-magic.patch, metadata.xml:
+  Bump version. Remove old ebuilds.
 
   31 Jan 2014; Marc Schiffbauer <mschiff@g.o> metadata.xml:
   added myself as maintainer



1.1                  sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild?rev=1.1&content-type=text/plain

Index: googleearth-7.1.2.2041.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild,v 1.1 2014/02/08 15:56:20 mschiff Exp $

EAPI=5

inherit pax-utils eutils unpacker fdo-mime gnome2-utils

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 )"
LICENSE="googleearth GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RESTRICT="mirror splitdebug"
IUSE="+bundled-libs"

QA_PREBUILT="*"

# TODO: find a way to unbundle libQt
# ./googleearth-bin: symbol lookup error: ./libbase.so: undefined symbol: _Z34QBasicAtomicInt_fetchAndAddOrderedPVii

RDEPEND="
	dev-libs/glib:2
	dev-libs/nspr
	media-libs/fontconfig
	media-libs/freetype
	net-misc/curl
	sys-devel/gcc[cxx]
	sys-libs/zlib
	virtual/glu
	virtual/opengl
	virtual/ttf-fonts
	x11-libs/libICE
	x11-libs/libSM
	x11-libs/libX11
	x11-libs/libXi
	x11-libs/libXext
	x11-libs/libXrender
	x11-libs/libXau
	x11-libs/libXdmcp
	!bundled-libs? (
		dev-db/sqlite:3
		dev-libs/expat
		dev-libs/nss
		sci-libs/gdal
		sci-libs/proj
	)"
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!"
}

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

	if ! use bundled-libs ; then
		einfo "removing bundled libs"
		cd opt/google/earth/free || die
		# sci-libs/gdal
		rm -v libgdal.so.1 || die
		# dev-db/sqlite
		rm -v libsqlite3.so || die
		# dev-libs/nss
		rm -v libplc4.so libplds4.so libnspr4.so libnssckbi.so libfreebl3.so \
			libnssdbm3.so libnss3.so libnssutil3.so libsmime3.so libnsssysinit.so \
			libsoftokn3.so libssl3.so || die
		# dev-libs/expat
		rm -v libexpat.so.1 || die
		# sci-libs/proj
		rm -v libproj.so.0 || die
		# dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4
#		rm -v libQt{Core,Gui,Network,WebKit}.so.4 || die
#		rm -rv plugins/imageformats || die
	fi
}

src_prepare() {
	# we have no ld-lsb.so.3 symlink
	# thanks to Nathan Phillip Brink <ohnobinki@××××××××××××××.net> for suggesting patchelf
	einfo "running patchelf"
	patchelf --set-interpreter /lib/ld-linux$(usex amd64 "-x86-64" "").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/*.so ; do
		[[ -f ${x} ]] || 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 '$ORIGIN/../..' "${x}" ||
			die "patchelf failed on ${x}"
	done

	epatch "${FILESDIR}"/${PN}-${PV%%.*}-desktopfile.patch
}

src_install() {
	make_wrapper ${PN} ./${PN} /opt/${PN} .

	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 -rf xdg-mime xdg-settings google-earth google-earth.desktop product_logo_*

	insinto /opt/${PN}
	doins -r *

	fperms +x /opt/${PN}/${PN}{,-bin}
	cd "${ED}" || die
	find . -type f -name "*.so.*" -exec fperms +x '{}' +

	pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin
}

pkg_preinst() {
	gnome2_icon_savelist
}

pkg_postinst() {
	elog "When you get a crash starting Google Earth, try adding a file ~./config/Google/GoogleEarthPlus.conf"
	elog "with the following options:"
	elog "lastTip = 4"
	elog "enableTips = false"
	elog ""
	elog "In addition, the use of free video drivers may cause 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
}