Put patches on Gentoo mirrors.

Package-Manager: portage-2.1.3_rc5

21 files changed, 84 insertions, 1010 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 5c34ec59c19e..3a93c3446353 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.168 2007/06/24 15:25:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.169 2007/06/25 07:22:42 ulm Exp $
+
+  25 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -files/emacs-21.2-sh.patch,
+  -files/emacs-21.3-amd64.patch, -files/emacs-21.3-hppa.patch,
+  -files/emacs-21.3-ppc64.patch, -files/emacs-21.3-xorg.patch,
+  -files/emacs-21.4-Xaw3d-headers.patch,
+  -files/emacs-21.4-autosave-tmp.patch,
+  -files/emacs-21.4-blessmail-build.patch,
+  -files/emacs-21.4-freebsd-terminfo.patch,
+  -files/emacs-21.4-libungif-gif-gentoo.patch,
+  -files/emacs-21.4-oldxmenu-malloc.patch,
+  -files/emacs-21.4-ppc64-fix-unexelf.patch, -files/emacs-21.4-qa.patch,
+  emacs-21.4-r4.ebuild, emacs-21.4-r8.ebuild, emacs-21.4-r12.ebuild:
+  Put patches on Gentoo mirrors.
 
   24 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1.ebuild:
   Depend on virtual/motif and remove lesstif USE flag.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 84ce7ae6722c..138cb3405e8c 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -5,58 +5,6 @@ AUX 60emacs-21.envd 34 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af SHA1 b67d
 MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af files/60emacs-21.envd 34
 SHA256 880372bcfead2fe980498ac54949933e46f7628c53c978affc93dcd1945a3153 files/60emacs-21.envd 34
-AUX emacs-21.2-sh.patch 5782 RMD160 4e9f7369d9655a2bdb9cc017ba62e60ef18976a7 SHA1 8ab2b30b3e276f5383c46fad4d9cf9c3d41b8985 SHA256 c06d2f9e435e8059608bea7314ffee7cbbd0b066bb9b1c96598988f2f96fd9e5
-MD5 2f1bf0e4f91897570110704adbaf48dc files/emacs-21.2-sh.patch 5782
-RMD160 4e9f7369d9655a2bdb9cc017ba62e60ef18976a7 files/emacs-21.2-sh.patch 5782
-SHA256 c06d2f9e435e8059608bea7314ffee7cbbd0b066bb9b1c96598988f2f96fd9e5 files/emacs-21.2-sh.patch 5782
-AUX emacs-21.3-amd64.patch 7938 RMD160 46def3808034e262f611934413f1db0b8b7c1ae5 SHA1 5be28afc7ec5ff461802b3fe93b848a0974c64d7 SHA256 538ca1af43ecd94a58a2cca69dc232c26f130c27aee4c7a70a191bd352d36606
-MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
-RMD160 46def3808034e262f611934413f1db0b8b7c1ae5 files/emacs-21.3-amd64.patch 7938
-SHA256 538ca1af43ecd94a58a2cca69dc232c26f130c27aee4c7a70a191bd352d36606 files/emacs-21.3-amd64.patch 7938
-AUX emacs-21.3-hppa.patch 2493 RMD160 8079f22901f6bc7d69ddb03241e519184d8fac56 SHA1 fc4875dca353bc18702040957da08cae49149c80 SHA256 519a341e6dbe96f7d4b5ff50ee5f3b3a28879d4e1f24b8f270d4397ec1c302b2
-MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
-RMD160 8079f22901f6bc7d69ddb03241e519184d8fac56 files/emacs-21.3-hppa.patch 2493
-SHA256 519a341e6dbe96f7d4b5ff50ee5f3b3a28879d4e1f24b8f270d4397ec1c302b2 files/emacs-21.3-hppa.patch 2493
-AUX emacs-21.3-ppc64.patch 1622 RMD160 3d2139ff24c475d229184bbe27316c17e4c7ad59 SHA1 3f11474530abfb36419c216dd06845db6630bd75 SHA256 4d4aadd8704d4e61d357ba4523ec71bab566342ba414190c91190fc608fc75bf
-MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
-RMD160 3d2139ff24c475d229184bbe27316c17e4c7ad59 files/emacs-21.3-ppc64.patch 1622
-SHA256 4d4aadd8704d4e61d357ba4523ec71bab566342ba414190c91190fc608fc75bf files/emacs-21.3-ppc64.patch 1622
-AUX emacs-21.3-xorg.patch 394 RMD160 51d64c84aaa61cd1eb6b08c8fa7688a10bc09949 SHA1 3ea6a71edbc432a2e8f10ebfa223f8d7c9f0480c SHA256 191c93e97587a7d7b9000d2cba24ef45233aa029719865646bf8d73b26510622
-MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
-RMD160 51d64c84aaa61cd1eb6b08c8fa7688a10bc09949 files/emacs-21.3-xorg.patch 394
-SHA256 191c93e97587a7d7b9000d2cba24ef45233aa029719865646bf8d73b26510622 files/emacs-21.3-xorg.patch 394
-AUX emacs-21.4-Xaw3d-headers.patch 2145 RMD160 0da9222f7f35d4de93470d36aba927ce3117d0d8 SHA1 309c96f228fc5c28b140cd8b9b81205e82f97a2c SHA256 52bf59a3d2e4786ab5c44f607d47fe16a965de40e5cf895ca36dc75362eee11c
-MD5 d958ceb1e8cbecb2717f9c3699a73754 files/emacs-21.4-Xaw3d-headers.patch 2145
-RMD160 0da9222f7f35d4de93470d36aba927ce3117d0d8 files/emacs-21.4-Xaw3d-headers.patch 2145
-SHA256 52bf59a3d2e4786ab5c44f607d47fe16a965de40e5cf895ca36dc75362eee11c files/emacs-21.4-Xaw3d-headers.patch 2145
-AUX emacs-21.4-autosave-tmp.patch 525 RMD160 db34685ca46b419dc1807acd0ebcc52ef622b20e SHA1 5865d14c568ed8046b3a8fc6971fa538347eb15e SHA256 18bb63c546d2496ead9544f69f8c33041fdf2da6d7b7a9bf13304b37fd54608a
-MD5 57a5ad0e9c07aa3ee8060eaff08f499b files/emacs-21.4-autosave-tmp.patch 525
-RMD160 db34685ca46b419dc1807acd0ebcc52ef622b20e files/emacs-21.4-autosave-tmp.patch 525
-SHA256 18bb63c546d2496ead9544f69f8c33041fdf2da6d7b7a9bf13304b37fd54608a files/emacs-21.4-autosave-tmp.patch 525
-AUX emacs-21.4-blessmail-build.patch 651 RMD160 77bda6cf13b94186eec0e078ebed8ee58baba21c SHA1 cece1d588f7b49261750c641c80e0fb7ec70fd2d SHA256 eb9a52dd38b05eda6f3155469147c860a95d0ccdc09c881f010cf9d16db39d62
-MD5 4ff9b93cb0b51bcdfbab1652f05f0625 files/emacs-21.4-blessmail-build.patch 651
-RMD160 77bda6cf13b94186eec0e078ebed8ee58baba21c files/emacs-21.4-blessmail-build.patch 651
-SHA256 eb9a52dd38b05eda6f3155469147c860a95d0ccdc09c881f010cf9d16db39d62 files/emacs-21.4-blessmail-build.patch 651
-AUX emacs-21.4-freebsd-terminfo.patch 356 RMD160 c145b098aad857b5bc1a6d877817b1423a3c1402 SHA1 e7431435693867b64d7a57a653927b7377bdc264 SHA256 b4f3091c191b1602bb3f1cc38f97cb123b20b7ffa52549f065ed69d466aba4d8
-MD5 9fbc99cbbee8577e3867cece08c06e3d files/emacs-21.4-freebsd-terminfo.patch 356
-RMD160 c145b098aad857b5bc1a6d877817b1423a3c1402 files/emacs-21.4-freebsd-terminfo.patch 356
-SHA256 b4f3091c191b1602bb3f1cc38f97cb123b20b7ffa52549f065ed69d466aba4d8 files/emacs-21.4-freebsd-terminfo.patch 356
-AUX emacs-21.4-libungif-gif-gentoo.patch 1534 RMD160 8bc5ef391e644ad00f46c7d34e7341862572346a SHA1 dd0247426f98d3e7e7362792d228e21e1d8855be SHA256 61793086af3c4a56ced40830977ba0d6ebc285d84b4b612798b35ca08f1f1689
-MD5 1607d289126ca057110a993cde0e25fd files/emacs-21.4-libungif-gif-gentoo.patch 1534
-RMD160 8bc5ef391e644ad00f46c7d34e7341862572346a files/emacs-21.4-libungif-gif-gentoo.patch 1534
-SHA256 61793086af3c4a56ced40830977ba0d6ebc285d84b4b612798b35ca08f1f1689 files/emacs-21.4-libungif-gif-gentoo.patch 1534
-AUX emacs-21.4-oldxmenu-malloc.patch 519 RMD160 c9223611cffd9892463168ce00426dcec0d06ad8 SHA1 9cbe6c08103477ed493985680b3a5b3441e9de0f SHA256 be942da986b1a1593c7a09db47dce919f5baee27e6425dfc06179ca5b4caf0ea
-MD5 7c4a46d4109a65062ec2b9172360203e files/emacs-21.4-oldxmenu-malloc.patch 519
-RMD160 c9223611cffd9892463168ce00426dcec0d06ad8 files/emacs-21.4-oldxmenu-malloc.patch 519
-SHA256 be942da986b1a1593c7a09db47dce919f5baee27e6425dfc06179ca5b4caf0ea files/emacs-21.4-oldxmenu-malloc.patch 519
-AUX emacs-21.4-ppc64-fix-unexelf.patch 2698 RMD160 ed0d68a88f98631d0a7146f9f23114a5aee6ca48 SHA1 484b2e01ee355e31b2f385eb7fa199f83512fcb0 SHA256 411aefa45cc11dc67eee88f9c0522da207eb4c93598672626462003f695f89dd
-MD5 5828fb42a73d0ee0d5b07cf73085b274 files/emacs-21.4-ppc64-fix-unexelf.patch 2698
-RMD160 ed0d68a88f98631d0a7146f9f23114a5aee6ca48 files/emacs-21.4-ppc64-fix-unexelf.patch 2698
-SHA256 411aefa45cc11dc67eee88f9c0522da207eb4c93598672626462003f695f89dd files/emacs-21.4-ppc64-fix-unexelf.patch 2698
-AUX emacs-21.4-qa.patch 2467 RMD160 22b054159a57b859b1d381b42565e96d254e4f7e SHA1 5aafbd565c97154399c663ec6a978c91957bda81 SHA256 058c08ab6300fe7bb6c91d253008972457eb51fe152787499cc9f6e3f78fe608
-MD5 b17a2a2d4bb386151ab7bbe2b946d031 files/emacs-21.4-qa.patch 2467
-RMD160 22b054159a57b859b1d381b42565e96d254e4f7e files/emacs-21.4-qa.patch 2467
-SHA256 058c08ab6300fe7bb6c91d253008972457eb51fe152787499cc9f6e3f78fe608 files/emacs-21.4-qa.patch 2467
 AUX emacs-21.desktop 238 RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc SHA1 92e6200b87c613264ee7103caa15d977c9040a12 SHA256 3d40581e18f1f633d0f1c822b00a8d2fb2de8ea95660fe0815ac837616f6db58
 MD5 ab4757cbbda4ac6f848021b947d1f2b2 files/emacs-21.desktop 238
 RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc files/emacs-21.desktop 238
