* [gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2012-05-14 23:06 Cyprien Nicolas
0 siblings, 0 replies; 4+ messages in thread
From: Cyprien Nicolas @ 2012-05-14 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 859824b72668cca4e7985855ec389699b5933977
Author: Cyprien Nicolas (fulax) <c.nicolas+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon May 14 23:06:03 2012 +0000
Commit: Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Mon May 14 23:06:03 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=859824b7
dev-scheme/guile-2.0.5: Add upstream patch that correctly names /usr/bin/guile-tools to /usr/bin/guile-tools-2.0. Bump to EAPI 4
(Portage version: 2.2.0_alpha104/git/Linux i686, signed Manifest commit with key 0xBE63A96F)
---
.../3742d778fbc6ea879437c19aeebe09179dceffdf.patch | 41 ++++++++++++++++++++
dev-scheme/guile/guile-2.0.5.ebuild | 10 ++++-
2 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/dev-scheme/guile/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch b/dev-scheme/guile/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch
new file mode 100644
index 0000000..051469f
--- /dev/null
+++ b/dev-scheme/guile/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch
@@ -0,0 +1,41 @@
+From 3742d778fbc6ea879437c19aeebe09179dceffdf Mon Sep 17 00:00:00 2001
+From: Ludovic Courtès <ludo@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.nicolas@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 <jimb@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/guile-2.0.5.ebuild b/dev-scheme/guile/guile-2.0.5.ebuild
index 76e1125..d93d3e8 100644
--- a/dev-scheme/guile/guile-2.0.5.ebuild
+++ b/dev-scheme/guile/guile-2.0.5.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-2.0.0.ebuild,v 1.2 2011/04/12 18:20:24 mr_bones_ Exp $
-EAPI=3
-inherit eutils flag-o-matic elisp-common
+EAPI=4
+inherit autotools eutils flag-o-matic elisp-common
DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
HOMEPAGE="http://www.gnu.org/software/guile/"
@@ -28,6 +28,12 @@ RDEPEND="${DEPEND}"
SLOT="2"
MAJOR="2.0"
+src_prepare() {
+ epatch "${FILESDIR}/3742d778fbc6ea879437c19aeebe09179dceffdf.patch"
+ epatch_user
+ eautoreconf
+}
+
src_configure() {
# see bug #178499
filter-flags -ftree-vectorize
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2012-07-03 21:48 Cyprien Nicolas
0 siblings, 0 replies; 4+ messages in thread
From: Cyprien Nicolas @ 2012-07-03 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 56631f8f78afd6f46d29e1bdbd5cc0ee7978b9a2
Author: Cyprien Nicolas (fulax) <c.nicolas+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Jul 3 21:48:35 2012 +0000
Commit: Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Tue Jul 3 21:48:35 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=56631f8f
dev-scheme/guile-1.8.8-r2: Import upstream patch for bug #424475. No revbump as it fixes a build-time failure.
(Portage version: 2.2.0_alpha110/git/Linux i686, signed Manifest commit with key 0xBE63A96F)
---
...uile-1.8.8-fix_stack-grow-direction-check.patch | 53 ++++++++++++++++++++
dev-scheme/guile/guile-1.8.8-r2.ebuild | 8 ++--
2 files changed, 57 insertions(+), 4 deletions(-)
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
new file mode 100644
index 0000000..a9fe226
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch
@@ -0,0 +1,53 @@
+From 62bc1072c19e81bb0f9e42a5034e7ab8c27d3b94 Mon Sep 17 00:00:00 2001
+From: Ludovic Courtès <ludo@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.nicolas@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/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild
index ffac522..82fce01 100644
--- a/dev-scheme/guile/guile-1.8.8-r2.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.10 2011/07/09 11:18:15 xarthisius Exp $
+# $Header: $
-EAPI=3
+EAPI=4
inherit eutils autotools flag-o-matic elisp-common
DESCRIPTION="Scheme interpreter"
@@ -29,8 +29,8 @@ SLOT="12"
MAJOR="1.8"
src_prepare() {
- #
epatch "${FILESDIR}/${P}-fix_guile-config.patch"
+ epatch "${FILESDIR}/${P}-fix_stack-grow-direction-check.patch"
eautoreconf
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2013-02-03 19:07 Cyprien Nicolas
0 siblings, 0 replies; 4+ messages in thread
From: Cyprien Nicolas @ 2013-02-03 19:07 UTC (permalink / raw
To: gentoo-commits
commit: d3860a29c593a0e03ee64c5b3a8407532f9006ce
Author: Cyprien Nicolas (fulax) <gentoo <AT> fulax <DOT> fr>
AuthorDate: Sun Feb 3 19:07:16 2013 +0000
Commit: Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Sun Feb 3 19:07:16 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=d3860a29
dev-scheme/guile-1.8.8-r2: Add patch to enable/disable readline support. wrt bug 392553
Package-Manager: portage-2.2.0_alpha161
Manifest-Sign-Key: 0x3D79478FBE63A96F
---
.../files/guile-1.8.8-config-with-readline.patch | 30 ++++++++++++++++++++
dev-scheme/guile/guile-1.8.8-r2.ebuild | 10 ++++--
2 files changed, 37 insertions(+), 3 deletions(-)
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
new file mode 100644
index 0000000..31637bb
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-config-with-readline.patch
@@ -0,0 +1,30 @@
+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/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild
index 82fce01..8768661 100644
--- a/dev-scheme/guile/guile-1.8.8-r2.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -11,7 +11,7 @@ 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="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads"
+IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads +readline"
RESTRICT="!regex? ( test )"
DEPEND="
@@ -19,7 +19,9 @@ DEPEND="
>=dev-libs/gmp-4.1
>=sys-devel/libtool-1.5.6
sys-devel/gettext
- emacs? ( virtual/emacs )"
+ emacs? ( virtual/emacs )
+ readline? ( sys-libs/readline )
+"
RDEPEND="${DEPEND}"
# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
@@ -31,6 +33,7 @@ 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"
eautoreconf
}
@@ -56,6 +59,7 @@ src_configure() {
$(use_enable debug-malloc) \
$(use_enable debug guile-debug) \
$(use_with threads) \
+ $(use_with readline) \
--with-modules \
EMACS=no
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2013-04-18 21:53 Cyprien Nicolas
0 siblings, 0 replies; 4+ messages in thread
From: Cyprien Nicolas @ 2013-04-18 21:53 UTC (permalink / raw
To: gentoo-commits
commit: 5a6e35d8edeceae8e424dd0096839497752d6967
Author: Cyprien Nicolas (fulax) <gentoo <AT> fulax <DOT> fr>
AuthorDate: Thu Apr 18 21:52:54 2013 +0000
Commit: Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Thu Apr 18 21:52:54 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=5a6e35d8
dev-scheme/guile-1.8.8-r3: EAPI 5, IUSE order, +networking, bug 464044
Package-Manager: portage-2.2.01.21890-prefix
RepoMan-Options: --force
Manifest-Sign-Key: 0x3D79478FBE63A96F
---
.../guile/files/guile-1.8.8-makeinfo-5.patch | 71 ++++++++++++++++++++
...guile-1.8.8-r2.ebuild => guile-1.8.8-r3.ebuild} | 10 +--
2 files changed, 74 insertions(+), 7 deletions(-)
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 0000000..9f3a02c
--- /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-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
similarity index 90%
rename from dev-scheme/guile/guile-1.8.8-r2.ebuild
rename to dev-scheme/guile/guile-1.8.8-r3.ebuild
index 8768661..5f5cb95 100644
--- a/dev-scheme/guile/guile-1.8.8-r2.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
inherit eutils autotools flag-o-matic elisp-common
DESCRIPTION="Scheme interpreter"
@@ -11,7 +11,7 @@ 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="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads +readline"
+IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs +networking nls +readline +regex +threads"
RESTRICT="!regex? ( test )"
DEPEND="
@@ -34,6 +34,7 @@ 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"
eautoreconf
}
@@ -83,11 +84,6 @@ src_install() {
dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
- # Now handled by app-admin/eselect-guile
- ## texmacs needs this, closing bug #23493
- #dodir /etc/env.d
- #echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
-
# necessary for registering slib, see bug 206896
keepdir /usr/share/guile/site
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-18 21:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-03 21:48 [gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/files/, dev-scheme/guile/ Cyprien Nicolas
-- strict thread matches above, loose matches on Subject: below --
2013-04-18 21:53 Cyprien Nicolas
2013-02-03 19:07 Cyprien Nicolas
2012-05-14 23:06 Cyprien Nicolas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox