dev-scheme/guile-www: Fix for broken test, #421781; Version Bump

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

6 files changed, 169 insertions, 5 deletions

diff --git a/dev-scheme/guile-www/ChangeLog b/dev-scheme/guile-www/ChangeLog
index 5dafba7cbe85..8330d52b87ec 100644
--- a/dev-scheme/guile-www/ChangeLog
+++ b/dev-scheme/guile-www/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-scheme/guile-www
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-www/ChangeLog,v 1.24 2011/11/21 15:32:15 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-www/ChangeLog,v 1.25 2012/06/19 12:11:34 jlec Exp $
+
+*guile-www-2.34 (19 Jun 2012)
+
+  19 Jun 2012; Justin Lecher <jlec@gentoo.org> guile-www-2.30.ebuild,
+  +files/guile-www-2.30-alive.test.patch,
+  +files/guile-www-2.30-alive.test2.patch, +guile-www-2.34.ebuild,
+  metadata.xml:
+  Fix for broken test, #421781; Version Bump
 
   21 Nov 2011; Justin Lecher <jlec@gentoo.org> guile-www-2.30.ebuild:
   keyworded for ~x86-macos ~x64-macos, tested by Johan Hattne #390123
diff --git a/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch b/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch
new file mode 100644
index 000000000000..fdd3b601533b
--- /dev/null
+++ b/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch
@@ -0,0 +1,74 @@
+From f41bf9380f7b08f5e8c07c9c58d66cd5da7bc356 Mon Sep 17 00:00:00 2001
+From: Thien-Thi Nguyen <ttn@gnuvola.org>
+Date: Thu, 28 Apr 2011 05:13:52 +0000
+Subject: [v] Make alive.test avoid (mis-)loading the .scm files, if possible.
+
+Reported by Bernardo Ezequiel Contreras:
+<https://savannah.nongnu.org/bugs/?33175>
+
+* source/alive.test: If guile has ‘%load-extensions’, create a
+preload file that removes ".scm" from it; use that file for
+all invocations; and delete it when done.  If in debug mode,
+display ponderings, as well as ‘guile --version’ output.
+---
+diff --git a/source/ChangeLog b/source/ChangeLog
+index 2b5bd1b..2de79f4 100644
+--- a/source/ChangeLog
++++ b/source/ChangeLog
+@@ -1,3 +1,15 @@
++2011-04-28  Thien-Thi Nguyen  <ttn@gnuvola.org>
++
++	[v] Make alive.test avoid (mis-)loading the .scm files, if possible.
++
++	Reported by Bernardo Ezequiel Contreras:
++	<https://savannah.nongnu.org/bugs/?33175>
++
++	* alive.test: If guile has ‘%load-extensions’, create a
++	preload file that removes ".scm" from it; use that file for
++	all invocations; and delete it when done.  If in debug mode,
++	display ponderings, as well as ‘guile --version’ output.
++
+ 2011-01-24  Thien-Thi Nguyen  <ttn@gnuvola.org>
+ 
+ 	Release: 2.29
+diff --git a/source/alive.test b/source/alive.test
+index 3521fcc..76e91c8 100755
+--- a/source/alive.test
++++ b/source/alive.test
+@@ -35,6 +35,25 @@ decho ()
+     if $debug ; then echo "$1" ; fi
+ }
+ 
++decho 'guile:'
++if $debug ; then ${GUILE-guile} --version ; fi
++
++if $guile -c '%load-extensions' >/dev/null 2>&1 ; then
++    preload=alive.preload
++    echo '(set! %load-extensions (delete ".scm" %load-extensions))' > $preload
++    if $debug ; then
++        decho 'preload:'
++        cat $preload
++        decho 'before:'
++        $guile -c '(begin (write %load-extensions) (newline))'
++    fi
++    guile="$guile -l $preload"
++    if $debug ; then
++        decho 'after:'
++        $guile -c '(begin (write %load-extensions) (newline))'
++    fi
++fi
++
+ decho 'indivdually:'
+ { while read m ;
+     do
+@@ -48,4 +67,8 @@ all="`cat $all`"
+ decho "$guile -c '(use-modules $all)'"
+ $guile -c "(use-modules $all)"
+ 
++if [ "$preload" ] ; then rm $preload ; fi
++
++exit 0
++
+ # alive.test ends here
+--
+cgit v0.9.0.2
diff --git a/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch b/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch
new file mode 100644
index 000000000000..9cf7efe984ab
--- /dev/null
+++ b/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch
@@ -0,0 +1,51 @@
+From cfabb94ca727d63f5712860c3fe4132926e498c9 Mon Sep 17 00:00:00 2001
+From: Thien-Thi Nguyen <ttn@gnuvola.org>
+Date: Mon, 02 May 2011 08:32:02 +0000
+Subject: [v] Refine preload: Prioritize "" instead of deleting ".scm".
+
+The 2011-04-28 change goes too far; it impedes
+loading system modules used by Guile-WWW modules.
+Reported by (Savannah user) vonbecmann:
+<https://savannah.nongnu.org/bugs/?33175>.
+
+* source/alive.test: Don't delete ".scm" from ‘%load-extensions’;
+instead, ensure only that "" is at the beginning of the list.
+---
+diff --git a/source/ChangeLog b/source/ChangeLog
+index 2de79f4..ece831e 100644
+--- a/source/ChangeLog
++++ b/source/ChangeLog
+@@ -1,3 +1,15 @@
++2011-05-02  Thien-Thi Nguyen  <ttn@gnuvola.org>
++
++	[v] Refine preload: Prioritize "" instead of deleting ".scm".
++
++	The 2011-04-28 change goes too far; it impedes
++	loading system modules used by Guile-WWW modules.
++	Reported by (Savannah user) vonbecmann:
++	<https://savannah.nongnu.org/bugs/?33175>.
++
++	* alive.test: Don't delete ".scm" from ‘%load-extensions’;
++	instead, ensure only that "" is at the beginning of the list.
++
+ 2011-04-28  Thien-Thi Nguyen  <ttn@gnuvola.org>
+ 
+ 	[v] Make alive.test avoid (mis-)loading the .scm files, if possible.
+diff --git a/source/alive.test b/source/alive.test
+index 76e91c8..6e430f4 100755
+--- a/source/alive.test
++++ b/source/alive.test
+@@ -39,8 +39,10 @@ decho 'guile:'
+ if $debug ; then ${GUILE-guile} --version ; fi
+ 
+ if $guile -c '%load-extensions' >/dev/null 2>&1 ; then
++    # Make sure "" is at head of list.
+     preload=alive.preload
+-    echo '(set! %load-extensions (delete ".scm" %load-extensions))' > $preload
++    echo '(set! %load-extensions (delete "" %load-extensions))' > $preload
++    echo '(set! %load-extensions (cons "" %load-extensions))' >> $preload
+     if $debug ; then
+         decho 'preload:'
+         cat $preload
+--
+cgit v0.9.0.2
diff --git a/dev-scheme/guile-www/guile-www-2.30.ebuild b/dev-scheme/guile-www/guile-www-2.30.ebuild
index 0f3f3cd6aca0..96295e370e1d 100644
--- a/dev-scheme/guile-www/guile-www-2.30.ebuild
+++ b/dev-scheme/guile-www/guile-www-2.30.ebuild
@@ -1,9 +1,11 @@
-# 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-www/guile-www-2.30.ebuild,v 1.2 2011/11/21 15:32:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-www/guile-www-2.30.ebuild,v 1.3 2012/06/19 12:11:34 jlec Exp $
 
 EAPI=4
 
+inherit eutils
+
 DESCRIPTION="Guile Scheme modules to facilitate HTTP, URL and CGI programming"
 HOMEPAGE="http://www.nongnu.org/guile-www/"
 SRC_URI="mirror://nongnu/guile-www/${P}.tar.gz"
@@ -15,3 +17,13 @@ IUSE=""
 
 RDEPEND=">=dev-scheme/guile-1.8"
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-alive.test.patch \
+		"${FILESDIR}"/${P}-alive.test2.patch
+}
+
+src_test() {
+	emake DEBUG=1 check
+}
diff --git a/dev-scheme/guile-www/guile-www-2.34.ebuild b/dev-scheme/guile-www/guile-www-2.34.ebuild
new file mode 100644
index 000000000000..89a33ef0d3d9
--- /dev/null
+++ b/dev-scheme/guile-www/guile-www-2.34.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-www/guile-www-2.34.ebuild,v 1.1 2012/06/19 12:11:34 jlec Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Guile Scheme modules to facilitate HTTP, URL and CGI programming"
+HOMEPAGE="http://www.nongnu.org/guile-www/"
+SRC_URI="mirror://nongnu/guile-www/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-scheme/guile-1.8"
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/guile-www/metadata.xml b/dev-scheme/guile-www/metadata.xml
index 9ac9ffdb3a41..e42d0af60f42 100644
--- a/dev-scheme/guile-www/metadata.xml
+++ b/dev-scheme/guile-www/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+	<herd>sci-chemistry</herd>
 </pkgmetadata>