@@ -84,6 +32,7 @@ SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074 files/em
 DIST emacs-18-patches.tar.bz2 16526 RMD160 ab0ed5e428fd71f24f44b43945940d7d33670e81 SHA1 3e2e962da5c7d3314943cdb402fd4c026301341c SHA256 d8dd29786dbd202b5e7bb3a176d97ae0901b6c1dd4276e253f0f42fcef34cd6e
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
+DIST emacs-21-patches.tar.bz2 8891 RMD160 ca0a44cc0d6e81fb245eb4f6069dd49550a9c55f SHA1 592c47434288a5c3672110acf4f36ab2072c19ae SHA256 456af3ed5bcfa99af3fd67c281e391ca1b67599aed0cfd470adca8b34240d914
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
@@ -91,26 +40,26 @@ EBUILD emacs-18.59-r4.ebuild 2550 RMD160 7ca1968659bccb05eadd4ae05a65fec1680dcfd
 MD5 8d0aa7f3f3145cfb8fe4246216c70ed5 emacs-18.59-r4.ebuild 2550
 RMD160 7ca1968659bccb05eadd4ae05a65fec1680dcfd3 emacs-18.59-r4.ebuild 2550
 SHA256 c5e4a6cd90ca3b9125b6bde38f71e8095ede50ab1549f936748434e71bb51432 emacs-18.59-r4.ebuild 2550
-EBUILD emacs-21.4-r12.ebuild 6066 RMD160 c618f8549cad6c9967995407d65cdd7cf5486f23 SHA1 81f11344300efa9d64eac003df703bb724d47533 SHA256 2f9058e5e1ae00b13951a614f4cd8b96c2d93ede193ef5f4714b749c335fafb8
-MD5 a7d67e52d368eea77780f058e6f5657f emacs-21.4-r12.ebuild 6066
-RMD160 c618f8549cad6c9967995407d65cdd7cf5486f23 emacs-21.4-r12.ebuild 6066
-SHA256 2f9058e5e1ae00b13951a614f4cd8b96c2d93ede193ef5f4714b749c335fafb8 emacs-21.4-r12.ebuild 6066
-EBUILD emacs-21.4-r4.ebuild 4535 RMD160 1930ccf03cdc16a70d243ff31f9166c299873abe SHA1 d7edca43277eb3e66a85958e3c21d643cbb248d7 SHA256 843e8efd54938f4390292f9c0efd9dfaa0f55d694e92c1102c36d649fba7b79c
-MD5 2e09f80cc20f1d0da8fe9af115188f9d emacs-21.4-r4.ebuild 4535
-RMD160 1930ccf03cdc16a70d243ff31f9166c299873abe emacs-21.4-r4.ebuild 4535
-SHA256 843e8efd54938f4390292f9c0efd9dfaa0f55d694e92c1102c36d649fba7b79c emacs-21.4-r4.ebuild 4535
-EBUILD emacs-21.4-r8.ebuild 5711 RMD160 249b044798438cf45407a262e3f751aea72a2796 SHA1 393385b35c2cbab272487e4eafc5ec8433803976 SHA256 591014e674fe57645affe5ada46d06ac3ec937fb1862a7ee75e59c015a37e6bc
-MD5 c26a6d9fbd64864d40dd82cffcde57f6 emacs-21.4-r8.ebuild 5711
-RMD160 249b044798438cf45407a262e3f751aea72a2796 emacs-21.4-r8.ebuild 5711
-SHA256 591014e674fe57645affe5ada46d06ac3ec937fb1862a7ee75e59c015a37e6bc emacs-21.4-r8.ebuild 5711
+EBUILD emacs-21.4-r12.ebuild 6092 RMD160 a0c7f9f0488588a5dcacb0d339eb34014e31525c SHA1 ee3a65ed18ae892a8536929efa90bbfbcbd5139d SHA256 a0399100a15a5f4a278485dd79041c0251b8d73d4db97c728a5797002571cb67
+MD5 979476bd3d679a99222359a5b098c262 emacs-21.4-r12.ebuild 6092
+RMD160 a0c7f9f0488588a5dcacb0d339eb34014e31525c emacs-21.4-r12.ebuild 6092
+SHA256 a0399100a15a5f4a278485dd79041c0251b8d73d4db97c728a5797002571cb67 emacs-21.4-r12.ebuild 6092
+EBUILD emacs-21.4-r4.ebuild 4582 RMD160 87552fa21a0dffc21a0eba018eabb3edd00ff294 SHA1 469872f21fe9ec984ef0729204edef4d5a792838 SHA256 8ab19a915bf42f07279ce25197aaac95fd54bf3b734d90d4a251d2ef6937f4ce
+MD5 4164b8252a985c56c0f5fcf4e4b653a8 emacs-21.4-r4.ebuild 4582
+RMD160 87552fa21a0dffc21a0eba018eabb3edd00ff294 emacs-21.4-r4.ebuild 4582
+SHA256 8ab19a915bf42f07279ce25197aaac95fd54bf3b734d90d4a251d2ef6937f4ce emacs-21.4-r4.ebuild 4582
+EBUILD emacs-21.4-r8.ebuild 5745 RMD160 31111ab0a092a969250bc4ec87b8ee9e3d7dc088 SHA1 ff96a684dcbd38dcb30931db1b55479dfd50477e SHA256 3a1aa4b2031d3de45105c2082cd32130404731444493fe2cd47b0c8e9ef31a70
+MD5 9c13d7443ba1e4b6bc6d5c1de60ad87a emacs-21.4-r8.ebuild 5745
+RMD160 31111ab0a092a969250bc4ec87b8ee9e3d7dc088 emacs-21.4-r8.ebuild 5745
+SHA256 3a1aa4b2031d3de45105c2082cd32130404731444493fe2cd47b0c8e9ef31a70 emacs-21.4-r8.ebuild 5745
 EBUILD emacs-22.1.ebuild 7245 RMD160 3aaf13665152aa188e75bbe1092438780bcfab3e SHA1 2562dc5f9535099ddbf6c7c4c3125a4a3db8ed8b SHA256 123e5b0ce781b6ff7d56593bb152c40ed3fb066a2563383d7221e602cdfa50e6
 MD5 2adb797bc23f916b56a068f998d09f7d emacs-22.1.ebuild 7245
 RMD160 3aaf13665152aa188e75bbe1092438780bcfab3e emacs-22.1.ebuild 7245
 SHA256 123e5b0ce781b6ff7d56593bb152c40ed3fb066a2563383d7221e602cdfa50e6 emacs-22.1.ebuild 7245
