Use epatch for bulk patching.

Package-Manager: portage-2.1.3.16

4 files changed, 27 insertions, 25 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 07af0c4df81f..b574c8d897ea 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # 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.198 2007/11/03 14:49:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.199 2007/11/03 16:14:44 ulm Exp $
+
+  03 Nov 2007; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r4.ebuild:
+  Use epatch for bulk patching.
 
 *emacs-22.1-r2 (03 Nov 2007)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index afd213673b0a..6c9043a5ce50 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -25,8 +25,8 @@ AUX emacs-22.1-oldxmenu-qa.patch 448 RMD160 ac5b0e57569f0963862ded46953be899fb63
 MD5 56912f79ce93e75206cf10fdeb85bf49 files/emacs-22.1-oldxmenu-qa.patch 448
 RMD160 ac5b0e57569f0963862ded46953be899fb637590 files/emacs-22.1-oldxmenu-qa.patch 448
 SHA256 3039fa8eedc22c638e706123bd1affb0f736a53bf0ebc68566678ead92a4c590 files/emacs-22.1-oldxmenu-qa.patch 448
-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-patches.tar.bz2 16592 RMD160 87410388441f3dabfb300154a7e3f2ee501e6ac0 SHA1 108fb43146568ac78052243bdf6b804e038efcf1 SHA256 9359bd2e8bc6fd0d7532ad4c91fccdfb12342a4e5c578d8e35f2abae11ccf024
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21-files.tar.bz2 900 RMD160 71b4a7b6d6b2f47a087fdb54381513b82fb97411 SHA1 04d909e88eb56378d09e6c10ed21e22c01525609 SHA256 3d7c5b2ca8b11d3cd2dd9ea22b90867471de34552e4d1bae11206d18031f6ab2
 DIST emacs-21-patches.tar.bz2 8891 RMD160 ca0a44cc0d6e81fb245eb4f6069dd49550a9c55f SHA1 592c47434288a5c3672110acf4f36ab2072c19ae SHA256 456af3ed5bcfa99af3fd67c281e391ca1b67599aed0cfd470adca8b34240d914
@@ -34,10 +34,10 @@ DIST emacs-21.4-patches.tar.bz2 9434 RMD160 fe05c6a0fd8b7c8d610d8992e8125446926f
 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
-EBUILD emacs-18.59-r4.ebuild 2529 RMD160 d6fce33f3e004e5dcdca8066e957183d02b65ad7 SHA1 e28714ced8a672874eb329dd87f1eeefce30d4b2 SHA256 1a5b1a218113178363b58bfcf06905f749c99004d038685cfa7e4886e2481f60
-MD5 1dfa07b505528dd70ec391ee6d0d7865 emacs-18.59-r4.ebuild 2529
-RMD160 d6fce33f3e004e5dcdca8066e957183d02b65ad7 emacs-18.59-r4.ebuild 2529
-SHA256 1a5b1a218113178363b58bfcf06905f749c99004d038685cfa7e4886e2481f60 emacs-18.59-r4.ebuild 2529
+EBUILD emacs-18.59-r4.ebuild 2505 RMD160 6374afa9da41a342c050d87c1885fef0c0223e1f SHA1 cf6869c88c1666094a30c64277bc1c5535cb119d SHA256 6b57378e28f7214c1dc3a7412cb12a02757829b2fdcf3958064066451164c46d
+MD5 7fa0a45fe6e3603669dd50567c9f3a83 emacs-18.59-r4.ebuild 2505
+RMD160 6374afa9da41a342c050d87c1885fef0c0223e1f emacs-18.59-r4.ebuild 2505
+SHA256 6b57378e28f7214c1dc3a7412cb12a02757829b2fdcf3958064066451164c46d emacs-18.59-r4.ebuild 2505
 EBUILD emacs-21.4-r12.ebuild 6197 RMD160 14e47c68a83aea84a78facf0f9470e0608138809 SHA1 b4d2de4e89645833bc86382e15067388b6f88d9a SHA256 263dbcd2ecc9d4557dc214418df3aee459013724854ff7301f8fb2e692a71501
 MD5 948b86edf3b321171e2af56aa0f75b0f emacs-21.4-r12.ebuild 6197
 RMD160 14e47c68a83aea84a78facf0f9470e0608138809 emacs-21.4-r12.ebuild 6197
@@ -62,17 +62,17 @@ EBUILD emacs-22.1-r2.ebuild 7686 RMD160 cc2f866668301b60383399ba428625cdc87e7555
 MD5 470fe07ac20e101b6d6e0b3d0a059ec5 emacs-22.1-r2.ebuild 7686
 RMD160 cc2f866668301b60383399ba428625cdc87e7555 emacs-22.1-r2.ebuild 7686
 SHA256 0bf3e457135f3d97dc977639764e7b6d40b6298b2a0cd70c737f1eb0b684378d emacs-22.1-r2.ebuild 7686
