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

Package-Manager: portage-2.1.3_rc9

5 files changed, 106 insertions, 10 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/Manifest b/dev-scheme/guile/Manifest
index 8b6c3889eb3c..92ea72092d77 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -41,6 +41,7 @@ SHA256 df098410fd7a27b66e2d5f28763d048484635ddf3010b54739d58deb7803b9ff files/sl
 DIST guile-1.6.7.tar.gz 3039294 RMD160 63d45e8143834c641d4a4732cfbb34e8984f55dd SHA1 00a82dc4c7c19f9b791e116a2baf83e7d0c0856d SHA256 8faeeac282b9d4175d15923a6bd0b6603653fdd744967b15d9577b5748555734
 DIST guile-1.6.8.tar.gz 3114052 RMD160 9c2c6a6afe2adce458e30e97da782ae18ce75b5c SHA1 5c244f730d7aaee32db4b0cc77b688f74a5caa71 SHA256 3d4ab874f90f5c2003229be29488ba2aa6fe1f0317774283360530d5d9236011
 DIST guile-1.8.1.tar.gz 3811979 RMD160 9d15620de8f29aa1a2e0e445e338dc95f1b27c50 SHA1 184555def153fdbc322045b1fdd90a7b23a84fbd SHA256 0a7154a7ce78cfabda813854beb1e760c0c295e4065c97f1e362dbe62b6e7225
+DIST guile-1.8.2.tar.gz 3762973 RMD160 aa7af82866457caa6521817bf49e895f6b1c350c SHA1 b5c624b152a45f302e185e20a468a02f2eb73e38 SHA256 1f7667c30228737e3cea58ff2b384bcc0eed8cb679392de827821e4d540c760e
 EBUILD guile-1.6.7.ebuild 2219 RMD160 2350fd8283ceb656e0421652fd3f5af69d30ef09 SHA1 05ffb966c0c76948d3919e6b95dde1fac38d80f2 SHA256 7eebc8c64167cf945f7f2a7f92691b83e6c3ff2fadf57fcd5d4c59bab5cd5353
 MD5 03bc26e1f5c7be3215d40a2fede75fa6 guile-1.6.7.ebuild 2219
 RMD160 2350fd8283ceb656e0421652fd3f5af69d30ef09 guile-1.6.7.ebuild 2219
@@ -49,14 +50,18 @@ EBUILD guile-1.6.8.ebuild 2274 RMD160 4ce174f641d93ed77b604ce9dc606b470921d775 S
 MD5 c3ef267f6db28317914e72cf8c931453 guile-1.6.8.ebuild 2274
 RMD160 4ce174f641d93ed77b604ce9dc606b470921d775 guile-1.6.8.ebuild 2274
 SHA256 f44c807db344bbd00342fc700878ca7728d32dc1e0ed47f499c07263d5d12427 guile-1.6.8.ebuild 2274
