commit: d7f036035ff474032d277484cbdb33225328d8d9 Author: Cyprien Nicolas (fulax) <gentoo <AT> fulax <DOT> fr> AuthorDate: Sun Jun 16 15:25:53 2019 +0000 Commit: Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com> CommitDate: Sun Jun 16 15:25:53 2019 +0000 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=d7f03603
dev-scheme/guile: SLOT, EAPI7, add pre-3.0 releases, cleanup app-admin/eselect-guile: Drop package package.mask: Update masks for guile app-admin/eselect-guile/ChangeLog | 19 -- .../eselect-guile/eselect-guile-1.2-r1.ebuild | 33 --- app-admin/eselect-guile/files/guile.eselect | 247 --------------------- app-admin/eselect-guile/files/guile.eselect.5 | 98 -------- ...-Fix-configure.in-macro-for-automake-1.13.patch | 38 ---- ...-guile-readline-configure-from-.in-to-.ac.patch | 202 ----------------- .../3742d778fbc6ea879437c19aeebe09179dceffdf.patch | 41 ---- dev-scheme/guile/files/50guile-gentoo.el | 4 - .../files/guile-1.8.8-config-with-readline.patch | 30 --- .../guile/files/guile-1.8.8-fix_guile-config.patch | 14 -- ...uile-1.8.8-fix_stack-grow-direction-check.patch | 53 ----- .../guile/files/guile-1.8.8-makeinfo-5.patch | 71 ------ .../guile/files/guile-2.2.3-gentoo-sandbox.patch | 10 + dev-scheme/guile/guile-1.8.8-r3.ebuild | 118 ---------- dev-scheme/guile/guile-2.0.11.ebuild | 56 ----- dev-scheme/guile/guile-2.0.9-r1.ebuild | 88 -------- dev-scheme/guile/guile-2.2.4-r1.ebuild | 78 +++++++ dev-scheme/guile/guile-2.9.2.ebuild | 77 +++++++ dev-scheme/guile/guile-999.ebuild | 97 -------- dev-scheme/guile/guile-9999.ebuild | 84 +++++++ dev-scheme/guile/metadata.xml | 10 +- profiles/package.mask | 23 +- 22 files changed, 257 insertions(+), 1234 deletions(-) diff --git a/app-admin/eselect-guile/ChangeLog b/app-admin/eselect-guile/ChangeLog deleted file mode 100644 index d7de2d23..00000000 --- a/app-admin/eselect-guile/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -# ChangeLog for app-admin/eselect-guile -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*eselect-guile-1.2-r1 (19 Apr 2013) - - 19 Apr 2013; Cyprien Nicolas (fulax) <c.nicolas+gen...@gmail.com> - +eselect-guile-1.2-r1.ebuild, -eselect-guile-1.1.ebuild, - -eselect-guile-1.2.ebuild, -files/1.2/guile.eselect, - -files/1.2/guile.eselect.5, files/guile.eselect, files/guile.eselect.5: - app-admin/eselect-guile-1.2-r1: Add a call to 'clean' on pkg_prerm - -*eselect-guile-1.2 (02 Oct 2012) - - 02 Oct 2012; Cyprien Nicolas <c.nicolas+b...@gmail.com> +files/1.2/guile.eselect, - +files/1.2/guile.eselect.5, +eselect-guile-1.2.ebuild: - version bump: EAPI 4, fix 'update ifunset' bug (it was ignored currently). - Remove 'GUILE_LOAD_PATH' from env.d file, as it breaks the not eselect'd - guile version. Drop pkg_prerm phase. diff --git a/app-admin/eselect-guile/eselect-guile-1.2-r1.ebuild b/app-admin/eselect-guile/eselect-guile-1.2-r1.ebuild deleted file mode 100644 index ccd6d96d..00000000 --- a/app-admin/eselect-guile/eselect-guile-1.2-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Manage multiple Guile versions on one system" -HOMEPAGE="https://www.gentoo.org/proj/en/lisp/scheme/"; -#SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -# Versions prior to guile-1.8.8-r2 aren't properly slotted -DEPEND="" -RDEPEND=">=app-admin/eselect-1.2.6 - !<dev-scheme/guile-1.8.8-r3" - -# We don't have any source directory to work on. -S="${T}" - -src_install() { - insinto /usr/share/eselect/modules - doins "${FILESDIR}"/guile.eselect - doman "${FILESDIR}"/guile.eselect.5 - #dodoc ChangeLog -} - -pkg_prerm() { - # Cleanup remaining symlinks - eselect guile clean -} diff --git a/app-admin/eselect-guile/files/guile.eselect b/app-admin/eselect-guile/files/guile.eselect deleted file mode 100644 index 5f323a71..00000000 --- a/app-admin/eselect-guile/files/guile.eselect +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id: $ -# -# DOCUMENTATION -# Following actions possible -# * show do_show() -# * list do_list() -# * set do_set() -# * update do_update() -# * clean do_clean() -# -# Behaviour: -# do_show(): -# Checks if /usr/bin/guile is a link and if the target exists, -# if yes, it outputs the currently linked Guile version. -# If it is no symlink, the user is told so, the same if there is -# no /usr/bin/guile or the target does not exist. -# do_list(): List all available versions of GNU Guile -# do_set(): Set a version to be target of the symlink. -# do_update(): Set the target to the highest version available -# (optionally: only if not set) -# do_clean(): Remove all set symlinks (for pkg_prerm) - -DESCRIPTION="Manage /usr/bin/guile* versions" -MAINTAINER="sch...@gentoo.org" -SVN_DATE='$Date: $' -VERSION=$(svn_date_to_version "${SVN_DATE}") - -BINARYLIST="guile-snarf guile-config guile-tools guile guild" -MANPAGELIST="guile" - -find_targets() { - # Return the list of available Guile binaries - local j - for j in "${EROOT}"/usr/bin/guile-[0-9]*; do - [[ -f ${j} ]] && basename ${j} - done -} - -remove_envfile() { - # When cleaning symlinks this takes care of the info documentation settings - rm -f "${EROOT}/etc/env.d/50guile" -} - -set_envfile() { - # Define INFOPATH environment variable in env file - [[ -d ${EROOT}/usr/share/info/guile-$1 ]] || return 1 - echo "INFOPATH=${EPREFIX}/usr/share/info/guile-$1" >"${EROOT}/etc/env.d/50guile" -} - -remove_symlinks() { - # Remove existing symlinks to binaries, man pages, - # m4 file, and the env file (own function) - local f - for f in ${BINARYLIST}; do - rm -f "${EROOT}/usr/bin/${f}" - done - for f in ${MANPAGELIST}; do - rm -f "${EROOT}"/usr/share/man/man1/${f}.1* - done - rm -f "${EROOT}"/usr/share/aclocal/guile.m4 - remove_envfile -} - -set_bin_symlinks() { - # Set symlinks to binaries in /usr/bin/ - local target=${1} f - for f in ${BINARYLIST}; do - # set symlink only if target binary actually exists - if [[ -f ${EROOT}/usr/bin/${f}-${target} ]]; then - ln -s "${f}-${target}" "${EROOT}/usr/bin/${f}" || die \ - "Couldn't set ${f}-${target} ${EROOT}/usr/bin/${f} symlink" - fi - done -} - -set_m4_symlinks() { - # Set symlink to guile.m4 - local target=${1} - if [[ -f ${EROOT}/usr/share/aclocal/guile-${target}.m4 ]]; then - ln -s "guile-${target}.m4" "${EROOT}"/usr/share/aclocal/guile.m4 \ - || die "Couldn't set guile-${target}.m4 guile.m4 symlink" - fi -} - -set_man_symlinks() { - # Set symlinks to man pages - local target=${1} extension f i - for f in ${MANPAGELIST}; do - for i in "${EROOT}"/usr/share/man/man1/${f}-${target}.1*; do - if [[ -f ${i} ]]; then - # target file exists; determine compress extension - extension=${i##*/${f}-${target}.1} - ln -s "${f}-${target}.1${extension}" \ - "${EROOT}/usr/share/man/man1/${f}.1${extension}" - fi - done - done -} - -set_symlinks() { - # Set symlinks to binaries and man pages, update info path - local target=$1 targets major - # target may be specified by its name or its index - if is_number "${target}"; then - # numeric index, find the target's name - targets=( $(find_targets) ) - [[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \ - || die -q "Number out of range: ${1}" - target=${targets[target-1]} - fi - - # is the target valid, i.e. does a Guile binary with this name exist? - [[ -f ${EROOT}/usr/bin/${target} ]] \ - || die -q "Target \"${1}\" doesn't appear to be valid!" - - echo "Switching guile to ${target} ..." - remove_symlinks || die -q "Couldn't remove existing symlink" - - major=${target#guile-} - set_bin_symlinks "${major}" - set_m4_symlinks "${major}" - set_man_symlinks "${major}" - set_envfile "${major}" - - # update /etc/profile.env from /etc/env.d files - do_action env update noldconfig - - return 0 -} - -test_for_root() { - # checks if the user has rights to modify /usr/bin/ - [[ -w ${EROOT}/usr/bin ]] || die -q "You need root privileges!" -} - -### show action ### - -describe_show() { - echo "Show the current target of the Guile symlink" -} - -do_show() { - [[ $# -gt 0 ]] && die -q "Too many parameters" - - write_list_start "Current target of Guile symlink:" - if [[ -L ${EROOT}/usr/bin/guile && -e ${EROOT}/usr/bin/guile ]]; then - write_kv_list_entry \ - "$(basename "$(readlink "${EROOT}/usr/bin/guile")")" "" - elif [[ -e ${EROOT}/usr/bin/guile ]]; then - write_kv_list_entry \ - "(not a symlink or target of symlink does not exist)" "" - else - write_kv_list_entry "(unset)" "" - fi -} - -### list action ### - -describe_list() { - echo "List available Guile symlink targets" -} - -do_list() { - [[ $# -gt 0 ]] && die -q "Too many parameters" - - local i targets - targets=( $(find_targets) ) - - for (( i = 0; i < ${#targets[@]}; i++ )); do - # Highlight the currently chosen version - [[ ${targets[i]} = \ - $(basename "$(readlink "${EROOT}/usr/bin/guile")") ]] \ - && targets[i]=$(highlight_marker "${targets[i]}") - done - write_list_start "Available Guile symlink targets:" - write_numbered_list -m "(none found)" "${targets[@]}" -} - -### set action ### - -describe_set() { - echo "Set a new Guile symlink" -} - -describe_set_options() { - echo "target : Target name or number (from 'list' action)" -} - -describe_set_parameters() { - echo "<target>" -} - -do_set() { - [[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to" - [[ $# -gt 1 ]] && die -q "Too many parameters" - test_for_root - - if [[ -e ${EROOT}/usr/bin/guile && ! -L ${EROOT}/usr/bin/guile ]]; then - die -q "${EROOT}/usr/bin/guile exists but is not a symlink" - fi - - set_symlinks "${1}" || die -q "Couldn't set a new symlink" -} - -### update action ### - -describe_update() { - echo "Automatically update the Guile symlink" -} - -describe_update_options() { - echo "ifunset : Do not override currently set version" -} - -do_update() { - [[ -z $1 || $1 = ifunset || $1 = --if-unset ]] || die -q "Usage error" - [[ $# -gt 1 ]] && die -q "Too many parameters" - - [[ $# -eq 1 && -L ${EROOT}/usr/bin/guile ]] && return 0 - - test_for_root - - if [[ -L ${EROOT}/usr/bin/guile ]]; then - # this is not redundant: "update" is called in pkg_postrm() of guile - # and should clean up any dead symlinks if no valid target exists - remove_symlinks || die -q "Couldn't remove existing symlink" - elif [[ -e ${EROOT}/usr/bin/guile ]]; then - die -q "${EROOT}/usr/bin/guile exists but is not a symlink" - fi - - local targets=( $(find_targets) ) - if [[ ${#targets[@]} -gt 0 ]]; then - set_symlinks "${targets[${#targets[@]}-1]}" \ - || die -q "Couldn't set a new symlink" - fi -} - -### Clean action -describe_clean() { - echo "Remove any existing symlinks" -} - -do_clean() { - remove_symlinks -} diff --git a/app-admin/eselect-guile/files/guile.eselect.5 b/app-admin/eselect-guile/files/guile.eselect.5 deleted file mode 100644 index c2be8583..00000000 --- a/app-admin/eselect-guile/files/guile.eselect.5 +++ /dev/null @@ -1,98 +0,0 @@ -.\" Copyright 2007-2013 Gentoo Foundation -.\" Distributed under the terms of the GNU General Public License v2 -.\" $Id: $ -.\" -.TH guile.eselect 5 "August 2011" "Gentoo Linux" eselect -.SH NAME -guile.eselect \- The Guile management module for Gentoo's eselect -.SH SYNOPSIS -.B eselect guile -.RB [ help | usage | version ] -.br -.B eselect guile list -.br -.B eselect guile set -.I target -.br -.B eselect guile show -.br -.B eselect guile update -.RB [ ifunset ] -.SH DESCRIPTION -.B eselect -is Gentoo's configuration and management tool. It features modules -that care for the individual administrative tasks. -.SH ACTION: LIST -.B eselect guile list -.br -List all installed Guile versions - -# eselect guile list -.br -Available Guile symlink targets: -.br - [1] guile-1.8 - [2] guile-2.0 * -.SH ACTION: SET -.B eselect guile set -.I target -.br -Activate the selected Guile version. -.I target -can be either an identification number given by -.B eselect guile list -or the name of one installed version. -.\" To avoid runtime issues with -.\" incompatible byte-code from the previously selected Emacs version, run -.\" .B emacs-updater -a rebuild -.\" to remerge all needed packages. - -# eselect guile set 1 -.br -Switching guile to guile-1.8 ... -.SH ACTION: SHOW -.B eselect guile show -.br -Print the currently activated Guile version. - -# eselect guile show -.br -Current target of Guile symlink: -.br - emacs-1.8 -.SH ACTION: UPDATE -.B eselect guile update -.RB [ ifunset ] -.br -Update the guile symlink to the last available version. If option -.B ifunset -is given, an existing implementation is not overridden. - -The update process consists in creating symlinks for guile's binaries, -man page and aclocal.m4. It also generates an environment file. -The symlinks concerns: -.br -* /usr/bin/guil[de] and /usr/bin/guile-{config,snarf,tools} binaries; -.br -* /usr/share/aclocal/guile.m4; -.br -* guile(1) man page. -.br -The environment file (/etc/env.d/50guile) defines INFOPATH and -GUILE_LOAD_PATH. - -# eselect guile update -.br -Switching guile to guile-2.0 ... -.SH AUTHORS -Cyprien Nicolas <c...@fulax.fr> -.br -This man page is based on eselect-emacs man-page whose authors are: -.br -Christian Faulhammer <fa...@gentoo.org> -.br -Ulrich Mueller <u...@gentoo.org> -.SH SEE ALSO -.BR eselect (1) -.SH REVISION -$Id: $ 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 deleted file mode 100644 index d738f0b1..00000000 --- a/dev-scheme/guile/files/0001-Fix-configure.in-macro-for-automake-1.13.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 80a8464c41ca1f30a19936d5524104c5297cc95b Mon Sep 17 00:00:00 2001 -From: Cyprien Nicolas <cypr...@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 deleted file mode 100644 index 0723c6d2..00000000 --- a/dev-scheme/guile/files/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch +++ /dev/null @@ -1,202 +0,0 @@ -From 19be2c9fcf92b6ec92fd051e114d074b496cce70 Mon Sep 17 00:00:00 2001 -From: Cyprien Nicolas <cypr...@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-gu...@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-gu...@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/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch b/dev-scheme/guile/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch deleted file mode 100644 index 051469f9..00000000 --- a/dev-scheme/guile/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3742d778fbc6ea879437c19aeebe09179dceffdf Mon Sep 17 00:00:00 2001 -From: Ludovic Courtès <l...@gnu.org> -Date: Mon, 14 May 2012 17:21:35 +0000 -Subject: Honor $(program_transform_name) for the `guile-tools' symlink. - -Fixes <http://bugs.gnu.org/11451>. -Reported by Cyprien Nicolas <c.nico...@gmail.com>. - -* meta/Makefile.am (install-data-hook): Honor $(program_transform_name). ---- -diff --git a/meta/Makefile.am b/meta/Makefile.am -index f26fc44..a05730d 100644 ---- a/meta/Makefile.am -+++ b/meta/Makefile.am -@@ -1,7 +1,8 @@ - ## Process this file with Automake to create Makefile.in - ## Jim Blandy <j...@red-bean.com> --- September 1997 - ## --## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. -+## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011, -+## 2012 Free Software Foundation, Inc. - ## - ## This file is part of GUILE. - ## -@@ -28,8 +29,12 @@ EXTRA_DIST= \ - - # What we now call `guild' used to be known as `guile-tools'. - install-data-hook: -- cd $(DESTDIR)$(bindir) && rm -f guile-tools$(EXEEXT) && \ -- $(LN_S) guild$(EXEEXT) guile-tools$(EXEEXT) -+ guild="`echo $(ECHO_N) guild \ -+ | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \ -+ guile_tools="`echo $(ECHO_N) guile-tools \ -+ | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \ -+ cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" && \ -+ $(LN_S) "$$guild" "$$guile_tools" - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = guile-2.0.pc --- -cgit v0.9.0.2 diff --git a/dev-scheme/guile/files/50guile-gentoo.el b/dev-scheme/guile/files/50guile-gentoo.el deleted file mode 100644 index d7098b12..00000000 --- a/dev-scheme/guile/files/50guile-gentoo.el +++ /dev/null @@ -1,4 +0,0 @@ - -;;; guile site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") diff --git a/dev-scheme/guile/files/guile-1.8.8-config-with-readline.patch b/dev-scheme/guile/files/guile-1.8.8-config-with-readline.patch deleted file mode 100644 index 31637bb7..00000000 --- a/dev-scheme/guile/files/guile-1.8.8-config-with-readline.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur guile-1.8.8.orig/configure.in guile-1.8.8/configure.in ---- guile-1.8.8.orig/configure.in 2013-02-03 19:54:05.000000000 +0100 -+++ guile-1.8.8/configure.in 2013-02-03 19:56:37.000000000 +0100 -@@ -57,7 +57,13 @@ - # - #-------------------------------------------------------------------- - --AC_CONFIG_SUBDIRS(guile-readline) -+GUILE_READLINE -+if test "x$with_readline" = xyes; then -+ AC_CONFIG_SUBDIRS(guile-readline) -+ GUILE_READLINE="guile-readline" -+fi -+ -+AC_SUBST([GUILE_READLINE]) - - #-------------------------------------------------------------------- - -diff -Nur guile-1.8.8.orig/Makefile.am guile-1.8.8/Makefile.am ---- guile-1.8.8.orig/Makefile.am 2013-02-03 19:54:06.000000000 +0100 -+++ guile-1.8.8/Makefile.am 2013-02-03 19:55:14.000000000 +0100 -@@ -24,7 +24,7 @@ - # - AUTOMAKE_OPTIONS = 1.10 - --SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \ -+SUBDIRS = oop libguile ice-9 guile-config @GUILE_READLINE@ emacs \ - scripts srfi doc examples test-suite benchmark-suite lang am - - bin_SCRIPTS = guile-tools diff --git a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch b/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch deleted file mode 100644 index 2b04426e..00000000 --- a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruN 1/configure.in 2/configure.in ---- 1/configure.in 2010-12-13 17:24:39.000000000 +0000 -+++ 2/configure.in 2011-04-29 11:53:39.000000000 +0000 -@@ -1522,8 +1522,8 @@ - ####################################################################### - - dnl Tell guile-config what flags guile users should compile and link with. --GUILE_LIBS="$LDFLAGS $LIBS" --GUILE_CFLAGS="$CPPFLAGS $PTHREAD_CFLAGS" -+GUILE_LIBS="$LIBS" -+GUILE_CFLAGS="$PTHREAD_CFLAGS" - AC_SUBST(GUILE_LIBS) - AC_SUBST(GUILE_CFLAGS) - diff --git a/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch b/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch deleted file mode 100644 index a9fe2265..00000000 --- a/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 62bc1072c19e81bb0f9e42a5034e7ab8c27d3b94 Mon Sep 17 00:00:00 2001 -From: Ludovic Courtès <l...@gnu.org> -Date: Sun, 01 Jul 2012 15:32:03 +0000 -Subject: Fix stack growth direction check. - -Backport of 236f901b0e2b18093421e2e440cf80d00fb98757 from `stable-2.0'. -Fixes <http://bugs.gnu.org/11845>. -Reported by Cyprien Nicolas <c.nico...@gmail.com>. - -* configure.in: Pull stack growth direction check from upstream - Autoconf. See - http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00035.html - for a discussion. ---- -diff --git a/configure.in b/configure.in -index f058841..682e31f 100644 ---- a/configure.in -+++ b/configure.in -@@ -1244,23 +1244,20 @@ SCM_I_GSC_STACK_GROWS_UP=0 - AC_RUN_IFELSE([AC_LANG_SOURCE( - [AC_INCLUDES_DEFAULT - int --find_stack_direction () -+find_stack_direction (int *addr, int depth) - { -- static char *addr = 0; -- auto char dummy; -- if (addr == 0) -- { -- addr = &dummy; -- return find_stack_direction (); -- } -- else -- return (&dummy > addr) ? 1 : -1; -+ int dir, dummy = 0; -+ if (! addr) -+ addr = &dummy; -+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; -+ dir = depth ? find_stack_direction (addr, depth - 1) : 0; -+ return dir + dummy; - } - - int --main () -+main (int argc, char **argv) - { -- return find_stack_direction () < 0; -+ return find_stack_direction (0, argc + !argv + 20) < 0; - }])], - [SCM_I_GSC_STACK_GROWS_UP=1], - [], --- -cgit v0.9.0.2 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 deleted file mode 100644 index 9f3a02c1..00000000 --- a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 937da0f2604ea208ec56517c5a41e582f316a246 Mon Sep 17 00:00:00 2001 -From: Cyprien Nicolas <c...@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/files/guile-2.2.3-gentoo-sandbox.patch b/dev-scheme/guile/files/guile-2.2.3-gentoo-sandbox.patch new file mode 100644 index 00000000..1cded2d2 --- /dev/null +++ b/dev-scheme/guile/files/guile-2.2.3-gentoo-sandbox.patch @@ -0,0 +1,10 @@ +diff --git a/test-suite/standalone/test-out-of-memory b/test-suite/standalone/test-out-of-memory +index 2216512..0ed6079 100755 +--- a/test-suite/standalone/test-out-of-memory ++++ b/test-suite/standalone/test-out-of-memory +@@ -5,2 +5,5 @@ exec guile -q -s "$0" "$@" + ++; Gentoo's sandbox does not handle OOM gracefully ++(exit 77) ++ + (unless (defined? 'setrlimit) diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild deleted file mode 100644 index eca8a997..00000000 --- a/dev-scheme/guile/guile-1.8.8-r3.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit eutils autotools flag-o-matic elisp-common - -DESCRIPTION="Scheme interpreter" -HOMEPAGE="http://www.gnu.org/software/guile/"; -SRC_URI="mirror://gnu/guile/${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs +networking nls +readline +regex +threads" -RESTRICT="!regex? ( test )" - -DEPEND=" - app-admin/eselect-guile - >=dev-libs/gmp-4.1 - >=sys-devel/libtool-1.5.6 - sys-devel/gettext - emacs? ( virtual/emacs ) - readline? ( sys-libs/readline ) -" -RDEPEND="${DEPEND}" - -# Guile seems to contain some slotting support, /usr/share/guile/ is slotted, -# but there are lots of collisions. Most in /usr/share/libguile. Therefore -# I'm slotting this in the same slot as guile-1.6* for now. -SLOT="12" -MAJOR="1.8" - -src_prepare() { - epatch "${FILESDIR}/${P}-fix_guile-config.patch" - 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 -} - -src_configure() { - # see bug #178499 - filter-flags -ftree-vectorize - - #will fail for me if posix is disabled or without modules -- hkBst - econf \ - --program-suffix="-${MAJOR}" \ - --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \ - --disable-error-on-warning \ - --disable-static \ - --enable-posix \ - $(use_enable networking) \ - $(use_enable regex) \ - $(use deprecated || use_enable discouraged) \ - $(use_enable deprecated) \ - $(use_enable emacs elisp) \ - $(use_enable nls) \ - --disable-rpath \ - $(use_enable debug-freelist) \ - $(use_enable debug-malloc) \ - $(use_enable debug guile-debug) \ - $(use_with threads) \ - $(use_with readline) \ - --with-modules \ - EMACS=no -} - -src_compile() { - emake || die "make failed" - - # Above we have disabled the build system's Emacs support; - # for USE=emacs we compile (and install) the files manually - if use emacs; then - cd emacs - elisp-compile *.el || die - fi -} - -src_install() { - einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed" - - # Maybe there is a proper way to do this? Symlink handled by eselect - mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed" - - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die - - # necessary for registering slib, see bug 206896 - keepdir /usr/share/guile/site - - if use emacs; then - elisp-install ${PN} emacs/*.{el,elc} || die - elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die - fi -} - -pkg_postinst() { - [ "${EROOT}" == "/" ] && pkg_config - use emacs && elisp-site-regen - eselect guile update ifunset -} - -pkg_postrm() { - use emacs && elisp-site-regen - eselect guile update ifunset -} - -pkg_config() { - if has_version dev-scheme/slib; then - einfo "Registering slib with guile" - install_slib_for_guile - fi -} - -_pkg_prerm() { - rm -f "${EROOT}"/usr/share/guile/site/slibcat -} diff --git a/dev-scheme/guile/guile-2.0.11.ebuild b/dev-scheme/guile/guile-2.0.11.ebuild deleted file mode 100644 index 832e1202..00000000 --- a/dev-scheme/guile/guile-2.0.11.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit eutils - -DESCRIPTION="Scheme interpreter. Also The GNU extension language" -HOMEPAGE="http://www.gnu.org/software/guile/"; -SRC_URI="mirror://gnu/guile/${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -#KEYWORDS="~amd64" -# Work in progress. No keywords. -# TODO: -# 1. Emacs support -# 2. Testing agains revdeps -# 3. Check file placing -# 4. ... -KEYWORDS="" -IUSE="networking +regex +deprecated nls debug-malloc debug +threads static" - -RDEPEND=" - dev-libs/gmp - virtual/libiconv - virtual/libintl - sys-devel/libtool - dev-libs/boehm-gc - dev-libs/libunistring - dev-libs/libffi" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - econf \ - --disable-rpath \ - $(use_enable static) \ - --disable-error-on-warning \ - $(use_enable debug-malloc) \ - $(use_enable debug guile-debug) \ - --enable-posix \ - $(use_enable networking) \ - $(use_enable regex) \ - $(use_enable deprecated) \ - $(use_enable nls) \ - $(use_with threads) \ - --with-modules -} - -src_install() { - einstall || die "einstall failed" - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die -} diff --git a/dev-scheme/guile/guile-2.0.9-r1.ebuild b/dev-scheme/guile/guile-2.0.9-r1.ebuild deleted file mode 100644 index 122d0d28..00000000 --- a/dev-scheme/guile/guile-2.0.9-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit flag-o-matic - -WANT_AUTOMAKE=1.12 - -DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" -HOMEPAGE="http://www.gnu.org/software/guile/"; -SRC_URI="mirror://gnu/guile/${P}.tar.gz" - -LICENSE="LGPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="debug debug-malloc +deprecated +networking nls +regex +threads" - -RDEPEND=" - app-admin/eselect-guile - >=dev-libs/boehm-gc-7.0[threads?] - dev-libs/gmp - dev-libs/libffi - >=dev-libs/libunistring-0.9.3 - sys-devel/gettext - >=sys-devel/libtool-1.5.6" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -SLOT="2" -MAJOR="2.0" - -src_configure() { - # see bug #178499 - filter-flags -ftree-vectorize - - #will fail for me if posix is disabled or without modules -- hkBst - econf \ - --program-suffix="-${MAJOR}" \ - --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \ - --disable-error-on-warning \ - --disable-static \ - --enable-posix \ - $(use_enable networking) \ - $(use_enable regex) \ - $(use_enable deprecated) \ - $(use_enable nls) \ - --disable-rpath \ - $(use_enable debug-malloc) \ - $(use_enable debug guile-debug) \ - $(use_with threads) \ - --with-modules -} - -src_compile() { - emake || die "make failed" -} - -src_install() { - einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed" - - # Maybe there is a proper way to do this? Symlink handled by eselect - mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed" - - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die - - # necessary for registering slib, see bug 206896 - keepdir /usr/share/guile/site -} - -pkg_postinst() { - [ "${EROOT}" == "/" ] && pkg_config - eselect guile update ifunset -} - -pkg_postrm() { - eselect guile update ifunset -} - -pkg_config() { - if has_version dev-scheme/slib; then - einfo "Registering slib with guile" - install_slib_for_guile - fi -} - -_pkg_prerm() { - rm -f "${EROOT}"/usr/share/guile/site/slibcat -} diff --git a/dev-scheme/guile/guile-2.2.4-r1.ebuild b/dev-scheme/guile/guile-2.2.4-r1.ebuild new file mode 100644 index 00000000..8a2a06f1 --- /dev/null +++ b/dev-scheme/guile/guile-2.2.4-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +MAJOR="2.2" +DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" +HOMEPAGE="https://www.gnu.org/software/guile/"; +SRC_URI="mirror://gnu/guile/${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="2.2/2.2-1" # libguile-2.2.so.1 => 2.2-1 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls +REQUIRED_USE="regex" # workaround for bug 596322 +RESTRICT="strip" + +RDEPEND=" + >=dev-libs/boehm-gc-7.0:=[threads?] + dev-libs/gmp:= + virtual/libffi:= + dev-libs/libltdl:= + dev-libs/libunistring:0= + sys-libs/ncurses:0= + sys-libs/readline:0=" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + sys-devel/libtool + sys-devel/gettext" + +PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" ) +DOCS=( GUILE-VERSION HACKING README ) + +src_configure() { + # see bug #178499 + filter-flags -ftree-vectorize + + econf \ + --program-suffix="-${MAJOR}" \ + --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \ + --disable-error-on-warning \ + --disable-rpath \ + --disable-static \ + --enable-posix \ + --without-libgmp-prefix \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --without-libltdl-prefix \ + --without-libreadline-prefix \ + --without-libunistring-prefix \ + $(use_enable debug guile-debug) \ + $(use_enable debug-malloc) \ + $(use_enable deprecated) \ + $(use_enable networking) \ + $(use_enable nls) \ + $(use_enable regex) \ + $(use_with threads) +} + +src_install() { + default + + # Maybe there is a proper way to do this? Symlink handled by eselect + mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed" + + # From Novell + # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0 + dodir /usr/share/gdb/auto-load/$(get_libdir) + mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die + + # necessary for registering slib, see bug 206896 + keepdir /usr/share/guile/site + + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-scheme/guile/guile-2.9.2.ebuild b/dev-scheme/guile/guile-2.9.2.ebuild new file mode 100644 index 00000000..18703848 --- /dev/null +++ b/dev-scheme/guile/guile-2.9.2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +MAJOR="3.0" +DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" +HOMEPAGE="https://www.gnu.org/software/guile/"; +SRC_URI="mirror://gnu-alpha/guile/${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="3.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug debug-malloc +deprecated +networking +regex +threads" # upstream recommended +networking +REQUIRED_USE="regex" # workaround for bug 596322 +RESTRICT="strip" + +RDEPEND=" + >=dev-libs/boehm-gc-7.2:=[threads?] + >=dev-libs/gmp-4.2:= + virtual/libffi:= + >=dev-libs/libltdl-1.5.6:= + >=dev-libs/libunistring-0.9.3:0= + sys-libs/ncurses:0= + sys-libs/readline:0=" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + sys-devel/libtool + sys-devel/gettext" + +PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" ) +DOCS=( GUILE-VERSION HACKING README ) + +src_configure() { + # see bug #178499 + filter-flags -ftree-vectorize + + econf \ + --program-suffix="-${MAJOR}" \ + --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \ + --disable-error-on-warning \ + --disable-rpath \ + --disable-static \ + --enable-posix \ + --without-libgmp-prefix \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --without-libltdl-prefix \ + --without-libreadline-prefix \ + --without-libunistring-prefix \ + $(use_enable debug guile-debug) \ + $(use_enable debug-malloc) \ + $(use_enable deprecated) \ + $(use_enable networking) \ + $(use_enable regex) \ + $(use_with threads) +} + +src_install() { + default + + # Maybe there is a proper way to do this? Symlink handled by eselect + mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed" + + # From Novell + # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0 + dodir /usr/share/gdb/auto-load/$(get_libdir) + mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die + + # necessary for registering slib, see bug 206896 + keepdir /usr/share/guile/site + + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-scheme/guile/guile-999.ebuild b/dev-scheme/guile/guile-999.ebuild deleted file mode 100644 index af840540..00000000 --- a/dev-scheme/guile/guile-999.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils flag-o-matic -inherit git-2 - -DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" -HOMEPAGE="http://www.gnu.org/software/guile/"; -#SRC_URI="mirror://gnu/guile/${P}.tar.gz" -EGIT_REPO_URI="git://git.sv.gnu.org/guile.git" - -LICENSE="LGPL-3" -KEYWORDS="" -IUSE="networking +regex +deprecated nls debug-malloc debug +threads" - -RDEPEND=" - app-admin/eselect-guile - >=dev-libs/boehm-gc-7.0[threads?] - dev-libs/gmp - dev-libs/libffi - dev-libs/libunistring - sys-devel/gettext - >=sys-devel/libtool-1.5.6" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -# Not 2.2; File colisions with 2.0 on libguilereadline-v-18 -SLOT="2" -MAJOR="2.2" - -src_prepare() { - # for live ebuilds - if [ -x autogen.sh ]; then - ./autogen.sh || die - fi -} - -src_configure() { - # see bug #178499 - filter-flags -ftree-vectorize - - #will fail for me if posix is disabled or without modules -- hkBst - econf \ - --program-suffix="-${MAJOR}" \ - --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \ - --disable-error-on-warning \ - --disable-static \ - --enable-posix \ - $(use_enable networking) \ - $(use_enable regex) \ - $(use_enable deprecated) \ - $(use_enable nls) \ - --disable-rpath \ - $(use_enable debug-malloc) \ - $(use_enable debug guile-debug) \ - $(use_with threads) \ - --with-modules -} - -src_compile() { - emake || die "make failed" -} - -src_install() { - einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed" - - # Maybe there is a proper way to do this? Symlink handled by eselect - mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed" - - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die - - # necessary for registering slib, see bug 206896 - keepdir /usr/share/guile/site -} - -pkg_postinst() { - [ "${EROOT}" == "/" ] && pkg_config - eselect guile update ifunset -} - -pkg_postrm() { - eselect guile update ifunset -} - -pkg_config() { - if has_version dev-scheme/slib; then - einfo "Registering slib with guile" - install_slib_for_guile - fi -} - -_pkg_prerm() { - rm -f "${EROOT}"/usr/share/guile/site/slibcat -} diff --git a/dev-scheme/guile/guile-9999.ebuild b/dev-scheme/guile/guile-9999.ebuild new file mode 100644 index 00000000..8ae5dfd8 --- /dev/null +++ b/dev-scheme/guile/guile-9999.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic git-r3 + +MAJOR="3.0" +DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" +HOMEPAGE="https://www.gnu.org/software/guile/"; +#SRC_URI="mirror://gnu-alpha/guile/${P}.tar.gz" +EGIT_REPO_URI="git://git.sv.gnu.org/guile.git" + +LICENSE="LGPL-3+" +SLOT="3.0" +KEYWORDS="" +IUSE="debug debug-malloc +deprecated +networking +regex +threads" # upstream recommended +networking +REQUIRED_USE="regex" # workaround for bug 596322 +RESTRICT="strip" + +RDEPEND=" + >=dev-libs/boehm-gc-7.2:=[threads?] + >=dev-libs/gmp-4.2:= + virtual/libffi:= + >=dev-libs/libltdl-1.5.6:= + >=dev-libs/libunistring-0.9.3:0= + sys-libs/ncurses:0= + sys-libs/readline:0=" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + sys-devel/libtool + sys-devel/gettext" + +PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" ) +DOCS=( GUILE-VERSION HACKING README ) + +src_prepare() { + default + + ./autogen.sh || die +} + +src_configure() { + # see bug #178499 + filter-flags -ftree-vectorize + + econf \ + --program-suffix="-${MAJOR}" \ + --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \ + --disable-error-on-warning \ + --disable-rpath \ + --disable-static \ + --enable-posix \ + --without-libgmp-prefix \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --without-libltdl-prefix \ + --without-libreadline-prefix \ + --without-libunistring-prefix \ + $(use_enable debug guile-debug) \ + $(use_enable debug-malloc) \ + $(use_enable deprecated) \ + $(use_enable networking) \ + $(use_enable regex) \ + $(use_with threads) +} + +src_install() { + default + + # Maybe there is a proper way to do this? Symlink handled by eselect + mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed" + + # From Novell + # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0 + dodir /usr/share/gdb/auto-load/$(get_libdir) + mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die + + # necessary for registering slib, see bug 206896 + keepdir /usr/share/guile/site + + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml index 77fb31d7..5b78ec86 100644 --- a/dev-scheme/guile/metadata.xml +++ b/dev-scheme/guile/metadata.xml @@ -1,20 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <herd>scheme</herd> - <maintainer> - <email>hk...@gentoo.org</email> + <maintainer type="project"> + <email>sch...@gentoo.org</email> + <name>Gentoo Scheme Project</name> </maintainer> <longdescription lang="en"> Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs. </longdescription> <use> - <flag name='debug-freelist'>Include garbage collector freelist debugging - code</flag> <flag name='debug-malloc'>Include malloc debugging code</flag> <flag name='deprecated'>Enable deprecated features</flag> - <flag name='discouraged'> (implied by deprecated) enable merely discouraged - features</flag> <flag name='networking'>Include networking interfaces</flag> <flag name='regex'> Include regular expression interfaces</flag> </use> diff --git a/profiles/package.mask b/profiles/package.mask index db8499be..e550ad31 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,21 +1,8 @@ +# Cyprien Nicolas (fulax) <gen...@fulax.fr> (16 Jun 2019) +# Experimental SLOT support +=dev-scheme/guile-2.2.4-r1 +=dev-scheme/guile-2.9.2 + # Cyprien Nicolas (fulax) <gen...@fulax.fr> (26 Jan 2013) # Mask texmacs imported in the overlay to test buildtime patches =app-office/texmacs-1.0.7.16-r2 - -# Cyprien Nicolas (fulax) <c.cnicolas+gen...@gmail.com> (24 Aug 2012) -# Mask app-admin/eselect-guile and dev-scheme/guile-2.0.6 as well, for -# the same reasons as below, wrt Bug #432526 by Juergen Rose and zmedico -app-admin/eselect-guile -=dev-scheme/guile-2.0.9 - -# Cyprien Nicolas <c.nicolas+gen...@gmail.com> (28 Apr 2011) -# Masked for several reasons pointed out by Marijn: -# Marijn Schouten <hk...@gentoo.org> (07 April 2011) -# Masked for number of issues, but can be used to -# 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-r3 - -# ASDF doesn't compile as built-in module -=dev-lisp/clisp-2.50_pre20130414
