diff options
| -rw-r--r-- | app-editors/emacs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-22.1-r3.ebuild | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 835db3f052d8..e5d2c2530b21 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.224 2007/12/28 23:50:15 ulm Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.225 2008/01/02 18:54:53 ulm Exp $ + + 02 Jan 2008; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r3.ebuild: + Remove explicit zlib dependency. 28 Dec 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r3.ebuild: Include net-libs/liblockfile in dependencies, fixes bug #203624. diff --git a/app-editors/emacs/emacs-22.1-r3.ebuild b/app-editors/emacs/emacs-22.1-r3.ebuild index 7ff47599e3c9..c5d8d2b15805 100644 --- a/app-editors/emacs/emacs-22.1-r3.ebuild +++ b/app-editors/emacs/emacs-22.1-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.11 2007/12/28 23:50:15 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.12 2008/01/02 18:54:53 ulm Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="latest" @@ -17,18 +17,17 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc ~sparc-fbsd x86 ~x86-fbsd" IUSE="alsa gif gtk gzip-el hesiod jpeg motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm" RESTRICT="strip" -X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps" - RDEPEND="!<app-editors/emacs-cvs-22.1 sys-libs/ncurses >=app-admin/eselect-emacs-0.7-r1 - sys-libs/zlib net-libs/liblockfile hesiod? ( net-dns/hesiod ) spell? ( || ( app-text/ispell app-text/aspell ) ) alsa? ( media-libs/alsa-lib ) X? ( - $X_DEPEND + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps x11-misc/emacs-desktop gif? ( media-libs/giflib ) jpeg? ( media-libs/jpeg ) |