Fix all of jpeg, libpng and tiff dependencies to correctly pull in SLOT="0" to ensure headers are installed.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 26 insertions, 17 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 88e92d99b12b..c53a477a5bd0 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/imlib2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.115 2012/09/29 18:40:34 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.116 2013/08/13 07:56:56 ssuominen Exp $
+
+  13 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> imlib2-1.4.4.ebuild,
+  imlib2-1.4.5.ebuild:
+  Fix all of jpeg, libpng and tiff dependencies to correctly pull in SLOT="0"
+  to ensure headers are installed.
 
   29 Sep 2012; Raúl Porcel <armin76@gentoo.org> imlib2-1.4.5.ebuild:
   alpha/ia64/sh/sparc stable wrt #433309
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index d9609a56165b..b015f79e5894 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -4,14 +4,18 @@ Hash: SHA256
 AUX imlib2-1.4.4-libpng-1.5.patch 2540 SHA256 5c4e0f1c5a4543e9f92f2974c7c996244274a1498bcb7083301d1153d6d79980 SHA512 ebd857e68bc2254f14992e234cdd812c9dea7c9746243add43fcc17bd51f353efe609d1748f77d797ef93b0bfabd7f1d6e7b5eb75868c892536ebae9053bc0a5 WHIRLPOOL beba2bb4e9df7f66e7437a89e2aa8581ed6bda0c6e0dcfd5056ef43d523ca02abe2c533d87ff7cb969fd2dcff19bd16b5faa86e45c64e0c73022d30b0a32a0fa
 DIST imlib2-1.4.4.tar.gz 977630 SHA256 a4de52c90b8cd155b41ca70c2d34209f7b94a9e4f8e77582f2682a1795306198 SHA512 657ca882e7358fb021ce08247f1f7dedee1aeb0e5fb7daa2dec4bf4859106801429eef3404ddb263fc3eccfde631d8559a69fec9f0cf23a6ca45bcbc98d3a380 WHIRLPOOL 4432edb84ea07c1d71d1e53459eea3378a18d1916a3d0b5514dbbc20b693197c3b10374b04b89caf0e268257963e0d3b33b8670242844e1fa5bb3cb70ff9c2cf
 DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0 SHA512 6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf WHIRLPOOL 53c003601ca6f89927794af0f0ba48f31cce31504061b71f68f0d67b0c4266d2617a24df467af2a03d485d129ad6de745382338addf39f70810ec71db6b0833c
-EBUILD imlib2-1.4.4.ebuild 1499 SHA256 b22955880ad86bd64634a707db20cd409a28f7ef1b626b7b70f2a9e9c16d6edd SHA512 13e670b1b294c6c5e622bc5bf129dbacfa94bd00ac7b7f12f4c862a59c720bc76871ded58c053b11eb96fabe9e56f9f9fd42c4b2bf0fd6911385b2207c8f41c1 WHIRLPOOL c3219042871fd95d6c7dc6e439c801402433285cf7f4e6584cddf557c93022cffce4e8d41841573e3bc8c8f85628bcb2002bfd98703bea0888a6a642b573a13d
-EBUILD imlib2-1.4.5.ebuild 1659 SHA256 b8041ec04ea745b2e02d71b535a8396e4a2dfd2f8fbab85276e03645875d53f6 SHA512 624fa023530f0e937c4b5a1e425bbcf5c65c0c08fb2712e31b0d15c32cebce28e00f4b32d5988ee58fb8e90e8b93a95caf2c0ac40144f721aa8a6c1ea70de359 WHIRLPOOL 4eb124599dae440a066602952d78cc80f741450bf6dba204177c3725d1ea5be4cbd5168442e8f22ceeab860196d6081d9ac897ca24dba6f7a614db1288521205
-MISC ChangeLog 13709 SHA256 18ff4e1c26b734fadece2020c2b39f09cadcb934ead994d21717eaee7063535c SHA512 41b851983dffb0ebc3ecb99632eb8ecd2c72b3ee05f4773016de1e07c44a9c071053a9383832b4a6d5b5eaea07957de9c4d4c11f03a8c7d444bbada14338a9a1 WHIRLPOOL 1cfb61a1d83e6ccf6d28f0045ae0771c86e2483653c5f91f92e54a196c450ee2ad971e7be7be85cf016b64f08120daf0a2a173324d4686b217597293b1ac410c
+EBUILD imlib2-1.4.4.ebuild 1508 SHA256 9aefb32798ef7d6566afb5d160e26ad996af3d4c399e86c458fc6aa352f2b228 SHA512 041a079eca66e3c066916a8db359ed408a79baff91d8ac771b585ba11be1b3012f14274f2559289254276613c8477e5133ead5feb4152df6b3bd062b42d7b0c7 WHIRLPOOL 54f785b2766bae3c7df624e1f20984186e27919a093921c053d76dd3225e58c8796a08d9b2ee2f064279a44e2f248243534ca232fc1b3f90791c538d748becf4
+EBUILD imlib2-1.4.5.ebuild 1664 SHA256 f540ec317040e4d1865a6bab548cb76e5c9ed4307fadc2c04b2aec73b77643a3 SHA512 9a627b28782796c793e55eb82168b6058549c9eb771768408baba99f9037911a9498662498f6dab18195df588433f85a80e46d6844f4e88bde62fef88bb06b17 WHIRLPOOL e109db59398d71a4b40f29ce3961b35b6f5461ba2c39f57c2d2709c75b20861a2a0850bee23dbf29ec100c51f86de3076d528d3910d21c31a7411435d0906544
+MISC ChangeLog 13923 SHA256 45f954b5e66020facbff4a0e23a625847fd1033834c4766ff862f0a80e470295 SHA512 aa7c26226526f92cd2715b4aad710b8dcb8a266d5cf4682ce4e164900c53dedb0f7fd722fcb213f5eaa3d20d18b209ca994d7ea2782da6854f5f093105b6fc07 WHIRLPOOL 822234a0e318141200c9a36a6870abf5c1dde372f8202ac8a3ff54b4844bce5f46218ccc605da0888b16e0c9efeaa9f5f5e0c1012b8add4d1eb267937da3c241
 MISC metadata.xml 2234 SHA256 0b9bafdca6d97aa6f505a0029f5bf22e8d55825a9e16e72e5c65ced280cfdbaa SHA512 9f58e1093d6ac06b3e865fa5ec339b3a96483e30ee91b8c98726faa3ade42b63b44f44482e13b85b5333fa7453909ee54f1b72b0051014cbe4fa22b6fb2e86c2 WHIRLPOOL 7640c0a00ce8090d36d2c7c3f7baa9741dc3e91ceb610012685614250a25e169045b9629ba3a2b2d85c86f078c23d23ad549eb871edc368eeebbc791691d39d1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlBnQKgACgkQuQc30/atMkCd0ACgmu01I8rElqtVQaUQ6/2xZlMu
-Z04AnRocaBnk71W6ovEP3UzTrdBtJkAW
-=4cGB
+iQEcBAEBCAAGBQJSCeY9AAoJEEdUh39IaPFN/SwH/1+Ot4YpcM9Hb85xOOFN/fYv
+Erw5Z0aO1mNCklmNQqqAFtVPPuOuSUJg1xAHFWTmToKd7gnWt5spMuq0zdJ5RfsZ
+m0L+fsjScxdW708JMufwYc5RfL/V59AbwSST3e4ttt8aOry9VwIYW5CpXH3T31Rn
+nWpYPXmi0HYgI00Au56EaJvbutMgmDWhzp8BAn9uv1VAtv7X/PYDsb/frj7Udy8y
+JL1pkyBPqPgrTFGdSdStpH39aH3O2HBb+3KVicbIyM02C3nEpyliRFUWbTlWFr+2
+/GT4JcGQjS0/NWFV7pdm0hhgQGg6j68znFdbO7Aj7kjtmPunDvWNdZ49JsRiNSs=
+=9QP5
 -----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/imlib2-1.4.4.ebuild b/media-libs/imlib2/imlib2-1.4.4.ebuild
index a3bd45dd3f14..25a2ab4405ea 100644
--- a/media-libs/imlib2/imlib2-1.4.4.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.4.ebuild,v 1.12 2012/05/05 08:02:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.4.ebuild,v 1.13 2013/08/13 07:56:56 ssuominen Exp $
 
 EAPI="2"
 
@@ -17,9 +17,9 @@ RDEPEND="=media-libs/freetype-2*
 	bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )
 	gif? ( >=media-libs/giflib-4.1.0 )
-	png? ( >=media-libs/libpng-1.4 )
-	jpeg? ( virtual/jpeg )
-	tiff? ( >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.4:0 )
+	jpeg? ( virtual/jpeg:0 )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
 	X? ( x11-libs/libXext x11-proto/xextproto )
 	mp3? ( media-libs/libid3tag )"
 DEPEND="${RDEPEND}
diff --git a/media-libs/imlib2/imlib2-1.4.5.ebuild b/media-libs/imlib2/imlib2-1.4.5.ebuild
index 0b444027fb6a..83ab5a8738ba 100644
--- a/media-libs/imlib2/imlib2-1.4.5.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild,v 1.9 2012/09/29 18:40:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild,v 1.10 2013/08/13 07:56:56 ssuominen Exp $
 
 EAPI=4
 inherit enlightenment toolchain-funcs
@@ -16,7 +16,7 @@ RDEPEND="=media-libs/freetype-2*
 	zlib? ( sys-libs/zlib )
 	gif? ( >=media-libs/giflib-4.1.0 )
 	png? ( media-libs/libpng:0 )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0 )
 	tiff? ( media-libs/tiff:0 )
 	X? (
 		x11-libs/libX11