From 89eb05ba1be50300672d49c2c64e10896bdf59e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sun, 29 Apr 2007 17:42:44 +0000 Subject: [PATCH] Apply ppc64 patch only on ppc64. Package-Manager: portage-2.1.2.5 --- app-editors/emacs/ChangeLog | 5 ++- app-editors/emacs/Manifest | 34 ++++++++++++------- app-editors/emacs/emacs-21.4-r12.ebuild | 8 +++-- .../files/emacs-21.4-ppc64-fix-unexelf.patch | 4 +-- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 5b22f8ff2e93..7de2fd5c0f84 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.141 2007/04/29 17:02:08 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.142 2007/04/29 17:42:44 ulm Exp $ + + 29 Apr 2007; Ulrich Mueller emacs-21.4-r12.ebuild: + Apply emacs-21.4-ppc64-fix-unexelf.patch only on ppc64 architecture. 29 Apr 2007; Markus Rothe +files/emacs-21.4-ppc64-fix-unexelf.patch, emacs-21.4-r12.ebuild: diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index bf2415425a79..02305004fa21 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 60emacs-21.envd 34 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af SHA1 b67d26aecf206d799eeee8cea2649486a3e024f9 SHA256 880372bcfead2fe980498ac54949933e46f7628c53c978affc93dcd1945a3153 MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af files/60emacs-21.envd 34 @@ -38,10 +41,10 @@ AUX emacs-21.4-libungif-gif-gentoo.patch 1534 RMD160 8bc5ef391e644ad00f46c7d34e7 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-ppc64-fix-unexelf.patch 2698 RMD160 7d8c31c706a3c67a8d2e9e429c3e58c052a0f2b6 SHA1 81163bbdb49a93052653dd12ab017c971189f08d SHA256 ec6bc784ed831421aa09703060b48ad124d3cf23308d312f9483880628e142b4 -MD5 3794f84a4813f7ea24350ef2dd013ef0 files/emacs-21.4-ppc64-fix-unexelf.patch 2698 -RMD160 7d8c31c706a3c67a8d2e9e429c3e58c052a0f2b6 files/emacs-21.4-ppc64-fix-unexelf.patch 2698 -SHA256 ec6bc784ed831421aa09703060b48ad124d3cf23308d312f9483880628e142b4 files/emacs-21.4-ppc64-fix-unexelf.patch 2698 +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 @@ -67,10 +70,10 @@ EBUILD emacs-18.59-r4.ebuild 2549 RMD160 02162c6c4f0561644d326a349e46dd6187df7d1 MD5 02f52fa5227806fdfa477c10a5fe7e33 emacs-18.59-r4.ebuild 2549 RMD160 02162c6c4f0561644d326a349e46dd6187df7d1e emacs-18.59-r4.ebuild 2549 SHA256 c8650c4f9fd7ec4dcce67d9ec0b77c6a25fc023321b55865489e580323f2ebf6 emacs-18.59-r4.ebuild 2549 -EBUILD emacs-21.4-r12.ebuild 5795 RMD160 2bfc8d88a9dd137880de68db0ba0445435f4c3d3 SHA1 2d86658c23f494c14106a6c99cca3a71deedfc7a SHA256 0739f1a4a6c83a103274814b2137ef696f6e636864da99e1b2fb63d4efd0629f -MD5 bd7ae8bcdf0603587f5f08dd8a683c90 emacs-21.4-r12.ebuild 5795 -RMD160 2bfc8d88a9dd137880de68db0ba0445435f4c3d3 emacs-21.4-r12.ebuild 5795 -SHA256 0739f1a4a6c83a103274814b2137ef696f6e636864da99e1b2fb63d4efd0629f emacs-21.4-r12.ebuild 5795 +EBUILD emacs-21.4-r12.ebuild 5805 RMD160 64b99f996fa8f9d788874d87313a48f71150f712 SHA1 40f9a9fa18ec5d34dc1b73ea9a795d9cf66a61e4 SHA256 a09a64fe36f68e879243704f8bc7c0b96a79f8543c25e33cc506ca4a4310f35d +MD5 b5c3b6c315ff7fc046ecf25399211fd9 emacs-21.4-r12.ebuild 5805 +RMD160 64b99f996fa8f9d788874d87313a48f71150f712 emacs-21.4-r12.ebuild 5805 +SHA256 a09a64fe36f68e879243704f8bc7c0b96a79f8543c25e33cc506ca4a4310f35d emacs-21.4-r12.ebuild 5805 EBUILD emacs-21.4-r4.ebuild 4551 RMD160 a7b49c929b37f60e45af01038595fd6e26579609 SHA1 aae095ad8995c6dc1b76e2805032073486b13476 SHA256 57f007813695810a6df614b335de85df341fdda53a36d7c806a18e315f70afec MD5 d008266355b179cf5699aded70630be3 emacs-21.4-r4.ebuild 4551 RMD160 a7b49c929b37f60e45af01038595fd6e26579609 emacs-21.4-r4.ebuild 4551 @@ -79,10 +82,10 @@ EBUILD emacs-21.4-r8.ebuild 5727 RMD160 e879aeb102baa9977fee9a40d18c4a0acc001be2 MD5 92f4d4ff1be57566edb7db155c0bbf53 emacs-21.4-r8.ebuild 5727 RMD160 e879aeb102baa9977fee9a40d18c4a0acc001be2 emacs-21.4-r8.ebuild 5727 SHA256 2a692ffbdc1203341a019866b2f54460a7f6faa7a048a8466cc2879545cdc3c2 emacs-21.4-r8.ebuild 5727 -MISC ChangeLog 21431 RMD160 0830d968cacb6295658bc08e9356a32087fca791 SHA1 7396216dca3002a988ea9a3bec32239dc0750cc2 SHA256 bb91d331cefc4cf1d94a270922558bae2ac801faaa016c2e9774a96def1cb80c -MD5 4b03a43334ae769ae89061d259da3311 ChangeLog 21431 -RMD160 0830d968cacb6295658bc08e9356a32087fca791 ChangeLog 21431 -SHA256 bb91d331cefc4cf1d94a270922558bae2ac801faaa016c2e9774a96def1cb80c ChangeLog 21431 +MISC ChangeLog 21569 RMD160 f7a97d835ca2f0a47af9d17f6268c663bcc90e5c SHA1 ffe28499aa7d92b2475efe7f400a913f2e87555c SHA256 59076e17053d980e955585d001b176509c917e2c06962dfd5f8160c82a630d29 +MD5 d1644c0736d9329d19b8d0a30d950359 ChangeLog 21569 +RMD160 f7a97d835ca2f0a47af9d17f6268c663bcc90e5c ChangeLog 21569 +SHA256 59076e17053d980e955585d001b176509c917e2c06962dfd5f8160c82a630d29 ChangeLog 21569 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -102,3 +105,10 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di 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 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.7 (GNU/Linux) + +iD8DBQFGNNmXOeoy/oIi7uwRAu2xAKDWcQ5ya4WODFo7uTc6kkknxNgqVwCg3Qcv +hYt9TFhY/J72/+m1UCRieSw= +=yiqD +-----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild index 6bd7ad5298ab..a33147c31c1e 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.9 2007/04/29 17:02:08 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.10 2007/04/29 17:42:44 ulm Exp $ WANT_AUTOCONF="2.1" @@ -53,9 +53,11 @@ src_unpack() { epatch "${FILESDIR}/emacs-21.3-hppa.patch" epatch "${FILESDIR}/emacs-21.2-sh.patch" epatch "${FILESDIR}/emacs-21.4-libungif-gif-gentoo.patch" - epatch "${FILESDIR}/emacs-21.4-ppc64-fix-unexelf.patch" - use ppc64 && epatch "${FILESDIR}/emacs-21.3-ppc64.patch" + if use ppc64; then + epatch "${FILESDIR}/emacs-21.3-ppc64.patch" + epatch "${FILESDIR}/emacs-21.4-ppc64-fix-unexelf.patch" + fi epatch "${FILESDIR}/emacs-21.4-autosave-tmp.patch" epatch "${FILESDIR}/emacs-21.4-blessmail-build.patch" 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 index e309e7b43125..5a812a9547c1 100644 --- a/app-editors/emacs/files/emacs-21.4-ppc64-fix-unexelf.patch +++ b/app-editors/emacs/files/emacs-21.4-ppc64-fix-unexelf.patch @@ -1,5 +1,5 @@ -Fix unexelf.c (unexec) on ppc64, backported from Emacs 22 by Chip -Coldwell, see +Fix unexelf.c (unexec) on ppc64, backported from Emacs 22 by Chip Coldwell, +see --- 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, -- 2.26.2