Trivial fixes for latest automake(1.13) and makeinfo-5*, fix bug #467064 and bug #464044, sed hack by Arfrever Frehtes Taifersar Arahesis [arfrever.fta gmail com] and texinfo patch by Cyprien Nicolas (fulax) [gentoo-bugzie fulax fr]

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x3AC579B91BC03656

4 files changed, 93 insertions, 11 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index 94b31375de88..d600262a54f0 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-scheme/guile
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.102 2013/04/24 21:30:07 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.103 2013/04/24 22:53:08 pchrist Exp $
+
+  24 Apr 2013; Panagiotis Christopoulos <pchrist@gentoo.org>
+  guile-1.8.8-r1.ebuild, +files/guile-1.8.8-makeinfo-5.patch:
+  Trivial fixes for latest automake(1.13) and makeinfo-5*, fix bug #467064 and
+  bug #464044, sed hack by Arfrever Frehtes Taifersar Arahesis [arfrever.fta
+  gmail com] and texinfo patch by Cyprien Nicolas (fulax) [gentoo-bugzie fulax
+  fr]
 
   24 Apr 2013; Panagiotis Christopoulos <pchrist@gentoo.org>
   guile-1.8.8-r1.ebuild:
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 466843ca4646..d2f8f28add05 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -4,17 +4,18 @@ Hash: SHA256
 AUX 50guile-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
 AUX guile-1.8.8-fix_guile-config.patch 494 SHA256 08e4d837a663fc27b037e64f8dd89d89ababb3ed13f1e7845109a0f901f3b0c4 SHA512 3ef2bcb31d5b80dfa2f23b8802b98af713230e59aafe773ca3fd847fbdc7759ebb2d19cead1b6b362a6fa504dfff0c2036d5359aa82b601d664eb2a49a98c970 WHIRLPOOL f6ccd01b09a7aab46fab36464ab49539c9dddb954cc2d1ed709074175273df306d8527bae0d3d83f212903693af00fdf087533611ea416036b1c557ebc0fd283
 AUX guile-1.8.8-gcc46.patch 1004 SHA256 9f11b3095ed4aa622a58e3a0805e49f56c258e81c9813c5053cea980cd93948b SHA512 0ace93548dde387c344e13f083d79227cd09506e0cf58ac0892f25c43bfcefe9071e83912b921fba120262884fa92aaabe4d07f8337d89b6da73f0f2c077dcfa WHIRLPOOL cf2ff22da564656387c7a42985d8c4fd004ff411739e1a081f71931c458287bf1166079f5a39b842f7e8b988e62e24e04d541e125340f0256c62b23de602d80b
+AUX guile-1.8.8-makeinfo-5.patch 2361 SHA256 f1bfbe27280f6105735a2b4f0cf7883a9a825d4df756b74663112612b7a72438 SHA512 a69ed6cf2fd87c6f3d61cc914eed960fcdebaa151778b1ecf04f1774e6dddf07d17bf90fb3243a08e8c231e391843201d0ba26debedef33199d8dd75f8cbcd09 WHIRLPOOL c392c00f99d68cba17db8f14c68dc153f9cf146a3a6e197c4101959e93eb634a451cf8cdf957216f1c24fafcebf377a93e81682d5c0692506a0dd4c7ac00fa48
 DIST guile-1.8.8.tar.gz 3956654 SHA256 c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0 WHIRLPOOL 104810030b5dae16805595a5b398e5a7e600771b64b08d5ff686036e2f273dcec3829a16e4cdb1dbb9db5813f2e225476f83e0535a789bc570fc2fc15a76dbe2
 DIST guile-2.0.0.tar.gz 5564966 SHA256 7ba4ebd54d5b16840424172a14b2d10c76821bda9336fab5055b29fc288ec67b
