diff options
| -rw-r--r-- | dev-scheme/guile/Manifest | 15 | ||||
| -rw-r--r-- | dev-scheme/guile/files/0001-Fix-configure.in-macro-for-automake-1.13.patch | 38 | ||||
| -rw-r--r-- | dev-scheme/guile/files/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch | 202 | ||||
| -rw-r--r-- | dev-scheme/guile/guile-1.8.8-r3.ebuild | 3 | ||||
| -rw-r--r-- | profiles/package.mask | 2 |
5 files changed, 246 insertions, 14 deletions
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest index 6046ddf5..5e0fb4ba 100644 --- a/dev-scheme/guile/Manifest +++ b/dev-scheme/guile/Manifest @@ -1,6 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - +AUX 0001-Fix-configure.in-macro-for-automake-1.13.patch 1043 SHA256 67dfa1309971f515c4bdbc0f94c8f948d5916b5cb8c02373d2d574921ff8edd5 SHA512 88543aacf4e86cfef1a5e2fc2f65ba3b1229339c51361ff75049894cebcfcf60fa922fd4596473c22492476de6bdb9e579cb6408311724bc2362e974f67bcbbc WHIRLPOOL 814ddaecd34133b5077c9da67d5c0142da1b78ce99ae3a9a95b89d4556d721c24c190a180eb09c63040e088cf9be5cd512c59faf82a9086ce476a8da877db3ff +AUX 0002-Rename-guile-readline-configure-from-.in-to-.ac.patch 6154 SHA256 5103dd5ef168680ed3c24866f3c9da18bee952033cb7b6b46bc133c576f978c6 SHA512 62dbce19217b7afd7388cc7931663a58eb5edb1f173608938ef26a57bb5bdb91c9678a410dc932e01e254b5b365649ed86367fcd7a5aecc27837a1da1cdc3ed6 WHIRLPOOL 073f5fcf88ea705aa917f2c5a4f2e7a3f07141186f323869379ceec306222aa0ee11a014248a20a065d275bc83ee52355d67a3590af6ff538cc7e8b57ede7a47 AUX 3742d778fbc6ea879437c19aeebe09179dceffdf.patch 1502 SHA256 24b3cf6cf5706e5207aab8b1d8f61cc8291d66e97bcd403a42497eb4b904338c SHA512 2f5f440f04bb9e75a9cf133af85f3db4f712dd2a21acf40e93813baf268a2225b56e10eeab65bb7b7de41303d591183439c85e1f5f59be7f798c99b980411ecb WHIRLPOOL 2202e5dd61c5e574a2f7414b1e6e7774b03c59bd50e98d359c9e7123b167aefe60632c58b4d6cb4144ab322e38d8a8bfd7f51e3ff29543acb648ccd606d90ebe AUX 50guile-gentoo.el 74 SHA256 ad625c24e5bb48b001eb4a68d441f10037acf467f5f91f68106c538dbee965b5 SHA512 ae5622013d03217afa73d9244f1845a674a22f98c219f562a3e4e620d5ab4ccd6364d2986401f90d225a8a2bcf280408bf558b3600aefa5efff1cdacecf94284 WHIRLPOOL 7208b112c1d3fbf524762cd2286eb614eb90b5b6038161d43cd6a6eaf8a7063588a3a7fdd411cf93403b250c6bcd9501cc3e483a5128b2167a3c1e290b8323a4 AUX guile-1.8.8-config-with-readline.patch 1039 SHA256 99a060d24deb10701144572cfe7ee2619ccd90963d2c502bd36e3eecdf438c66 SHA512 de495f6b8273405c2dea905ebf08c14a2943b3a52a8ff6e734b59d7823416e4a4d23ac1c004f1a418e28ccaeaecd0be350d6b86cb1faf6ef6e1b7127bec4b802 WHIRLPOOL a1293b4596d2f8b4c0c7be3fb94f49e78b7dfeffaf95435f979c5fac30c5d5cf32c0e970ccccf684ca40e5769dc04feb68634d207b2d89e76528fbea86c05e5d @@ -9,15 +8,7 @@ AUX guile-1.8.8-fix_stack-grow-direction-check.patch 1427 SHA256 1035c3dbecccfce 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.9.tar.gz 7335306 SHA256 b24a112456702bf479395a1ac0b038fecafc8a252f6af798006312a7251315e7 SHA512 bc6dc05733085f807d6f6ef77b0565025d3fbd3fcbb8862a0cae54ca83fa731ba76fb3f33747eacfd01991ff4a5b996c73496df32dfaa56e21246a7094a4a83b WHIRLPOOL fefb184d166431414e08e58726bf08726d2971a0ed2064acf570e23c58c53aa9531117e6be808f11f86cd62fc13930bcc8b7d62975f8ed700f237cb8059205bb -EBUILD guile-1.8.8-r3.ebuild 3182 SHA256 c2d8544abd0640c387ccd2d07c970ca2bb0bf0496fb700ca871fbc24c859282f SHA512 bd7329c92f0e7019cd5465013e165a3565953a94fb5b20998112780bffadddebb2964ec8e8188ce592a42e61271373bc283b3806a69485685cf5e41d235c7334 WHIRLPOOL 405a5da46bcc626864519056a8014cfb94529fb5d7c174bf12976269e36d13ecae5aecd8322a1ffdfb348935738c8f750d05c1b4312a9287c969921dd4dd1ca7 +EBUILD guile-1.8.8-r3.ebuild 3318 SHA256 18159426b2e73c6cf4325075594a9645230399f2bed98c6b475a0b0545686e9a SHA512 2ea133137147eec9a5555e77b67c9aa91b69df92c18989ffbaa2319635ae61be71bbc2c5e6fc6738c35b1206e85029934135ba0b7c3f990acf3385a76971fa62 WHIRLPOOL 5016adb44a0c539094c3dfb48ad2f36bed1eaa4dce371fbc351ba3f4df3283eb6c548f2e6a6cd88f508e696ff0dbaf259568d79e38d568383b8aa7c93dac9128 EBUILD guile-2.0.9-r1.ebuild 2031 SHA256 c2072bce73554306f22e099a85db5facb0fc15a7127e5a60e611feb511bb6c89 SHA512 1bb3a45ad9fbdfdd0cbcff0747a6c27cbc009ec62904326b665aac9195d8f3ba2f642e937798202af3e7f2af3a9009eac9e5b00d6def9dfead1f91a550d01fd5 WHIRLPOOL e45c046f7663d888521b8e80dd91a9d7c9a260bf210359ae2cf0127cd860b3d80b9b24ed5f11cd6418a183ff0e7cf00aeba362584619a57b73744f131424db46 EBUILD guile-999.ebuild 2214 SHA256 d8dd4dfe4fe8bc0e2d1ccdb5fda3e0131cd57929b083cfb503d0616a33be4e31 SHA512 3250661e3324f741157ebe038926b67840debd808a784efc180e590edbe1b7588bbf99534bc3b30593b0ea0e39e8ef042ced3286c49e10493b1eb26076cb1fe0 WHIRLPOOL 9836658abaf7647313acee28399a4f8603a0be4b698f3b75c080ee221d3b53de48f1051d51889b4e1065f0cb59b74d16748f7a192fccc468d91dd590d08aa952 MISC metadata.xml 1002 SHA256 60781a2ffcda537e7cf6922542f398e646d219fae385f707f544cf3b27a62688 SHA512 80ad93f051ef2de4f4201d9cb23d169e78641f4983407bbcc408e8a6894d4f3aa63e373199280c16030dfb3c79d3086751937105f27778bdda4e8d48ff442b98 WHIRLPOOL 6e9e7fc47c415b425b34c45e31b9b3b2be907351555eab3714819e4076fc9c5e393ba0c54f18df44dbf90699c87ee2adbe753c3627ce371c95aeff7e95fcad58 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iIoEAREIAEoFAlF4UEtDFIAAAAAAEgAocGNocmlzdEBnZW50b28ub3JnMEE4ODEw -MzBDRDQ0RkRCMkEwMDFFNzZFM0FDNTc5QjkxQkMwMzY1NgAKCRA6xXm5G8A2VpPt -AJ9gi8BbYcwZXsaARrTubCHDZVBbCgCeOfdIuloP5y4D/fJexFAayhDLazc= -=q+9L ------END PGP SIGNATURE----- diff --git a/dev-scheme/guile/files/0001-Fix-configure.in-macro-for-automake-1.13.patch b/dev-scheme/guile/files/0001-Fix-configure.in-macro-for-automake-1.13.patch new file mode 100644 index 00000000..d738f0b1 --- /dev/null +++ b/dev-scheme/guile/files/0001-Fix-configure.in-macro-for-automake-1.13.patch @@ -0,0 +1,38 @@ +From 80a8464c41ca1f30a19936d5524104c5297cc95b Mon Sep 17 00:00:00 2001 +From: Cyprien Nicolas <cyprien@nicolas.tf> +Date: Thu, 25 Apr 2013 00:15:40 +0200 +Subject: [PATCH 1/2] Fix configure.in macro for automake-1.13 + +Reported through https://bugs.gentoo.org/show_bug.cgi?id=467064 +Fix by Arfrever Frehtes Taifersar Arahesis + +* Replace AM_CONFIG_HEADER by AC_CONFIG_HEADERS, the former + being deprecated since automake-1.13 + +--- + guile-readline/configure.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/guile-readline/configure.in b/guile-readline/configure.in +index 7c9d3d9..c17bee6 100644 +--- a/guile-readline/configure.in ++++ b/guile-readline/configure.in +@@ -9,14 +9,13 @@ AC_INIT(guile-readline, + + AC_CONFIG_AUX_DIR([.]) + AC_CONFIG_SRCDIR(readline.c) +-AM_CONFIG_HEADER([guile-readline-config.h]) ++AC_CONFIG_HEADERS([guile-readline-config.h]) + AM_INIT_AUTOMAKE([foreign no-define]) + + . $srcdir/../GUILE-VERSION + + AC_PROG_INSTALL + AC_PROG_CC +-AM_PROG_CC_STDC + AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL + +-- +1.7.11.7 + diff --git a/dev-scheme/guile/files/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch b/dev-scheme/guile/files/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch new file mode 100644 index 00000000..0723c6d2 --- /dev/null +++ b/dev-scheme/guile/files/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch @@ -0,0 +1,202 @@ +From 19be2c9fcf92b6ec92fd051e114d074b496cce70 Mon Sep 17 00:00:00 2001 +From: Cyprien Nicolas <cyprien@nicolas.tf> +Date: Thu, 25 Apr 2013 00:17:13 +0200 +Subject: [PATCH 2/2] Rename guile-readline/configure from .in to .ac + +* Rename guile-readline/configure.in to guile-readline/configure.ac. + Since automake-1.13, configure.in file produce a warning. + +--- + guile-readline/configure.ac | 86 +++++++++++++++++++++++++++++++++++++++++++++ + guile-readline/configure.in | 86 --------------------------------------------- + 2 files changed, 86 insertions(+), 86 deletions(-) + create mode 100644 guile-readline/configure.ac + delete mode 100644 guile-readline/configure.in + +diff --git a/guile-readline/configure.ac b/guile-readline/configure.ac +new file mode 100644 +index 0000000..c17bee6 +--- /dev/null ++++ b/guile-readline/configure.ac +@@ -0,0 +1,86 @@ ++AC_PREREQ(2.50) ++ ++dnl Don't use "echo -n", which is not portable (e.g., not available on ++dnl MacOS X). Instead, use `patsubst' to remove the newline. ++AC_INIT(guile-readline, ++ patsubst(m4_esyscmd(. ../GUILE-VERSION && echo ${GUILE_VERSION}), [ ++]), ++ [bug-guile@gnu.org]) ++ ++AC_CONFIG_AUX_DIR([.]) ++AC_CONFIG_SRCDIR(readline.c) ++AC_CONFIG_HEADERS([guile-readline-config.h]) ++AM_INIT_AUTOMAKE([foreign no-define]) ++ ++. $srcdir/../GUILE-VERSION ++ ++AC_PROG_INSTALL ++AC_PROG_CC ++AC_LIBTOOL_WIN32_DLL ++AC_PROG_LIBTOOL ++ ++dnl ++dnl Check for Winsock and other functionality on Win32 (*not* CygWin) ++dnl ++AC_CYGWIN ++AC_MINGW32 ++EXTRA_DEFS="" ++if test "$MINGW32" = "yes" ; then ++ if test $enable_shared = yes ; then ++ EXTRA_DEFS="-DSCM_IMPORT" ++ fi ++fi ++AC_SUBST(EXTRA_DEFS) ++ ++for termlib in ncurses curses termcap terminfo termlib ; do ++ AC_CHECK_LIB(${termlib}, tgoto, ++ [LIBS="-l${termlib} $LIBS"; break]) ++done ++ ++AC_CHECK_LIB(readline, readline) ++if test $ac_cv_lib_readline_readline = no; then ++ AC_MSG_WARN([libreadline was not found on your system.]) ++fi ++ ++AC_CHECK_FUNCS(siginterrupt rl_clear_signals rl_cleanup_after_signal) ++ ++dnl Check for modern readline naming ++AC_CHECK_FUNCS(rl_filename_completion_function) ++ ++dnl Check for rl_get_keymap. We only use this for deciding whether to ++dnl install paren matching on the Guile command line (when using ++dnl readline for input), so it's completely optional. ++AC_CHECK_FUNCS(rl_get_keymap) ++ ++AC_CACHE_CHECK([for rl_getc_function pointer in readline], ++ ac_cv_var_rl_getc_function, ++ [AC_TRY_LINK([ ++#include <stdio.h> ++#include <readline/readline.h>], ++ [printf ("%ld", (long) rl_getc_function)], ++ [ac_cv_var_rl_getc_function=yes], ++ [ac_cv_var_rl_getc_function=no])]) ++if test "${ac_cv_var_rl_getc_function}" = "yes"; then ++ AC_DEFINE(HAVE_RL_GETC_FUNCTION, 1, ++ [Define if your readline library has the rl_getc_function variable.]) ++fi ++ ++if test $ac_cv_lib_readline_readline = yes \ ++ -a $ac_cv_var_rl_getc_function = no; then ++ AC_MSG_WARN([*** libreadline is too old on your system.]) ++ AC_MSG_WARN([*** You need readline version 2.1 or later.]) ++fi ++ ++AC_CHECK_FUNCS(strdup) ++ ++. $srcdir/LIBGUILEREADLINE-VERSION ++AC_SUBST(LIBGUILEREADLINE_MAJOR) ++AC_SUBST(LIBGUILEREADLINE_INTERFACE_CURRENT) ++AC_SUBST(LIBGUILEREADLINE_INTERFACE_REVISION) ++AC_SUBST(LIBGUILEREADLINE_INTERFACE_AGE) ++AC_SUBST(LIBGUILEREADLINE_INTERFACE) ++ ++AC_SUBST(GUILE_EFFECTIVE_VERSION) ++ ++AC_CONFIG_FILES(Makefile ice-9/Makefile) ++AC_OUTPUT +diff --git a/guile-readline/configure.in b/guile-readline/configure.in +deleted file mode 100644 +index c17bee6..0000000 +--- a/guile-readline/configure.in ++++ /dev/null +@@ -1,86 +0,0 @@ +-AC_PREREQ(2.50) +- +-dnl Don't use "echo -n", which is not portable (e.g., not available on +-dnl MacOS X). Instead, use `patsubst' to remove the newline. +-AC_INIT(guile-readline, +- patsubst(m4_esyscmd(. ../GUILE-VERSION && echo ${GUILE_VERSION}), [ +-]), +- [bug-guile@gnu.org]) +- +-AC_CONFIG_AUX_DIR([.]) +-AC_CONFIG_SRCDIR(readline.c) +-AC_CONFIG_HEADERS([guile-readline-config.h]) +-AM_INIT_AUTOMAKE([foreign no-define]) +- +-. $srcdir/../GUILE-VERSION +- +-AC_PROG_INSTALL +-AC_PROG_CC +-AC_LIBTOOL_WIN32_DLL +-AC_PROG_LIBTOOL +- +-dnl +-dnl Check for Winsock and other functionality on Win32 (*not* CygWin) +-dnl +-AC_CYGWIN +-AC_MINGW32 +-EXTRA_DEFS="" +-if test "$MINGW32" = "yes" ; then +- if test $enable_shared = yes ; then +- EXTRA_DEFS="-DSCM_IMPORT" +- fi +-fi +-AC_SUBST(EXTRA_DEFS) +- +-for termlib in ncurses curses termcap terminfo termlib ; do +- AC_CHECK_LIB(${termlib}, tgoto, +- [LIBS="-l${termlib} $LIBS"; break]) +-done +- +-AC_CHECK_LIB(readline, readline) +-if test $ac_cv_lib_readline_readline = no; then +- AC_MSG_WARN([libreadline was not found on your system.]) +-fi +- +-AC_CHECK_FUNCS(siginterrupt rl_clear_signals rl_cleanup_after_signal) +- +-dnl Check for modern readline naming +-AC_CHECK_FUNCS(rl_filename_completion_function) +- +-dnl Check for rl_get_keymap. We only use this for deciding whether to +-dnl install paren matching on the Guile command line (when using +-dnl readline for input), so it's completely optional. +-AC_CHECK_FUNCS(rl_get_keymap) +- +-AC_CACHE_CHECK([for rl_getc_function pointer in readline], +- ac_cv_var_rl_getc_function, +- [AC_TRY_LINK([ +-#include <stdio.h> +-#include <readline/readline.h>], +- [printf ("%ld", (long) rl_getc_function)], +- [ac_cv_var_rl_getc_function=yes], +- [ac_cv_var_rl_getc_function=no])]) +-if test "${ac_cv_var_rl_getc_function}" = "yes"; then +- AC_DEFINE(HAVE_RL_GETC_FUNCTION, 1, +- [Define if your readline library has the rl_getc_function variable.]) +-fi +- +-if test $ac_cv_lib_readline_readline = yes \ +- -a $ac_cv_var_rl_getc_function = no; then +- AC_MSG_WARN([*** libreadline is too old on your system.]) +- AC_MSG_WARN([*** You need readline version 2.1 or later.]) +-fi +- +-AC_CHECK_FUNCS(strdup) +- +-. $srcdir/LIBGUILEREADLINE-VERSION +-AC_SUBST(LIBGUILEREADLINE_MAJOR) +-AC_SUBST(LIBGUILEREADLINE_INTERFACE_CURRENT) +-AC_SUBST(LIBGUILEREADLINE_INTERFACE_REVISION) +-AC_SUBST(LIBGUILEREADLINE_INTERFACE_AGE) +-AC_SUBST(LIBGUILEREADLINE_INTERFACE) +- +-AC_SUBST(GUILE_EFFECTIVE_VERSION) +- +-AC_CONFIG_FILES(Makefile ice-9/Makefile) +-AC_OUTPUT +-- +1.7.11.7 + diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild index 65757e7c..eca8a997 100644 --- a/dev-scheme/guile/guile-1.8.8-r3.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild @@ -3,7 +3,6 @@ # $Header: $ EAPI=5 -WANT_AUTOMAKE=1.12 inherit eutils autotools flag-o-matic elisp-common DESCRIPTION="Scheme interpreter" @@ -36,6 +35,8 @@ src_prepare() { epatch "${FILESDIR}/${P}-fix_stack-grow-direction-check.patch" epatch "${FILESDIR}/${P}-config-with-readline.patch" epatch "${FILESDIR}/${P}-makeinfo-5.patch" + epatch "${FILESDIR}/0001-Fix-configure.in-macro-for-automake-1.13.patch" + epatch "${FILESDIR}/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch" eautoreconf } diff --git a/profiles/package.mask b/profiles/package.mask index a662bbfd..db8499be 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -15,7 +15,7 @@ app-admin/eselect-guile # test against if people are impatient ;P # Known issues: # - doesn't build when boehm-gc is built without threads -=dev-scheme/guile-1.8.8-r2 +=dev-scheme/guile-1.8.8-r3 # ASDF doesn't compile as built-in module =dev-lisp/clisp-2.50_pre20130414 |