add 1.8.2, remove silly sleep 999 from tests and disable failing patches (all probably upstream)

(Portage version: 2.1.3_rc9)

4 files changed, 90 insertions, 2 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index 9f104e8e397a..7bbbf3c447c0 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.23 2007/06/23 15:40:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.24 2007/07/29 14:00:21 hkbst Exp $
+
+*guile-1.8.2 (29 Jul 2007)
+
+  29 Jul 2007; Marijn Schouten <hkBst@gentoo.org> +guile-1.8.2.ebuild:
+  add 1.8.2, remove silly sleep 999 from tests and disable failing patches
+  (all probably upstream)
 
   23 Jun 2007; Diego Pettenò <flameeyes@gentoo.org> guile-1.8.1-r3.ebuild:
   Filter -ftree-vectorize flag as per bug #178499.
diff --git a/dev-scheme/guile/files/digest-guile-1.8.2 b/dev-scheme/guile/files/digest-guile-1.8.2
new file mode 100644
index 000000000000..73a876e4d29a
--- /dev/null
+++ b/dev-scheme/guile/files/digest-guile-1.8.2
@@ -0,0 +1,3 @@
+MD5 a4b64a992deae0532f8015bcc6c40784 guile-1.8.2.tar.gz 3762973
+RMD160 aa7af82866457caa6521817bf49e895f6b1c350c guile-1.8.2.tar.gz 3762973
+SHA256 1f7667c30228737e3cea58ff2b384bcc0eed8cb679392de827821e4d540c760e guile-1.8.2.tar.gz 3762973
diff --git a/dev-scheme/guile/guile-1.8.1-r3.ebuild b/dev-scheme/guile/guile-1.8.1-r3.ebuild
index 6c994b5386f2..88436ad236b8 100644
--- a/dev-scheme/guile/guile-1.8.1-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r3.ebuild,v 1.5 2007/06/23 15:40:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.1-r3.ebuild,v 1.6 2007/07/29 14:00:21 hkbst Exp $
 
 inherit eutils autotools flag-o-matic
 
@@ -25,6 +25,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
+
 	# for xbindkeys
 	cp /usr/share/gettext/config.rpath .
 	epatch ${FILESDIR}/guile-1.8.1-autotools_fixes.patch
diff --git a/dev-scheme/guile/guile-1.8.2.ebuild b/dev-scheme/guile/guile-1.8.2.ebuild
new file mode 100644
index 000000000000..26ed35294057
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.2.ebuild
@@ -0,0 +1,77 @@
+# 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.2.ebuild,v 1.1 2007/07/29 14:00:21 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}
+
+	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
+
+	# for xbindkeys
+#	cp /usr/share/gettext/config.rpath .
+#	epatch ${FILESDIR}/guile-1.8.1-autotools_fixes.patch
+
+	# for free-bsd, bug 179728
+#	epatch $FILESDIR/guile-1.8.1-defaultincludes.patch
+#	epatch $FILESDIR/guile-1.8.1-clog-cexp.patch
+
+#	eautoreconf
+
+	# for lilypond 2.11.x
+#	epatch ${FILESDIR}/guile-1.8-rational.patch
+}
+
+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
+}