summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-09-28 05:35:45 +0000
committerUlrich Müller <ulm@gentoo.org>2011-09-28 05:35:45 +0000
commitd6cc0a1a6d665a5ced80837c112b8688ac32b951 (patch)
treec394ead485cce95c8adb7a5c9477d110c57121a9 /app-editors
parentVersion bump (diff)
downloadgentoo-2-d6cc0a1a6d665a5ced80837c112b8688ac32b951.tar.gz
gentoo-2-d6cc0a1a6d665a5ced80837c112b8688ac32b951.tar.bz2
gentoo-2-d6cc0a1a6d665a5ced80837c112b8688ac32b951.zip
Fix dependency on libpng.
(Portage version: 2.1.10.19/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/emacs-21.4-r23.ebuild4
-rw-r--r--app-editors/emacs/emacs-22.3-r8.ebuild4
-rw-r--r--app-editors/emacs/emacs-23.3-r1.ebuild4
-rw-r--r--app-editors/emacs/emacs-23.3-r2.ebuild4
5 files changed, 13 insertions, 9 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 278e616c639b..6f393dc5c8d3 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.432 2011/09/27 16:03:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.433 2011/09/28 05:35:45 ulm Exp $
+
+ 28 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r23.ebuild,
+ emacs-22.3-r8.ebuild, emacs-23.3-r1.ebuild, emacs-23.3-r2.ebuild:
+ Fix dependency on libpng.
27 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r23.ebuild,
emacs-22.3-r8.ebuild, -emacs-23.2-r2.ebuild:
diff --git a/app-editors/emacs/emacs-21.4-r23.ebuild b/app-editors/emacs/emacs-21.4-r23.ebuild
index fe92d10c268e..9f43dcbd3f75 100644
--- a/app-editors/emacs/emacs-21.4-r23.ebuild
+++ b/app-editors/emacs/emacs-21.4-r23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r23.ebuild,v 1.3 2011/09/27 16:03:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r23.ebuild,v 1.4 2011/09/28 05:35:45 ulm Exp $
EAPI=4
WANT_AUTOMAKE="none"
@@ -30,7 +30,7 @@ DEPEND="sys-libs/ncurses
>=media-libs/giflib-4.1.0.1b
virtual/jpeg
>=media-libs/tiff-3.5.5-r3
- >=media-libs/libpng-1.2.1
+ >=media-libs/libpng-1.4:0
Xaw3d? ( x11-libs/libXaw3d )
!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
)"
diff --git a/app-editors/emacs/emacs-22.3-r8.ebuild b/app-editors/emacs/emacs-22.3-r8.ebuild
index 0211eb0f98f4..7337bd70143b 100644
--- a/app-editors/emacs/emacs-22.3-r8.ebuild
+++ b/app-editors/emacs/emacs-22.3-r8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r8.ebuild,v 1.2 2011/09/27 16:03:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r8.ebuild,v 1.3 2011/09/28 05:35:45 ulm Exp $
EAPI=4
WANT_AUTOMAKE="none"
@@ -29,7 +29,7 @@ RDEPEND="sys-libs/ncurses
x11-misc/xbitmaps
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
- png? ( media-libs/libpng )
+ png? ( >=media-libs/libpng-1.4:0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
gtk? ( x11-libs/gtk+:2 )
diff --git a/app-editors/emacs/emacs-23.3-r1.ebuild b/app-editors/emacs/emacs-23.3-r1.ebuild
index 4e1e7ef8ae69..3c95d3c46019 100644
--- a/app-editors/emacs/emacs-23.3-r1.ebuild
+++ b/app-editors/emacs/emacs-23.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild,v 1.2 2011/08/29 16:28:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild,v 1.3 2011/09/28 05:35:45 ulm Exp $
EAPI=4
WANT_AUTOMAKE="none"
@@ -34,7 +34,7 @@ RDEPEND="sys-libs/ncurses
gconf? ( >=gnome-base/gconf-2.26.2 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
- png? ( media-libs/libpng )
+ png? ( >=media-libs/libpng-1.4:0 )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
index 1daf7d54c66b..21ead6000f4a 100644
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ b/app-editors/emacs/emacs-23.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.5 2011/09/25 13:00:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.6 2011/09/28 05:35:45 ulm Exp $
EAPI=4
WANT_AUTOMAKE="none"
@@ -33,7 +33,7 @@ RDEPEND="sys-libs/ncurses
gconf? ( >=gnome-base/gconf-2.26.2 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
- png? ( media-libs/libpng )
+ png? ( >=media-libs/libpng-1.4:0 )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )