fix reader regression

(Portage version: 2.1.3.14)

4 files changed, 86 insertions, 1 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index 002286743731..0fbfa3fd3518 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/guile
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.29 2007/10/17 10:42:43 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.30 2007/10/18 10:41:59 hkbst Exp $
+
+*guile-1.8.3-r1 (18 Oct 2007)
+
+  18 Oct 2007; Marijn Schouten <hkBst@gentoo.org> +files/fix-reader-cr.diff,
+  +guile-1.8.3-r1.ebuild:
+  fix reader regression
 
 *guile-1.8.3 (17 Oct 2007)
 
diff --git a/dev-scheme/guile/files/digest-guile-1.8.3-r1 b/dev-scheme/guile/files/digest-guile-1.8.3-r1
new file mode 100644
index 000000000000..0af9cf12e8d9
--- /dev/null
+++ b/dev-scheme/guile/files/digest-guile-1.8.3-r1
@@ -0,0 +1,3 @@
+MD5 7fd016924e1bc3e273f4009a080942de guile-1.8.3.tar.gz 3871450
+RMD160 6255e99dbd175700dba6b861aaa64631c5bd6d49 guile-1.8.3.tar.gz 3871450
+SHA256 2ab59099cf2d46f57cf5421c9b84aa85f61961640046e8066c6b321257517796 guile-1.8.3.tar.gz 3871450
diff --git a/dev-scheme/guile/files/fix-reader-cr.diff b/dev-scheme/guile/files/fix-reader-cr.diff
new file mode 100644
index 000000000000..09e9ecae6725
--- /dev/null
+++ b/dev-scheme/guile/files/fix-reader-cr.diff
@@ -0,0 +1,11 @@
+--- orig/libguile/read.c
++++ mod/libguile/read.c
+@@ -150,7 +150,7 @@ static SCM *scm_read_hash_procedures;
+ /* `isblank' is only in C99.  */
+ #define CHAR_IS_BLANK_(_chr)					\
+   (((_chr) == ' ') || ((_chr) == '\t') || ((_chr) == '\n')	\
+-   || ((_chr) == '\f'))
++   || ((_chr) == '\f') || ((_chr) == '\r'))
+ 
+ #ifdef MSDOS
+ # define CHAR_IS_BLANK(_chr)			\
diff --git a/dev-scheme/guile/guile-1.8.3-r1.ebuild b/dev-scheme/guile/guile-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..0832b3beb14c
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.3-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.3-r1.ebuild,v 1.1 2007/10/18 10:41:59 hkbst Exp $
+
+inherit eutils autotools flag-o-matic
+
+DESCRIPTION="Scheme interpreter"
+HOMEPAGE="http://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DEPEND=">=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext"
+
+# 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"
+
+IUSE="networking regex discouraged deprecated elisp nls debug-freelist debug-malloc debug threads"
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	epatch "${FILESDIR}"/fix-reader-cr.diff
+
+	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
+}
+
+src_compile() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+#will fail for me if posix is disabled or without modules -- hkBst
+	econf \
+		--disable-error-on-warning \
+		--disable-static \
+		--enable-posix \
+		$(use_enable networking) \
+		$(use_enable regex) \
+		$(use deprecated || use_enable discouraged) \
+		$(use_enable deprecated) \
+		$(use_enable elisp) \
+		$(use_enable nls) \
+		--disable-rpath \
+		$(use_enable debug-freelist) \
+		$(use_enable debug-malloc) \
+		$(use_enable debug guile-debug) \
+		$(use_with threads) \
+		--with-modules
+
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die "install failed"
+
+	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README SNAPSHOTS THANKS
+
+	# texmacs needs this, closing bug #23493
+	dodir /etc/env.d
+	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
+}