Less restrictive when checking gcc version

diff --git a/dev-lang/maude/ChangeLog b/dev-lang/maude/ChangeLog
index 918bd806971230b2f5593246d2f43210fd405c10..6f47be5a7abe01f59cc5b073d4f1e9b27b283270 100644 (file)
--- a/dev-lang/maude/ChangeLog
+++ b/dev-lang/maude/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/maude
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.7 2004/12/28 19:58:15 ribosome Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.8 2005/01/17 12:32:50 phosphan Exp $
+
+  17 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> maude-2.1.1-r2.ebuild:
+  Changed DEPEND and added pkg_setup gcc version check because of bug #77856
 
   28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> maude-2.1.1-r2.ebuild:
   Dependency update: dev-libs/buddy -> sci-libs/buddy.

diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index 402e694013b630b1a5f9f5b9969783b9bf7d4d78..c3197f1568483132e42a9f99ef278b1ed71d0b84 100644 (file)
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -1,5 +1,5 @@
-MD5 d865e15872d2e55bbaeafc30a14ff57f maude-2.1.1-r2.ebuild 1456
-MD5 8d9cf4d43860c299d9b6a73a902622bf ChangeLog 1450
+MD5 e3f8bc84fd018eef06f4909411eaddcb maude-2.1.1-r2.ebuild 1676
+MD5 fc2533105167523a434779d5011b641f ChangeLog 1604
 MD5 40e5ec90608b2221625c50399a8f1f5a metadata.xml 612
 MD5 ef113f0269722dd261f4d017bdda4127 files/23maude 27
 MD5 5fdcf01ac8efe5c12f7fb581494b2b5f files/digest-maude-2.1.1-r2 138

diff --git a/dev-lang/maude/maude-2.1.1-r2.ebuild b/dev-lang/maude/maude-2.1.1-r2.ebuild
index 1b29d94140f4dee143409d888993b081678f2e5a..291eb3c7771652ac4c773d99309835b544b87051 100644 (file)
--- a/dev-lang/maude/maude-2.1.1-r2.ebuild
+++ b/dev-lang/maude/maude-2.1.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.1.1-r2.ebuild,v 1.2 2004/12/28 19:58:15 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.1.1-r2.ebuild,v 1.3 2005/01/17 12:32:50 phosphan Exp $
 
-inherit eutils
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Maude - A high-level specification language"
 HOMEPAGE="http://maude.cs.uiuc.edu/"
@@ -18,12 +18,22 @@ IUSE="doc"
 RDEPEND="virtual/libc
        sci-libs/buddy
        dev-libs/libtecla
-       >=dev-libs/gmp-4.1.3
-       >=sys-devel/gcc-3.4.3"
+       >=dev-libs/gmp-4.1.3"
 
 DEPEND="${RDEPEND}
        sys-devel/bison
-       sys-devel/flex"
+       sys-devel/flex
+       || ( >=sys-devel/gcc-3.4.3
+               =sys-devel/gcc-3.3* )"
+
+pkg_setup() {
+       if [ "$(gcc-version)" = "3.4" ]; then
+               if [ "$(gcc-micro-version)" -lt 3 ]; then
+                       eerror "Need gcc 3.3.x or >= 3.4.3"
+                       die "Wrong gcc version"
+               fi
+       fi
+}
 
 src_unpack() {
        unpack ${A}