Add patch to build on Gentoo/FreeBSD/SPARC64, see bug #159584. Add ~sparc-fbsd keywords.
authorDiego Elio Pettenò <flameeyes@gentoo.org>
Tue, 2 Jan 2007 20:55:00 +0000 (20:55 +0000)
committerDiego Elio Pettenò <flameeyes@gentoo.org>
Tue, 2 Jan 2007 20:55:00 +0000 (20:55 +0000)
Package-Manager: portage-2.1.2_rc4-r4

12 files changed:
app-editors/emacs-cvs/ChangeLog
app-editors/emacs-cvs/Manifest
app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild
app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.90
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.91
app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0
app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r1
app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc.patch [new file with mode: 0644]

index 95fda6b4ca532ba3e8c9f621f580b7cdd08fcc9a..7856e45d8c9cd006cf1ef64816b365b0a42da732 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-cvs
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.57 2006/12/29 23:14:03 opfer Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.58 2007/01/02 20:55:00 flameeyes Exp $
+
+  02 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/emacs-cvs-freebsd-sparc.patch, emacs-cvs-22.0.91.ebuild,
+  emacs-cvs-23.0.0-r1.ebuild:
+  Add patch to build on Gentoo/FreeBSD/SPARC64, see bug #159584. Add
+  ~sparc-fbsd keywords.
 
   29 Dec 2006; <fauli@gentoo.org> emacs-cvs-22.0.91.ebuild:
   changed SVN version to 22.0.92, as reported in bug #158730 by Graham Murray
index abd5df661a21e743635694362a7451a5c6cd91a5..584956436e431f07d6da83cca5e2a5c98750533b 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 40aspell-gentoo.el 80 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 SHA1 90ab33e0d4a61dbc8feaabdc3dd08ec059941179 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 files/40aspell-gentoo.el 80
@@ -18,6 +21,10 @@ AUX emacs-cvs-21.3.50-nofink.diff 1520 RMD160 31c8fc31a4715d26e1566d87f09b947d16
 MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
 RMD160 31c8fc31a4715d26e1566d87f09b947d1664b136 files/emacs-cvs-21.3.50-nofink.diff 1520
 SHA256 09f387ecc0a53f02acbe445b3e9c82cd815700c7313329e0bc5d8baa39a925a7 files/emacs-cvs-21.3.50-nofink.diff 1520
+AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
+MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475
+RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475
+SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b files/emacs-cvs-freebsd-sparc.patch 475
 AUX emacs-subdirs-el-gentoo.diff 1580 RMD160 fea0e4ade096977b4f77b7b0234c8097dda3650e SHA1 44c56f1ed16896225f85e62804b8c91bb90392ae SHA256 d01a8119a565689a37499e6d5aedcbf7e9329e1612840d281ae5a0c183059d6e
 MD5 bd7222d2c80bddb9077f389897887cdf files/emacs-subdirs-el-gentoo.diff 1580
 RMD160 fea0e4ade096977b4f77b7b0234c8097dda3650e files/emacs-subdirs-el-gentoo.diff 1580
@@ -54,44 +61,51 @@ EBUILD emacs-cvs-22.0.90.ebuild 5383 RMD160 a2489d2fe0cfe15d1926bd14952a7330ffb4
 MD5 8136caf18f203a26be18cf1b17a2ed09 emacs-cvs-22.0.90.ebuild 5383
 RMD160 a2489d2fe0cfe15d1926bd14952a7330ffb449d7 emacs-cvs-22.0.90.ebuild 5383
 SHA256 a0389d71b39a8e1f98b7f9b8c2a34a9b7cc1ab242bf501054ee7d599ff0167d0 emacs-cvs-22.0.90.ebuild 5383
