Fix dependency on libpng.

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 278e616c639beb950a5b07e7344e9262f633c619..6f393dc5c8d3bdb323c46f39cfb430d0357aeb94 100644 (file)
--- 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/Manifest b/app-editors/emacs/Manifest
index bed3b7a25aadf5eb82edb72402af55f8b3d4c637..92c9405b1d4eed22c236e3a1b6655e133349700e 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -12,16 +12,16 @@ DIST emacs-23.3-patches-1.tar.bz2 1675 RMD160 f167c15e8d1c6a9629967aa3f910cc476e
 DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
-EBUILD emacs-21.4-r23.ebuild 5017 RMD160 e92ddfdee1ff2b9c2df52d976723eda5ad4811ee SHA1 b343d241c2512c4272a2bf6fc0bca06a8f66a921 SHA256 f4ba366b89cd724cfd7a0860a62a6acfcf4ef0d26b4705b53a203ea8f1def9fb
-EBUILD emacs-22.3-r8.ebuild 7874 RMD160 5428fd00d6b704386e0e0f6f3840dfaccab865fc SHA1 3774048cac24618c52184d4036f63a1156c6e1db SHA256 4ff86dd8f43791a2734939367c9a2e29e71f0c318b3c7057909e436882c2ec16
-EBUILD emacs-23.3-r1.ebuild 10269 RMD160 4a384f15d098757c99f15d0592a49d2415b9d2f5 SHA1 5c1a2259f4911c8e238a4cdcfe686998ecad7039 SHA256 8b50b0f54553270a1c71a948110fe0d101a2f11ffe847913d60abb4aa716130a
-EBUILD emacs-23.3-r2.ebuild 10499 RMD160 619e3a5eb5e1f1d748445a62e946f5beaeb8dcd8 SHA1 191e7c5a633287e0b20f9b89b25c6e16fe52eb51 SHA256 cc4bc41be44c3af9e452ba2e8d7f0aeb9149a77412719673935a8880d1d394cb
-MISC ChangeLog 61814 RMD160 b07053e05341b1fb277e6f40c4c3ccb9ba7b4c6f SHA1 dc339acd7b12b5b443fa15e9e545ed62dd4f99c2 SHA256 cc3a2ce3d26edb92e26bea9b2cfcbc1f59c954301cb2954d0088c573d27daf5e
+EBUILD emacs-21.4-r23.ebuild 5017 RMD160 bb3c54bfb53827aa857b465d7fff42a11a92b2ad SHA1 a1dade7a5da5d9ed39995c30df31923e0d3c1f47 SHA256 9dd3e8baaeaea97db9c2046e6ea94278c70e1f4d188579d231c4034489c825a4
+EBUILD emacs-22.3-r8.ebuild 7882 RMD160 9acdd2299199e277ac287583d4fb007b2aa1335e SHA1 d58b682f8437146b3ef87bc692c1825bad794a39 SHA256 12d897f4247cbaf59eda3946fa5c38671086ba9de5d24289638aa7de56ab5ed2
+EBUILD emacs-23.3-r1.ebuild 10277 RMD160 8f902be9fb6a328517507099243e76a2a667fa0a SHA1 ee8568fe4c1ffb509c812a3e80a5b22469c29aae SHA256 f022fbe2be9d8378945a69741336513863b80c7670e24f8c07a949189ed417b8
+EBUILD emacs-23.3-r2.ebuild 10502 RMD160 29d5bbf0f14c48a46cc7426b110638a265ea7cde SHA1 47e5ac411f44235cbd552b59dae98b46fe397113 SHA256 998b864b2dffbb95f31ee2e38a8abab4c618ba19edfe694b7d09864e35af7f8c
+MISC ChangeLog 61981 RMD160 521e24d0d82da53bc411f3eb0155fd6c8987bdd8 SHA1 28696e435837a6ceada23d80d108e7089a9ace69 SHA256 8a684d7ae8a987ebe42339e9ea53c90a586806c7a9ca8e4ca9f7c8c33a97852d
 MISC metadata.xml 1799 RMD160 a7f84fb65e4183986c56293d6736de494c866afe SHA1 09be81d68015c843266b1b2f0e4fb3d3903bb1c6 SHA256 160051b131c440f42d74910a95c00692a7e63778dc60cb331d6033abbd302808
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6B9YMACgkQOeoy/oIi7uyE8gCfeUvaWRip2Br6QgsIOcNZc3v9
-JYYAn0tQ3zRjizFRhFdb3OBWNRgtdlqQ
-=M+Fl
+iEYEARECAAYFAk6Cs+YACgkQOeoy/oIi7uxJgwCcDjPuyOwYlAjZ0Ce5HDzktVI0
+GiYAn3X78rcpReTlZg05As2awBkJBjSr
+=+aVq
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-21.4-r23.ebuild b/app-editors/emacs/emacs-21.4-r23.ebuild
index fe92d10c268e4de8e218855b33d040a6d55a5c06..9f43dcbd3f75a110d0cebdc2fe8fbb3eeb9db09c 100644 (file)
--- 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 0211eb0f98f42659146c4556a84ca831b566df05..7337bd70143b94ec194f6300877c11b8ec71b7e3 100644 (file)
--- 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 4e1e7ef8ae694c46755ee64262d97fd2dff72ec0..3c95d3c46019bdcc7de54beb2988cb90646a0445 100644 (file)
--- 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 1daf7d54c66b5359e97f3264e588f890273152cd..21ead6000f4a7edff81d31d6713429c3acaa8667 100644 (file)
--- 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 )