-EBUILD guile-1.8.8-r1.ebuild 2856 SHA256 02ce411b8e29b26063ad87845e05fcedeacb8f59b8c61c247b418dc61db6f40c SHA512 4f71e3d1092d65bee6cd3026067faf21fabaedc999b5a74ac94731aa92ffb38ed82c447efbd2e408587530711b56f1c85a3e6071a914ab06822e54154a6da645 WHIRLPOOL 36cb66161505f9df03dd8380caa5bef6c53f16383a51fa9d9c75c6acd37276017302f6e88e4a0e19b2adbf772dabbff6a83792515b2d933aac9e7b11122ea493
+EBUILD guile-1.8.8-r1.ebuild 2990 SHA256 1a1e97fd44179511b53c51d5bd1d8fa2103da1aa664c62fd1f11cac72e243e9e SHA512 0d8bf885829e4af53e85f8ef6920a8bf7b4d9ca44a1afe3f464cb646e97274bd78865110a843ce22d7fa11704c3d657a4e98a4621d754a39becd421ac495c62d WHIRLPOOL 95a7bec300f67a0614d0121adcfaefa710e0f889ebb1091be5f19eb872695de310279b027118cc06168e861925f2e4982cc0d6e06a133d6deab9b9dd35200d5d
 EBUILD guile-2.0.0.ebuild 2359 SHA256 a805e62c1b2a604925a4eaa35070575053f553a7045533366cf4708dce73f9ce SHA512 11fd2937ef77ea45a8606a3b0629bca558b0ef0a9ef43c85269e3ec83838ce4ed5a6259c2ba6ce12b8b3077d5259aa43ba21e7542ceb9987e62866aa0eb7a55b WHIRLPOOL bf8c90e831a92b38271043f5f697b00c73a2d510521b19963dd7d157cd4e0883d4abe4147498af8ef9a6f57acde8ac9f964d09909c0cff3384da0d9c816b4794
-MISC ChangeLog 25530 SHA256 744fc565cecb90ba524836b71b2b5a07f92e17874bfa53a015c5ce72a2b2ea8f SHA512 7ee24b472f5a4570d8d5786c19e2c7a7a8e71eb52ab659254608c3665ef91087b790f4df8e1a0b29f2fe77c7f277578cfbd57f5a526853ec6872d6ac96c38a53 WHIRLPOOL 00eb5ff00b7f1076d91a6018587c7ceca253aee890890a8f6613da9a9e910264f00e3c574fecfc57aacc6cd954a2cecacd690e9c00ed6a5b252fcbb0e886b32f
+MISC ChangeLog 25895 SHA256 dc64395d8087d56da4d74bc0ddcd8561bb45949037fa0c654b0bbab62d687047 SHA512 70b6387e51c23f9d9d066ada9eb01210c2b84ff4edae2d1963c1bef4c4ab505c5efeccefde6f8115dee029431ec04b9625f25f437fb29e75a254cc99e817d8c7 WHIRLPOOL a59fce79b05f8dd3286e0dd656c676ce9a94be1cf243ec176410352d514fe73a9285e1159100a53ed5a6a6395c7494732bee11d67554ccbf1f0834c19e1e07e7
 MISC metadata.xml 939 SHA256 bec92c2558ecc371364a598a582a19b43dff9a809fe732d150e9b209b76f17ca SHA512 ca2dd2db48025f250b4ddaeea40a6119c00bdbc7c6d8167f274fffa9155ae64083a3ccb1cff272abd3cdfc108f555f9f04beb10532ce7174db50ce96d0a4f1eb WHIRLPOOL 75f94d8db3b573829322c06a6a388775cb9b6302624c345f492a650b6ac644d2a48021b16b436786e138eb8753f9ed3354df4e5944bd92f2a3b7b4819ff91155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iIoEAREIAEoFAlF4TuVDFIAAAAAAEgAocGNocmlzdEBnZW50b28ub3JnMEE4ODEw
-MzBDRDQ0RkRCMkEwMDFFNzZFM0FDNTc5QjkxQkMwMzY1NgAKCRA6xXm5G8A2VnYp
-AKCL3CsEbgEFREJVIatrSiUrs/qZ0gCeKISzhC5WSgVCQd4Jn4V0uoBf/LQ=
-=h/5v
+iIoEAREIAEoFAlF4YllDFIAAAAAAEgAocGNocmlzdEBnZW50b28ub3JnMEE4ODEw
+MzBDRDQ0RkRCMkEwMDFFNzZFM0FDNTc5QjkxQkMwMzY1NgAKCRA6xXm5G8A2Vjg/
+AJ4xtgI1a5dLDHmbPSgJXSE0vhcH6ACggKZ1V8qASayHfD0I8qGlEWEdyUU=
+=StBo
 -----END PGP SIGNATURE-----
