New patchset, fixes dumping on macos, bug 388817. Call epatch_user to allow for user patches.

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

3 files changed, 14 insertions, 8 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index b716395305bf..5d9db7374e1d 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.440 2011/11/28 11:06:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.441 2011/12/03 15:16:24 ulm Exp $
+
+  03 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r2.ebuild:
+  New patchset, fixes dumping on macos, bug 388817. Call epatch_user to allow
+  for user patches.
 
   28 Nov 2011; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Update longdescription.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a83e812474a7..55b631f6befc 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,19 +9,20 @@ DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a
 DIST emacs-22.3-patches-8.tar.bz2 5974 RMD160 a17c6e291b6c0d246d30a27baceaa882b12a1250 SHA1 fbb03538973be5f416edbffebc567f6346caef4b SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST emacs-23.3-patches-1.tar.bz2 1675 RMD160 f167c15e8d1c6a9629967aa3f910cc476e22315e SHA1 51522c8af1c0991ef189f8537e6636f7e1b30553 SHA256 caec6e052a564e75de2873e2d0e4ffb8169bde3c4f786e1a04b8781df31456fe
+DIST emacs-23.3-patches-2.tar.bz2 1936 RMD160 c1cbe26f05e68efe0768445a3918892e995a59dd SHA1 3f55305dab83084b01f8958371d4e0fd4114b88b SHA256 403f88c0b814817734f275e6ee6ff4c8f27858a2429ea7d0a029c2d89ebaa5de
 DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
 EBUILD emacs-21.4-r23.ebuild 5017 RMD160 bb3c54bfb53827aa857b465d7fff42a11a92b2ad SHA1 a1dade7a5da5d9ed39995c30df31923e0d3c1f47 SHA256 9dd3e8baaeaea97db9c2046e6ea94278c70e1f4d188579d231c4034489c825a4
 EBUILD emacs-22.3-r8.ebuild 7882 RMD160 9acdd2299199e277ac287583d4fb007b2aa1335e SHA1 d58b682f8437146b3ef87bc692c1825bad794a39 SHA256 12d897f4247cbaf59eda3946fa5c38671086ba9de5d24289638aa7de56ab5ed2
 EBUILD emacs-23.3-r1.ebuild 10277 RMD160 8f902be9fb6a328517507099243e76a2a667fa0a SHA1 ee8568fe4c1ffb509c812a3e80a5b22469c29aae SHA256 f022fbe2be9d8378945a69741336513863b80c7670e24f8c07a949189ed417b8
-EBUILD emacs-23.3-r2.ebuild 10639 RMD160 4c2397cde6353d37626f9625cd7c02f22a553a4d SHA1 a7c0085e46b33855026f035144372f0228c8a2aa SHA256 a94fab4fb032446f0785a292d074d57e37d08408c5e75e36b91daccb6a929f3b
-MISC ChangeLog 62738 RMD160 7a0d19f69ba817e6b962d2b9cbb4d29ef8ef7446 SHA1 927a161ad3edfa089622d27103753f03c2213300 SHA256 428da5519db6081844c61915e21e667aec1244dc0173e721aa148bb15f819b5e
+EBUILD emacs-23.3-r2.ebuild 10652 RMD160 931702ab00bc7c62041b5e415f30e889534b8aab SHA1 897bbb0663682aa8148b26dbcf089a455988c2dc SHA256 c418222a96b263332db8712ff316f9448414b962682267e0a77b0f261ecb1378
+MISC ChangeLog 62906 RMD160 4ac1dc78bd430e20199c0cdfc622057f9c53ff75 SHA1 6f2e1741251a8ee479e589f1e2b20d538950d7f7 SHA256 240b041fdc67a27b518375126d1a083d14ea75d34f707347a5b0461dc043625e
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7TbXwACgkQOeoy/oIi7uwAZwCfQ/VvnabJy17SRc7Dc4SLftks
-N68AoKDKyegFqdEG+jTxgx34KFZwJHvC
-=3Qx7
+iEYEARECAAYFAk7aP4sACgkQOeoy/oIi7uxrigCghQdNURgj/kf6DvlCjW3kbVss
+tucAnA4DrY4WczkRA6M2s0IMZGUWZate
+=M1wj
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
index eacb4685b8f5..ff357290c1b9 100644
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ b/app-editors/emacs/emacs-23.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.12 2011/11/11 21:38:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.13 2011/12/03 15:16:24 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -10,7 +10,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
-	mirror://gentoo/${P}-patches-1.tar.bz2"
+	mirror://gentoo/${P}-patches-2.tar.bz2"
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
@@ -74,6 +74,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}"
 
 src_prepare() {
 	EPATCH_SUFFIX=patch epatch
+	epatch_user
 
 	sed -i \
 		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \