diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-12-12 03:23:51 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-12 03:23:51 +0000 |
| commit | ab98c91c0084be64ab5f7d5d0f83fc3ce39a3786 (patch) | |
| tree | fd2826eaee2cd3ea2bbf3ba71e18247f65dba376 | |
| parent | Remove old versions of amanda, 2.4.5 has been in tree for 6 months. (diff) | |
| download | gentoo-2-ab98c91c0084be64ab5f7d5d0f83fc3ce39a3786.tar.gz gentoo-2-ab98c91c0084be64ab5f7d5d0f83fc3ce39a3786.tar.bz2 gentoo-2-ab98c91c0084be64ab5f7d5d0f83fc3ce39a3786.zip | |
Add modular X dependencies.
(Portage version: 2.0.53)
| -rw-r--r-- | app-editors/emacs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.4-r1.ebuild | 15 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-22.0.50_pre20050225.ebuild | 12 |
3 files changed, 27 insertions, 6 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/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 ) |