summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-01-22 17:50:19 +0000
committerUlrich Müller <ulm@gentoo.org>2010-01-22 17:50:19 +0000
commitc4ebdde10bec1762ac1c4f9c560601d25989ccb7 (patch)
treee33e0cd42a91218148a2b752492a222f08d4b8ab /app-editors
parentRequire SLOT="0" of media-libs/jpeg for headers. (diff)
downloadgentoo-2-c4ebdde10bec1762ac1c4f9c560601d25989ccb7.tar.gz
gentoo-2-c4ebdde10bec1762ac1c4f9c560601d25989ccb7.tar.bz2
gentoo-2-c4ebdde10bec1762ac1c4f9c560601d25989ccb7.zip
Depend on SLOT 0 of media-libs/jpeg, as requested by ssuominen.
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/emacs-21.4-r19.ebuild4
-rw-r--r--app-editors/emacs/emacs-22.3-r3.ebuild4
-rw-r--r--app-editors/emacs/emacs-23.1-r2.ebuild4
4 files changed, 11 insertions, 7 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4f4f8c53f2c3..78743f81e74f 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.363 2010/01/16 18:48:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.364 2010/01/22 17:50:19 ulm Exp $
+
+ 22 Jan 2010; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r19.ebuild,
+ emacs-22.3-r3.ebuild, emacs-23.1-r2.ebuild:
+ Depend on SLOT 0 of media-libs/jpeg, as requested by ssuominen.
16 Jan 2010; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r19.ebuild,
emacs-22.3-r3.ebuild, emacs-23.1-r2.ebuild:
diff --git a/app-editors/emacs/emacs-21.4-r19.ebuild b/app-editors/emacs/emacs-21.4-r19.ebuild
index d9e6b94317c2..600f1f7fde4a 100644
--- a/app-editors/emacs/emacs-21.4-r19.ebuild
+++ b/app-editors/emacs/emacs-21.4-r19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r19.ebuild,v 1.14 2010/01/16 18:48:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r19.ebuild,v 1.15 2010/01/22 17:50:19 ulm Exp $
EAPI=2
@@ -27,7 +27,7 @@ DEPEND="sys-libs/ncurses
x11-libs/libXpm
x11-misc/xbitmaps
>=media-libs/giflib-4.1.0.1b
- >=media-libs/jpeg-6b-r2
+ >=media-libs/jpeg-6b-r2:0
>=media-libs/tiff-3.5.5-r3
>=media-libs/libpng-1.2.1
Xaw3d? ( x11-libs/Xaw3d )
diff --git a/app-editors/emacs/emacs-22.3-r3.ebuild b/app-editors/emacs/emacs-22.3-r3.ebuild
index 2cddfc1d8493..164e5dc1f164 100644
--- a/app-editors/emacs/emacs-22.3-r3.ebuild
+++ b/app-editors/emacs/emacs-22.3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.14 2010/01/16 18:48:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.15 2010/01/22 17:50:19 ulm Exp $
EAPI=2
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
x11-libs/libXt
x11-misc/xbitmaps
gif? ( media-libs/giflib )
- jpeg? ( media-libs/jpeg )
+ jpeg? ( media-libs/jpeg:0 )
tiff? ( media-libs/tiff )
png? ( media-libs/libpng )
xpm? ( x11-libs/libXpm )
diff --git a/app-editors/emacs/emacs-23.1-r2.ebuild b/app-editors/emacs/emacs-23.1-r2.ebuild
index 057859e139a8..81c91311b03e 100644
--- a/app-editors/emacs/emacs-23.1-r2.ebuild
+++ b/app-editors/emacs/emacs-23.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r2.ebuild,v 1.13 2010/01/16 18:48:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r2.ebuild,v 1.14 2010/01/22 17:50:19 ulm Exp $
EAPI=2
@@ -49,7 +49,7 @@ RDEPEND="!=app-editors/emacs-vcs-23.0*
x11-libs/libXt
x11-misc/xbitmaps
gif? ( media-libs/giflib )
- jpeg? ( media-libs/jpeg )
+ jpeg? ( media-libs/jpeg:0 )
png? ( media-libs/libpng )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )