Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-editors
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/Manifest18
-rw-r--r--app-editors/emacs/emacs-21.4-r1.ebuild15
-rw-r--r--app-editors/emacs/emacs-22.0.50_pre20050225.ebuild12
4 files changed, 31 insertions, 20 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index a4190e35ce61..7e291be30197 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.73 2005/09/17 15:14:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.74 2005/12/12 03:23:51 spyderous Exp $
+
+ 12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; emacs-21.4-r1.ebuild,
+ emacs-22.0.50_pre20050225.ebuild:
+ Add modular X dependencies.
23 Aug 2005; Aron Griffis <agriffis@gentoo.org> emacs-21.4-r1.ebuild:
stable on ia64
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 136e74c3bc5a..539eaaa6d22b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,12 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 8619462807c23136315a718f962fbb5e ChangeLog 10954
MD5 767c6035b2be8309041a7c2e81bfd7a0 emacs-18.59.ebuild 2007
-MD5 645fea787d76386cac4b47be726a443c emacs-21.4-r1.ebuild 4399
+MD5 f74ec17e5a9b48b18c4d9463a5fbeacb emacs-21.4-r1.ebuild 4609
MD5 870802726485f04f143c5e053d7a9209 emacs-21.4.ebuild 4141
-MD5 27ad4010641ab075702e1ca9bea2e506 emacs-22.0.50_pre20050225.ebuild 5421
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 0cf914f2dfc52c58aac1c394a480b988 ChangeLog 10807
+MD5 35366f87e0ccd6efda71c52352f98171 emacs-22.0.50_pre20050225.ebuild 5557
MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/60emacs-22.0.50.envd 39
MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
@@ -22,10 +18,4 @@ MD5 ab4757cbbda4ac6f848021b947d1f2b2 files/emacs-21.desktop 238
MD5 3a0ce8880fff1be2f5e8281633532546 files/emacs-22.0.50.desktop 242
MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520
MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLDL6Kf2g/qXtneoRAnR+AJ9lnCX0uVQPxa6hTooJyZjNBREYhQCeKglq
-xX3PmKNr2HpCOsf3TJdFjgc=
-=2RH8
------END PGP SIGNATURE-----
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
diff --git a/app-editors/emacs/emacs-21.4-r1.ebuild b/app-editors/emacs/emacs-21.4-r1.ebuild
index ca06afe22a30..6fa02d61e7bc 100644
--- a/app-editors/emacs/emacs-21.4-r1.ebuild
+++ b/app-editors/emacs/emacs-21.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.15 2005/08/23 03:12:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.16 2005/12/12 03:23:51 spyderous Exp $
inherit flag-o-matic eutils alternatives toolchain-funcs
@@ -16,13 +16,21 @@ IUSE="X Xaw3d gnome leim lesstif motif nls nosendmail"
RDEPEND="sys-libs/ncurses
sys-libs/gdbm
- X? ( virtual/x11
+ X? ( || ( ( x11-libs/libXext
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXmu
+ x11-libs/libXpm
+ )
+ virtual/x11
+ )
>=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 )
+ !Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
motif? (
lesstif? ( x11-libs/lesstif )
!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
@@ -32,7 +40,8 @@ RDEPEND="sys-libs/ncurses
nls? ( sys-devel/gettext )
!nosendmail? ( virtual/mta )"
DEPEND="${RDEPEND}
- >=sys-devel/autoconf-2.58"
+ >=sys-devel/autoconf-2.58
+ X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
PROVIDE="virtual/emacs virtual/editor"
SANDBOX_DISABLED="1"
diff --git a/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
index d50f48b80d7a..92cb154e3535 100644
--- a/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
+++ b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild,v 1.3 2005/04/12 21:28:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild,v 1.4 2005/12/12 03:23:51 spyderous Exp $
inherit elisp-common alternatives flag-o-matic eutils
@@ -25,7 +25,15 @@ DEPEND=">=sys-apps/portage-2.0.51
>=sys-libs/ncurses-5.3
sys-libs/gdbm
spell? ( || ( app-text/ispell app-text/aspell ) )
- X? ( virtual/x11
+ X? ( || ( ( x11-libs/libXext
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-misc/xbitmaps
+ )
+ virtual/x11
+ )
gif? ( >=media-libs/giflib-4.1.0.1b )
jpeg? ( >=media-libs/jpeg-6b )
tiff? ( >=media-libs/tiff-3.5.7 )