gcc4 patch, thanks to Chen Xiangyang <chenxy@opencjk.org>; bug #95835

Package-Manager: portage-2.0.51.22-r1

4 files changed, 34 insertions, 8 deletions

diff --git a/dev-util/gperf/ChangeLog b/dev-util/gperf/ChangeLog
index 54f531da0053..9094d3e4c209 100644
--- a/dev-util/gperf/ChangeLog
+++ b/dev-util/gperf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/gperf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gperf/ChangeLog,v 1.24 2005/05/13 23:00:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gperf/ChangeLog,v 1.25 2005/06/16 02:42:16 halcy0n Exp $
+
+  16 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/gperf-3.0.1-gcc4.patch, gperf-3.0.1.ebuild:
+  Added patch to fix compilation with gcc-4.0, thanks to Chen Xiangyang
+  <chenxy@opencjk.org> ; bug #95835
 
   13 May 2005; Bryan Østergaard <kloeri@gentoo.org> gperf-3.0.1.ebuild:
   ~ia64 keyword.
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index be1a173004f2..5c22dc3ba0ee 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8d1717d426f597021ff737c276d7d021 ChangeLog 2306
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 394f455dcecdacce486612befd9ebc07 gperf-3.0.1.ebuild 548
+MD5 27d46328281c7d5e3849303c1e222bbe ChangeLog 2517
 MD5 06f4145fae65bfcd6d8b89d7fbee1aad gperf-2.7.2.ebuild 756
+MD5 189ef118c6dfbf229c695b47acb4f6f4 gperf-3.0.1.ebuild 634
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 ec1cc9b13d8e32fc5d07f728b58f8fe9 files/digest-gperf-2.7.2 63
 MD5 748cbc76e71cf034e58e6eae1ad118e4 files/digest-gperf-3.0.1 63
+MD5 0a0bda5fe3eff0d80208d327962fb08b files/gperf-3.0.1-gcc4.patch 424
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFChTF4Kf2g/qXtneoRAtRNAKDFTeO9uCITVPznSj3V0mpnaJ08rgCgwkz6
-Bmov4UXr4ko+D8015jKsHzA=
-=2m4s
+iD8DBQFCsOcXCRZPokWLroQRAq50AJ4pKz7dBkEGpVkMbQO66pFkjoOaHwCeN0n9
+uoYpqa5YvUHRjzNs3Zs/UuY=
+=VPXV
 -----END PGP SIGNATURE-----
diff --git a/dev-util/gperf/files/gperf-3.0.1-gcc4.patch b/dev-util/gperf/files/gperf-3.0.1-gcc4.patch
new file mode 100644
index 000000000000..cb07379bcba2
--- /dev/null
+++ b/dev-util/gperf/files/gperf-3.0.1-gcc4.patch
@@ -0,0 +1,13 @@
+diff -Naur gperf-3.0.1.old/src/positions.h gperf-3.0.1/src/positions.h
+--- gperf-3.0.1.old/src/positions.h	2003-04-07 17:48:19.000000000 +0800
++++ gperf-3.0.1/src/positions.h	2005-06-12 08:17:14.000000000 +0800
+@@ -28,6 +28,9 @@
+ 
+ /* This class denotes a set of byte positions, used to access a keyword.  */
+ 
++class PositionIterator;
++class PositionReverseIterator;
++
+ class Positions
+ {
+   friend class PositionIterator;
diff --git a/dev-util/gperf/gperf-3.0.1.ebuild b/dev-util/gperf/gperf-3.0.1.ebuild
index 869f04f657c9..bfaca7aacac3 100644
--- a/dev-util/gperf/gperf-3.0.1.ebuild
+++ b/dev-util/gperf/gperf-3.0.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gperf/gperf-3.0.1.ebuild,v 1.13 2005/05/13 23:00:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gperf/gperf-3.0.1.ebuild,v 1.14 2005/06/16 02:42:16 halcy0n Exp $
+
+inherit eutils
 
 DESCRIPTION="A perfect hash function generator"
 HOMEPAGE="http://www.gnu.org/software/gperf/gperf.html"
@@ -13,6 +15,11 @@ IUSE=""
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 }