updated patches or gcc4/Darwin8

(Portage version: 2.0.51.22-r2)

5 files changed, 49 insertions, 17 deletions

diff --git a/dev-util/guile/ChangeLog b/dev-util/guile/ChangeLog
index 4f7b5686c8d6..911ec6ea8220 100644
--- a/dev-util/guile/ChangeLog
+++ b/dev-util/guile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/guile
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/ChangeLog,v 1.47 2005/07/23 20:30:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/ChangeLog,v 1.48 2005/08/07 18:57:18 kito Exp $
+
+  07 Aug 2005; Kito <kito@gentoo.org> +files/guile-1.6.7-posix.patch,
+  +files/guile-1.6.7-scmsigs.patch, guile-1.6.7.ebuild:
+  updated patches or gcc4/Darwin8
 
   23 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> guile-1.6.7.ebuild:
   Stable on sh.
diff --git a/dev-util/guile/Manifest b/dev-util/guile/Manifest
index b32e970b530f..7dfb2ec61ff4 100644
--- a/dev-util/guile/Manifest
+++ b/dev-util/guile/Manifest
@@ -1,17 +1,20 @@
-MD5 0d9318a760c6bf3f32beccf5f5b5c81f guile-1.6.6.ebuild 2067
+MD5 241f8b638de722269d1c152940935d83 ChangeLog 6101
 MD5 f4a3bb08da3e9162271dee410addc833 guile-1.4-r3.ebuild 786
 MD5 6c96ba5979bf0f56d6d04c90de9e0208 guile-1.4.1.ebuild 818
-MD5 fa0f632bc3ab88538e4d2ed8b6f057f5 guile-1.6.7.ebuild 2226
 MD5 eac249d9efd570c8e59e37ae1a6c5a49 guile-1.6.4-r1.ebuild 1920
-MD5 241f8b638de722269d1c152940935d83 ChangeLog 6101
+MD5 0d9318a760c6bf3f32beccf5f5b5c81f guile-1.6.6.ebuild 2067
+MD5 5671a6bc69061290afcae6320febe09f guile-1.6.7.ebuild 2309
 MD5 327369d7f77a3211382c3d8f3cc2eba5 metadata.xml 313
-MD5 0cd979c8cd8e7667986b79db8ccae209 files/guile-macos-posix.patch 904
+MD5 983ca0d7ff0dc5899a453df89e714538 files/digest-guile-1.4-r3 62
 MD5 c6e6b728591d901172031cc9a0997d31 files/digest-guile-1.4.1 64
+MD5 c8ef00401b82bbfae1fa78785341e8dc files/digest-guile-1.6.4-r1 64
 MD5 30c55437dd6efe1474a4f4312228b2ca files/digest-guile-1.6.6 64
 MD5 cd2f121bfb660c3ae7ba916a07d086f7 files/digest-guile-1.6.7 64
-MD5 d97c8dff01a8b6735f8bef03c72f52f3 files/guile-macos-relink.patch 1213
-MD5 c8ef00401b82bbfae1fa78785341e8dc files/digest-guile-1.6.4-r1 64
+MD5 421beec2399dd47b6cc14d5691d7dcc4 files/guile-1.4-inet_aton.patch 624
+MD5 e2fa8e3e29ab3c7a798e111ba6ea6fe8 files/guile-1.6.7-dynamic.patch 460
 MD5 a162d311d2487b57ea35eb452b2ad5d1 files/guile-1.6.7-gcc4.patch 483
+MD5 fef232023ed79bf3be45821cd627b23a files/guile-1.6.7-posix.patch 405
+MD5 07e499caf8f16c40f43897900b8a189b files/guile-1.6.7-scmsigs.patch 319
 MD5 979d4686f6e39379b33139182873dead files/guile-amd64.patch 439
-MD5 421beec2399dd47b6cc14d5691d7dcc4 files/guile-1.4-inet_aton.patch 624
-MD5 983ca0d7ff0dc5899a453df89e714538 files/digest-guile-1.4-r3 62
+MD5 0cd979c8cd8e7667986b79db8ccae209 files/guile-macos-posix.patch 904
+MD5 d97c8dff01a8b6735f8bef03c72f52f3 files/guile-macos-relink.patch 1213
diff --git a/dev-util/guile/files/guile-1.6.7-posix.patch b/dev-util/guile/files/guile-1.6.7-posix.patch
new file mode 100644
index 000000000000..a4cd2bcaef51
--- /dev/null
+++ b/dev-util/guile/files/guile-1.6.7-posix.patch
@@ -0,0 +1,16 @@
+--- libguile/posix.c.sav	Tue Jan 25 19:01:44 2005
++++ libguile/posix.c	Tue Jan 25 19:01:55 2005
+@@ -1257,6 +1257,13 @@
+     SCM_MEMORY_ERROR;
+   strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str));
+   ptr[SCM_STRING_LENGTH (str)] = 0;
++#if defined(macosx)
++  if (!strchr(ptr, '=')) {
++    unsetenv(ptr);
++    rv = 0;
++  }
++  else
++#endif
+   rv = putenv (ptr);
+   if (rv < 0)
+     SCM_SYSERROR;
diff --git a/dev-util/guile/files/guile-1.6.7-scmsigs.patch b/dev-util/guile/files/guile-1.6.7-scmsigs.patch
new file mode 100644
index 000000000000..65b5b52c3dc7
--- /dev/null
+++ b/dev-util/guile/files/guile-1.6.7-scmsigs.patch
@@ -0,0 +1,11 @@
+--- libguile/scmsigs.c.sav	Tue Feb 11 22:07:54 2003
++++ libguile/scmsigs.c	Tue Feb 11 22:08:18 2003
+@@ -66,7 +66,7 @@
+ /* The thread system has its own sleep and usleep functions.  */
+ #ifndef USE_THREADS
+ 
+-#if defined(MISSING_SLEEP_DECL)
++#if defined(MISSING_SLEEP_DECL) && ! defined(macosx)
+ int sleep ();
+ #endif
+ 
diff --git a/dev-util/guile/guile-1.6.7.ebuild b/dev-util/guile/guile-1.6.7.ebuild
index 136847c954de..3f1b6e61d505 100644
--- a/dev-util/guile/guile-1.6.7.ebuild
+++ b/dev-util/guile/guile-1.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.6.7.ebuild,v 1.14 2005/07/23 20:30:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.6.7.ebuild,v 1.15 2005/08/07 18:57:18 kito Exp $
 
 inherit flag-o-matic eutils libtool
 
@@ -38,12 +38,10 @@ src_unpack() {
 		replace-flags -O3 -O2
 	fi
 
-	if use ppc-macos ; then
-		elibtoolize
-		epatch ${FILESDIR}/guile-macos-posix.patch
-		epatch ${FILESDIR}/guile-macos-relink.patch
-	fi
-
+	# fix for putenv on Darwin
+	epatch ${FILESDIR}/${P}-posix.patch
+	# fixes sleep/usleep errors on Darwin
+	epatch ${FILESDIR}/${P}-scmsigs.patch
 	# Fix for gcc-4.0
 	epatch ${FILESDIR}/${P}-gcc4.patch
 }
@@ -53,7 +51,7 @@ src_compile() {
 	# -g3, at least on some architectures.  (19 Aug 2003 agriffis)
 	filter-flags -g3
 
-	use ppc-macos && append-flags -no-cpp-precomp -Dmacosx
+	use userland_Darwin && append-flags -Dmacosx
 
 	econf \
 		--with-threads \