diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-05-18 16:56:39 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-05-18 16:56:39 +0200 |
| commit | 7de896814e030d9e225c0a13cd4721008e0b0725 (patch) | |
| tree | c6eff2e539f6b8a451852f480fea5e8892138416 /app-editors | |
| parent | elisp-common.eclass: Die on errors in elisp-site-regen. (diff) | |
| download | emacs-7de896814e030d9e225c0a13cd4721008e0b0725.tar.gz emacs-7de896814e030d9e225c0a13cd4721008e0b0725.tar.bz2 emacs-7de896814e030d9e225c0a13cd4721008e0b0725.zip | |
Merge changes from Portage tree.
Package-Manager: portage-2.2.10
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 3 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index a7590b2..984e63a 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 18 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild: + Merge changes from Portage tree. + 05 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild: Merge changes from Portage tree. diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild index 95c8ace..f324765 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild @@ -85,12 +85,7 @@ RDEPEND="sys-libs/ncurses )" DEPEND="${RDEPEND} - alsa? ( virtual/pkgconfig ) - dbus? ( virtual/pkgconfig ) - gfile? ( virtual/pkgconfig ) - gnutls? ( virtual/pkgconfig ) - libxml2? ( virtual/pkgconfig ) - X? ( virtual/pkgconfig ) + virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr |