| 1 |
commit: f943758ce4081e2ae7ecc67e14dbade3c7bd7b83 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 2 16:39:41 2013 +0000 |
| 4 |
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 2 16:39:41 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=f943758c |
| 7 |
|
| 8 |
Merge changes from Portage tree. |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.12.13 |
| 11 |
|
| 12 |
--- |
| 13 |
app-editors/emacs-vcs/ChangeLog | 3 +++ |
| 14 |
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 2 +- |
| 15 |
2 files changed, 4 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog |
| 18 |
index e8b7388..837311e 100644 |
| 19 |
--- a/app-editors/emacs-vcs/ChangeLog |
| 20 |
+++ b/app-editors/emacs-vcs/ChangeLog |
| 21 |
@@ -2,6 +2,9 @@ |
| 22 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 02 Aug 2013; Ulrich Müller <ulm@g.o> emacs-vcs-24.3.9999.ebuild: |
| 26 |
+ Merge changes from Portage tree. |
| 27 |
+ |
| 28 |
14 Jul 2013; Ulrich Müller <ulm@g.o> emacs-vcs-24.3.9999.ebuild: |
| 29 |
Update URI for Xft font guide. |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild |
| 33 |
index 21d908b..6326622 100644 |
| 34 |
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild |
| 35 |
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild |
| 36 |
@@ -56,7 +56,7 @@ RDEPEND="sys-libs/ncurses |
| 37 |
gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 38 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 39 |
gif? ( media-libs/giflib ) |
| 40 |
- jpeg? ( virtual/jpeg ) |
| 41 |
+ jpeg? ( virtual/jpeg:0= ) |
| 42 |
png? ( >=media-libs/libpng-1.4:0= ) |
| 43 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 44 |
tiff? ( media-libs/tiff ) |
Archives