diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-10-17 09:18:30 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-10-17 09:18:30 +0000 |
| commit | 6c55360c2aba7b04a66e9a4811de0b7a698cbca9 (patch) | |
| tree | 77f7a76a48df7d5a0de44ce1c88e4fe47ef12785 /dev-scheme | |
| parent | amd64 stable, bug #525496 (diff) | |
| download | gentoo-2-6c55360c2aba7b04a66e9a4811de0b7a698cbca9.tar.gz gentoo-2-6c55360c2aba7b04a66e9a4811de0b7a698cbca9.tar.bz2 gentoo-2-6c55360c2aba7b04a66e9a4811de0b7a698cbca9.zip | |
Fix building with texinfo-5 (#464044)
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-scheme')
| -rw-r--r-- | dev-scheme/guile/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch | 15 | ||||
| -rw-r--r-- | dev-scheme/guile/guile-1.8.8-r1.ebuild | 13 |
3 files changed, 27 insertions, 7 deletions
diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog index cf20dd369a42..0d6a3d8e660f 100644 --- a/dev-scheme/guile/ChangeLog +++ b/dev-scheme/guile/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-scheme/guile # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.104 2014/06/10 00:34:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.105 2014/10/17 09:18:30 pacho Exp $ + + 17 Oct 2014; Pacho Ramos <pacho@gentoo.org> + +files/guile-1.8.8-gtexinfo-5.patch, guile-1.8.8-r1.ebuild: + Fix building with texinfo-5 (#464044) 10 Jun 2014; Mike Frysinger <vapier@gentoo.org> guile-1.8.8-r1.ebuild: Add arm64/m68k love. diff --git a/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch new file mode 100644 index 000000000000..d7fbda15c101 --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_tutorial_guile-tut.texi,v 1.1 2013/11/30 07:06:25 dsainty Exp $
+
+Compatibility with gtexinfo 5.2
+
+--- doc/tutorial/guile-tut.texi 2010-12-14 06:24:39.000000000 +1300
++++ doc/tutorial/guile-tut.texi 2013-11-30 19:44:28.304575529 +1300
+@@ -446,7 +446,7 @@
+ Schemer} from that list.}
+
+
+-@subsection Hello World
++@section Hello World
+ @cindex hello world
+
+ Our first program is the typical Scheme "hello world" program. Put the
\ No newline at end of file diff --git a/dev-scheme/guile/guile-1.8.8-r1.ebuild b/dev-scheme/guile/guile-1.8.8-r1.ebuild index c15e2ccc35ad..0e720d43674e 100644 --- a/dev-scheme/guile/guile-1.8.8-r1.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 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.17 2014/06/10 00:34:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.8-r1.ebuild,v 1.18 2014/10/17 09:18:30 pacho Exp $ -EAPI=3 +EAPI=5 inherit eutils autotools flag-o-matic elisp-common DESCRIPTION="Scheme interpreter" @@ -30,7 +30,8 @@ MAJOR="1.8" src_prepare() { epatch "${FILESDIR}/${P}-fix_guile-config.patch" \ "${FILESDIR}/${P}-gcc46.patch" \ - "${FILESDIR}/${P}-makeinfo-5.patch" + "${FILESDIR}/${P}-makeinfo-5.patch" \ + "${FILESDIR}/${P}-gtexinfo-5.patch" sed \ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \ -e "/AM_PROG_CC_STDC/d" \ @@ -63,7 +64,7 @@ src_configure() { } src_compile() { - emake || die "make failed" + emake # Above we have disabled the build system's Emacs support; # for USE=emacs we compile (and install) the files manually @@ -74,9 +75,9 @@ src_compile() { } src_install() { - einstall || die "install failed" + einstall - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die + dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS # texmacs needs this, closing bug #23493 dodir /etc/env.d |