-MISC ChangeLog 29712 RMD160 b9152f3a9b00d1cbf62a47a8aed015b63f462881 SHA1 a554b98327984fb63d6d1728b2591eb86a2907ee SHA256 cf6a12389c302eec841183435436ca971608e6265302c1e189c75cf778644b11
-MD5 d0cc6903576af485a2db162cb9c65f41 ChangeLog 29712
-RMD160 b9152f3a9b00d1cbf62a47a8aed015b63f462881 ChangeLog 29712
-SHA256 cf6a12389c302eec841183435436ca971608e6265302c1e189c75cf778644b11 ChangeLog 29712
+MISC ChangeLog 29815 RMD160 55fae85ac26a6c1c39ef785086521eda6ca4a085 SHA1 bc51b4f7e37d6183b5c1515a8f71be54b703eb97 SHA256 2a1333a093653f74a7bb296c8a18265d40b523b96df1928a6903d34bd56f6f78
+MD5 d937116f4ba6640596850dc3edae8bd8 ChangeLog 29815
+RMD160 55fae85ac26a6c1c39ef785086521eda6ca4a085 ChangeLog 29815
+SHA256 2a1333a093653f74a7bb296c8a18265d40b523b96df1928a6903d34bd56f6f78 ChangeLog 29815
 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 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 8fb342b1b21870dacf89e5c8612fd3cb files/digest-emacs-18.59-r4 795
+RMD160 464d3691e19b07c659846a8d9ea24b18c5f101c0 files/digest-emacs-18.59-r4 795
+SHA256 f7d4b9ed47bcd2d99200e2174e011edfd6b8b0bf30965823409bceede6353da1 files/digest-emacs-18.59-r4 795
 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
@@ -94,7 +94,7 @@ SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHLIqGOeoy/oIi7uwRAjdyAKCRQ/dM8gJU3MlJnLTVrgm7Js3F9ACffv6x
-R2QRkTSJwUHr/yTYMrGN6Tw=
-=//5J
+iD8DBQFHLJ6IOeoy/oIi7uwRAm6TAJ9Sk/Rxft5WuCmZZq90SXjQT5BS2ACfYwMG
+0wnkzD8GSHhdbUtL8Nc6CNs=
+=1cBU
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r4.ebuild b/app-editors/emacs/emacs-18.59-r4.ebuild
index 8ebf77446e10..99cc82cbee50 100644
--- a/app-editors/emacs/emacs-18.59-r4.ebuild
+++ b/app-editors/emacs/emacs-18.59-r4.ebuild
@@ -1,14 +1,14 @@
 # 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-18.59-r4.ebuild,v 1.5 2007/10/10 06:22:17 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v 1.6 2007/11/03 16:14:44 ulm Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
-	mirror://gentoo/emacs-18-patches.tar.bz2
-	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz"
+	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
+	mirror://gentoo/${P}-patches.tar.bz2"
 
 LICENSE="GPL-1 BSD"
 SLOT="18"
@@ -27,12 +27,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
-	epatch "${WORKDIR}/${P}-unexelf.patch"
-	epatch "${WORKDIR}/${P}-gentoo.patch"
-	epatch "${WORKDIR}/${P}-gcc4.patch"
+	EPATCH_SUFFIX=patch epatch
 }
 
 src_compile() {
+	# Do not use the sandbox, or the dumped Emacs will be twice as large
 	SANDBOX_ON=0
 
 	# autoconf? What's autoconf? We are living in 1992. ;-)
diff --git a/app-editors/emacs/files/digest-emacs-18.59-r4 b/app-editors/emacs/files/digest-emacs-18.59-r4
index 2ec99cae6e30..627a71376b68 100644
--- a/app-editors/emacs/files/digest-emacs-18.59-r4
+++ b/app-editors/emacs/files/digest-emacs-18.59-r4
@@ -1,9 +1,9 @@
-MD5 f61420b327a9753e57b14fb1d3dae826 emacs-18-patches.tar.bz2 16526
-RMD160 ab0ed5e428fd71f24f44b43945940d7d33670e81 emacs-18-patches.tar.bz2 16526
-SHA256 d8dd29786dbd202b5e7bb3a176d97ae0901b6c1dd4276e253f0f42fcef34cd6e emacs-18-patches.tar.bz2 16526
 MD5 a7a4ed051dc232cdc9cf37208135302a emacs-18.59-linux22x-elf-glibc21.diff.gz 15671
 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 emacs-18.59-linux22x-elf-glibc21.diff.gz 15671
 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd emacs-18.59-linux22x-elf-glibc21.diff.gz 15671
+MD5 a6d22da947633ee5869d2a59c99eaf9a emacs-18.59-patches.tar.bz2 16592
+RMD160 87410388441f3dabfb300154a7e3f2ee501e6ac0 emacs-18.59-patches.tar.bz2 16592
+SHA256 9359bd2e8bc6fd0d7532ad4c91fccdfb12342a4e5c578d8e35f2abae11ccf024 emacs-18.59-patches.tar.bz2 16592
 MD5 ca57ae095ef098faca135bca736e1ca8 emacs-18.59.tar.gz 2962652
 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc emacs-18.59.tar.gz 2962652
 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e emacs-18.59.tar.gz 2962652