Dropped ppc-macos keyword, see you in prefix

Package-Manager: portage-2.1.2.2

8 files changed, 95 insertions, 91 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 4df18af60a82..b0c7a739c567 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.93 2007/03/16 08:41:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.94 2007/03/18 15:31:37 grobian Exp $
+
+  18 Mar 2007; Fabian Groffen <grobian@gentoo.org>
+  -files/emacs-cvs-21.3.50-nofink.diff,
+  +files/emacs-cvs-darwin-fsf-gcc.patch, +files/emacs-cvs-nofink.patch,
+  emacs-cvs-22.0.95-r1.ebuild, emacs-cvs-22.0.9999-r5.ebuild,
+  emacs-cvs-23.0.0-r1.ebuild:
+  Dropped ppc-macos keyword, see you in prefix
 
   16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-cvs-22.0.95-r1.ebuild, emacs-cvs-22.0.9999-r5.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 09a9d223aaf2..7c0498c6af8d 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50emacs-23.0.0.envd 38 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 SHA1 8451fb9088e819c0c996df5abd692fd91366bd68 SHA256 6179b1cbc85458d3cb49605ec095aa9ddfedcbd3b68dcbad01679717d5b86b1a
 MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 files/50emacs-23.0.0.envd 38
@@ -13,18 +10,22 @@ AUX emacs-23.0.0.desktop 240 RMD160 ca1edb1c6dbb916658ee9b86130f400498f2e27e SHA
 MD5 5585d3da10b713e4f268c2ab75b4b2da files/emacs-23.0.0.desktop 240
 RMD160 ca1edb1c6dbb916658ee9b86130f400498f2e27e files/emacs-23.0.0.desktop 240
 SHA256 3931cd9401f587dae3bc898f39bffebe349b3597bbf7bd3199b7ec1ab01167d1 files/emacs-23.0.0.desktop 240
-AUX emacs-cvs-21.3.50-nofink.diff 1520 RMD160 31c8fc31a4715d26e1566d87f09b947d1664b136 SHA1 0adbb79e61ef1a37fd7df0bd779c32ee4085d4e6 SHA256 09f387ecc0a53f02acbe445b3e9c82cd815700c7313329e0bc5d8baa39a925a7
-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-blessmail-build.patch 651 RMD160 77bda6cf13b94186eec0e078ebed8ee58baba21c SHA1 cece1d588f7b49261750c641c80e0fb7ec70fd2d SHA256 eb9a52dd38b05eda6f3155469147c860a95d0ccdc09c881f010cf9d16db39d62
 MD5 4ff9b93cb0b51bcdfbab1652f05f0625 files/emacs-cvs-blessmail-build.patch 651
 RMD160 77bda6cf13b94186eec0e078ebed8ee58baba21c files/emacs-cvs-blessmail-build.patch 651
 SHA256 eb9a52dd38b05eda6f3155469147c860a95d0ccdc09c881f010cf9d16db39d62 files/emacs-cvs-blessmail-build.patch 651
+AUX emacs-cvs-darwin-fsf-gcc.patch 676 RMD160 9fb330b5c4217da4c4ecdce591eaa6b994eb6bc8 SHA1 feaf0087e3863fe2b4d9d7fe9839e32a1499b11e SHA256 eeb156504c365704ffc5a2834331e1fc444d918b7db911e936c8b1b23783ec9a
+MD5 1830e4946883da61575664230b40add0 files/emacs-cvs-darwin-fsf-gcc.patch 676
+RMD160 9fb330b5c4217da4c4ecdce591eaa6b994eb6bc8 files/emacs-cvs-darwin-fsf-gcc.patch 676
+SHA256 eeb156504c365704ffc5a2834331e1fc444d918b7db911e936c8b1b23783ec9a files/emacs-cvs-darwin-fsf-gcc.patch 676
 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-cvs-nofink.patch 646 RMD160 5c175694de32f8582514da8de55e0aabfa36ca19 SHA1 0dac10946b8af2039579c3ad7fc6888cc035a83f SHA256 6ecd24ba7d5da8f738aed6ec6485ba08c0b96873700d997e9cf0a7e97cd5267b
+MD5 034b2b023b54541a11fcd2f8898b06ab files/emacs-cvs-nofink.patch 646
+RMD160 5c175694de32f8582514da8de55e0aabfa36ca19 files/emacs-cvs-nofink.patch 646
+SHA256 6ecd24ba7d5da8f738aed6ec6485ba08c0b96873700d997e9cf0a7e97cd5267b files/emacs-cvs-nofink.patch 646
 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
