Update SRC_URI of 5.1.3535.3218-r1 to what is now hopefully a stable URL of a final 5.1 release. Remove old versions.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 10 insertions, 415 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 25dc8f9570e0..323e8be0ea81 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -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.11 2010/06/14 09:50:32 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.12 2010/06/15 07:56:06 caster Exp $
+
+  15 Jun 2010; Vlastimil Babka <caster@gentoo.org>
+  -googleearth-4.2.205.5730.ebuild, -googleearth-4.3.7284.3916.ebuild,
+  -googleearth-5.0.11733.9347.ebuild, -googleearth-5.1.3535.3218.ebuild,
+  googleearth-5.1.3535.3218-r1.ebuild:
+  Update SRC_URI of 5.1.3535.3218-r1 to what is now hopefully a stable URL
+  of a final 5.1 release. Remove old versions.
 
   14 Jun 2010; Christoph Mende <angelos@gentoo.org>
   googleearth-5.1.3535.3218-r1.ebuild:
diff --git a/sci-geosciences/googleearth/googleearth-4.2.205.5730.ebuild b/sci-geosciences/googleearth/googleearth-4.2.205.5730.ebuild
deleted file mode 100644
index 0255946ac7d6..000000000000
--- a/sci-geosciences/googleearth/googleearth-4.2.205.5730.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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-4.2.205.5730.ebuild,v 1.2 2010/03/26 15:05:30 spatz Exp $
-
-inherit eutils fdo-mime
-
-DESCRIPTION="A 3D interface to the planet"
-HOMEPAGE="http://earth.google.com/"
-SRC_URI="http://dl.google.com/earth/client/GE4/release_4_2/GoogleEarthLinux.bin"
-
-LICENSE="googleearth MIT SGI-B-1.1 openssl as-is ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="mirror strip"
-IUSE=""
-
-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 )
-	amd64? (
-	app-emulation/emul-linux-x86-xlibs
-	app-emulation/emul-linux-x86-baselibs
-	|| (
-		>=app-emulation/emul-linux-x86-xlibs-7.0
-		x11-drivers/nvidia-drivers
-		<x11-drivers/ati-drivers-8.28.8 ) )
-	virtual/ttf-fonts"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_makeself
-	# 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.*$::" postinstall.sh
-}
-
-src_install() {
-	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
-	./postinstall.sh
-	insinto /usr/share/mime/packages
-	doins ${PN}-mimetypes.xml
-	domenu Google-${PN}.desktop
-	doicon ${PN}-icon.png
-	dodoc README.linux
-
-	cd bin
-	tar xf "${WORKDIR}"/${PN}-linux-x86.tar
-	exeinto /opt/${PN}
-	doexe *
-
-	cd "${D}"/opt/${PN}
-	tar xf "${WORKDIR}"/${PN}-data.tar
-
-	cd "${D}"
-	# mime magic for gnome by Ed Catmur in bug 141371
-	epatch "${FILESDIR}"/mime-magic.patch
-
-	# make sure we install with correct permissions
-	fowners -R root:root /opt/${PN}
-	fperms -R a-x,a+X /opt/googleearth/{xml,res{,ources}}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/sci-geosciences/googleearth/googleearth-4.3.7284.3916.ebuild b/sci-geosciences/googleearth/googleearth-4.3.7284.3916.ebuild
deleted file mode 100644
index 9ba3a5e1a599..000000000000
--- a/sci-geosciences/googleearth/googleearth-4.3.7284.3916.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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-4.3.7284.3916.ebuild,v 1.2 2010/03/26 15:05:30 spatz Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime
-
-DESCRIPTION="A 3D interface to the planet"
-HOMEPAGE="http://earth.google.com/"
-SRC_URI="http://dl.google.com/earth/client/ge4/release_4_3/googleearth-linux-plus-4.3.7284.3916.bin
-			-> GoogleEarthLinux-${PV}.bin"
-
-LICENSE="googleearth MIT SGI-B-1.1 openssl as-is ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip"
-IUSE=""
-
-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/libXinerama
-	x11-libs/libXrender )
-	amd64? (
-	app-emulation/emul-linux-x86-xlibs
-	app-emulation/emul-linux-x86-baselibs
-	|| (
-		>=app-emulation/emul-linux-x86-xlibs-7.0
-		x11-drivers/nvidia-drivers
-		<x11-drivers/ati-drivers-8.28.8 ) )
-	virtual/ttf-fonts"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_makeself
-	# 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.*$::" postinstall.sh
-}
-
-src_install() {
-	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
-	./postinstall.sh
-	insinto /usr/share/mime/packages
-	doins ${PN}-mimetypes.xml
-	domenu Google-${PN}.desktop
-	doicon ${PN}-icon.png
-	dodoc README.linux
-
-	cd bin
-	tar xf "${WORKDIR}"/${PN}-linux-x86.tar
-	exeinto /opt/${PN}
-	doexe *
-
-	cd "${D}"/opt/${PN}
-	tar xf "${WORKDIR}"/${PN}-data.tar
-
-	cd "${D}"
-	# mime magic for gnome by Ed Catmur in bug 141371
-	epatch "${FILESDIR}"/mime-magic.patch
-
-	# make sure we install with correct permissions
-	fowners -R root:root /opt/${PN}
-	fperms -R a-x,a+X /opt/googleearth/{xml,res{,ources}}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/sci-geosciences/googleearth/googleearth-5.0.11733.9347.ebuild b/sci-geosciences/googleearth/googleearth-5.0.11733.9347.ebuild
deleted file mode 100644
index fb5e3a0ec820..000000000000
--- a/sci-geosciences/googleearth/googleearth-5.0.11733.9347.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.0.11733.9347.ebuild,v 1.2 2010/03/26 15:05:30 spatz Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime
-
-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/advanced/previous/GoogleEarthLinux.bin
-			-> GoogleEarthLinux-${PV}.bin"
-
-LICENSE="googleearth MIT SGI-B-1.1 openssl as-is ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip"
-IUSE=""
-
-RDEPEND="
-	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/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		sys-libs/zlib
-		dev-libs/glib:2
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-baselibs
-		|| (
-			>=app-emulation/emul-linux-x86-xlibs-7.0
-			x11-drivers/nvidia-drivers
-			<x11-drivers/ati-drivers-8.28.8
-		)
-	)
-	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"
-
-src_unpack() {
-	unpack_makeself
-}
-
-src_prepare() {
-	# 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.*$::" postinstall.sh
-}
-
-src_install() {
-	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
-	./postinstall.sh
-	insinto /usr/share/mime/packages
-	doins ${PN}-mimetypes.xml
-	domenu Google-${PN}.desktop
-	doicon ${PN}-icon.png
-	dodoc README.linux
-
-	cd bin
-	tar xf "${WORKDIR}"/${PN}-linux-x86.tar
-	exeinto /opt/${PN}
-	doexe *
-
-	cd "${D}"/opt/${PN}
-	tar xf "${WORKDIR}"/${PN}-data.tar
-
-	fowners -R root:root /opt/${PN}
-	fperms -R a-x,a+X /opt/googleearth/{xml,resources}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
index f0a25fde3b81..010e2a150e98 100644
--- a/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
+++ b/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
@@ -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.2 2010/06/14 09:50:32 angelos Exp $
+# $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 $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ 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
+SRC_URI="http://dl.google.com/earth/client/advanced/previous/GoogleEarthLinux.bin
 			-> GoogleEarthLinux-${PV}.bin"
 
 LICENSE="googleearth GPL-2"
diff --git a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
deleted file mode 100644
index dc88ed3a11d5..000000000000
--- a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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.ebuild,v 1.5 2010/05/21 07:24:34 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
-}
-
-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
-
-	if ! use qt-bundled; then
-		rm -rvf libQt{Core,Gui,Network,WebKit}.so.4 plugins/imageformats qt.conf || die
-	fi
-	rm -rvf libGLU.so.1 libcurl.so.4 || die
-	if ! use mdns-bundled; then
-		rm -rfv libnss_mdns4_minimal.so.2 || die
-	fi
-	if use x86; then
-		# no 32 bit libs for gdal
-		rm -rvf libgdal.so.1 || die
-	fi
-
-	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
-}