-MISC ChangeLog 24987 RMD160 8788bd4c56d1f4e1bf961d32fb20b2dcf3fdefe3 SHA1 238984756df1f2775117dbbd08b148649811969f SHA256 741162fc291538f10a2f2f233a9ce2457680aab2c045b32082ce5e64e7a73efb
-MD5 c88aedd79be42e8ed96ae9a28cf820e4 ChangeLog 24987
-RMD160 8788bd4c56d1f4e1bf961d32fb20b2dcf3fdefe3 ChangeLog 24987
-SHA256 741162fc291538f10a2f2f233a9ce2457680aab2c045b32082ce5e64e7a73efb ChangeLog 24987
+MISC ChangeLog 25622 RMD160 700dc7a9a2bc858a0bbfeed5077a12f00ed06510 SHA1 5ded7326cc6c18d37d47e6c1a0dc4aac7bea964f SHA256 327223af555a7997a380f57d3e882bc58e2b95f717bf7b3b79e1032856776171
+MD5 c06236b461f31af828af8957d622b57d ChangeLog 25622
+RMD160 700dc7a9a2bc858a0bbfeed5077a12f00ed06510 ChangeLog 25622
+SHA256 327223af555a7997a380f57d3e882bc58e2b95f717bf7b3b79e1032856776171 ChangeLog 25622
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -118,22 +67,22 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 6bd3531350f6b7c7682351e3dcf628d0 files/digest-emacs-18.59-r4 786
 RMD160 4d1f0a68da522f0bfbe8cebdb748c5f95ccc1c9d files/digest-emacs-18.59-r4 786
 SHA256 a5d7f43b69d68028793ee45424a1fce37e65dd63802310ebfda5ca85a62e9ba7 files/digest-emacs-18.59-r4 786
-MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r12 473
-RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r12 473
-SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r12 473
-MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r4 473
-RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r4 473
-SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r4 473
-MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r8 473
-RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r8 473
-SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r8 473
+MD5 468a3477927c6638fd0c62ac262de2ec files/digest-emacs-21.4-r12 720
+RMD160 b0ca2d4dd576d4e81ebffdba3f7abe36980d9707 files/digest-emacs-21.4-r12 720
+SHA256 92435bb0f281ed6635d5c18928331c73fcfac2ab62762eb8aa88275a0a7fe4db files/digest-emacs-21.4-r12 720
+MD5 468a3477927c6638fd0c62ac262de2ec files/digest-emacs-21.4-r4 720
+RMD160 b0ca2d4dd576d4e81ebffdba3f7abe36980d9707 files/digest-emacs-21.4-r4 720
+SHA256 92435bb0f281ed6635d5c18928331c73fcfac2ab62762eb8aa88275a0a7fe4db files/digest-emacs-21.4-r4 720
+MD5 468a3477927c6638fd0c62ac262de2ec files/digest-emacs-21.4-r8 720
+RMD160 b0ca2d4dd576d4e81ebffdba3f7abe36980d9707 files/digest-emacs-21.4-r8 720
+SHA256 92435bb0f281ed6635d5c18928331c73fcfac2ab62762eb8aa88275a0a7fe4db files/digest-emacs-21.4-r8 720
 MD5 8c64069c07b5fdaf75a4679bad002334 files/digest-emacs-22.1 238
 RMD160 503cb2e6877f461b2adf972a8bbef02e81eb79ef files/digest-emacs-22.1 238
 SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/digest-emacs-22.1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGf1lDOeoy/oIi7uwRAn55AJ48GK2UmtWbBU5PYJu2YhUW57OoHgCfRHi0
-4CPawMTKt7ql5PCHDwvk3gM=
-=5tCF
+iD8DBQFGf21KOeoy/oIi7uwRAmN0AJ0TC1UmeT9hGKnlWlx8SGICp71HagCgkzLy
+/kxPeFqjafI4KP9dcFaiS7o=
+=g+ir
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild
index 2c4e9dbf4660..2ce1df3f32fc 100644
--- a/app-editors/emacs/emacs-21.4-r12.ebuild
+++ b/app-editors/emacs/emacs-21.4-r12.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/emacs-21.4-r12.ebuild,v 1.26 2007/06/24 21:14:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.27 2007/06/25 07:22:42 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -9,6 +9,7 @@ inherit flag-o-matic eutils toolchain-funcs autotools
 DESCRIPTION="An incredibly powerful, extensible text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
+	mirror://gentoo/emacs-21-patches.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2 FDL-1.1"
@@ -51,23 +52,23 @@ src_unpack() {
 		-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}/emacs-21.3-xorg.patch"
-	epatch "${FILESDIR}/emacs-21.3-amd64.patch"
-	epatch "${FILESDIR}/emacs-21.3-hppa.patch"
-	epatch "${FILESDIR}/emacs-21.2-sh.patch"
-	epatch "${FILESDIR}/emacs-21.4-libungif-gif-gentoo.patch"
+	epatch "${WORKDIR}/emacs-21.3-xorg.patch"
+	epatch "${WORKDIR}/emacs-21.3-amd64.patch"
+	epatch "${WORKDIR}/emacs-21.3-hppa.patch"
+	epatch "${WORKDIR}/emacs-21.2-sh.patch"
+	epatch "${WORKDIR}/emacs-21.4-libungif-gif-gentoo.patch"
 
 	if use ppc64; then
-		epatch "${FILESDIR}/emacs-21.3-ppc64.patch"
-		epatch "${FILESDIR}/emacs-21.4-ppc64-fix-unexelf.patch"
+		epatch "${WORKDIR}/emacs-21.3-ppc64.patch"
+		epatch "${WORKDIR}/emacs-21.4-ppc64-fix-unexelf.patch"
 	fi
 
-	epatch "${FILESDIR}/emacs-21.4-autosave-tmp.patch"
-	epatch "${FILESDIR}/emacs-21.4-blessmail-build.patch"
-	epatch "${FILESDIR}/emacs-21.4-qa.patch"
-	epatch "${FILESDIR}/emacs-21.4-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/emacs-21.4-freebsd-terminfo.patch"
-	epatch "${FILESDIR}/emacs-21.4-oldxmenu-malloc.patch"
+	epatch "${WORKDIR}/emacs-21.4-autosave-tmp.patch"
+	epatch "${WORKDIR}/emacs-21.4-blessmail-build.patch"
+	epatch "${WORKDIR}/emacs-21.4-qa.patch"
+	epatch "${WORKDIR}/emacs-21.4-Xaw3d-headers.patch"
+	epatch "${WORKDIR}/emacs-21.4-freebsd-terminfo.patch"
+	epatch "${WORKDIR}/emacs-21.4-oldxmenu-malloc.patch"
 
 	# install emacsclient.1 man page (#165466)
 	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
diff --git a/app-editors/emacs/emacs-21.4-r4.ebuild b/app-editors/emacs/emacs-21.4-r4.ebuild
index 1ea7bb4a1a15..038e8caef355 100644
--- a/app-editors/emacs/emacs-21.4-r4.ebuild
+++ b/app-editors/emacs/emacs-21.4-r4.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.15 2007/05/15 15:03:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.16 2007/06/25 07:22:42 ulm Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
 DESCRIPTION="An incredibly powerful, extensible text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