@@ -34,22 +35,22 @@ MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236
 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236
 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236
 DIST emacs-22.0.95.tar.gz 37754533 RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 SHA1 90cd5a6078d26b3bd0eb4f2da0561df759bc880f SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d
-EBUILD emacs-cvs-22.0.95-r1.ebuild 6758 RMD160 dbeaec086a4e803ab7c40182eac1323f78a944c7 SHA1 fb52d3cffb03293dc62045090cb633332fd6e70e SHA256 09cde13e2d0893d142482151849c6d67643c2659091ff8269d923d95e799ab3a
-MD5 68ee0f70e3402ae127b6448a2017eb31 emacs-cvs-22.0.95-r1.ebuild 6758
-RMD160 dbeaec086a4e803ab7c40182eac1323f78a944c7 emacs-cvs-22.0.95-r1.ebuild 6758
-SHA256 09cde13e2d0893d142482151849c6d67643c2659091ff8269d923d95e799ab3a emacs-cvs-22.0.95-r1.ebuild 6758
-EBUILD emacs-cvs-22.0.9999-r5.ebuild 6815 RMD160 db698c4d310cbbfcabae6d81650ca7077c896032 SHA1 2934e7b4d6f8cabc48e20ec8a3b292d0f08864de SHA256 9c9529fdb61f921147ae2d18e62580c5f4d7b59902126983de25c4b13171f80b
-MD5 c9a84e570d628f244dc3bc61449f3a84 emacs-cvs-22.0.9999-r5.ebuild 6815
-RMD160 db698c4d310cbbfcabae6d81650ca7077c896032 emacs-cvs-22.0.9999-r5.ebuild 6815
-SHA256 9c9529fdb61f921147ae2d18e62580c5f4d7b59902126983de25c4b13171f80b emacs-cvs-22.0.9999-r5.ebuild 6815
-EBUILD emacs-cvs-23.0.0-r1.ebuild 5743 RMD160 b164c9e764fecd991e65a61d89c804080b71b766 SHA1 b663e3b75bb561439fbff9e7cb536258180d16d3 SHA256 cb3e09f1383533c93947f4a4043e5b70848250a0c8843295c0b1e65dbe0c9c73
-MD5 9416690d34c620c0cc3d6853039dc367 emacs-cvs-23.0.0-r1.ebuild 5743
-RMD160 b164c9e764fecd991e65a61d89c804080b71b766 emacs-cvs-23.0.0-r1.ebuild 5743
-SHA256 cb3e09f1383533c93947f4a4043e5b70848250a0c8843295c0b1e65dbe0c9c73 emacs-cvs-23.0.0-r1.ebuild 5743
-MISC ChangeLog 18038 RMD160 3d29a58a44366662da114cddb3769f27b6b82d0e SHA1 197bf77deb9ef99c39112827ba1627327372d27f SHA256 336fb8ac81a5405fe5a6ac0a61a98c651be465b32ab154c5d476bbfb79a416e9
-MD5 3d4c48aed6d5f5047565625c78f04a45 ChangeLog 18038
-RMD160 3d29a58a44366662da114cddb3769f27b6b82d0e ChangeLog 18038
-SHA256 336fb8ac81a5405fe5a6ac0a61a98c651be465b32ab154c5d476bbfb79a416e9 ChangeLog 18038
+EBUILD emacs-cvs-22.0.95-r1.ebuild 6646 RMD160 697d6d627a63b30035a038ca152c75d2bb112501 SHA1 6d850116d04fe4bca37a1587607d2e72c030851d SHA256 b79786aa5bd7bdb5a7aefe661e6306d5fb438e5c81eb03d4e257fdb1bc0e4321
+MD5 929746de96c4d661d535e0140ff7d324 emacs-cvs-22.0.95-r1.ebuild 6646
+RMD160 697d6d627a63b30035a038ca152c75d2bb112501 emacs-cvs-22.0.95-r1.ebuild 6646
+SHA256 b79786aa5bd7bdb5a7aefe661e6306d5fb438e5c81eb03d4e257fdb1bc0e4321 emacs-cvs-22.0.95-r1.ebuild 6646
+EBUILD emacs-cvs-22.0.9999-r5.ebuild 6703 RMD160 ab79349ce31820c581f441a28f5c804c19a9d5e7 SHA1 e0329d4c0e5a832017010b54cdb54e594f5da628 SHA256 99b8f86bd83a042c1d957ca692ef70324a378aa348d14c4e30a9d57d5980f982
+MD5 056489a8d8c2b8ab768d99f2e395f54f emacs-cvs-22.0.9999-r5.ebuild 6703
+RMD160 ab79349ce31820c581f441a28f5c804c19a9d5e7 emacs-cvs-22.0.9999-r5.ebuild 6703
+SHA256 99b8f86bd83a042c1d957ca692ef70324a378aa348d14c4e30a9d57d5980f982 emacs-cvs-22.0.9999-r5.ebuild 6703
+EBUILD emacs-cvs-23.0.0-r1.ebuild 5771 RMD160 7bdd88696d8dd6acff620f08d13054a000d6818f SHA1 d1a8e32ddf54d005149c4e49c1ad2da457511265 SHA256 8a4ae4af7b36a80b1a219755f43e312cfac08cef8a8b9eafc22619e16983bf78
+MD5 34741c31c1ea6765df206a263b34bfd8 emacs-cvs-23.0.0-r1.ebuild 5771
+RMD160 7bdd88696d8dd6acff620f08d13054a000d6818f emacs-cvs-23.0.0-r1.ebuild 5771
+SHA256 8a4ae4af7b36a80b1a219755f43e312cfac08cef8a8b9eafc22619e16983bf78 emacs-cvs-23.0.0-r1.ebuild 5771
+MISC ChangeLog 18343 RMD160 6b04018b9941baee989e5f9c05f2e6a837ba03dc SHA1 d7287e38df6eb548d15a1b6ceeea63c7fa470161 SHA256 d83f1d04095f466a0ae892d1d701de1aa44ca28879cea8dacb86ab60217a1065
+MD5 3d0089dc270bef0ea417e366704708de ChangeLog 18343
+RMD160 6b04018b9941baee989e5f9c05f2e6a837ba03dc ChangeLog 18343
+SHA256 d83f1d04095f466a0ae892d1d701de1aa44ca28879cea8dacb86ab60217a1065 ChangeLog 18343
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -63,10 +64,3 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 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 v1.4.6 (GNU/Linux)
-
-iD8DBQFF+lf1NQqtfCuFneMRAkszAKCM2Tu1/nd5IWM6IERzE3CGnUYMBQCffpGN
-JHzXlOy4eOoHK9OeaD8xruw=
-=yfCO
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild
index 6c368c41e680..17fbcc3e9314 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.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/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild,v 1.5 2007/03/16 08:41:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild,v 1.6 2007/03/18 15:31:37 grobian Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -37,7 +37,7 @@ PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="22.0.95"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 S="${WORKDIR}/emacs-${PV}"
 
 src_unpack() {
@@ -54,7 +54,6 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
 
 	eautoreconf
 }