-EBUILD guile-1.8.1-r3.ebuild 2114 RMD160 068554764ca0a30ba356715c918af690ec762e6a SHA1 4f5caff382147568f9fbac79d9da318ab14814a4 SHA256 064c41ca9e491e423736f51bc088c0f6112d6cdad4325901048cb3b4e7c8489d
-MD5 88e52f42312dffaef2de6f1704b1bce2 guile-1.8.1-r3.ebuild 2114
-RMD160 068554764ca0a30ba356715c918af690ec762e6a guile-1.8.1-r3.ebuild 2114
-SHA256 064c41ca9e491e423736f51bc088c0f6112d6cdad4325901048cb3b4e7c8489d guile-1.8.1-r3.ebuild 2114
-MISC ChangeLog 10230 RMD160 231590e0d323d74c6cfa93d24dcc4ddf5dbc7df8 SHA1 afae8c9d9936e280dd174af4160171f5b4d7e27c SHA256 0e28b717a97a6001b329f6ae5ab7501b292b8408c6b7089a53cd36959b92f59e
-MD5 6a0794fd49ccfee20a397d22035fbb2c ChangeLog 10230
-RMD160 231590e0d323d74c6cfa93d24dcc4ddf5dbc7df8 ChangeLog 10230
-SHA256 0e28b717a97a6001b329f6ae5ab7501b292b8408c6b7089a53cd36959b92f59e ChangeLog 10230
+EBUILD guile-1.8.1-r3.ebuild 2170 RMD160 d88abaa3728afdac0d0d04be32039f24f7b33528 SHA1 c98ca92a2c9c81d922675d4949788a30fe173659 SHA256 81725276747ddadd85a5d6a63e8e44fdd297b5e375f4e6872e830aa112af041b
+MD5 c8c53e15f715ad6ce7f2d0ab5ad97b25 guile-1.8.1-r3.ebuild 2170
+RMD160 d88abaa3728afdac0d0d04be32039f24f7b33528 guile-1.8.1-r3.ebuild 2170
+SHA256 81725276747ddadd85a5d6a63e8e44fdd297b5e375f4e6872e830aa112af041b guile-1.8.1-r3.ebuild 2170
+EBUILD guile-1.8.2.ebuild 2173 RMD160 cc7cf77cb6b9dc0b0d260ae2d0f0538cdab19011 SHA1 f31a2bb95cac25ad606d6c0647aacc49b4db4a35 SHA256 fbc956fafa53511a2faf6db2c3ad1586720f5bfe0add5d071cc824d287bd6ea0
+MD5 6dd24fd2a9411ce359d15a8eafaa4da1 guile-1.8.2.ebuild 2173
+RMD160 cc7cf77cb6b9dc0b0d260ae2d0f0538cdab19011 guile-1.8.2.ebuild 2173
+SHA256 fbc956fafa53511a2faf6db2c3ad1586720f5bfe0add5d071cc824d287bd6ea0 guile-1.8.2.ebuild 2173
+MISC ChangeLog 10427 RMD160 e8856994a3f2926f1102033dd6fafa130d554d48 SHA1 3d9cdc74e4eb5960dc304e1f26e68e453ce661b0 SHA256 841a82b0dcb43e9fcd1ffae339409a9e22aad9e47d7c1da600a505a6efa9af18
+MD5 eea401cf0e246d9ab5b00842e64695ee ChangeLog 10427
+RMD160 e8856994a3f2926f1102033dd6fafa130d554d48 ChangeLog 10427
+SHA256 841a82b0dcb43e9fcd1ffae339409a9e22aad9e47d7c1da600a505a6efa9af18 ChangeLog 10427
 MISC metadata.xml 555 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c SHA1 b22e226e21b88b7124ab9365a4ba91f19ecc4ee0 SHA256 d167df240a4a0ff64e824febc1ace682c334ca7005eec9399551b35069d0e99e
 MD5 7cefc4ef3671fb0674ef38ba8a168423 metadata.xml 555
 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c metadata.xml 555
@@ -70,3 +75,6 @@ SHA256 5fe57fdf65206892e7849a01d1d34321956d46a0385c807d8edef02c779c62af files/di
 MD5 ef2df2d4f4b247a20d69cef6037dbbd8 files/digest-guile-1.8.1-r3 238
 RMD160 1be5c9ba1e6cdeac98d5fef78197f278c4412bdc files/digest-guile-1.8.1-r3 238
 SHA256 bf49fc77bf84831910b076db7866a2df7495407883629d7fc7c9c5ed827ff09e files/digest-guile-1.8.1-r3 238
+MD5 83cb349da6de48d912eb8401bc9ea109 files/digest-guile-1.8.2 238
+RMD160 bc1703bc62292ce50355916ad6fc7427967d390e files/digest-guile-1.8.2 238
+SHA256 a0ffa3a097e3dd4f5cec0fd2530f30e4b3df026331eca0c5ecb76a8f8f9efa3b files/digest-guile-1.8.2 238
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
+}