+	mirror://gentoo/emacs-21-patches.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -50,11 +51,11 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/emacs-21.3-xorg.patch
-	epatch ${FILESDIR}/emacs-21.3-amd64.patch
-	epatch ${FILESDIR}/emacs-21.3-hppa.patch
-	epatch ${FILESDIR}/emacs-21.2-sh.patch
-	use ppc64 && epatch ${FILESDIR}/emacs-21.3-ppc64.patch
+	epatch "${WORKDIR}/emacs-21.3-xorg.patch"
+	epatch "${WORKDIR}/emacs-21.3-amd64.patch"
+	epatch "${WORKDIR}/emacs-21.3-hppa.patch"
+	epatch "${WORKDIR}/emacs-21.2-sh.patch"
+	use ppc64 && epatch "${WORKDIR}/emacs-21.3-ppc64.patch"
 
 	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
 
diff --git a/app-editors/emacs/emacs-21.4-r8.ebuild b/app-editors/emacs/emacs-21.4-r8.ebuild
index f31ccadf2737..2063915f7529 100644
--- a/app-editors/emacs/emacs-21.4-r8.ebuild
+++ b/app-editors/emacs/emacs-21.4-r8.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r8.ebuild,v 1.3 2007/05/15 15:03:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r8.ebuild,v 1.4 2007/06/25 07:22:42 ulm Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
 DESCRIPTION="An incredibly powerful, extensible text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
+	mirror://gentoo/emacs-21-patches.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -50,16 +51,16 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}/emacs-21.3-xorg.patch"
-	epatch "${FILESDIR}/emacs-21.3-amd64.patch"
-	epatch "${FILESDIR}/emacs-21.3-hppa.patch"
-	epatch "${FILESDIR}/emacs-21.2-sh.patch"
-	epatch "${FILESDIR}/emacs-21.4-libungif-gif-gentoo.patch"
+	epatch "${WORKDIR}/emacs-21.3-xorg.patch"
+	epatch "${WORKDIR}/emacs-21.3-amd64.patch"
+	epatch "${WORKDIR}/emacs-21.3-hppa.patch"
+	epatch "${WORKDIR}/emacs-21.2-sh.patch"
+	epatch "${WORKDIR}/emacs-21.4-libungif-gif-gentoo.patch"
 
-	use ppc64 && epatch "${FILESDIR}/emacs-21.3-ppc64.patch"
+	use ppc64 && epatch "${WORKDIR}/emacs-21.3-ppc64.patch"
 
-	epatch "${FILESDIR}/emacs-21.4-autosave-tmp.patch"
-	epatch "${FILESDIR}/emacs-21.4-blessmail-build.patch"
+	epatch "${WORKDIR}/emacs-21.4-autosave-tmp.patch"
+	epatch "${WORKDIR}/emacs-21.4-blessmail-build.patch"
 
 	# This will need to be updated for X-Compilation
 	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r12 b/app-editors/emacs/files/digest-emacs-21.4-r12
index 6898ecff2a12..24df8a280bd3 100644
--- a/app-editors/emacs/files/digest-emacs-21.4-r12
+++ b/app-editors/emacs/files/digest-emacs-21.4-r12
@@ -1,3 +1,6 @@
+MD5 c3394d805e6ed999c4ac7d197091f1e3 emacs-21-patches.tar.bz2 8891
+RMD160 ca0a44cc0d6e81fb245eb4f6069dd49550a9c55f emacs-21-patches.tar.bz2 8891
+SHA256 456af3ed5bcfa99af3fd67c281e391ca1b67599aed0cfd470adca8b34240d914 emacs-21-patches.tar.bz2 8891
 MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
 RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r4 b/app-editors/emacs/files/digest-emacs-21.4-r4
index 6898ecff2a12..24df8a280bd3 100644
--- a/app-editors/emacs/files/digest-emacs-21.4-r4
+++ b/app-editors/emacs/files/digest-emacs-21.4-r4
@@ -1,3 +1,6 @@
+MD5 c3394d805e6ed999c4ac7d197091f1e3 emacs-21-patches.tar.bz2 8891
+RMD160 ca0a44cc0d6e81fb245eb4f6069dd49550a9c55f emacs-21-patches.tar.bz2 8891
+SHA256 456af3ed5bcfa99af3fd67c281e391ca1b67599aed0cfd470adca8b34240d914 emacs-21-patches.tar.bz2 8891
 MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
 RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r8 b/app-editors/emacs/files/digest-emacs-21.4-r8
index 6898ecff2a12..24df8a280bd3 100644
--- a/app-editors/emacs/files/digest-emacs-21.4-r8
+++ b/app-editors/emacs/files/digest-emacs-21.4-r8
@@ -1,3 +1,6 @@
+MD5 c3394d805e6ed999c4ac7d197091f1e3 emacs-21-patches.tar.bz2 8891
+RMD160 ca0a44cc0d6e81fb245eb4f6069dd49550a9c55f emacs-21-patches.tar.bz2 8891
+SHA256 456af3ed5bcfa99af3fd67c281e391ca1b67599aed0cfd470adca8b34240d914 emacs-21-patches.tar.bz2 8891
 MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
 RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
