diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-03-12 10:19:38 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-03-12 10:19:38 +0000 |
| commit | 5b02f8faf7cb2b0e543d2ff85bf5b7a9d5beea88 (patch) | |
| tree | c8137c403635ecf493ea581c221e90d6f416aaa8 /app-editors/emacs/emacs-22.3-r2.ebuild | |
| parent | Add ~arm/~sh (diff) | |
| download | gentoo-2-5b02f8faf7cb2b0e543d2ff85bf5b7a9d5beea88.tar.gz gentoo-2-5b02f8faf7cb2b0e543d2ff85bf5b7a9d5beea88.tar.bz2 gentoo-2-5b02f8faf7cb2b0e543d2ff85bf5b7a9d5beea88.zip | |
Fix dependencies. Don't install subdirs.el.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'app-editors/emacs/emacs-22.3-r2.ebuild')
| -rw-r--r-- | app-editors/emacs/emacs-22.3-r2.ebuild | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/app-editors/emacs/emacs-22.3-r2.ebuild b/app-editors/emacs/emacs-22.3-r2.ebuild index 44618b41bf06..6adb045bf27d 100644 --- a/app-editors/emacs/emacs-22.3-r2.ebuild +++ b/app-editors/emacs/emacs-22.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.2 2009/03/12 01:00:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.3 2009/03/12 10:19:38 ulm Exp $ EAPI=2 @@ -16,19 +16,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbs IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d +xpm" RESTRICT="strip" -RDEPEND="!<app-editors/emacs-cvs-22.1 - sys-libs/ncurses +RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) - spell? ( || ( app-text/aspell app-text/ispell ) ) alsa? ( media-libs/alsa-lib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps - app-emacs/emacs-common-gentoo gif? ( media-libs/giflib ) jpeg? ( media-libs/jpeg ) tiff? ( media-libs/tiff ) @@ -46,6 +43,11 @@ DEPEND="${RDEPEND} X? ( gtk? ( dev-util/pkgconfig ) ) gzip-el? ( app-arch/gzip )" +RDEPEND="${RDEPEND} + !<app-editors/emacs-cvs-22.1 + >=app-emacs/emacs-common-gentoo-1[X?] + spell? ( || ( app-text/aspell app-text/ispell ) )" + # FULL_VERSION keeps the full version number, which is needed in order to # determine some path information correctly for copy/move operations later on FULL_VERSION="${PV}" @@ -179,7 +181,6 @@ src_install () { # avoid collision between slots, see bug #169033 e.g. rm "${D}"/usr/share/emacs/site-lisp/subdirs.el rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores - keepdir /usr/share/emacs/site-lisp keepdir /var/lib/games/emacs local c=";;" @@ -228,9 +229,6 @@ emacs-infodir-rebuild() { } pkg_postinst() { - [ -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ] \ - || cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el - local f for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do [ -e "${f}" ] || touch "${f}" |