[dev-scheme/guile] Modify ebuild,v 1.11 by adding upstream patch to fix tests.

5 files changed, 182 insertions, 0 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
new file mode 100644
index 0000000..3eba0c6
--- /dev/null
+++ b/dev-scheme/guile/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for dev-scheme/guile
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header$
+
+*guile-1.8.5-r1 (19 Apr 2010)
+
+  19 Apr 2010; Dustin Polke <dustin.polke@uni-siegen.de>
+  +guile-1.8.5-r1.ebuild, +files/guile-fix_tests.patch:
+  Add upstream patch to fix tests, see bug 295093.
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
new file mode 100644
index 0000000..849371f
--- /dev/null
+++ b/dev-scheme/guile/Manifest
@@ -0,0 +1,5 @@
+AUX guile-fix_tests.patch 1217 RMD160 e12a0b170d58aa1058b9e78bbf00b98c6e495f71 SHA1 4c0368dcae6deda84da442293509646828f8ada7 SHA256 8ed774a7f7a95b3597b4c8df2bd73bb33a3b08d543fbbeffb050eb4bb51c8ac3
+DIST guile-1.8.5.tar.gz 3933369 RMD160 7f8ab70e1c524f7c20a65977b13c2575eeb61655 SHA1 3ef611cf5c4998a5bdfc7935765bb68730038614 SHA256 e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289
+EBUILD guile-1.8.5-r1.ebuild 3053 RMD160 17d61237613d301e6c1bfa7b2ce876b5c3957b00 SHA1 cc8a6cf997814143b6b19f28e9a1e6b6e7dead10 SHA256 407741e41bd81ee140f99c82e7fd7a3bf0aa31dd5d04cfb903f7a0a83c7f39f2
+MISC ChangeLog 21739 RMD160 f19c482694e2706e4594ef1bc34c5762f9933328 SHA1 c88c405b99a7b072bdf64774afc6005974cfa290 SHA256 d975591c8c9da328fabdb2909b0d8f07d619023a6d0dab22d17867cd88d737bd
+MISC metadata.xml 1055 RMD160 e9a2a4c3c6629e0a521791f59c373ce1e8b68220 SHA1 fb4541c5f46e23719cc55024c2ab31344bf73f13 SHA256 87841c9e125b7de272c87c8abcc3e9c53c6934cec6f4fe5e3ad60c09566bbbff
diff --git a/dev-scheme/guile/files/guile-fix_tests.patch b/dev-scheme/guile/files/guile-fix_tests.patch
new file mode 100644
index 0000000..ffe76fa
--- /dev/null
+++ b/dev-scheme/guile/files/guile-fix_tests.patch
@@ -0,0 +1,34 @@
+diff -Naur guile-1.8.7.orig/test-suite/standalone/Makefile.am guile-1.8.7/test-suite/standalone/Makefile.am
+--- guile-1.8.7.orig/test-suite/standalone/Makefile.am	2009-07-03 19:19:00.000000000 -0300
++++ guile-1.8.7/test-suite/standalone/Makefile.am	2009-12-13 14:42:35.000000000 -0300
+@@ -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		\
+diff -Naur guile-1.8.7.orig/test-suite/standalone/test-asmobs guile-1.8.7/test-suite/standalone/test-asmobs
+--- guile-1.8.7.orig/test-suite/standalone/test-asmobs	2009-06-26 17:21:50.000000000 -0300
++++ guile-1.8.7/test-suite/standalone/test-asmobs	2009-12-13 14:41:42.000000000 -0300
+@@ -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.5-r1.ebuild b/dev-scheme/guile/guile-1.8.5-r1.ebuild
new file mode 100644
index 0000000..f742b83
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.5-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.5-r1.ebuild,v 1.11 2009/10/19 00:32:29 vapier Exp $
+
+EAPI=1
+inherit eutils autotools flag-o-matic elisp-common
+
+DESCRIPTION="Scheme interpreter"
+HOMEPAGE="http://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+RESTRICT="!regex? ( test )"
+
+DEPEND=">=dev-libs/gmp-4.1
+	>=sys-devel/libtool-1.5.6
+	sys-devel/gettext
+	emacs? ( virtual/emacs )"
+
+# 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 emacs nls debug-freelist debug-malloc debug +threads"
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
+
+#	cp configure.in configure.in.old
+
+	#for libtool-2.2*, bug 212723
+	sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in
+
+#	diff -u configure.in.old configure.in
+
+	# Fix tests, upstream patch, see bug 295093
+	epatch "${FILESDIR}/${PN}-fix_tests.patch"
+	eautoreconf
+}
+
+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 \
+		EMACS=no
+
+	emake || die "make failed"
+
+	# Above we have disabled the build system's Emacs support;
+	# for USE=emacs we compile (and install) the files manually
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	einstall || die "install failed"
+
+	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
+
+	# texmacs needs this, closing bug #23493
+	dodir /etc/env.d
+	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
+
+	# necessary for registering slib, see bug 206896
+	keepdir /usr/share/guile/site
+
+	if use emacs; then
+		elisp-install ${PN} emacs/*.{el,elc} || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \
+			|| die "elisp-site-file-install failed"
+	fi
+}
+
+pkg_postinst() {
+	[ "${ROOT}" == "/" ] && pkg_config
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
+
+pkg_config() {
+	if has_version dev-scheme/slib; then
+		einfo "Registering slib with guile"
+		install_slib_for_guile
+	fi
+}
+
+_pkg_prerm() {
+	rm -f "${ROOT}"/usr/share/guile/site/slibcat
+}
diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml
new file mode 100644
index 0000000..6b1908a
--- /dev/null
+++ b/dev-scheme/guile/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs.
+	</longdescription>
+	<use>
+	<flag name='debug-freelist'>Include garbage collector freelist debugging
+	code</flag>
+	<flag name='debug-malloc'>Include malloc debugging code</flag>
+	<flag name='deprecated'>Enable deprecated features</flag>
+	<flag name='discouraged'> (implied by deprecated) enable merely discouraged
+	features</flag>
+	<flag name='elisp'>Enable Emacs Lisp support</flag>
+	<flag name='networking'>Include networking interfaces</flag>
+	<flag name='regex'> Include regular expression interfaces</flag>
+	</use>
+</pkgmetadata>