summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-04-13 14:24:38 +0000
committerUlrich Müller <ulm@gentoo.org>2007-04-13 14:24:38 +0000
commitc31b38be86358634f398b13ea9b417f8cd68ec39 (patch)
tree7e3aa7ba0385591cd397bdd8713bd1c72c5ca078 /app-editors
parentAdded some files to dodoc. (diff)
downloademacs-c31b38be86358634f398b13ea9b417f8cd68ec39.tar.gz
emacs-c31b38be86358634f398b13ea9b417f8cd68ec39.tar.bz2
emacs-c31b38be86358634f398b13ea9b417f8cd68ec39.zip
Depend on x11-libs/libXaw unconditionally at build-time, bug #174453.
svn path=/emacs-overlay/; revision=251
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog4
-rw-r--r--app-editors/emacs/Manifest16
-rw-r--r--app-editors/emacs/emacs-21.4-r11.ebuild3
3 files changed, 14 insertions, 9 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 9f40430..6606a76 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Apr 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> emacs-21.4-r11.ebuild:
+ Depend on x11-libs/libXaw unconditionally at build-time. Fixes bug #174453,
+ reported by Wulf Krueger <philantrop@gentoo.org>.
+
07 Apr 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> emacs-21.4-r11.ebuild:
Include FDL-1.1 in LICENSE.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index eb9f76f..6e603c5 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -43,14 +43,14 @@ EBUILD emacs-18.59-r3.ebuild 2465 RMD160 87dafe0fcdc9631503d860a1151acd946ce14ab
MD5 cd9890c79aa5fb5e92b6630bc206b199 emacs-18.59-r3.ebuild 2465
RMD160 87dafe0fcdc9631503d860a1151acd946ce14aba emacs-18.59-r3.ebuild 2465
SHA256 910740f3502ac9652df9a2ddb5df720c2fff500354a1b4bb3cf4916422354e52 emacs-18.59-r3.ebuild 2465
-EBUILD emacs-21.4-r11.ebuild 5660 RMD160 8af2d4f605c1ccbd1663224007c628e63fa250f5 SHA1 bad5bdc549cd68f18494551ba2bf6fcfee36d57e SHA256 26608d22b643f09693bac436defa97411f9940eaf5b7b930ab6cf0779959af2d
-MD5 521795a20348b8c9c51d4236271250c1 emacs-21.4-r11.ebuild 5660
-RMD160 8af2d4f605c1ccbd1663224007c628e63fa250f5 emacs-21.4-r11.ebuild 5660
-SHA256 26608d22b643f09693bac436defa97411f9940eaf5b7b930ab6cf0779959af2d emacs-21.4-r11.ebuild 5660
-MISC ChangeLog 2952 RMD160 859ad1f8ff3356872b69fc657d18e300574b19ba SHA1 52da48fc688d085ecf156655f73c3762de076a64 SHA256 e7644b5592a5e14c3fdae9462b298ecedab61a08b6652cbc983b153b2ace8965
-MD5 2263c686c624b86f5340be8a97ceead9 ChangeLog 2952
-RMD160 859ad1f8ff3356872b69fc657d18e300574b19ba ChangeLog 2952
-SHA256 e7644b5592a5e14c3fdae9462b298ecedab61a08b6652cbc983b153b2ace8965 ChangeLog 2952
+EBUILD emacs-21.4-r11.ebuild 5688 RMD160 8fac4232f9f215e30af7aaa9f87a0468db29d6b7 SHA1 3c1d9ac06bc41382636d9a3318c1657be1999fc2 SHA256 7572eba59997a8f238ab709fce22ff9239f934cb0b3160428270874f7a81a27d
+MD5 102d27ac3b7d83d2d72b4fd68c7a839d emacs-21.4-r11.ebuild 5688
+RMD160 8fac4232f9f215e30af7aaa9f87a0468db29d6b7 emacs-21.4-r11.ebuild 5688
+SHA256 7572eba59997a8f238ab709fce22ff9239f934cb0b3160428270874f7a81a27d emacs-21.4-r11.ebuild 5688
+MISC ChangeLog 3159 RMD160 294bb62ca6ea0ff541a91acc4022fc6a291fe435 SHA1 7f379ea6909967a581b0bd6e9c01a58018f8336f SHA256 b2346415a75ff91cee89ec4897be348087dfd02a37aaaa8b733836aa4bccc601
+MD5 b115c1b40b5f8a63b95967da02352072 ChangeLog 3159
+RMD160 294bb62ca6ea0ff541a91acc4022fc6a291fe435 ChangeLog 3159
+SHA256 b2346415a75ff91cee89ec4897be348087dfd02a37aaaa8b733836aa4bccc601 ChangeLog 3159
MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
diff --git a/app-editors/emacs/emacs-21.4-r11.ebuild b/app-editors/emacs/emacs-21.4-r11.ebuild
index 0acdea3..d443a38 100644
--- a/app-editors/emacs/emacs-21.4-r11.ebuild
+++ b/app-editors/emacs/emacs-21.4-r11.ebuild
@@ -40,7 +40,8 @@ RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-0.7-r1"
DEPEND="${RDEPEND}
- X? ( x11-misc/xbitmaps )"
+ X? ( x11-misc/xbitmaps
+ !arm? ( x11-libs/libXaw ) )"
PROVIDE="virtual/emacs virtual/editor"