summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2009-10-07 13:48:10 +0000
committerVlastimil Babka <caster@gentoo.org>2009-10-07 13:48:10 +0000
commit8d2e8f6bdb4f7e0b7535911e80fb4404596f841d (patch)
tree149e1f789ea6fd153e6d90b692fa281fd840d14d /x11-misc
parentMask x11-misc/googleearth-5 due to gcc-4.2 dep (diff)
downloadhistorical-8d2e8f6bdb4f7e0b7535911e80fb4404596f841d.tar.gz
historical-8d2e8f6bdb4f7e0b7535911e80fb4404596f841d.tar.bz2
historical-8d2e8f6bdb4f7e0b7535911e80fb4404596f841d.zip
Depend on gcc-4.2+ and check that it's active in pkg_setup, ewarn otherwise.
Package-Manager: portage-2.2_rc44/cvs/Linux x86_64
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/googleearth/ChangeLog7
-rw-r--r--x11-misc/googleearth/Manifest4
-rw-r--r--x11-misc/googleearth/googleearth-5.1.3509.4636_beta.ebuild18
3 files changed, 23 insertions, 6 deletions
diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index b81e4a3223bc..f8a69a866ac4 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/googleearth
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.48 2009/10/03 12:12:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.49 2009/10/07 13:48:10 caster Exp $
+
+ 07 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+ googleearth-5.1.3509.4636_beta.ebuild:
+ Depend on gcc-4.2+ and check that it's active in pkg_setup, ewarn
+ otherwise.
*googleearth-5.1.3509.4636_beta (03 Oct 2009)
diff --git a/x11-misc/googleearth/Manifest b/x11-misc/googleearth/Manifest
index 6a8390875630..4e08889dfb78 100644
--- a/x11-misc/googleearth/Manifest
+++ b/x11-misc/googleearth/Manifest
@@ -6,6 +6,6 @@ DIST GoogleEarthLinux.bin 23048189 RMD160 bf8994f6aa9f4204510023ac629c331789e396
EBUILD googleearth-4.2.205.5730.ebuild 2071 RMD160 8192bab1be53ac5ec031b25e38153132b5f750fd SHA1 b2b977a8829960f4fbeba2f4eadb0b2dce4a8fed SHA256 07ab620ee20456354574fb5b083eed4b5ad0027856ff45c80ec958c1834f7e3c
EBUILD googleearth-4.3.7284.3916.ebuild 2158 RMD160 b76715d8f85b564cd289a586042ce0676bbb6d76 SHA1 7894219bf4848fcc9f8e35725b685a0e2a9b1b93 SHA256 3a30847bd9321b94ce94e053f5207746b2c74607906fbd17c68cd586d4ef9864
EBUILD googleearth-5.0.11733.9347.ebuild 2531 RMD160 2b42b88b7d07469d7eb81d1effcdc97f0ea55f2b SHA1 2959fcad1eacb1665f4b4cf967114819b61a85ef SHA256 791151f0b38e97bf9bd443cabc89ba720a446240e6fb8060acc7a90450b95f8c
-EBUILD googleearth-5.1.3509.4636_beta.ebuild 2633 RMD160 ab21a11e58794ae9b962bb109edd5782105ccb70 SHA1 5e8ff8e862ebbc399a0d0c6f228778d463503b0a SHA256 2f3353a1cdb218e731572bd483ec2d4a55ddbed877d1cee5522ef7ab5bb5550a
-MISC ChangeLog 8637 RMD160 a385570c58a711a22187c2cfc2c917a56b9ec410 SHA1 c8add6c0543430ad6ad399e55a65f636033fdfb9 SHA256 a6eb759b65b86f1efe48de5568052c7e54c70d59a8ae428516addf6f8bb0c175
+EBUILD googleearth-5.1.3509.4636_beta.ebuild 3074 RMD160 eddc1335b3d362948db94a1885a4803eca850526 SHA1 4f26ea1f77137d4e78fb6b060c39e68de9250658 SHA256 d2f197ba6ea528a81183a9365f68534ade10ebec879bcde56a29b75d48a9e21c
+MISC ChangeLog 8811 RMD160 b1d3d57077da5e4b713452e669a82d1d6ff8722e SHA1 7bb3b1d19f5063b815594e17e04f5f34b74d8a1b SHA256 3ebf04d13ac8fb7d2d69f40a7401dcd3a5fc90729d1879e90e4e82ad4f0eaf26
MISC metadata.xml 486 RMD160 38fcb5658be4e5b2977bbcdb852de135ae2b8976 SHA1 ab4d80c62a6fcc859db41208e3b97f1bd3aabc27 SHA256 d14335ba032c2b603b36d0fe3505433ac2a61a9972b424175fd91961d261ac66
diff --git a/x11-misc/googleearth/googleearth-5.1.3509.4636_beta.ebuild b/x11-misc/googleearth/googleearth-5.1.3509.4636_beta.ebuild
index d4a376349d27..a4b6057dc28e 100644
--- a/x11-misc/googleearth/googleearth-5.1.3509.4636_beta.ebuild
+++ b/x11-misc/googleearth/googleearth-5.1.3509.4636_beta.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3509.4636_beta.ebuild,v 1.1 2009/10/03 12:12:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3509.4636_beta.ebuild,v 1.2 2009/10/07 13:48:10 caster Exp $
EAPI=2
-inherit eutils fdo-mime
+inherit eutils fdo-mime versionator toolchain-funcs
DESCRIPTION="A 3D interface to the planet"
HOMEPAGE="http://earth.google.com/"
@@ -19,7 +19,9 @@ KEYWORDS="~amd64 ~x86"
RESTRICT="mirror strip"
IUSE=""
-RDEPEND="
+GCC_NEEDED="4.2"
+
+RDEPEND=">=sys-devel/gcc-${GCC_NEEDED}[-nocxx]
x86? (
media-libs/fontconfig
media-libs/freetype
@@ -65,6 +67,16 @@ 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
}