diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-10-17 09:18:31 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-10-17 09:18:31 +0000 |
| commit | 5ee4bcc29cef32cc043a652b12ba3208e7a06919 (patch) | |
| tree | 6833c762aae694409d9963279fc8f66311a5240f /dev-scheme | |
| parent | amd64 stable, bug #525496 (diff) | |
| download | historical-5ee4bcc29cef32cc043a652b12ba3208e7a06919.tar.gz historical-5ee4bcc29cef32cc043a652b12ba3208e7a06919.tar.bz2 historical-5ee4bcc29cef32cc043a652b12ba3208e7a06919.zip | |
Fix building with texinfo-5 (#464044)
Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-scheme')
| -rw-r--r-- | dev-scheme/guile/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-scheme/guile/Manifest | 21 | ||||
| -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 |
4 files changed, 33 insertions, 22 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/Manifest b/dev-scheme/guile/Manifest index 47ce82f3cd79..6d2ec183c299 100644 --- a/dev-scheme/guile/Manifest +++ b/dev-scheme/guile/Manifest @@ -4,27 +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-gtexinfo-5.patch 460 SHA256 bae4abbfb50e895ff12d7d49192b64e64be4ca270d424a59ad209c0c67bc281f SHA512 19185a96bb6dcf7f1cac1908633d65d8cb673148469553cce4099256d05a94688834a61ddc0a18957f9fe253fffb2821817b4b29a4a604e8c152debb6e3323a6 WHIRLPOOL 2c0249fae9e0197cddca53d84743f9134e6e7f15f3862953f3fc36d4554f6539f80e2d67cc604c6c25c099e5667512f4fc6204e091142d5af07e2943c4f34a96 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 SHA512 44b5b703455eed28fc3981a067d8e0afd47b73bceb4d161c8d1db763db59adeb4add661424a41691bd00c7f4c54c5b02fefe9cd6cf94250eabab04848a2db3b2 WHIRLPOOL 066fcec5cffc217e233eb7c83eaef4fbbdaac7ada15acef5ebb2fbb937b8060c795a365bdc4c361965e452258db6d87bc637706370d951a2ed57f7337c52c06c -EBUILD guile-1.8.8-r1.ebuild 3000 SHA256 d7dfef0d2918976908459bb6f11f88b05285ec0e89333a51e2bdd02ac1ca794f SHA512 73f774d87c41ad15ba57c636c609ce696287477b77a5ed9bbd517810043bad165f3d43669320249b0930754adcf373d67ec3ed93e5a9da7b373a620b89bb55fb WHIRLPOOL b787a9a4a8ace658667d0b7146a2326f61519a147d5a044c1b6f5a1b80eb7965653a6f957a4cf7b80df22788049b9cbef97648ac34ab024bfca574d890607fcf +EBUILD guile-1.8.8-r1.ebuild 2987 SHA256 30c631e64fcf2170aca1e7e57b8e47d672ed30f0953b2ebaf0a081ae5052b986 SHA512 4579e109c30ee6c3f8f899fad1b49aa18402b4c8356653f24209afabff7785cfe4c3499ba4d72e5f36f898e8206afd3c7db3dbeb37b0812c08705b8d45c5a991 WHIRLPOOL cbff010ffc8e85cdfd85d66342cc4eb67541ce897f0ae3fd4cd8a9e197e1f11c465c46e06d64afd497e8b5d1ca851a59a80151d7ff4eba2f59a17b27c1acf041 EBUILD guile-2.0.0.ebuild 2359 SHA256 a805e62c1b2a604925a4eaa35070575053f553a7045533366cf4708dce73f9ce SHA512 11fd2937ef77ea45a8606a3b0629bca558b0ef0a9ef43c85269e3ec83838ce4ed5a6259c2ba6ce12b8b3077d5259aa43ba21e7542ceb9987e62866aa0eb7a55b WHIRLPOOL bf8c90e831a92b38271043f5f697b00c73a2d510521b19963dd7d157cd4e0883d4abe4147498af8ef9a6f57acde8ac9f964d09909c0cff3384da0d9c816b4794 -MISC ChangeLog 25991 SHA256 7c4591dea70700fb53ec1df095ea05dc8a79478bda45f91704565748089d584c SHA512 48a752b77de7494222a65575a3cd4d64bf6f8ba597d84715da8e468e13091f4091528e86872472fa254c6bd97792385bfb170a9993c672a515a19cfee63875df WHIRLPOOL e23b4f0c9752fd0c03a062dda607061ba9bbf7c3213078fcb5f21307eca0372ee48d76c6e906f3bf7bcf002a93d9ca83113f9e04662f966854992f017468eb80 +MISC ChangeLog 26139 SHA256 52b752617f8e59d8c3bc44273d95d4f3d85e21a4ffad2f32171dca218bdb284f SHA512 634a924a70c5720023f2d8a8566815254c141592779f5f8fd4437fccc3ff1897d106da95d39b76af7a03abb62651f94fb188570f695b43e884abc357b35ea794 WHIRLPOOL 3de1b1a8de9411b9cf33c62304be5fd355136eec399005e21e8e39093aba578c12d92e3f17bf1b02a3c013dd738c47c6594731c6bd98279bcaf5449215b53843 MISC metadata.xml 939 SHA256 bec92c2558ecc371364a598a582a19b43dff9a809fe732d150e9b209b76f17ca SHA512 ca2dd2db48025f250b4ddaeea40a6119c00bdbc7c6d8167f274fffa9155ae64083a3ccb1cff272abd3cdfc108f555f9f04beb10532ce7174db50ce96d0a4f1eb WHIRLPOOL 75f94d8db3b573829322c06a6a388775cb9b6302624c345f492a650b6ac644d2a48021b16b436786e138eb8753f9ed3354df4e5944bd92f2a3b7b4819ff91155 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJTllKOAAoJEPGu1DbS6WIAF7cP/2/8a/iF44fkFNh688PNacG2 -LajgxyMCpwGQ9fiQTI5ZkfOZMNcdU+DIy0FO3QkEukroXzca4B8JDwYtHgPLvoBS -5iAQ9LrosWfxdB2usw404gpaQVSCo8wtm+kvGAfkgtmYj2N4jD52sUST7AVpyHfM -uW49CqF3f2dIku22f4AqAhBq2jvg1ya/VLOGpHWCG5Nraq8yTaIHeJcTzfDERJy1 -XJ+Qi8bI5sRTQT1qaC+A+YG5s7QeXzn2b8hCH8cVSiE7PoEwN07w8myT51ymJDmn -oXU8TYKQ2Wb6Pwp299snJVgMkUicTha5J82hBKtvnFfrWs0UUmHjYf8hZEOiU5i4 -KLFml1vFfw7N3sMX05DgJnVFNpUeMIZfUrt82QSnw1DvucoiYoiW1+q2kKB2tp52 -tI+Bdrd0lKgXnSrWg3RJAFm8iKka7z258dZHzQYOQEXv+CBX57lNe7LekM0L+8iY -CSOuLxowSy0vLGwRflgNeMdNK6Ui6+ULbBMDZysyGzNoIguMUoXV5lpRdXT9ej3O -90jx44bRA94kY3c6gJlPX5khWU3e35sDht9knCR1EFHUpdOCb43Cm1D4tdXKw9eP -RSSu8io4/ivHm6C6mQwtAYZZsRStyZ3QXvyifY7C0Bnh45fxiKJo2KhjjNqXfWOF -WbR4qKyHPJRfOUAGkrAL -=1A70 +iEUEAREIAAYFAlRA3ucACgkQCaWpQKGI+9RM0gCWL67uqpWRUuIdootE7HQFbVvq +CQCeKBVhAEam3yP8utATfuMwlH7ML/I= +=Pfuv -----END PGP SIGNATURE----- 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 |