Fix test failure, bug 295093.

Package-Manager: portage-2.2_rc59/cvs/Linux i686

4 files changed, 49 insertions, 9 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index bbd4c861f188..6cc28039b0bc 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/guile
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.74 2009/12/05 14:23:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.75 2009/12/14 19:30:22 ulm Exp $
+
+  14 Dec 2009; Ulrich Mueller <ulm@gentoo.org> guile-1.8.7.ebuild,
+  +files/guile-1.8.7-fix_tests.patch:
+  Fix test failure, bug 295093. Proxy commit for Tomás Touceda (chiiph).
 
 *guile-1.8.7 (05 Dec 2009)
 
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index cc4938022b9e..ee20bad7784e 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX 50guile-gentoo.el 38 RMD160 93ecb185b2729f847b6b34bbb1dd96a207510df2 SHA1 4363c907b30fe150f1d4de4be733f943256a0b82 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115
 AUX gcc-4.3.patch 2097 RMD160 9143d75c389f3bc2d57fab7d197064899ec573aa SHA1 339a5e22e528204d85b1d049f01d58d5f9be409f SHA256 3702a63fef213535d2df8dfa093f73d5642640537a4ae3a1f1bc7f9ada5333b4
+AUX guile-1.8.7-fix_tests.patch 888 RMD160 b34a98684d016b8f660da97b66c3e3acc6e5b123 SHA1 c229e11da5a5b0974ecf23e3ccdfd42723932abd SHA256 077829a887549f9c65a6c366a5e2c709dfbab07bc81f46a60f2557dcc5c34adb
 AUX slibtest.patch 2916 RMD160 770b65dca197515aef7b06f98dbbf18daf019609 SHA1 2c19bff9b9087735267e19425ed3bcde3664b6a2 SHA256 df098410fd7a27b66e2d5f28763d048484635ddf3010b54739d58deb7803b9ff
 DIST guile-1.6.8.tar.gz 3114052 RMD160 9c2c6a6afe2adce458e30e97da782ae18ce75b5c SHA1 5c244f730d7aaee32db4b0cc77b688f74a5caa71 SHA256 3d4ab874f90f5c2003229be29488ba2aa6fe1f0317774283360530d5d9236011
 DIST guile-1.8.4.tar.gz 3821388 RMD160 58a502e553519b7f4e409ede361ad12141f20fec SHA1 1e80fe242acfde2bfa39fd1e8409a8f010e24e2b SHA256 ca03762565291708b6fbcda4224570e59889795651d3bbb5a380ff6d2c69e1b3
@@ -15,13 +16,13 @@ EBUILD guile-1.8.4.ebuild 2208 RMD160 b835240de302dc2ea8247fe1648a93b93984dc88 S
 EBUILD guile-1.8.5-r1.ebuild 2964 RMD160 62df6e7cdb13bb77d0df0d85ca24bc817f1f7077 SHA1 ca8812f09fde0f8b487c520a1fe595d3fdc7872b SHA256 2ca5ce8a6a214e836d98b5d5aa7179c4a15bffe7a9fe1a45e0f1263f9c2350f6
 EBUILD guile-1.8.5.ebuild 2426 RMD160 f7cae837c44b9a5f86b243bb29fd9acead3ba89d SHA1 b9a9b0464c1742193edd9ad94307251454b29f3a SHA256 1f22d34aa444f0269686199c06c49e7c01dd9340ef323bcdc61b3fe2bdd138f4
 EBUILD guile-1.8.6.ebuild 2955 RMD160 aaa5f4597fff6e8086199a34e7726427084ad9d8 SHA1 035b8da88b1b51983e1b438d2aad71735b7cbdfb SHA256 c5eb7a65d8283443054f1de73310a73b67ee90491f19b1b26959a438d4a56d77
