Update patch for sparc-fbsd, bug 231243.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 i686

4 files changed, 24 insertions, 8 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index a440df8cc674..e9c61a440efd 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.207 2008/06/04 12:28:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.208 2008/07/09 18:00:56 ulm Exp $
+
+  09 Jul 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-freebsd-sparc-1.patch, emacs-cvs-23.0.9999.ebuild:
+  Update patch for sparc-fbsd, bug 231243.
 
   04 Jun 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.2.9999.ebuild,
   emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index ffe1c93e76fb..bfbf7f8efabe 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX emacs-cvs-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 SHA1 a04c98c22ed9608ac6d81db0b9031da9a5b115db SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c
+AUX emacs-cvs-freebsd-sparc-1.patch 448 RMD160 4f131b630ec09e1d9170374fc60a1620f0f718e9 SHA1 5bc71be91bb8008cec2473479184e250e5284c68 SHA256 e2c2e53e2995d4a505c480d17e0a7e5abff61ea96c4d3451a1e019c985a59cd8
 AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
 DIST emacs-cvs-23.0.50_pre20080201.tar.bz2 21883295 RMD160 fa6f3b46fd642d4168018298e63f43afd4949233 SHA1 1b649cb9f3e9eafbe7e2fbe1e4523a92bf9dc72e SHA256 6aff7cf61e3873aa8620b0f491a5186dd449a8f3b9a321b2abab63807be4d5b9
 EBUILD emacs-cvs-22.2.9999.ebuild 8409 RMD160 16075c57e1c4c06db81654f35fb47b42e439f4f6 SHA1 f9d39f7db5adf82fe290d8a6f6dd67493e956954 SHA256 86a436ae5432a72d41af549549385cc3ed057d98978b4563c45eec36691df86f
 EBUILD emacs-cvs-23.0.50_pre20080201.ebuild 7957 RMD160 92351c78dffc7861145d07373651af5e00da573f SHA1 c6501f0922baef7378cb53d7de1ea0827aa34a13 SHA256 655a77674c9713d167a7c53ec6257d98ee7ece467aed62436971f8f3c091936c
-EBUILD emacs-cvs-23.0.9999.ebuild 8894 RMD160 51072d638d7ce54f2057472463cbc4bd74c4f4c6 SHA1 bf33f65f20328e71a5760ff1760e0b8268014f16 SHA256 dcaa64ed0974179c207da2979f3c74f137af4a2d804abb3cee7b36050c2e3706
-MISC ChangeLog 39771 RMD160 ed54098610562eb30800ff9f0771bf9bd5375b10 SHA1 a78cf6950b584c62ec2b234a8d99ee30b4fda921 SHA256 fd17f10a8a03da9fdad015cdfa22ffb0a6464495688ddd1375b22bae1b046677
+EBUILD emacs-cvs-23.0.9999.ebuild 8896 RMD160 255c7637892316c0e6248d7f276ff1d575d1db98 SHA1 91c6f18683ef77f2ef96b6de7ea3b02719374e0a SHA256 e2d2a574ed02ef30657c8009d698b301c1cd6d5188fc97b51ce240e07c657f88
+MISC ChangeLog 39932 RMD160 fd29d3aed5d0766e5242d801b0ee16ef207c4358 SHA1 f28107cd5d68e988e010b89bd2641a9abf025eac SHA256 a83231a2b6bd492da0fc55ee698ff7b2a9c842a2242d6aca60ba3077be288e83
 MISC metadata.xml 1213 RMD160 7df0bb43f41ecf811a37b60ee3cbefc7f798e840 SHA1 e545b177be5578569de6410bfea01cffe6003611 SHA256 1e71985b81478302fb03a9af91293f7dfad07aa7b31c4cc226170b45d573ce13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkhGiqcACgkQOeoy/oIi7uzsjgCgtIPFq5ADQP5ghtclS4wUZjf7
-iUIAnAx3r4lRcRMc3n+3ZndfP4rKzEhs
-=3l3m
+iEYEARECAAYFAkh0/N4ACgkQOeoy/oIi7uyLewCglAkvPuahv0JlIE5fb15WeFuB
+YigAoMq6vRgxOGojoubDK/eP6DbS05oX
+=7owF
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
index b1777a1f39d0..de866c200c10 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.6 2008/06/04 12:28:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.7 2008/07/09 18:00:56 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -85,7 +85,7 @@ src_unpack() {
 		|| die "Upstream version number changed to ${FULL_VERSION}"
 	echo
 
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	epatch "${FILESDIR}/${PN}-freebsd-sparc-1.patch"
 
 	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch b/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch
new file mode 100644
index 000000000000..85ff3a088784
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch
@@ -0,0 +1,11 @@
+--- emacs-orig/src/alloc.c	2008-07-09 19:33:18.000000000 +0200
++++ emacs/src/alloc.c	2008-07-09 19:39:48.000000000 +0200
+@@ -4487,7 +4487,7 @@
+   /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is
+      needed on ia64 too.  See mach_dep.c, where it also says inline
+      assembler doesn't work with relevant proprietary compilers.  */
+-#ifdef __sparc__
++#if defined(__sparc__) && !defined(__FreeBSD__)
+   asm ("ta 3");
+ #endif
+