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

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

7 files changed, 181 insertions, 12 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/Manifest b/dev-scheme/guile-www/Manifest
index 187725b5411d..bf2d69b32581 100644
--- a/dev-scheme/guile-www/Manifest
+++ b/dev-scheme/guile-www/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX guile-www-2.30-alive.test.patch 2244 RMD160 2f8e769a3e699efa6f8aa12470edcab8dff73edf SHA1 28e0ce2867be89d7b0b2e312cf60002d5e88a68d SHA256 8a914f5c2f290c821c9d61e10f4bc7c498ec986e576a0f39ee03bcfd3b4700f1
+AUX guile-www-2.30-alive.test2.patch 1895 RMD160 46d801bc209f0fd2cd8b4fee6e2f4e71a24b3e62 SHA1 ddf85280577ec0715174947fa525d2ef2518dc2a SHA256 fb26dfa63eab5b13c936a7e5af5391f27409015732eda0793da2c96060f593f8
 DIST guile-www-2.27.tar.gz 501893 RMD160 adb09b171205e5425e71599ea0eee004c250676b SHA1 55eb85e8753407ab7cc7237c757e4762d2edf941 SHA256 14e9c8b4f16a3c5209fde893879c85448893967b415829828ce01a64e77b49ec
 DIST guile-www-2.28.tar.gz 511023 RMD160 0350c36c9a3e503f7246a2595f7b4712bad5080f SHA1 3c5da0086bdaad541758549625f6f3ab5fbb0ccb SHA256 15b8f77ac59ffbc07a4cf2d8a669e829846631ea7011362689a9135536eaf454
 DIST guile-www-2.30.tar.gz 545982 RMD160 4afd219f300e47d22a95b1cc2eb9af116582260a SHA1 640213ed45433bd5464ca78b77e94caaaaf7f377 SHA256 21b76dd924baf8ee7a75aa4aa0abcfc461b0cfaecf32007a4d9cd5f95a239c78
+DIST guile-www-2.34.tar.xz 594488 RMD160 a64a194023542626452cb94b4fd4733b4e258cf0 SHA1 6032822ed86dee173614f8f9c381179bc9daccf1 SHA256 7d9ecf245f477970d7f9c035fcc4908537c165d02461cd6253ada3be32f45b62
 EBUILD guile-www-2.27.ebuild 633 RMD160 a977e79e336dee2359770ce4f672f9bc3d660b2c SHA1 7af97688686994457e696931d4813761e84d0573 SHA256 a251be59312668cdf964c1678ab9bed07da6387da671676163e2844a4ea1d719
 EBUILD guile-www-2.28.ebuild 643 RMD160 3da801a893fdd0578e267bc548e200e2e276472b SHA1 52c1d2428b3b030649013b93167d2531441b961f SHA256 e7bf98a4309f5a6543c940841da24a1516ec88c99c23842f9c27ed1aef6bc9dc
-EBUILD guile-www-2.30.ebuild 585 RMD160 b2163ae7d069098402640af5c0ae3691a646ce38 SHA1 6ef0d318b6bef0a32ac44f021f89a91327e06d45 SHA256 4c23b0195ec85971083cbcbce1831d18118c78a6421671e0a1dec40a4106a2c7
-MISC ChangeLog 3115 RMD160 358df6dbe80593e235e441e0e00a9441b0c37770 SHA1 9b346bfd92b2888968c51d8fe430df7bfa060b20 SHA256 75787e6d020dcbacacc7800a6ea8413f0d2d5e0b8f8f8d79dcc1ff01160cb1dd
-MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+EBUILD guile-www-2.30.ebuild 746 RMD160 147ba808042da9c1d3afe0318533020d57c299d5 SHA1 d02408242b3d0c20eabcd8d5c118a2a2c2cf74d2 SHA256 22020bc0b85e1e727c090753100e9f2b7e4887265ad3b1dfdd368838eb5d573c
+EBUILD guile-www-2.34.ebuild 601 RMD160 20e229beefc6c67fdc83cd7b23fe23a6925dc1cb SHA1 e6c9269913f19ebbcd26d113b5865a7c47f39449 SHA256 862afc7bbd98c1ab06002d9fc864b8b74c3242e4ae8bc5686ef4fbdb44175d3b
+MISC ChangeLog 3387 RMD160 3473992748f3720760b64e1aa821d29940f389cd SHA1 7b62f9c849f900b99eae58ccb7335e525b5712af SHA256 99cd2e359ea197d7052c00c127550197c674d60c66c030b540a503efe1433473
+MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk7KbwQACgkQgAnW8HDreRYoMQCfeZ9HHw+6DUNGICSBFg6aHkue
-wJcAn14xODg/cpFh14vGCuSM5xEWQlBk
-=LioO
+iEYEAREKAAYFAk/gbHsACgkQgAnW8HDreRZ3EQCeN3FfojTppxnjrNAKAoCoXS3C
+QxIAn2llh5b11oEnp0PLsgQIAtnTpSOy
+=RVSS
 -----END PGP SIGNATURE-----
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>