summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-05-14 20:11:06 +0000
committerUlrich Müller <ulm@gentoo.org>2007-05-14 20:11:06 +0000
commit008cbd14a1b4a0004838791e2b784a3f845e2e8d (patch)
treed8edcd11cd48cf591b310d74ebd5e7108c6157b6 /app-editors/emacs
parentrevbump for new useflag to support displaying channel modes during compilation (diff)
downloadhistorical-008cbd14a1b4a0004838791e2b784a3f845e2e8d.tar.gz
historical-008cbd14a1b4a0004838791e2b784a3f845e2e8d.tar.bz2
historical-008cbd14a1b4a0004838791e2b784a3f845e2e8d.zip
Removed !arm flag for Xaw3d and motif.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/Manifest24
-rw-r--r--app-editors/emacs/emacs-21.4-r12.ebuild37
3 files changed, 35 insertions, 32 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 485302ff57e7..d23a19c39f11 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# 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.146 2007/05/14 19:39:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.147 2007/05/14 20:11:06 ulm Exp $
+
+ 14 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r12.ebuild:
+ Remove !arm inverse arch flag for Xaw3d and motif, according to jokey it is
+ not needed anymore.
14 May 2007; Markus Ullmann <jokey@gentoo.org> emacs-21.4-r12.ebuild:
Works on arm as well
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5f4fbe162dea..7295bebf5c13 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -66,10 +66,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 5772 RMD160 cf3b2a99a111060def3c8aced93f4e5535fc6d50 SHA1 ac82eecc0fa4831174fd0a79f2c23eb89cce41cd SHA256 e78d8a2eb2ac0d23db02bbd312855cc8769228d7e7a7b2ab630203b55f7fe58c
-MD5 9e17807efcae1de22a7978370685bd83 emacs-21.4-r12.ebuild 5772
-RMD160 cf3b2a99a111060def3c8aced93f4e5535fc6d50 emacs-21.4-r12.ebuild 5772
-SHA256 e78d8a2eb2ac0d23db02bbd312855cc8769228d7e7a7b2ab630203b55f7fe58c emacs-21.4-r12.ebuild 5772
+EBUILD emacs-21.4-r12.ebuild 5741 RMD160 0c4472125bd3ae46fac745f1840410f7ef81412b SHA1 6504711a4a925c4b433a725f0f99887e163fa6e0 SHA256 423c51dd2e6edd9512d34e8bf2876eb2f4c0a9be6b53baf0cdccff7e57d0eaf3
+MD5 ae09cf492ed375939dcbf62bd839d82a emacs-21.4-r12.ebuild 5741
+RMD160 0c4472125bd3ae46fac745f1840410f7ef81412b emacs-21.4-r12.ebuild 5741
+SHA256 423c51dd2e6edd9512d34e8bf2876eb2f4c0a9be6b53baf0cdccff7e57d0eaf3 emacs-21.4-r12.ebuild 5741
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
@@ -78,10 +78,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 22101 RMD160 dc2dcec268d32771230abd35535c75f66055b6e7 SHA1 95b9e731031a55187a71bde3f85e0144e84d28f7 SHA256 df6fa5514f11dd5620cb5ad5e8b5ed25ba93a2c3e16265106c64ef35f8b8ebde
-MD5 4501191b1f301e133e0fc8628b5f2348 ChangeLog 22101
-RMD160 dc2dcec268d32771230abd35535c75f66055b6e7 ChangeLog 22101
-SHA256 df6fa5514f11dd5620cb5ad5e8b5ed25ba93a2c3e16265106c64ef35f8b8ebde ChangeLog 22101
+MISC ChangeLog 22270 RMD160 0b9e9754115a77cc55b46d2fd3a8887231c2a370 SHA1 8041056b6285e861f168880ae44f39b0f87a5e36 SHA256 904e852640a962158e86b98274fd01905ae475633b3d588d857b225622b1a35a
+MD5 d8b58cfceadd4793402493af311024e5 ChangeLog 22270
+RMD160 0b9e9754115a77cc55b46d2fd3a8887231c2a370 ChangeLog 22270
+SHA256 904e852640a962158e86b98274fd01905ae475633b3d588d857b225622b1a35a ChangeLog 22270
MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -99,9 +99,9 @@ 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 v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
-iD8DBQFGSLrhz974XjDVpbkRAgz0AJ4zx2TQ03B5FAXWFyuQa7kdsYzpvwCeO04P
-NHAyMjq7jlqSl/+x+DSXCuM=
-=butz
+iD8DBQFGSMLfOeoy/oIi7uwRAlLGAJ9aOSZZTaQSD7CJ2GR2PZg0sDClZQCeIodq
+G1T8jed1fFWbpwWdtQPRLNQ=
+=Dg7q
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild
index 3d552f80461c..05182b59b0b1 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.14 2007/05/14 19:39:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.15 2007/05/14 20:11:06 ulm Exp $
WANT_AUTOCONF="2.1"
@@ -17,22 +17,22 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="X Xaw3d leim lesstif motif nls nosendmail"
RDEPEND="sys-libs/ncurses
- X? ( x11-libs/libXext
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXmu
- x11-libs/libXpm
- x11-misc/emacs-desktop
- >=media-libs/giflib-4.1.0.1b
- >=media-libs/jpeg-6b-r2
- >=media-libs/tiff-3.5.5-r3
- >=media-libs/libpng-1.2.1
- !arm? (
- Xaw3d? ( x11-libs/Xaw3d )
- motif? (
- lesstif? ( x11-libs/lesstif )
- !lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
- )
+ X? (
+ x11-libs/libXext
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-misc/emacs-desktop
+ >=media-libs/giflib-4.1.0.1b
+ >=media-libs/jpeg-6b-r2
+ >=media-libs/tiff-3.5.5-r3
+ >=media-libs/libpng-1.2.1
+ Xaw3d? ( x11-libs/Xaw3d )
+ motif? (
+ lesstif? ( x11-libs/lesstif )
+ !lesstif? ( >=x11-libs/openmotif-2.1.30 )
+ )
)
!nosendmail? ( virtual/mta )
>=app-admin/eselect-emacs-0.7-r1"
@@ -43,10 +43,9 @@ DEPEND="${RDEPEND}
PROVIDE="virtual/emacs virtual/editor"
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"