From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 5 Nov 2005 19:40:26 +0000 (+0000)
Subject: Added GCC4 patch and marked ~ppc-macos (bug #111620)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea428830c9a0b8bf2eedde2dd56c9fa65577e60e;p=gentoo.git

Added GCC4 patch and marked ~ppc-macos (bug #111620)
Package-Manager: portage-2.0.51.22-r3
---

diff --git a/dev-util/cook/ChangeLog b/dev-util/cook/ChangeLog
index 0e5840eb4ab9..09912551f483 100644
--- a/dev-util/cook/ChangeLog
+++ b/dev-util/cook/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cook
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cook/ChangeLog,v 1.10 2005/05/03 12:17:12 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cook/ChangeLog,v 1.11 2005/11/05 19:40:26 grobian Exp $
+
+  05 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/cook-2.24-gcc4.patch, cook-2.24.ebuild:
+  Added GCC4 patch and marked ~ppc-macos (bug #111620)
 
   03 May 2005; David Holm <dholm@gentoo.org> cook-2.24.ebuild:
   Added to ~ppc.
diff --git a/dev-util/cook/Manifest b/dev-util/cook/Manifest
index 295d6226624c..75c72ee19ccb 100644
--- a/dev-util/cook/Manifest
+++ b/dev-util/cook/Manifest
@@ -1,6 +1,7 @@
-MD5 e78df1dec11b4cf2e02e51a753e8aff1 ChangeLog 1285
 MD5 fc8ccc6bfb5600efd3ea8c9db8e179ab cook-2.20.ebuild 749
-MD5 2aa4a5cecbf6148f9bc0316e9267e918 cook-2.24.ebuild 752
+MD5 46f52d85cfe8dd066e129b0e2f2d3696 cook-2.24.ebuild 852
+MD5 c49c5b0d53ba7d18a653440749c214ba ChangeLog 1443
 MD5 f5ca48222c20db748f67d924018d9ea2 metadata.xml 1152
 MD5 4be1f5bce7cfcda18e62970a88d5e081 files/digest-cook-2.20 61
 MD5 29e53f56f421381adba874bde0ec4393 files/digest-cook-2.24 61
+MD5 afb193d4c33dba59d6ced46f08e96e6d files/cook-2.24-gcc4.patch 289
diff --git a/dev-util/cook/cook-2.24.ebuild b/dev-util/cook/cook-2.24.ebuild
index 0d775debac58..9eee434131d9 100644
--- a/dev-util/cook/cook-2.24.ebuild
+++ b/dev-util/cook/cook-2.24.ebuild
@@ -1,18 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cook/cook-2.24.ebuild,v 1.4 2005/05/03 12:17:12 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cook/cook-2.24.ebuild,v 1.5 2005/11/05 19:40:26 grobian Exp $
 
 DESCRIPTION="tool for constructing files; a drop in replacement for make"
 SRC_URI="http://www.canb.auug.org.au/~millerp/cook/${P}.tar.gz"
 HOMEPAGE="http://www.canb.auug.org.au/~millerp/cook/cook.html"
 
+inherit eutils
+
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~ppc ~ppc-macos ~sparc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/bison"
 
+src_unpack() {
+	unpack "${A}"
+	epatch "${FILESDIR}/${P}"-gcc4.patch
+}
+
 src_compile() {
 	econf || die "./configure failed"
 	make || die	# doesn't seem to like emake
diff --git a/dev-util/cook/files/cook-2.24-gcc4.patch b/dev-util/cook/files/cook-2.24-gcc4.patch
new file mode 100644
index 000000000000..3206be25c7b5
--- /dev/null
+++ b/dev-util/cook/files/cook-2.24-gcc4.patch
@@ -0,0 +1,11 @@
+--- cook-2.24/file_check/file_check.h.orig	2005-11-05 20:22:22.000000000 +0100
++++ cook-2.24/file_check/file_check.h	2005-11-05 20:22:51.000000000 +0100
+@@ -26,7 +26,7 @@
+ #include <str.h>
+ 
+ extern int warning;
+-extern int limit;
++static int limit;
+ 
+ void file_check _((string_ty *));
+