Make 5.1.3533.1731-r1 RESTRICT=fetch due to distfile no longer available, with explanation.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 20 insertions, 7 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 9bbe9ff2cfb6..c5a7d5de4f36 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,11 @@
 # 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.13 2010/06/15 08:55:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.14 2010/06/20 08:51:30 caster Exp $
+
+  20 Jun 2010; Vlastimil Babka <caster@gentoo.org>
+  googleearth-5.1.3533.1731-r1.ebuild:
+  Make 5.1.3533.1731-r1 RESTRICT=fetch due to distfile no longer available,
+  with explanation.
 
 *googleearth-5.2.1.1329_beta (15 Jun 2010)
 
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 99956a61f46d..df227b7bfcd3 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -3,8 +3,8 @@ AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6
 DIST GoogleEarthLinux-5.1.3533.1731.bin 25989559 RMD160 4ec6fc65e9822dee7bdea0b1a0966dbd4b7b6b96 SHA1 e64f2840bf7161b9860c4d99e9de0c27f960e131 SHA256 6f477f1acac653ae218df0df998ef5c658bf08c8c554be1a92027eb1b80dbaeb
 DIST GoogleEarthLinux-5.1.3535.3218.bin 25932414 RMD160 46d7a763e835d657798f3cd198f1a7931d31b292 SHA1 3af3c817a587b6bfd6e0fb20de157751a3ea4fda SHA256 f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac
 DIST GoogleEarthLinux-5.2.1.1329_beta.bin 31388873 RMD160 bdcff2860eb590f223277cbfa14e49fa2cdee2d0 SHA1 1a72482a675ec65fcf5c24833a580485d17d46de SHA256 97dc80a6cdadfd356ba2ec2b5cad6e6d08303da47e95274621270e74ed1ae3c6
-EBUILD googleearth-5.1.3533.1731-r1.ebuild 3321 RMD160 f02f2e4ef6db95fadc74d90d78dea48f44591544 SHA1 efb8ecd1e7a581519f332f93353c32b7e7281a97 SHA256 89e2a46541f947038a65d6ce06a06c48bdbd24fe6911adcab80ac2b470bab4b3
+EBUILD googleearth-5.1.3533.1731-r1.ebuild 3741 RMD160 80567f20677bc97a1b63c200fd66987f26ac4337 SHA1 798b01ac7407e94619dd3d501d2ea53c44b1f789 SHA256 0fa8fc9978e83771bc223413b0fac1b09688aad79f3d28826512aad518a05b49
 EBUILD googleearth-5.1.3535.3218-r1.ebuild 3871 RMD160 7f0721a2558a48da6c33a84ffc90bc06e0d877a7 SHA1 bc91d588c56a99f1be79f05813246f2a065d7cad SHA256 0b6cd71f09d02ca14c603bf20cc92c21b5160b7b00d72f90f4fa195970dbd509
 EBUILD googleearth-5.2.1.1329_beta.ebuild 4403 RMD160 dccba7475803b26dd0759c3203f8dea4307d72d0 SHA1 dc08efa0361f08d7d16e7371e742f31d6d6b2cb6 SHA256 fcef047fa1a0d8424074682cfbec869e9579413894d17e5a916576336a55dafd
-MISC ChangeLog 13706 RMD160 902b3b8867e7cd69cbd57845527a67b215ddd727 SHA1 8cea5bf67a3595af5158b9a57d9df6c483f4d503 SHA256 f0d4e4fd14b338161d1534c5d0eec9d2c52be1e41406071ab91c0d0a81070a22
+MISC ChangeLog 13893 RMD160 2ba6f769f8fa88a02746424f5ada1e37fb39c171 SHA1 a121aac46acca53c2fb82fcc80aaf503f66a0921 SHA256 287765a3df944ee39551d10a15a525422319fae1bd74f2418ae3a47c91b1c1c9
 MISC metadata.xml 613 RMD160 cfe7468be5f1fa85b0c0f36bc70e3fa33f0bcd29 SHA1 26dd871ce06415fb9323e1b91127ab81928538e6 SHA256 d9baa8e942136a47ef41fa76f025f3af6933f4fb534cb225fb553f8a6ca33382
diff --git a/sci-geosciences/googleearth/googleearth-5.1.3533.1731-r1.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3533.1731-r1.ebuild
index 6e7bf1d83a2d..5ee2bf08a088 100644
--- a/sci-geosciences/googleearth/googleearth-5.1.3533.1731-r1.ebuild
+++ b/sci-geosciences/googleearth/googleearth-5.1.3533.1731-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.3533.1731-r1.ebuild,v 1.3 2010/04/26 19:06:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v 1.4 2010/06/20 08:51:30 caster Exp $
 
 EAPI=2
 
@@ -10,13 +10,12 @@ 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"
+SRC_URI="GoogleEarthLinux-${PV}.bin"
 
 LICENSE="googleearth MIT SGI-B-1.1 openssl as-is ZLIB"
 SLOT="0"
 KEYWORDS="amd64 x86"
-RESTRICT="mirror strip"
+RESTRICT="fetch strip"
 IUSE="qt-bundled"
 
 GCC_NEEDED="4.2"
@@ -70,6 +69,15 @@ opt/googleearth/libmoduleframework.so
 
 QA_DT_HASH="opt/${PN}/.*"
 
+pkg_nofetch() {
+	elog "This version is no longer available from Google and the license prevents mirroring."
+	elog "This ebuild is meant for those who already downloaded it, until the current version is stabilized."
+	elog "If you can get the distfile from e.g. another computer of yours,"
+	elog "copy the file ${SRC_URI} to ${DISTDIR}."
+	elog "Otherwise, you need to unmask the 5.1.3535.3218-r1 version,"
+	elog "stabilization is tracked at https://bugs.gentoo.org/show_bug.cgi?id=320065"
+}
+
 pkg_setup() {
 	GCC_VER="$(gcc-version)"
 	if ! version_is_at_least ${GCC_NEEDED} ${GCC_VER}; then