-EBUILD emacs-cvs-22.0.91.ebuild 5380 RMD160 cb88081eabb73db782e328ac90eb8ec6806f6ac8 SHA1 0722c6ffea3329131afa164e166d06e4d9930a7a SHA256 29b277f134af16a95a030a3dad8f78157700ccd9e112929a236306f686e43061
-MD5 c8aec0bb5a2be4a4847056dcac98fe6e emacs-cvs-22.0.91.ebuild 5380
-RMD160 cb88081eabb73db782e328ac90eb8ec6806f6ac8 emacs-cvs-22.0.91.ebuild 5380
-SHA256 29b277f134af16a95a030a3dad8f78157700ccd9e112929a236306f686e43061 emacs-cvs-22.0.91.ebuild 5380
-EBUILD emacs-cvs-23.0.0-r1.ebuild 5702 RMD160 d28ef5f8fdaf2ffdf775fdb3619614bd576eec2a SHA1 885c28bdd7d435873c13ec65ce39e0d2dca555b1 SHA256 4ac6281c7bfca35837243a4969b94f131aba380089b7e0b66f37317e2e9ac06e
-MD5 20711cd2204ea8c68dbcaec236374648 emacs-cvs-23.0.0-r1.ebuild 5702
-RMD160 d28ef5f8fdaf2ffdf775fdb3619614bd576eec2a emacs-cvs-23.0.0-r1.ebuild 5702
-SHA256 4ac6281c7bfca35837243a4969b94f131aba380089b7e0b66f37317e2e9ac06e emacs-cvs-23.0.0-r1.ebuild 5702
+EBUILD emacs-cvs-22.0.91.ebuild 5663 RMD160 59cbdd417ffbcc50004fe4f32c6220b82bddb8e0 SHA1 510e8fbf11398a7c03d5ea6ff7abcae1748bdafb SHA256 5f9e41899fe67281c5b957a67b3640a6779630f48427675aaafed24213d692a7
+MD5 46d44d98ea8e8f2423a2cb2c2489efce emacs-cvs-22.0.91.ebuild 5663
+RMD160 59cbdd417ffbcc50004fe4f32c6220b82bddb8e0 emacs-cvs-22.0.91.ebuild 5663
+SHA256 5f9e41899fe67281c5b957a67b3640a6779630f48427675aaafed24213d692a7 emacs-cvs-22.0.91.ebuild 5663
+EBUILD emacs-cvs-23.0.0-r1.ebuild 5984 RMD160 6b728c9a31cf0f56a75badddf5c941500ba8d8e8 SHA1 b998805d32a19c1f27f53a9b3195dd9fcbfcec87 SHA256 dda339425a96853fbd15f59f3546632822b3ef09f04505d29f08c46647addbce
+MD5 bab102caf80f3a93f0ed44583c04e29c emacs-cvs-23.0.0-r1.ebuild 5984
+RMD160 6b728c9a31cf0f56a75badddf5c941500ba8d8e8 emacs-cvs-23.0.0-r1.ebuild 5984
+SHA256 dda339425a96853fbd15f59f3546632822b3ef09f04505d29f08c46647addbce emacs-cvs-23.0.0-r1.ebuild 5984
 EBUILD emacs-cvs-23.0.0.ebuild 5238 RMD160 69658f6f15cde1d369751fe3bcdcd93325df1c60 SHA1 740ffd7e4416be19cb4a40db63d33d1066800cd9 SHA256 032229a1d06307801e350ad47d2f2caea70f57230cb8b80c75a9fc14508292d2
 MD5 10d02dd5a3cbe31f162edaebf502797c emacs-cvs-23.0.0.ebuild 5238
 RMD160 69658f6f15cde1d369751fe3bcdcd93325df1c60 emacs-cvs-23.0.0.ebuild 5238
 SHA256 032229a1d06307801e350ad47d2f2caea70f57230cb8b80c75a9fc14508292d2 emacs-cvs-23.0.0.ebuild 5238
-MISC ChangeLog 10032 RMD160 2357cc865669677ade753f14ec1b25f52fd1311a SHA1 66d10ba0f4f8e36c278207ef28812c587f9cbda2 SHA256 fa6a64bb6af22cd9a69e376eebaa0572bc24d8dae63a6ef99f427d0a14e8eea2
-MD5 82f666eb0f645c3f5c9d1d9ed2acef4f ChangeLog 10032
-RMD160 2357cc865669677ade753f14ec1b25f52fd1311a ChangeLog 10032
-SHA256 fa6a64bb6af22cd9a69e376eebaa0572bc24d8dae63a6ef99f427d0a14e8eea2 ChangeLog 10032
+MISC ChangeLog 10279 RMD160 e80741b24dc1d21eff1f4387ba67ee14475dd60c SHA1 a97676bb5ad331c7b78ffca55e9bcf14c8ddd51d SHA256 0b5a72c3a552a66993c6d25f1b3c28bf91f7a04a63f33a1960965434e5b98838
+MD5 145962d6b97acff3105b48902551eeac ChangeLog 10279
+RMD160 e80741b24dc1d21eff1f4387ba67ee14475dd60c ChangeLog 10279
+SHA256 0b5a72c3a552a66993c6d25f1b3c28bf91f7a04a63f33a1960965434e5b98838 ChangeLog 10279
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r2 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r3 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r3 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r3 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.90 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.90 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.90 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.91 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.91 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.91 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0-r1 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r3 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r3 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.90 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.90 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.90 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.91 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.91 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.91 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r1 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFmsbAAiZjviIA2XgRAhWuAJ9+5bXpj3USshuK8eY33j/M3TFe2wCcD1KL
+wFY0ddDFmelhdWiYXblXuaY=
+=v/b0
+-----END PGP SIGNATURE-----
index e284d86970e292c57312e0ed6d80dbf86737b287..f42c97526b74548786028c1afb33df1450f93d4f 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild,v 1.2 2006/12/29 23:14:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild,v 1.3 2007/01/02 20:55:00 flameeyes Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -37,7 +37,7 @@ PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="22.0.92"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
 DFILE=emacs-${SLOT}.desktop
 
@@ -46,6 +46,10 @@ src_unpack() {
        cd ${S};
        epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
        use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
+       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" \
+               "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
+       epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
 }
 
 src_compile() {
index e06a8eafdac5e482e921e71c2ea793be163b5d4e..34d5f09fb21beeae44ad57c1dfc80e56f026c1af 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.0-r1.ebuild,v 1.3 2006/11/29 21:54:58 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild,v 1.4 2007/01/02 20:55:00 flameeyes Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -38,7 +38,7 @@ PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="23.0.0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~sparc-fbsd ~x86"
 
 DFILE=emacs-${SLOT}.desktop
 
@@ -47,6 +47,10 @@ src_unpack() {
        cd ${S};
        epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
        use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
+       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" \
+               "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
+       epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
 }
 
 src_compile() {
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc.patch b/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc.patch
new file mode 100644 (file)
index 0000000..d5e0793
--- /dev/null
@@ -0,0 +1,13 @@
+Index: emacs/src/alloc.c
+===================================================================
+--- emacs.orig/src/alloc.c
++++ emacs/src/alloc.c
+@@ -4522,7 +4522,7 @@ mark_stack ()
+   /* 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