Fix dependency on libpng.

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

5 files changed, 18 insertions, 14 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 061c5e6706e2..78be025c5420 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.63 2011/09/26 12:31:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.64 2011/09/28 05:43:45 ulm Exp $
+
+  28 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
+  emacs-vcs-24.0.90.ebuild, emacs-vcs-24.0.9999-r1.ebuild:
+  Fix dependency on libpng.
 
 *emacs-vcs-24.0.90 (26 Sep 2011)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 9cb532761583..f7b5208de53d 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA1
 
 DIST emacs-24.0.90.tar.gz 50961184 RMD160 aa7f7997240f5b9db2979e0ba25ac762f796711b SHA1 a37880965d1763215bae935f1f28dd9e6505dd8c SHA256 629ca66cfa529a783a9e372e010a8b8d8b3d65e1e5105ef94f1621a403b9cb83
-EBUILD emacs-vcs-23.3.9999.ebuild 10754 RMD160 cbedbedb761e58dc07e977e3e07928cc00af549e SHA1 f4d2187ff9adbf5ec471c4a55c5f04484234034c SHA256 fb2b6ac6bfd7ba188b1f27f10dbaf8ab7886fba72490003b552f4a94654709a9
-EBUILD emacs-vcs-24.0.90.ebuild 10930 RMD160 b4756abd8d0e1bda90e60758060b64b6bcd43fd7 SHA1 d7514fbcb70ff5b401e6cbfeb2673bf68f44bac3 SHA256 2f0c771989033e2915c19f89cb6e360b2826d7b58c1fbcef7f264f3180cfdc06
-EBUILD emacs-vcs-24.0.9999-r1.ebuild 10936 RMD160 b50759ef06b5389fdcbbd216575c9b6edad188c1 SHA1 d81ccede0d0407b5a653af326078a688ba1d9273 SHA256 6e822e0a4e092e815d7fb17108153a787358732048b06191ee3235d39792b68c
-MISC ChangeLog 60098 RMD160 ce6f94688238783d73118df5fcd3934f08e6e788 SHA1 8ac534ea252d5169039d0cf155f7ffd46fdd0ca7 SHA256 cda20674d18a343674f24bdab6d53402fc7c6569bb5f2ed8bc3c8b7497c735f7
+EBUILD emacs-vcs-23.3.9999.ebuild 10762 RMD160 d61acc2035306995a99bcee38b4ebd0393d91192 SHA1 5010925cddd1782c1bf622a545699be09d9cdc6e SHA256 d44015713280e55a387babc77d33d7f42e0b55f31895c8bd8572e3b025de24cb
+EBUILD emacs-vcs-24.0.90.ebuild 10938 RMD160 2365702c56ed715def9c2292e28957664445f13d SHA1 6503983bdb8dbfa391f4d5043699cf4224458311 SHA256 1043ef192f565778445d7abfbc511251f5c97914b9e68cefaf6ea2c4b4129f53
+EBUILD emacs-vcs-24.0.9999-r1.ebuild 10944 RMD160 323e19ca48db217be352638b36ad45ef966a424b SHA1 9a7d09e8df07e7c67df246a5bd194b7aae65acca SHA256 1983fb83b1621914fc026a087eb828bd198f807b6c170f21a2a5b084006646ae
+MISC ChangeLog 60261 RMD160 209e2025d9d4426c362f74f615efd96f3d391686 SHA1 5761a7474fa83bcba6189ef64f76b8504c661137 SHA256 af488c31a0d800d9d442d0d3f19f506e1218079f60d92264b3a62bec2ae158dd
 MISC metadata.xml 2314 RMD160 a05bd6bb9637e92af9e2500a11dfdb1801ff5a4d SHA1 ec99de5f7aacbfdb0cf05701bf18ca4b259b88d8 SHA256 859f11b55f66c850fdaf9fa7dd69412f8f247def16168fbddb5de7501a4d2996
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6AckYACgkQOeoy/oIi7uwcnQCg0LBzXMv5csX3vDXOpP8VGKja
-BpcAoJGyqbmgA+l+vxIO4d/ZM6YOav03
-=LhnB
+iEYEARECAAYFAk6CtcUACgkQOeoy/oIi7uxYTACgp6ODDV0eJ7o/uUG9IhEm237O
+x/cAnjemmszahtqsYYIjEQLEnsNg4IAP
+=C8PG
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
index c2b52e94ad17..cff81717074e 100644
--- a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.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-vcs/emacs-vcs-23.3.9999.ebuild,v 1.13 2011/09/26 12:31:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.14 2011/09/28 05:43:45 ulm Exp $
 EAPI=4
 WANT_AUTOMAKE="none"
 
@@ -47,7 +47,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-vcs/emacs-vcs-24.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.90.ebuild
index f29e63a2104d..c1197a718a50 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.90.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-vcs/emacs-vcs-24.0.90.ebuild,v 1.1 2011/09/26 12:31:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.90.ebuild,v 1.2 2011/09/28 05:43:45 ulm Exp $
 
 EAPI=4
 
@@ -51,7 +51,7 @@ RDEPEND="sys-libs/ncurses
 		libxml2? ( >=dev-libs/libxml2-2.2.0 )
 		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-vcs/emacs-vcs-24.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
index 8f59ed7f60a8..cd84e873d337 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-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-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.17 2011/09/26 12:31:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.18 2011/09/28 05:43:45 ulm Exp $
 
 EAPI=4
 
@@ -51,7 +51,7 @@ RDEPEND="sys-libs/ncurses
 		libxml2? ( >=dev-libs/libxml2-2.2.0 )
 		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 )