Fix building w/ GCC 4.5, patch from xarthisius. (bug #317175)

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

4 files changed, 36 insertions, 5 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index d2f0e9d5371c..7498c87a0eff 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/guile
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.76 2010/03/08 22:46:31 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.77 2010/05/30 06:10:46 dirtyepic Exp $
+
+  30 May 2010; Ryan Hill <dirtyepic@gentoo.org> guile-1.8.7.ebuild,
+  +files/guile-1.8.7-gcc45.patch:
+  Fix building w/ GCC 4.5, patch from xarthisius. (bug #317175)
 
   08 Mar 2010; Mounir Lamouri <volkmar@gentoo.org> guile-1.8.6.ebuild:
   Stabilizing 1.8.6 for ppc, bug 245701.
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 07cc041e4ba8..42ae2e60acf2 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50guile-gentoo.el 38 RMD160 93ecb185b2729f847b6b34bbb1dd96a207510df2 SHA1 4363c907b30fe150f1d4de4be733f943256a0b82 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115
 AUX gcc-4.3.patch 2097 RMD160 9143d75c389f3bc2d57fab7d197064899ec573aa SHA1 339a5e22e528204d85b1d049f01d58d5f9be409f SHA256 3702a63fef213535d2df8dfa093f73d5642640537a4ae3a1f1bc7f9ada5333b4
 AUX guile-1.8.7-fix_tests.patch 888 RMD160 b34a98684d016b8f660da97b66c3e3acc6e5b123 SHA1 c229e11da5a5b0974ecf23e3ccdfd42723932abd SHA256 077829a887549f9c65a6c366a5e2c709dfbab07bc81f46a60f2557dcc5c34adb
+AUX guile-1.8.7-gcc45.patch 410 RMD160 45a86c32d38bb970832b925c171bf5578f40ad61 SHA1 c439fc297c8b523e607a6dff89bda99e263eecdc SHA256 0b9f7b11a70e131384836e76b5013fd30096a4dbbf09f404e4022c1d274799eb
 AUX slibtest.patch 2916 RMD160 770b65dca197515aef7b06f98dbbf18daf019609 SHA1 2c19bff9b9087735267e19425ed3bcde3664b6a2 SHA256 df098410fd7a27b66e2d5f28763d048484635ddf3010b54739d58deb7803b9ff
 DIST guile-1.6.8.tar.gz 3114052 RMD160 9c2c6a6afe2adce458e30e97da782ae18ce75b5c SHA1 5c244f730d7aaee32db4b0cc77b688f74a5caa71 SHA256 3d4ab874f90f5c2003229be29488ba2aa6fe1f0317774283360530d5d9236011
 DIST guile-1.8.4.tar.gz 3821388 RMD160 58a502e553519b7f4e409ede361ad12141f20fec SHA1 1e80fe242acfde2bfa39fd1e8409a8f010e24e2b SHA256 ca03762565291708b6fbcda4224570e59889795651d3bbb5a380ff6d2c69e1b3
@@ -13,6 +17,13 @@ EBUILD guile-1.8.4.ebuild 2208 RMD160 b835240de302dc2ea8247fe1648a93b93984dc88 S
 EBUILD guile-1.8.5-r1.ebuild 2964 RMD160 62df6e7cdb13bb77d0df0d85ca24bc817f1f7077 SHA1 ca8812f09fde0f8b487c520a1fe595d3fdc7872b SHA256 2ca5ce8a6a214e836d98b5d5aa7179c4a15bffe7a9fe1a45e0f1263f9c2350f6
 EBUILD guile-1.8.5.ebuild 2426 RMD160 f7cae837c44b9a5f86b243bb29fd9acead3ba89d SHA1 b9a9b0464c1742193edd9ad94307251454b29f3a SHA256 1f22d34aa444f0269686199c06c49e7c01dd9340ef323bcdc61b3fe2bdd138f4
 EBUILD guile-1.8.6.ebuild 2952 RMD160 a555e1a128a770ffa649783c5a95a05e72f6ae97 SHA1 6bc5d3179e7ee8ce276bf100bcce9df1d71b1f3d SHA256 b6ac475fa6dd34bf93d6555e15197892f07473b94e5032fa0f96e3213ae24470
-EBUILD guile-1.8.7.ebuild 2925 RMD160 753b002788017e727c6731b3e4dbd3146e770aab SHA1 2dce97bb10a5ad3517f6629885777c599a9204d6 SHA256 3eeb2ebe9534b67aa298641141b29f500fb285065d53135dd8d4b4e0bf07eab5
-MISC ChangeLog 21574 RMD160 ffd214848f27b02ec7c9c841020256acf05aae20 SHA1 4d98b352ab5608cd43f67f2d3f870d3240d82902 SHA256 ebcd0f7e47c9136521505c113eb397391bc1e95585985eed41137a7feb9c8418
+EBUILD guile-1.8.7.ebuild 2980 RMD160 804adf66afb54811b8c680499b2757626dca2ae0 SHA1 420ae55db1ff7f9ef73ea285fefc512c8fbf0020 SHA256 73bc9fd3349cc210784bb97d1d166cfbe61e0ddbe7920db37f5332f2dfa8d668
+MISC ChangeLog 21743 RMD160 9b64a1c3a2fe611ba82b161a4c6cb179def8dab9 SHA1 cd896d575cd7a54391a8c5b39bbec3da2da74aa4 SHA256 e1ed6174a474e994ac7a5eb52a797b69fcc292297483eefabb74bc944451092b
 MISC metadata.xml 1055 RMD160 e9a2a4c3c6629e0a521791f59c373ce1e8b68220 SHA1 fb4541c5f46e23719cc55024c2ab31344bf73f13 SHA256 87841c9e125b7de272c87c8abcc3e9c53c6934cec6f4fe5e3ad60c09566bbbff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwCAjMACgkQiqiDRvmkBmIbqQCg0Swmyiq09PQsd7FRJU60J7jN
+x20AnRcIsD33DBl/ielVDbQVWpw9kwrI
+=M2sU
+-----END PGP SIGNATURE-----
diff --git a/dev-scheme/guile/files/guile-1.8.7-gcc45.patch b/dev-scheme/guile/files/guile-1.8.7-gcc45.patch
new file mode 100644
index 000000000000..18e28b1326b1
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.7-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing docs build with gcc-4.5
+
+http://bugs.gentoo.org/317175
+
+Patch scavenged from
+http://lists.gnu.org/archive/html/guile-devel/2009-11/msg00078.html
+
+--- libguile/guile-snarf-docs.in
++++ libguile/guile-snarf-docs.in
+@@ -23,4 +23,4 @@
+ ## Let the user override the preprocessor autoconf found.
+ test -n "${CPP+set}" || CPP="@CPP@"
+ 
+-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
++${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
diff --git a/dev-scheme/guile/guile-1.8.7.ebuild b/dev-scheme/guile/guile-1.8.7.ebuild
index cd4e9e0e3db3..63426ef05edb 100644
--- a/dev-scheme/guile/guile-1.8.7.ebuild
+++ b/dev-scheme/guile/guile-1.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7.ebuild,v 1.2 2009/12/14 19:30:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7.ebuild,v 1.3 2010/05/30 06:10:46 dirtyepic Exp $
 
 EAPI=1
 inherit eutils autotools flag-o-matic elisp-common
@@ -30,6 +30,7 @@ src_unpack() {
 
 	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
 	epatch "${FILESDIR}/${P}-fix_tests.patch"
+	epatch "${FILESDIR}"/${P}-gcc45.patch  # 317175
 
 #	cp configure.in configure.in.old