fix reader regression

Package-Manager: portage-2.1.3.14

5 files changed, 101 insertions, 5 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/Manifest b/dev-scheme/guile/Manifest
index d7ad8ea8f3d7..ca479c671f57 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -1,3 +1,7 @@
+AUX fix-reader-cr.diff 359 RMD160 852538454e948cb1d6bd605a4c1651463e148de4 SHA1 f5ee616ece18ef9cd2e2acaae5de0f76527c6596 SHA256 96972332fb3c2a66ce47e0326216cb110f26f450305fc66b511cd3fdf2f5077d
+MD5 270b7a00fc6bb523415f46edbec53ce8 files/fix-reader-cr.diff 359
+RMD160 852538454e948cb1d6bd605a4c1651463e148de4 files/fix-reader-cr.diff 359
+SHA256 96972332fb3c2a66ce47e0326216cb110f26f450305fc66b511cd3fdf2f5077d files/fix-reader-cr.diff 359
 AUX guile-1.4-inet_aton.patch 624 RMD160 af4fb5713ed861821b9a0cf0ae8ad47a7591b95e SHA1 917c260608b18fa58dcf5e34f57bdf1415d043be SHA256 4fab8cbc26b94c490c47e6f3eb1ba46543e405a32854f7546f4b18680631a331
 MD5 421beec2399dd47b6cc14d5691d7dcc4 files/guile-1.4-inet_aton.patch 624
 RMD160 af4fb5713ed861821b9a0cf0ae8ad47a7591b95e files/guile-1.4-inet_aton.patch 624
@@ -59,14 +63,18 @@ EBUILD guile-1.8.2.ebuild 2171 RMD160 d8a741e4c6edc9152c98842ed3b6125ca745e2d8 S
 MD5 db54e695cfb789d6977ec6a0097bf5b4 guile-1.8.2.ebuild 2171
 RMD160 d8a741e4c6edc9152c98842ed3b6125ca745e2d8 guile-1.8.2.ebuild 2171
 SHA256 066f151b7a6a9835858a12c577d0dfebd0044afd162829f22523c8fbf84ad2f9 guile-1.8.2.ebuild 2171
+EBUILD guile-1.8.3-r1.ebuild 1896 RMD160 4339a5a98770e5f9e1255e97c2d8a9e62b01e6f0 SHA1 7ee88b6446e478bf60a4f1a5687442f230207e23 SHA256 15e6f593aba273f82bf09faa11605415ea51627e9ef0253af2a76bc7854b84d2
+MD5 d3e4b1fa0bd7468cbbbdf9f12d0bada7 guile-1.8.3-r1.ebuild 1896
+RMD160 4339a5a98770e5f9e1255e97c2d8a9e62b01e6f0 guile-1.8.3-r1.ebuild 1896
+SHA256 15e6f593aba273f82bf09faa11605415ea51627e9ef0253af2a76bc7854b84d2 guile-1.8.3-r1.ebuild 1896
 EBUILD guile-1.8.3.ebuild 1847 RMD160 3d80a6405328b3a03cf28b17438da9d854c88f09 SHA1 c114ccd7a7f9bd28e4aa7f083288b82ae655f686 SHA256 354e090b0185fd2b42814bc24ff2f712f0e1a36f1466c002f255b7b30c6e63c7
 MD5 6e1f384f2aa4c9a34057ff344d0602cb guile-1.8.3.ebuild 1847
 RMD160 3d80a6405328b3a03cf28b17438da9d854c88f09 guile-1.8.3.ebuild 1847
 SHA256 354e090b0185fd2b42814bc24ff2f712f0e1a36f1466c002f255b7b30c6e63c7 guile-1.8.3.ebuild 1847
-MISC ChangeLog 11715 RMD160 f925d1060f473c24bba46dba84ccd813e2200807 SHA1 45dd4efc0cad780838f3f616ab45ce11d9320f20 SHA256 380129728e444c771b9b7ab3b46a765bdc48b47597ca80eb4aa7d258de1bcff9
-MD5 e9d10a1911555d5e9009ef6e3cdce383 ChangeLog 11715
-RMD160 f925d1060f473c24bba46dba84ccd813e2200807 ChangeLog 11715
-SHA256 380129728e444c771b9b7ab3b46a765bdc48b47597ca80eb4aa7d258de1bcff9 ChangeLog 11715
+MISC ChangeLog 11874 RMD160 4e065ef21afd2d9109f081596f262ca9af9b4257 SHA1 a7b86090501e71c6d519e87d487a2ffe892d1453 SHA256 9120460cdfd09f994efa387f042f889c9c71e75ed35b7b5cb83bc3059c7d2568
+MD5 135f2bcef33da2c40256411ca21a1ac8 ChangeLog 11874
+RMD160 4e065ef21afd2d9109f081596f262ca9af9b4257 ChangeLog 11874
+SHA256 9120460cdfd09f994efa387f042f889c9c71e75ed35b7b5cb83bc3059c7d2568 ChangeLog 11874
 MISC metadata.xml 555 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c SHA1 b22e226e21b88b7124ab9365a4ba91f19ecc4ee0 SHA256 d167df240a4a0ff64e824febc1ace682c334ca7005eec9399551b35069d0e99e
 MD5 7cefc4ef3671fb0674ef38ba8a168423 metadata.xml 555
 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c metadata.xml 555
@@ -86,3 +94,6 @@ SHA256 a0ffa3a097e3dd4f5cec0fd2530f30e4b3df026331eca0c5ecb76a8f8f9efa3b files/di
 MD5 4fe4cd56b4dc35a8d37f63428be27ade files/digest-guile-1.8.3 238
 RMD160 937357c8a8075738446ba274a478fcaad8cf82d9 files/digest-guile-1.8.3 238
 SHA256 a9322c586c42b5be7ecd73b26c77c22698e9ca10374580e8cff333b4a0d84f99 files/digest-guile-1.8.3 238
+MD5 4fe4cd56b4dc35a8d37f63428be27ade files/digest-guile-1.8.3-r1 238
+RMD160 937357c8a8075738446ba274a478fcaad8cf82d9 files/digest-guile-1.8.3-r1 238
+SHA256 a9322c586c42b5be7ecd73b26c77c22698e9ca10374580e8cff333b4a0d84f99 files/digest-guile-1.8.3-r1 238
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
+}