diff --git a/app-editors/emacs/files/emacs-21.2-sh.patch b/app-editors/emacs/files/emacs-21.2-sh.patch
deleted file mode 100644
index 254db249fc0f..000000000000
--- a/app-editors/emacs/files/emacs-21.2-sh.patch
+++ /dev/null
@@ -1,175 +0,0 @@
---- emacs21-21.2.orig/configure.in
-+++ emacs21-21.2/configure.in
-@@ -1055,6 +1055,16 @@
-     machine=mipsel opsys=gnu-linux
-   ;;
- 
-+  ## SuperH (little endian) Linux-based GNU system
-+  sh[34]-*-linux-gnu* )
-+    machine=sh opsys=gnu-linux
-+  ;;
-+
-+  ## SuperH (big endian) Linux-based GNU system
-+  sh[34]eb-*-linux-gnu* )
-+    machine=sheb opsys=gnu-linux
-+  ;;
-+
-   ## UXP/DS
-   sparc-fujitsu-sysv4* )
-     machine=sparc opsys=uxpds
---- emacs21-21.2.orig/src/m/sh.h
-+++ emacs21-21.2/src/m/sh.h
-@@ -0,0 +1,122 @@
-+/* machine description file for Hitach SuperH.
-+   Copyright (C) 2000 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+
-+/* The following line tells the configuration script what sort of 
-+   operating system this machine is likely to run.
-+   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"  */
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#undef WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+ * group of arguments and treat it as an array of the arguments.  */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Define WORD_MACHINE if addresses and such have
-+ * to be corrected before they can be used as byte counts.  */
-+
-+#undef WORD_MACHINE
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+   does not define it automatically:
-+   Ones defined so far include vax, m68000, ns16000, pyramid,
-+   orion, tahoe, APOLLO and many others */
-+#define SUPERH
-+
-+/* Use type int rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines.  */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+   the 24-bit bit field into an int.  In other words, if bit fields
-+   are always unsigned.
-+
-+   If you use NO_UNION_TYPE, this flag does not matter.  */
-+
-+#define EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define CANNOT_DUMP on machines where unexec does not work.
-+   Then the function dump-emacs will not be defined
-+   and temacs will do (load "loadup") automatically unless told otherwise.  */
-+
-+#undef CANNOT_DUMP
-+
-+/* Define VIRT_ADDR_VARIES if the virtual addresses of
-+   pure and impure space as loaded can vary, and even their
-+   relative order cannot be relied on.
-+
-+   Otherwise Emacs assumes that text space precedes data space,
-+   numerically.  */
-+
-+#undef VIRT_ADDR_VARIES
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+   and the one written in C should be used instead.
-+   Define HAVE_ALLOCA to say that the system provides a properly
-+   working alloca function and it should be used.
-+   Define neither one if an assembler-language alloca
-+   in the file alloca.s should be used.  */
-+
-+#undef C_ALLOCA
-+#define HAVE_ALLOCA
-+
-+/* Define NO_REMAP if memory segmentation makes it not work well
-+   to change the boundary between the text section and data section
-+   when Emacs is dumped.  If you define this, the preloaded Lisp
-+   code will not be sharable; but that's better than failing completely.  */
-+
-+#undef NO_REMAP
-+
-+/* Some really obscure 4.2-based systems (like Sequent DYNIX)
-+ * do not support asynchronous I/O (using SIGIO) on sockets,
-+ * even though it works fine on tty's.  If you have one of
-+ * these systems, define the following, and then use it in
-+ * config.h (or elsewhere) to decide when (not) to use SIGIO.
-+ *
-+ * You'd think this would go in an operating-system description file,
-+ * but since it only occurs on some, but not all, BSD systems, the
-+ * reasonable place to select for it is in the machine description
-+ * file.
-+ */
-+
-+#undef NO_SOCK_SIGIO
-+
-+
-+/* After adding support for a new system, modify the large case
-+   statement in the `configure' script to recognize reasonable
-+   configuration names, and add a description of the system to
-+   `etc/MACHINES'.
-+
-+   If you've just fixed a problem in an existing configuration file,
-+   you should also check `etc/MACHINES' to make sure its descriptions
-+   of known problems in that configuration should be updated.  */
-only in patch2:
---- emacs21-21.2.orig/src/m/sheb.h
-+++ emacs21-21.2/src/m/sheb.h
-@@ -0,0 +1,8 @@
-+/* machine description file for sheb (SuperH big endian).  */
-+
-+#include "sh.h"
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#define WORDS_BIG_ENDIAN
---- emacs-21.2.orig/configure	Fri Mar 15 21:46:09 2002
-+++ emacs-21.2/configure	Mon Nov 25 16:30:19 2002
-@@ -1666,6 +1666,16 @@
-     machine=mips opsys=gnu-linux
-   ;;
- 
-+  ## SuperH (little endian) Linux-based GNU system
-+  sh[34]-*-linux-gnu* )
-+    machine=sh opsys=gnu-linux
-+  ;;
-+
-+  ## SuperH (big endian) Linux-based GNU system
-+  sh[34]eb-*-linux-gnu* )
-+    machine=sheb opsys=gnu-linux
-+  ;;
-+
-   ## UXP/DS
-   sparc-fujitsu-sysv4* )
-     machine=sparc opsys=uxpds
diff --git a/app-editors/emacs/files/emacs-21.3-amd64.patch b/app-editors/emacs/files/emacs-21.3-amd64.patch
deleted file mode 100644
index 9c5f5e201d71..000000000000
--- a/app-editors/emacs/files/emacs-21.3-amd64.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -Naur emacs-21.3-old/configure emacs-21.3/configure
---- emacs-21.3-old/configure	2003-12-14 03:34:27.000000000 +0000
-+++ emacs-21.3/configure	2003-12-14 03:35:13.000000000 +0000
-@@ -1632,6 +1632,11 @@
-     machine=ia64 opsys=gnu-linux
-   ;;
- 
-+  ## X86-64
-+  x86_64*-*-linux* )
-+    machine=x86_64 opsys=gnu-linux
-+  ;;
-+
-   ## Intel 386 machines where we don't care about the manufacturer
-   i[3456]86-*-* )
-     machine=intel386
-diff -Naur emacs-21.3-old/configure.in emacs-21.3/configure.in
---- emacs-21.3-old/configure.in	2003-12-14 03:34:27.000000000 +0000
-+++ emacs-21.3/configure.in	2003-12-14 03:35:04.000000000 +0000
-@@ -1006,6 +1006,11 @@
-     machine=ia64 opsys=gnu-linux
-   ;;
- 
-+  ## X86-64
-+  x86_64*-*-linux* )
-+    machine=x86_64 opsys=gnu-linux
-+  ;;
-+
-   ## Intel 386 machines where we don't care about the manufacturer
-   i[3456]86-*-* )
-     machine=intel386
-diff -Naur emacs-21.3-old/src/m/x86_64.h emacs-21.3/src/m/x86_64.h
---- emacs-21.3-old/src/m/x86_64.h	1970-01-01 00:00:00.000000000 +0000
-+++ emacs-21.3/src/m/x86_64.h	2003-12-14 03:35:04.000000000 +0000
-@@ -0,0 +1,175 @@
-+/* machine description file for the X86-64 architecture.
-+   Copyright (C) 2000 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 1, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define BITS_PER_LONG		64
-+#define BITS_PER_EMACS_INT	64
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#undef WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+   group of arguments and treat it as an array of the arguments.  */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Define WORD_MACHINE if addresses and such have
-+   to be corrected before they can be used as byte counts.  */
-+
-+/* #define WORD_MACHINE */
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+   does not define it automatically:
-+   Ones defined so far include vax, m68000, ns16000, pyramid,
-+   orion, tahoe, APOLLO and many others */
-+
-+/* __x86_64__ defined automatically */
-+
-+
-+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines.  */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define the type to use.  */
-+#define EMACS_INT		long
-+#define EMACS_UINT		unsigned long
-+#define SPECIAL_EMACS_INT
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+   the 24-bit bit field into an int.  In other words, if bit fields
-+   are always unsigned.
-+
-+   If you use NO_UNION_TYPE, this flag does not matter.  */
-+
-+#define EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE		long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define CANNOT_DUMP on machines where unexec does not work.
-+   Then the function dump-emacs will not be defined
-+   and temacs will do (load "loadup") automatically unless told otherwise.  */
-+#if 0
-+#define CANNOT_DUMP
-+#endif
-+
-+/* Define VIRT_ADDR_VARIES if the virtual addresses of
-+   pure and impure space as loaded can vary, and even their
-+   relative order cannot be relied on.
-+
-+   Otherwise Emacs assumes that text space precedes data space,
-+   numerically.  */
-+
-+/* #define VIRT_ADDR_VARIES */
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+   and the one written in C should be used instead.
-+   Define HAVE_ALLOCA to say that the system provides a properly
-+   working alloca function and it should be used.
-+   Define neither one if an assembler-language alloca
-+   in the file alloca.s should be used.  */
-+
-+#define HAVE_ALLOCA
-+
-+/* Define the following if GNU malloc and the relocating allocator do
-+   not work together with X.  */
-+
-+/* #define SYSTEM_MALLOC */
-+
-+/* Define NO_REMAP if memory segmentation makes it not work well
-+   to change the boundary between the text section and data section
-+   when Emacs is dumped.  If you define this, the preloaded Lisp
-+   code will not be sharable; but that's better than failing completely.  */
-+
-+/* #define NO_REMAP */
-+
-+/* Some really obscure 4.2-based systems (like Sequent DYNIX) do not
-+   support asynchronous I/O (using SIGIO) on sockets, even though it
-+   works fine on tty's.  If you have one of these systems, define the
-+   following, and then use it in config.h (or elsewhere) to decide
-+   when (not) to use SIGIO.
-+
-+   You'd think this would go in an operating-system description file,
-+   but since it only occurs on some, but not all, BSD systems, the
-+   reasonable place to select for it is in the machine description
-+   file.  */
-+
-+/* #define NO_SOCK_SIGIO */
-+
-+#ifdef __ELF__
-+#undef UNEXEC
-+#define UNEXEC unexelf.o
-+#endif
-+
-+#define PNTR_COMPARISON_TYPE unsigned long
-+
-+/* On the 64 bit architecture, we can use 60 bits for addresses */
-+
-+#define VALBITS         60
-+
-+/* Define XINT and XUINT so that they can take arguments of type int */
-+
-+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-+#define XUINT(a) ((long) (a) & VALMASK)
-+
-+/* Declare malloc and realloc in a way that is clean.
-+   But not in makefiles!  */
-+
-+#ifndef NOT_C_CODE
-+/* We need these because pointers are larger than the default ints.  */
-+# if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#  include <alloca.h>
-+# else
-+#  include <stdlib.h>
-+# endif
-+
-+/* We need to prototype these for the lib-src programs even if we don't
-+   use the system malloc for the Emacs proper.  */
-+#ifdef _MALLOC_INTERNAL
-+/* These declarations are designed to match the ones in gmalloc.c.  */
-+#if defined (__STDC__) && __STDC__
-+extern void *malloc (), *realloc (), *calloc ();
-+#else
-+extern char *malloc (), *realloc (), *calloc ();
-+#endif
-+#else /* not _MALLOC_INTERNAL */
-+extern void *malloc (), *realloc (), *calloc ();
-+#endif /* not _MALLOC_INTERNAL */
-+
-+#ifdef REL_ALLOC
-+#ifndef _MALLOC_INTERNAL
-+/* "char *" because ralloc.c defines it that way.  gmalloc.c thinks it
-+   is allowed to prototype these as "void *" so we don't prototype in
-+   that case.  You're right: it stinks!  */
-+extern char *r_alloc (), *r_re_alloc ();
-+extern void r_alloc_free ();
-+#endif /* not _MALLOC_INTERNAL */
-+#endif /* REL_ALLOC */
-+
-+#endif /* not NOT_C_CODE */
-+
-+#define HAVE_TEXT_START
-diff -Naur emacs-21.3-old/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h
---- emacs-21.3-old/src/s/gnu-linux.h	2003-12-14 03:34:28.000000000 +0000
-+++ emacs-21.3/src/s/gnu-linux.h	2003-12-14 03:35:04.000000000 +0000
-@@ -173,8 +173,12 @@
- /* GNU/Linux usually has crt0.o in a non-standard place */
- #define START_FILES pre-crt0.o /usr/lib/crt0.o
- #else
-+#if defined(__x86_64)
-+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-+#else
- #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
- #endif
-+#endif
- 
- #ifdef __ELF__
- /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-@@ -225,8 +229,12 @@
- #else
- #undef LIB_GCC
- #define LIB_GCC
-+#if defined(__x86_64)
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-+#else
- #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
- #endif
-+#endif
- 
- /* Don't use -g in test compiles in configure.
-    This is so we will use the same shared libs for that linking
diff --git a/app-editors/emacs/files/emacs-21.3-hppa.patch b/app-editors/emacs/files/emacs-21.3-hppa.patch
deleted file mode 100644
index 6955f9385ee0..000000000000
--- a/app-editors/emacs/files/emacs-21.3-hppa.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -uNr emacs-21.3.orig/configure emacs-21.3/configure
---- emacs-21.3.orig/configure	2003-12-20 15:03:19.622159984 +0000
-+++ emacs-21.3/configure	2003-12-20 15:13:56.550332184 +0000
-@@ -1179,6 +1179,10 @@
-     machine=hp800 opsys=nextstep
-   ;;
- 
-+  hppa*-*-linux-gnu* )
-+    machine=hp800 psys=gnu-linux
-+  ;;
-+  
-   ## Orion machines
-   orion-orion-bsd* )
-     machine=orion opsys=bsd4-2
-diff -uNr emacs-21.3.orig/configure.in emacs-21.3/configure.in
---- emacs-21.3.orig/configure.in	2003-12-20 15:03:19.624159680 +0000
-+++ emacs-21.3/configure.in	2003-12-20 15:15:22.825216408 +0000
-@@ -553,6 +553,10 @@
-     machine=hp800 opsys=nextstep
-   ;;
- 
-+  hppa*-*-linux-gnu* )
-+    machine=hp800 opsys=gnu-linux
-+  ;;
-+
-   ## Orion machines
-   orion-orion-bsd* )
-     machine=orion opsys=bsd4-2
---- emacs21-21.2.orig/src/m/hp800.h
-+++ emacs21-21.2/src/m/hp800.h
-@@ -85,7 +85,7 @@
- #define bcmp		memcmp
- #endif
- 
--#ifdef __hpux
-+#if defined(__hpux) || defined(__linux__)
- /* Now define a symbol for the cpu type, if your compiler
-    does not define it automatically:
-    Ones defined so far include vax, m68000, ns16000, pyramid,
-@@ -94,6 +94,15 @@
- #     define hp9000s800
- #endif
- 
-+#ifdef __linux__
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+#else
- /* Data type of load average, as read out of kmem.  */
- 
- #define LOAD_AVE_TYPE double
-@@ -101,7 +110,7 @@
- /* Convert that into an integer that is 100 for a load average of 1.0  */
- 
- #define LOAD_AVE_CVT(x) ((int) (x * 100.0))
--
-+#endif
- 
- /* Define CANNOT_DUMP on machines where unexec does not work.
-    Then the function dump-emacs will not be defined
-@@ -116,6 +125,7 @@
-    Otherwise Emacs assumes that text space precedes data space,
-    numerically.  */
- 
-+#ifdef __hpux
- #define VIRT_ADDR_VARIES
- 
- /* Define C_ALLOCA if this machine does not support a true alloca
-@@ -134,6 +144,9 @@
- 
- #define DATA_START    0x40000000
- #define TEXT_START    0x00000000
-+#else
-+#define HAVE_ALLOCA
-+#endif
- 
- #define STACK_DIRECTION 1 
- 
-@@ -147,6 +160,7 @@
- /* This machine requires completely different unexec code
-    which lives in a separate file.  Specify the file name.  */
- 
-+#ifdef __hpux
- #define UNEXEC unexhp9k800.o
- 
- #define LIBS_MACHINE
-@@ -179,5 +193,5 @@
- 
- #define index strchr
- #define rindex strrchr
--
--#endif /* __hpux */
-+#endif
-+#endif
diff --git a/app-editors/emacs/files/emacs-21.3-ppc64.patch b/app-editors/emacs/files/emacs-21.3-ppc64.patch
deleted file mode 100644
index 757213794b59..000000000000
--- a/app-editors/emacs/files/emacs-21.3-ppc64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- emacs-21.3/src/m/macppc.h.sopwith	2001-10-23 02:43:33.000000000 -0400
-+++ emacs-21.3/src/m/macppc.h	2003-05-02 09:17:37.000000000 -0400
-@@ -95,11 +95,47 @@
- 
- #ifdef LINUX
- #define LINKER $(CC) -nostdlib
--#define LD_SWITCH_MACHINE -Xlinker -m -Xlinker elf32ppc
-+#ifdef __powerpc64__
-+#define LD_SWITCH_MACHINE -m64 -Xlinker -m -Xlinker elf64ppc
-+#else
-+#define LD_SWITCH_MACHINE -m32 -Xlinker -m -Xlinker elf32ppc
-+#endif
- /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
-    because prefix-args is not used.  */
- #undef LD_SWITCH_SYSTEM_TEMACS
- #define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc
-+
-+#ifdef __powerpc64__
-+/* Misc 64-bit fixups, patterned after the x86_64 file */
-+#undef BITS_PER_LONG
-+#undef BITS_PER_EMACS_INT
-+#undef VALBITS
-+#undef PNTR_COMPARISON_TYPE
-+#undef MARKBIT
-+#undef XINT
-+#undef XUINT
-+#undef XPNTR
-+#undef START_FILES
-+#undef LIB_STANDARD
-+#undef EMACS_INT
-+#undef EMACS_UINT
-+#undef SPECIAL_EMACS_INT
-+
-+#define BITS_PER_LONG 64
-+#define BITS_PER_EMACS_INT 64
-+#define VALBITS 60
-+#define PNTR_COMPARISON_TYPE unsigned long
-+#define MARKBIT         0x8000000000000000L
-+
-+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-+#define XUINT(a) ((long) (a) & VALMASK)
-+#define XPNTR(a) XUINT (a)
-+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-+#define EMACS_INT               long
-+#define EMACS_UINT              unsigned long
-+#define SPECIAL_EMACS_INT
-+#endif
- #endif
- 
- #if 0  /* This breaks things on PPC GNU/Linux ecept for Yellowdog,
diff --git a/app-editors/emacs/files/emacs-21.3-xorg.patch b/app-editors/emacs/files/emacs-21.3-xorg.patch
deleted file mode 100644
index a97bb108b621..000000000000
--- a/app-editors/emacs/files/emacs-21.3-xorg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur emacs-21.3-old/src/xterm.h emacs-21.3/src/xterm.h
---- emacs-21.3-old/src/xterm.h  2002-02-22 11:41:44.000000000 +0100
-+++ emacs-21.3/src/xterm.h      2004-10-30 12:33:12.000000000 +0200
-@@ -21,8 +21,8 @@
- 
- #include <X11/Xlib.h>
- #include <X11/cursorfont.h>
--#include <X11/Xutil.h>
- #include <X11/keysym.h>
-+#include <X11/Xutil.h>
- #include <X11/Xatom.h>
- #include <X11/Xresource.h>
diff --git a/app-editors/emacs/files/emacs-21.4-Xaw3d-headers.patch b/app-editors/emacs/files/emacs-21.4-Xaw3d-headers.patch
deleted file mode 100644
index 26d7a8546ab3..000000000000
--- a/app-editors/emacs/files/emacs-21.4-Xaw3d-headers.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur emacs-21.4-orig/src/xfns.c emacs-21.4/src/xfns.c
---- emacs-21.4-orig/src/xfns.c	2002-12-06 18:05:35.000000000 +0100
-+++ emacs-21.4/src/xfns.c	2007-04-19 01:56:40.000000000 +0200
-@@ -69,8 +69,13 @@
- #include <X11/Shell.h>
- 
- #ifndef USE_MOTIF
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Paned.h>
-+#include <X11/Xaw3d/Label.h>
-+#else  /* !HAVE_XAW3D */
- #include <X11/Xaw/Paned.h>
- #include <X11/Xaw/Label.h>
-+#endif /* HAVE_XAW3D */
- #endif /* USE_MOTIF */
- 
- #ifdef USG
-diff -ur emacs-21.4-orig/src/xmenu.c emacs-21.4/src/xmenu.c
---- emacs-21.4-orig/src/xmenu.c	2002-01-06 07:18:19.000000000 +0100
-+++ emacs-21.4/src/xmenu.c	2007-04-19 01:56:40.000000000 +0200
-@@ -73,7 +73,11 @@
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>
- #ifdef USE_LUCID
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Paned.h>
-+#else  /* !HAVE_XAW3D */
- #include <X11/Xaw/Paned.h>
-+#endif /* HAVE_XAW3D */
- #endif /* USE_LUCID */
- #include "../lwlib/lwlib.h"
- #else /* not USE_X_TOOLKIT */
-diff -ur emacs-21.4-orig/lwlib/lwlib.c emacs-21.4/lwlib/lwlib.c
---- emacs-21.4-orig/lwlib/lwlib.c	2000-09-30 19:03:27.000000000 +0200
-+++ emacs-21.4/lwlib/lwlib.c	2007-04-19 01:56:40.000000000 +0200
-@@ -49,7 +49,11 @@
- #include "lwlib-Xol.h"
- #endif
- #if defined (USE_XAW)
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Paned.h>
-+#else  /* !HAVE_XAW3D */
- #include <X11/Xaw/Paned.h>
-+#endif /* HAVE_XAW3D */
- #include "lwlib-Xaw.h"
- #endif
- 
-diff -ur emacs-21.4-orig/lwlib/lwlib-Xaw.c emacs-21.4/lwlib/lwlib-Xaw.c
---- emacs-21.4-orig/lwlib/lwlib-Xaw.c	2001-02-28 15:55:17.000000000 +0100
-+++ emacs-21.4/lwlib/lwlib-Xaw.c	2007-04-19 01:56:40.000000000 +0200
-@@ -31,12 +31,21 @@
- #include <X11/CoreP.h>
- #include <X11/Shell.h>
- 
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Scrollbar.h>
-+#include <X11/Xaw3d/Paned.h>
-+#include <X11/Xaw3d/Dialog.h>
-+#include <X11/Xaw3d/Form.h>
-+#include <X11/Xaw3d/Command.h>
-+#include <X11/Xaw3d/Label.h>
-+#else /* !HAVE_XAW3D */
- #include <X11/Xaw/Scrollbar.h>
- #include <X11/Xaw/Paned.h>
- #include <X11/Xaw/Dialog.h>
- #include <X11/Xaw/Form.h>
- #include <X11/Xaw/Command.h>
- #include <X11/Xaw/Label.h>
-+#endif /* HAVE_XAW3D */
- 
- #include <X11/Xatom.h>
- 
diff --git a/app-editors/emacs/files/emacs-21.4-autosave-tmp.patch b/app-editors/emacs/files/emacs-21.4-autosave-tmp.patch
deleted file mode 100644
index 240439d962ad..000000000000
--- a/app-editors/emacs/files/emacs-21.4-autosave-tmp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- emacs-21.4/lisp/startup.el~	2003-03-16 23:05:59.000000000 +0100
-+++ emacs-21.4/lisp/startup.el	2007-02-16 11:21:18.000000000 +0100
-@@ -629,6 +629,9 @@
-   (setq small-temporary-file-directory
- 	(if (eq system-type 'ms-dos)
- 	    (getenv "TMPDIR")))
-+  (setq auto-save-file-name-transforms
-+	(list (list (caar auto-save-file-name-transforms)
-+		    (expand-file-name "\\2" temporary-file-directory))))
- 
-   ;; See if we should import version-control from the environment variable.
-   (let ((vc (getenv "VERSION_CONTROL")))
diff --git a/app-editors/emacs/files/emacs-21.4-blessmail-build.patch b/app-editors/emacs/files/emacs-21.4-blessmail-build.patch
deleted file mode 100644
index 03b072320435..000000000000
--- a/app-editors/emacs/files/emacs-21.4-blessmail-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- emacs-22.0.93/lib-src/Makefile.in~	2007-01-17 16:53:20.000000000 +0100
-+++ emacs-22.0.93/lib-src/Makefile.in	2007-02-17 11:29:06.000000000 +0100
-@@ -23,6 +23,10 @@
- # inherited from the environment.
- SHELL = /bin/sh
- 
-+# following two lines taken from ../lisp/Makefile.in
-+EMACS = ../src/emacs
-+EMACSOPT = -batch --no-site-file --multibyte
-+
- # ==================== Things `configure' will edit ====================
- 
- CC=@CC@
-@@ -279,7 +283,7 @@
- 
- #ifdef MOVEMAIL_NEEDS_BLESSING
- blessmail:
--	../src/emacs -batch -l $(srcdir)/../lisp/mail/blessmail.el
-+	$(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el
- 	chmod +x blessmail
- #endif
- 
diff --git a/app-editors/emacs/files/emacs-21.4-freebsd-terminfo.patch b/app-editors/emacs/files/emacs-21.4-freebsd-terminfo.patch
deleted file mode 100644
index 0741dbebfa1b..000000000000
--- a/app-editors/emacs/files/emacs-21.4-freebsd-terminfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Taken from FreeBSD Ports
-
---- src/s/freebsd.h.orig	Tue Feb 20 19:52:17 2001
-+++ src/s/freebsd.h	Mon Feb 18 11:51:50 2002
-@@ -68,6 +68,11 @@
- #define LIBS_SYSTEM -lutil
- #if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
-+#else
-+#ifdef HAVE_LIBNCURSES
-+#define TERMINFO
-+#define LIBS_TERMCAP -lncurses
-+#endif
- #endif
- 
- #define SYSV_SYSTEM_DIR
diff --git a/app-editors/emacs/files/emacs-21.4-libungif-gif-gentoo.patch b/app-editors/emacs/files/emacs-21.4-libungif-gif-gentoo.patch
deleted file mode 100644
index abae185c1155..000000000000
--- a/app-editors/emacs/files/emacs-21.4-libungif-gif-gentoo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur emacs-21.4.orig/configure.in emacs-21.4/configure.in
---- emacs-21.4.orig/configure.in	2003-03-16 16:06:05.000000000 -0600
-+++ emacs-21.4/configure.in	2006-08-12 17:15:44.000000000 -0500
-@@ -1927,7 +1927,7 @@
-     AC_CHECK_HEADER(gif_lib.h,
- # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
- # Earlier versions can crash Emacs.
--      AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes))
-+      AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes))
-   fi
- 
-   if test "${HAVE_GIF}" = "yes"; then
-@@ -2283,7 +2283,7 @@
- echo "  Does Emacs use -lXpm?                                   ${HAVE_XPM}"
- echo "  Does Emacs use -ljpeg?                                  ${HAVE_JPEG}"
- echo "  Does Emacs use -ltiff?                                  ${HAVE_TIFF}"
--echo "  Does Emacs use -lungif?                                 ${HAVE_GIF}"
-+echo "  Does Emacs use -lgif?                                   ${HAVE_GIF}"
- echo "  Does Emacs use -lpng?                                   ${HAVE_PNG}"
- echo "  Does Emacs use X toolkit scroll bars?                   ${USE_TOOLKIT_SCROLL_BARS}"
- echo
-diff -ur emacs-21.4.orig/src/Makefile.in emacs-21.4/src/Makefile.in
---- emacs-21.4.orig/src/Makefile.in	2003-01-23 04:34:06.000000000 -0600
-+++ emacs-21.4/src/Makefile.in	2006-08-12 17:23:30.000000000 -0500
-@@ -402,7 +402,7 @@
- 
- #if HAVE_GIF
- #ifndef LIBGIF
--#define LIBGIF -lungif
-+#define LIBGIF -lgif
- #endif /* not defined LIBGIF */
- #else /* not HAVE_GIF */
- #define LIBGIF
-Only in emacs-21.4/src: Makefile.in~
diff --git a/app-editors/emacs/files/emacs-21.4-oldxmenu-malloc.patch b/app-editors/emacs/files/emacs-21.4-oldxmenu-malloc.patch
deleted file mode 100644
index c7d45e677ac2..000000000000
--- a/app-editors/emacs/files/emacs-21.4-oldxmenu-malloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- emacs-21.4/oldXMenu/XMakeAssoc.c~	1999-10-03 21:35:22.000000000 +0200
-+++ emacs-21.4/oldXMenu/XMakeAssoc.c	2007-05-28 22:21:57.000000000 +0200
-@@ -91,7 +91,7 @@
- 	/* If we are here then the new entry should be inserted just */
- 	/* before the current value of "Entry". */
- 	/* Create a new XAssoc and load it with new provided data. */
--	new_entry = (XAssoc *) xmalloc(sizeof(XAssoc));
-+	new_entry = (XAssoc *) malloc(sizeof(XAssoc));
- 	new_entry->display = dpy;
- 	new_entry->x_id = x_id;
- 	new_entry->data = data;
diff --git a/app-editors/emacs/files/emacs-21.4-ppc64-fix-unexelf.patch b/app-editors/emacs/files/emacs-21.4-ppc64-fix-unexelf.patch
deleted file mode 100644
index 5a812a9547c1..000000000000
--- a/app-editors/emacs/files/emacs-21.4-ppc64-fix-unexelf.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Fix unexelf.c (unexec) on ppc64, backported from Emacs 22 by Chip Coldwell,
-see <http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183304>
---- emacs-21.4/src/unexelf.c	2002-10-15 10:21:44.000000000 -0400
-+++ emacs-21.4.works/src/unexelf.c	2006-07-26 11:08:05.000000000 -0400
-@@ -697,7 +697,7 @@ unexec (new_name, old_name, data_start, 
-   ElfW(Addr) new_data2_addr;
- 
-   int n, nn;
--  int old_bss_index, old_sbss_index;
-+  int old_bss_index, old_sbss_index, old_plt_index;
-   int old_data_index, new_data2_index;
-   int old_mdebug_index;
-   struct stat stat_buf;
-@@ -759,12 +759,31 @@ unexec (new_name, old_name, data_start, 
-     if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
-       old_sbss_index = -1;
- 
--  if (old_sbss_index == -1)
-+  /* PowerPC64 has .plt in the BSS section.  */
-+  old_plt_index = find_section (".plt", old_section_names,
-+				old_name, old_file_h, old_section_h, 1);
-+  if (old_plt_index != -1)
-+    if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
-+      old_plt_index = -1;
-+
-+  if (old_sbss_index == -1 && old_plt_index == -1)
-     {
-       old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
-       old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
-       new_data2_index = old_bss_index;
-     }
-+  else if (old_plt_index != -1
-+	   && (old_sbss_index == -1
-+	       || (OLD_SECTION_H (old_sbss_index).sh_addr
-+		   > OLD_SECTION_H (old_plt_index).sh_addr)))
-+    {
-+      old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
-+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
-+	+ OLD_SECTION_H (old_plt_index).sh_size;
-+      if (old_sbss_index != -1)
-+	old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
-+      new_data2_index = old_plt_index;
-+    }
-   else
-     {
-       old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
-@@ -955,7 +974,7 @@ unexec (new_name, old_name, data_start, 
-       if (n == old_bss_index
- 	  /* The new bss and sbss section's size is zero, and its file offset
- 	     and virtual address should be off by NEW_DATA2_SIZE.  */
--	  || n == old_sbss_index
-+	  || n == old_sbss_index || n == old_plt_index
- 	  )
- 	{
- 	  /* NN should be `old_s?bss_index + 1' at this point. */
-@@ -986,9 +1005,8 @@ unexec (new_name, old_name, data_start, 
- 	      >= OLD_SECTION_H (old_bss_index-1).sh_offset)
- 	    NEW_SECTION_H (nn).sh_offset += new_data2_size;
- #else
--	  if (round_up (NEW_SECTION_H (nn).sh_offset,
--			OLD_SECTION_H (old_bss_index).sh_addralign)
--	      >= new_data2_offset)
-+	  if (NEW_SECTION_H (nn).sh_offset + NEW_SECTION_H (nn).sh_size
-+	      > new_data2_offset)
- 	    NEW_SECTION_H (nn).sh_offset += new_data2_size;
- #endif
- 	  /* Any section that was originally placed after the section
diff --git a/app-editors/emacs/files/emacs-21.4-qa.patch b/app-editors/emacs/files/emacs-21.4-qa.patch
deleted file mode 100644
index d44ddc4acb4a..000000000000
--- a/app-editors/emacs/files/emacs-21.4-qa.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ur emacs-21.4-orig/lib-src/cvtmail.c emacs-21.4/lib-src/cvtmail.c
---- emacs-21.4-orig/lib-src/cvtmail.c	2002-02-15 13:06:48.000000000 +0100
-+++ emacs-21.4/lib-src/cvtmail.c	2007-03-19 09:02:08.000000000 +0100
-@@ -33,12 +33,15 @@
-  * Author: Larry Kolodney, 1985
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
- 
- #include <stdio.h>
- 
--char *malloc ();
--char *realloc ();
-+#ifndef HAVE_STDLIB_H
- char *getenv ();
-+#endif
- 
- char *xmalloc ();
- char *xrealloc ();
-diff -ur emacs-21.4-orig/lib-src/yow.c emacs-21.4/lib-src/yow.c
---- emacs-21.4-orig/lib-src/yow.c	1999-02-26 12:37:05.000000000 +0100
-+++ emacs-21.4/lib-src/yow.c	2007-03-19 09:03:50.000000000 +0100
-@@ -10,6 +10,10 @@
-  * With dynamic memory allocation.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <stdio.h>
- #include <ctype.h>
- #include <../src/epaths.h>      /* For PATH_DATA.  */
-@@ -33,8 +37,6 @@
-     &res;})
- #endif
- 
--char *malloc(), *realloc();
--
- void yow();
- void setup_yow();
- 
-diff -ur emacs-21.4-orig/src/prefix-args.c emacs-21.4/src/prefix-args.c
---- emacs-21.4-orig/src/prefix-args.c	2001-02-22 02:49:37.000000000 +0100
-+++ emacs-21.4/src/prefix-args.c	2007-03-19 09:20:27.000000000 +0100
-@@ -43,6 +43,10 @@
-    If I can't write a completely portable program to do this in C,
-    I'm quitting and taking up gardening.  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #include <stdio.h>
- 
- int
-diff -ur emacs-21.4-orig/src/xterm.c emacs-21.4/src/xterm.c
---- emacs-21.4-orig/src/xterm.c	2002-10-15 16:21:45.000000000 +0200
-+++ emacs-21.4/src/xterm.c	2007-03-19 09:13:01.000000000 +0100
-@@ -10899,7 +10899,7 @@
- 		    if (!tool_bar_p)
- 		      if (!dpyinfo->x_focus_frame
- 			  || f == dpyinfo->x_focus_frame)
--			construct_mouse_click (&emacs_event, &event, f);
-+			construct_mouse_click (&emacs_event, &event.xbutton, f);
- 		  }
- 		else
- 		  {
-diff -ur emacs-21.4-orig/oldXMenu/ChgPane.c emacs-21.4/oldXMenu/ChgPane.c
---- emacs-21.4-orig/oldXMenu/ChgPane.c	1999-10-03 21:34:53.000000000 +0200
-+++ emacs-21.4/oldXMenu/ChgPane.c	2007-03-19 15:10:00.000000000 +0100
-@@ -13,6 +13,7 @@
-  *
-  */
- 
-+#include <config.h>
- #include "XMenuInt.h"
- 
- int
-diff -ur emacs-21.4-orig/oldXMenu/ChgSel.c emacs-21.4/oldXMenu/ChgSel.c
---- emacs-21.4-orig/oldXMenu/ChgSel.c	1999-10-03 21:34:54.000000000 +0200
-+++ emacs-21.4/oldXMenu/ChgSel.c	2007-03-19 15:10:02.000000000 +0100
-@@ -13,6 +13,7 @@
-  *
-  */
- 
-+#include <config.h>
- #include "XMenuInt.h"
- 
- int