[gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/files/, dev-scheme/guile/

["Cyprien Nicolas" <c.nicolas+gentoo@gmail.com>]

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