diff --git a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
new file mode 100644
index 000000000000..9f3a02c18c65
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
@@ -0,0 +1,71 @@
+From 937da0f2604ea208ec56517c5a41e582f316a246 Mon Sep 17 00:00:00 2001
+From: Cyprien Nicolas <cyp@fulax.fr>
+Date: Thu, 18 Apr 2013 23:45:23 +0200
+Subject: [PATCH] Fix texinfo files for makeinfo-5.1
+
+---
+ doc/ref/api-options.texi | 2 +-
+ doc/ref/api-utility.texi | 2 +-
+ doc/ref/fdl.texi         | 2 +-
+ doc/ref/gh.texi          | 4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/ref/api-options.texi b/doc/ref/api-options.texi
+index 7b7a6e0..6ce7291 100644
+--- a/doc/ref/api-options.texi
++++ b/doc/ref/api-options.texi
+@@ -377,9 +377,9 @@ configure @emph{reading}, @emph{printing}, @emph{debugging} or
+ * User level options interfaces::
+ * Reader options::
+ * Printing options::
+-* Debugger options::
+ * Evaluator options::
+ * Evaluator trap options::
++* Debugger options::
+ * Examples of option use::
+ @end menu
+ 
+diff --git a/doc/ref/api-utility.texi b/doc/ref/api-utility.texi
+index 4a90212..9a4f3cc 100644
+--- a/doc/ref/api-utility.texi
++++ b/doc/ref/api-utility.texi
+@@ -657,7 +657,7 @@ Return 1 if @var{x} is a Scheme-level hook, 0 otherwise.
+ @end deftypefn
+ 
+ 
+-@subsubsection Handling Scheme-level hooks from C code
++@subsubheading Handling Scheme-level hooks from C code
+ 
+ Here is an example of how to handle Scheme-level hooks from C code using
+ the above functions.
+diff --git a/doc/ref/fdl.texi b/doc/ref/fdl.texi
+index 17fe148..4866055 100644
+--- a/doc/ref/fdl.texi
++++ b/doc/ref/fdl.texi
+@@ -408,7 +408,7 @@ as a draft) by the Free Software Foundation.
+ @end enumerate
+ 
+ @page
+-@appendixsubsec ADDENDUM: How to use this License for your documents
++@appendixsec ADDENDUM: How to use this License for your documents
+ 
+ To use this License in a document you have written, include a copy of
+ the License in the document and put the following copyright and
+diff --git a/doc/ref/gh.texi b/doc/ref/gh.texi
+index 95dfd92..bbd3af1 100644
+--- a/doc/ref/gh.texi
++++ b/doc/ref/gh.texi
+@@ -995,8 +995,8 @@ These correspond to the Scheme @code{(cons a b)} and @code{(list l0 l1
+ 
+ @deftypefun SCM gh_car (SCM @var{obj})
+ @deftypefunx SCM gh_cdr (SCM @var{obj})
+-@dots{}
+-
++@deftypefunx SCM gh_c[ad][ad]r (SCM @var{obj})
++@deftypefunx SCM gh_c[ad][ad][ad]r (SCM @var{obj})
+ @deftypefunx SCM gh_c[ad][ad][ad][ad]r (SCM @var{obj})
+ These correspond to the Scheme @code{(caadar ls)} procedures etc @dots{}
+ @end deftypefun
+-- 
+1.8.2.1
+
diff --git a/dev-scheme/guile/guile-1.8.8-r1.ebuild b/dev-scheme/guile/guile-1.8.8-r1.ebuild
index 98fb5341addc..c33704ce11ae 100644
--- a/dev-scheme/guile/guile-1.8.8-r1.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.8-r1.ebuild,v 1.15 2013/04/24 21:30:07 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.8-r1.ebuild,v 1.16 2013/04/24 22:53:08 pchrist Exp $
 
 EAPI=3
-WANT_AUTOMAKE=1.12
 inherit eutils autotools flag-o-matic elisp-common
 
 DESCRIPTION="Scheme interpreter"
@@ -29,9 +28,13 @@ SLOT="12"
 MAJOR="1.8"
 
 src_prepare() {
-	#
 	epatch "${FILESDIR}/${P}-fix_guile-config.patch" \
-		"${FILESDIR}"/${P}-gcc46.patch
+		"${FILESDIR}/${P}-gcc46.patch" \
+		"${FILESDIR}/${P}-makeinfo-5.patch"
+	sed \
+		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
+		-e "/AM_PROG_CC_STDC/d" \
+		-i guile-readline/configure.in
 	eautoreconf
 }