-EBUILD guile-1.8.7.ebuild 2866 RMD160 4214c6c3778d5f57147b64202316a8600af60819 SHA1 8600cd2cfa99343172e9bcfc407cbb52c013a7d4 SHA256 dee3e61fc25c87471830358798c3917b2be0eaf4cf98cdb7f6270ee30f8476bb
-MISC ChangeLog 21232 RMD160 8c6ecec0ddc92104bffc6a812d4ff9c6f088063b SHA1 5876eb384b559a4ce20e7f461398c57c3cde7fd7 SHA256 bd9b5cbab1b30f1e2ca780ba54f9c7fde8967193beafdb748a9247a347fc2ac9
+EBUILD guile-1.8.7.ebuild 2925 RMD160 753b002788017e727c6731b3e4dbd3146e770aab SHA1 2dce97bb10a5ad3517f6629885777c599a9204d6 SHA256 3eeb2ebe9534b67aa298641141b29f500fb285065d53135dd8d4b4e0bf07eab5
+MISC ChangeLog 21412 RMD160 4f184b3b4b5d3a517059a06ebbdd05ac1629297e SHA1 dbc3994ebd7ec0c8aec97bed848812e76e846d9b SHA256 e09269cf60d65ab0ff2eaaa559a81490ce9cea2e93b830159dc0dc0a043da782
 MISC metadata.xml 1055 RMD160 e9a2a4c3c6629e0a521791f59c373ce1e8b68220 SHA1 fb4541c5f46e23719cc55024c2ab31344bf73f13 SHA256 87841c9e125b7de272c87c8abcc3e9c53c6934cec6f4fe5e3ad60c09566bbbff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAksabZoACgkQOeoy/oIi7uwR6gCgi58uT0szo+SkhhlJqQBGPDeW
-rMEAoJmOfDnYBnQ9HBsH7iHe6k1Sebze
-=RH/b
+iEYEARECAAYFAksmkuwACgkQOeoy/oIi7uwuNACg6Rrci10jop2vOdl5RHDkX14v
+xBEAoLP4TmAx6g2XkP2ctjrClZqmpGmk
+=pROS
 -----END PGP SIGNATURE-----
diff --git a/dev-scheme/guile/files/guile-1.8.7-fix_tests.patch b/dev-scheme/guile/files/guile-1.8.7-fix_tests.patch
new file mode 100644
index 000000000000..dc67f3acb7d7
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.7-fix_tests.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/295093
+
+--- guile-1.8.7.orig/test-suite/standalone/Makefile.am
++++ guile-1.8.7/test-suite/standalone/Makefile.am
+@@ -28,7 +28,9 @@
+ BUILT_SOURCES =
+ EXTRA_DIST =
+ 
+-TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
++TESTS_ENVIRONMENT =					\
++builddir="$(builddir)"					\
++GUILE_AUTO_COMPILE=0 "${top_builddir}/pre-inst-guile-env"
+ 
+ test_cflags =					\
+   -I$(top_srcdir)/test-suite/standalone		\
+--- guile-1.8.7.orig/test-suite/standalone/test-asmobs
++++ guile-1.8.7/test-suite/standalone/test-asmobs
+@@ -2,7 +2,8 @@
+ exec guile -q -s "$0" "$@"
+ !#
+ 
+-(load-extension "libtest-asmobs" "libtest_asmobs_init")
++(load-extension (string-append (getenv "builddir") "/libtest-asmobs")
++                "libtest_asmobs_init")
+ 
+ (define (test x v)
+   (if v
+@@ -114,4 +115,4 @@
+ 
+ ;; Local Variables:
+ ;; mode: scheme
+-;; End:
+\ No newline at end of file
++;; End:
diff --git a/dev-scheme/guile/guile-1.8.7.ebuild b/dev-scheme/guile/guile-1.8.7.ebuild
index 3ab31eb55de6..cd4e9e0e3db3 100644
--- a/dev-scheme/guile/guile-1.8.7.ebuild
+++ b/dev-scheme/guile/guile-1.8.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7.ebuild,v 1.1 2009/12/05 14:23:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7.ebuild,v 1.2 2009/12/14 19:30:22 ulm Exp $
 
 EAPI=1
-inherit flag-o-matic elisp-common
+inherit eutils autotools flag-o-matic elisp-common
 
 DESCRIPTION="Scheme interpreter"
 HOMEPAGE="http://www.gnu.org/software/guile/"
@@ -29,6 +29,7 @@ src_unpack() {
 	unpack ${A}; cd "${S}"
 
 	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
+	epatch "${FILESDIR}/${P}-fix_tests.patch"
 
 #	cp configure.in configure.in.old
 
@@ -37,7 +38,7 @@ src_unpack() {
 
 #	diff -u configure.in.old configure.in
 
-#	eautoreconf
+	eautoreconf
 }
 
 src_compile() {