From f943758ce4081e2ae7ecc67e14dbade3c7bd7b83 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Fri, 2 Aug 2013 18:39:41 +0200 Subject: Merge changes from Portage tree. Package-Manager: portage-2.1.12.13 --- app-editors/emacs-vcs/ChangeLog | 3 +++ app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'app-editors') diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index e8b7388..837311e 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 02 Aug 2013; Ulrich Müller emacs-vcs-24.3.9999.ebuild: + Merge changes from Portage tree. + 14 Jul 2013; Ulrich Müller emacs-vcs-24.3.9999.ebuild: Update URI for Xft font guide. diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild index 21d908b..6326622 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild @@ -56,7 +56,7 @@ RDEPEND="sys-libs/ncurses gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) -- cgit v1.2.3-18-g5258