@@ -189,7 +188,7 @@ pkg_postinst() {
 	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
 		cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
 
-	use ppc-macos || update-alternatives
+	update-alternatives
 	elisp-site-regen
 
 	# ecompress from Portage 2.2.* does auto-compression
@@ -207,6 +206,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use ppc-macos || update-alternatives
+	update-alternatives
 	elisp-site-regen
 }
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild
index 458cde8f75ca..13836a7b5ab2 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.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/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild,v 1.5 2007/03/16 08:41:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild,v 1.6 2007/03/18 15:31:37 grobian Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -42,7 +42,7 @@ PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="22.0.95"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 S="${WORKDIR}/emacs"
 
 src_unpack() {
@@ -59,7 +59,6 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
 
 	eautoreconf
 }
@@ -194,7 +193,7 @@ pkg_postinst() {
 	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
 		cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
 
-	use ppc-macos || update-alternatives
+	update-alternatives
 	elisp-site-regen
 
 	# ecompress from Portage 2.2.* does auto-compression
@@ -212,6 +211,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use ppc-macos || update-alternatives
+	update-alternatives
 	elisp-site-regen
 }
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild
index 4d1a370725d2..9e0b6383ff89 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.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/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild,v 1.8 2007/03/07 05:21:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild,v 1.9 2007/03/18 15:31:37 grobian Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -37,19 +37,20 @@ PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="23.0.0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~sparc-fbsd ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86"
 
 DFILE=emacs-${SLOT}.desktop
 
 src_unpack() {
 	cvs_src_unpack
-	cd ${S};
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/emacs-subdirs-el-gentoo.diff
+	epatch "${FILESDIR}"/emacs-cvs-nofink.patch
+	epatch "${FILESDIR}"/emacs-cvs-darwin-fsf-gcc.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" \
 		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	epatch "${FILESDIR}"/${PN}-freebsd-sparc.patch
 }
 
 src_compile() {
@@ -87,6 +88,7 @@ src_compile() {
 		einfo "Configuring to build with Carbon Emacs"
 		econf --enable-debug \
 			--enable-carbon-app=/Applications/Gentoo \
+			--program-suffix=.emacs-${SLOT} \
 			--without-x \
 			$(use_with jpeg) $(use_with tiff) \
 			$(use_with gif) $(use_with png) \
@@ -166,7 +168,7 @@ update-alternatives() {
 }
 
 pkg_postinst() {
-	use ppc-macos || update-alternatives
+	update-alternatives
 	elisp-site-regen
 	if use X; then
 		while read line; do einfo "${line}"; done<<'EOF'
@@ -183,6 +185,6 @@ EOF
 }
 
 pkg_postrm() {
-	use ppc-macos || update-alternatives
+	update-alternatives
 	elisp-site-regen
 }
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-21.3.50-nofink.diff b/app-editors/emacs-cvs/files/emacs-cvs-21.3.50-nofink.diff
deleted file mode 100644
index a09185303d13..000000000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-21.3.50-nofink.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.in.orig	Wed Sep 22 02:03:18 2004
-+++ configure.in	Wed Sep 22 02:11:16 2004
-@@ -1126,12 +1126,12 @@
-     machine=powermac opsys=darwin
-     # Define CPP as follows to make autoconf work correctly.
-     CPP="${CC-cc} -E -no-cpp-precomp"
--    # Use fink packages if available.
--    if test -d /sw/include && test -d /sw/lib; then
--	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
--        CPP="${CPP} ${GCC_TEST_OPTIONS}"
--	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
--    fi
-+#    # Use fink packages if available.
-+#    if test -d /sw/include && test -d /sw/lib; then
-+#	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
-+#        CPP="${CPP} ${GCC_TEST_OPTIONS}"
-+#	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
-+#    fi
-   ;;
- 
-   ## AMD x86-64 Linux-based GNU system
---- configure.orig	Wed Sep 22 02:18:49 2004
-+++ configure	Wed Sep 22 02:20:03 2004
-@@ -2601,12 +2601,12 @@
-     machine=powermac opsys=darwin
-     # Define CPP as follows to make autoconf work correctly.
-     CPP="${CC-cc} -E -no-cpp-precomp"
--    # Use fink packages if available.
--    if test -d /sw/include && test -d /sw/lib; then
--	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
--        CPP="${CPP} ${GCC_TEST_OPTIONS}"
--	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
--    fi
-+#    # Use fink packages if available.
-+#    if test -d /sw/include && test -d /sw/lib; then
-+#	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
-+#        CPP="${CPP} ${GCC_TEST_OPTIONS}"
-+#	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
-+#    fi
-   ;;
- 
-   ## AMD x86-64 Linux-based GNU system
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-darwin-fsf-gcc.patch b/app-editors/emacs-cvs/files/emacs-cvs-darwin-fsf-gcc.patch
new file mode 100644
index 000000000000..60adb4889026
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-darwin-fsf-gcc.patch
@@ -0,0 +1,25 @@
+* Fabian Groffen <grobian@gentoo.org>
+  Remove gcc-apple specific flags, such that we can compile with FSF GCC
+
+--- src/s/darwin.h
++++ src/s/darwin.h
+@@ -264,7 +264,7 @@
+ 
+ /* Indicate that we are compiling for Mac OS X and where to find Mac
+    specific headers.  */
+-#define C_SWITCH_SYSTEM -fpascal-strings -DMAC_OSX -I../mac/src
++#define C_SWITCH_SYSTEM -DMAC_OSX -I../mac/src
+ 
+ /* Link in the Carbon lib. */
+ #ifdef HAVE_CARBON
+--- configure
++++ configure
+@@ -2383,7 +2383,7 @@
+     esac
+     opsys=darwin
+     # Define CPP as follows to make autoconf work correctly.
+-    CPP="${CC-cc} -E -no-cpp-precomp"
++    CPP="${CC-cc} -E"
+   ;;
+ 
+   ## AT&T 3b2, 3b5, 3b15, 3b20
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-nofink.patch b/app-editors/emacs-cvs/files/emacs-cvs-nofink.patch
new file mode 100644
index 000000000000..d2fe92486b02
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-nofink.patch
@@ -0,0 +1,20 @@
+* Fabian Groffen <grobian@gentoo.org>
+  We don't want Fink stuff, we only want our own stuff.  No need to
+  patch configure.in, as upstream doesn't like this patch, as they put
+  it in on purpose.
+
+--- configure
++++ configure
+@@ -2384,12 +2384,6 @@
+     opsys=darwin
+     # Define CPP as follows to make autoconf work correctly.
+     CPP="${CC-cc} -E -no-cpp-precomp"
+-    # Use fink packages if available.
+-    if test -d /sw/include && test -d /sw/lib; then
+-      GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
+-      CPP="${CPP} ${GCC_TEST_OPTIONS}"
+-      NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
+-    fi
+   ;;
+ 
+   ## AT&T 3b2, 3b5, 3b15, 3b20