Pull in correct SLOT of libjpeg for headers.

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

3 files changed, 17 insertions, 20 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index afed90e6a429..d14179fce783 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.234 2013/05/26 06:43:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.235 2013/08/05 09:44:22 ssuominen Exp $
+
+  05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> tiff-4.0.3-r2.ebuild:
+  Pull in correct SLOT of libjpeg for headers.
 
   26 May 2013; Agostino Sarubbo <ago@gentoo.org> tiff-4.0.3-r2.ebuild:
   Stable for s390, wrt bug #468334
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index b8f271f31f32..d0805b5d4c6c 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX tiff-3.9.5-CVE-2012-1173.patch 1621 SHA256 1697dda50fcd92599f8e567a55783d699d919964df895c5c9098eed41715621f SHA512 262ad17d9fb2c0e03dd5ead72b27d446efb44104db5330a1a0cb4998712b59e70a945eb5bbf4f0216dde475c56ef1d4977cf46ee189619402727921dadacbde6 WHIRLPOOL 2b9dcccd9c0a0285cdbd35ccad2fb0525fba3212b3b84ef9347f47a425ff4c92ed55a2cb2bd3f0af4e93cca3a0e78a76133006e5cab130b53b2dd8e422e51d39
 AUX tiff-3.9.7-CVE-2012-4447.patch 5706 SHA256 373020d6c383778ee40f642d90e5d9f3a878f0c17a529825e43e1647d27332cf SHA512 defb8251401b7d65c2cd8f60df30d35551c1b1d0a1dcf514dd95da89572873177ea116e9373dd07cd260e00434235090e1d8864199d5fdfa84c445cb6905ddd6 WHIRLPOOL ac54215b65806681ae5e337a538ce91357247f28815eee7a29ff5eef179075ec43b473a7f62195056a37318e84ae15a2d503fd94b54a0dee173ac6851858f342
@@ -23,24 +23,18 @@ EBUILD tiff-3.9.5-r3.ebuild 1799 SHA256 10fc18a8ada9f8763ff295b6f42326b0f6866e23
 EBUILD tiff-3.9.7.ebuild 1903 SHA256 1fb8829e88efee4827555610d50e6e0c9cafc5e87f95ad7ea6a0667d2985cf89 SHA512 205893a1fc4460746b5821a3d73b063f9d736ca9cbb16beef69969f9c7f542bb19a069edf953b4c25d57fc2d2db7ea8ec395fd6f026c6228445ccb936536fbad WHIRLPOOL aa53c763f198bc9f10aca670192da8ca40bf29f127bbae01829af76733a8f48420adbcdee30daa66bcbf869d5b7099fc2457ff0c6115a6e83ae3c6b1f0074749
 EBUILD tiff-4.0.2-r1.ebuild 1446 SHA256 4301e356a342b75d9425d94ca7fc0f29eb956265136d23219851cbd7532c9c86 SHA512 f3f5ccd83c300a3acd445e9fe420c9c3150ad3933a80db1a315ff55afd73ca0829f6848bca49e0dab44246c506c12d8595eeb6d442cf414f28d20397da8034ea WHIRLPOOL ebe9c1d649335cdedf6630fb943cd916f2a64898a18015c0a389e3299b850b9a2c50ccc54a93519c7f2e72988bfa492969db52afe1068429cbca7b3cab049941
 EBUILD tiff-4.0.3-r1.ebuild 1429 SHA256 2fc720bbe56409b73d782a68bd2476caf5e0eb4449f5df775088cb24e989ada0 SHA512 d53620a858fbd774b36723d33f0c129edd634ef4913647319d76e60d3a87edb3cbe52c42b1e2e7a7155c9ce14540e158a3d1081f2046f6677c03570dae121ee4 WHIRLPOOL 021e573bc100640b1efceac2f42635645bb79bd729d113dd200676decaa863febb45bca37c721575043e23e60aa203419927c7aae7736f01e946ecb35fe10e00
-EBUILD tiff-4.0.3-r2.ebuild 1595 SHA256 9775e3fa5b7be9e503e07ca29c92013ce654f3fd62677b30c7e593c85a8e3daa SHA512 caea7c856c1638ec0c41c17ed41500a1693b8ad4b462ec6436f4bb63eccf7c3eee7a83f5aae9d07fc12ada6895de8391bb1b097816f59cf0ebeea49f8d5905a1 WHIRLPOOL 5314ec98b35a2af92319934cc7e6cbee802b7574fdc60de3671fa12e592af0d40e058ffea42b64e00f736aba8a9d24d93ed57c8009fcaf100765df42137f2ddf
+EBUILD tiff-4.0.3-r2.ebuild 1602 SHA256 745db9df119c066bf90f0dad327600ce575324272e9adb688a939be0d50e8320 SHA512 b1565cd640e3d30bcc5ac3df9516889a72152b7f36850d71c2fc1d2014d3c9e5103f27f6d2b607d0845eb9554af0f453aaab8d134d8b8609e61a7604d3fe7346 WHIRLPOOL f006d4e7770615e663c27013dbc65fc8c9608964dcdb011a6140e1f1b0041562472685a46a84836f81e780ab838713ec7ed079a8aef924edfcbccb137387b26c
 EBUILD tiff-4.0.3.ebuild 1353 SHA256 ae60d4451163f8fde953b0ba1120f3a10d01601a23d457ecf05f2ea0007c477f SHA512 a5aabfa782dc9c97e9a93e7f1a224152d7a561d0c8131042ca24e5ab40744125be8fc1e1a892a4f6f808003bd2d8c881ccaafd1165522f829adf15956d9d3689 WHIRLPOOL 4841ce497247a05952c1b83f718983422b819642a133acea9ab5daa6daeccc2ceb6f6faa2b26957fa9f965751d99ed533575c550e93205386d0c427965745eb2
-MISC ChangeLog 32669 SHA256 162c12cb83fe82de7b905cca3b6898154ca5b41c2d481deb77304e271c1581a4 SHA512 6c8c94522a69e391ea5e8ba2c5a98f772c5c97b86db0f75f0b9f22841aaa1ed734a6b427cea06f293bafe439fb7e05035c56f2342cdedfaadd6b6964068b52f7 WHIRLPOOL dafe79baa01608c9dd063b156b3462b4b77b7db278ac32bbf913fe84574cd6aa4a846b02ba292a1937c4fb35f9f64b282b3e54bbe1a453585f573567057c9d06
+MISC ChangeLog 32799 SHA256 dbadd04a669dcdf26e0c6fb35209fa0ce43a2f6412b00607bd8b8d51b3a8fb9e SHA512 0079373765bae79f563fe5478d7f9596122f034cc1a399314e1de3b25c73028adc7f8d07465e3934d7015bf2de61a2e9a0e8226d17c98878ae89cc1f96e761af WHIRLPOOL d2091516aea9b1e6792374bdf419131b2f1bf17140d2fa62f61157bd71705f3bd40af2bcf82ae7f95a51e6aa49fa8eee0d930f8a1947ee3f5047bc6c5473c0dc
 MISC metadata.xml 309 SHA256 c1893fd7aaa763da14257353ceca7356500d8c8112f635f587c4ef407bd6ca51 SHA512 435eddb4a4280b37dd5948f305f88c5b3c8d193d50776a4c608132addcff03016fb00b218ad8be93a59dfdde28b57fc9d1327b18dc772344057147a5d3826f4b WHIRLPOOL b3323fa861535082bd475896c3cd5490c584cfe0262ffa25288bcda76e36ee58c42c825811ccc34078ed624e48467842012750cd650cf91398313cf4c6b60892
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRoa5VAAoJELp701BxlEWf1qgQAKsS85LPgURhwt3wnFjxSsCV
-L1chQ0RvQnuZc/hyyDFUA8ck94vwFrEdcwxAFMO9MzQMFhU6DT4BnpBhs/ka1e0I
-71qJ+O6fVCCx5TSbXA32LXB0shgkH6G/S+k5UnH15nXp4jWh6svvADwcDfBQtB63
-ssfJjlGdkkp7PBllrPRZ2OhKuEy991uBpQbSZo1eSKGhSdMwijpLPyye5rnaCErv
-gD9Kp23InXzGSng/Z6A+qOlAchJBZrsK03bFWwgtoIC69NuB65OpSz8o+pMfcTTq
-f0l1YYPM+vGks6grNUQzhVKLPXFUtkP81HxBLi2jQRdO/ArvG+/OoCsWnNQxhhCv
-+NglGL0FfRdMUe6UcqYsghP1NxwkS4PWVXgncNsBHxmd9qBiTwKo2to6qfBQBm1G
-p5cCGlbn3Iag8OwPg6SACmqPAG6NW1hB2+9dmyBt6hepCjn6BWGk43NWjj8gwWFc
-i/6Z6adE4OUAhTCVkHYHeoL/xfjfG7oDo1JfdpuYbV76p14xTUO2NOJo+HhrDkGN
-WmmD83lDJvgdqVTMBK+402rmKVoenl0/mxduorKNuuvQyQKueMiMGJWq5oUhf47n
-/lvZp2CWU4qloQEmpw+E4hCmpzORpQgnN1h4A0MwxaEAqK4e8mNX6RMgQhRDhcyn
-Hvh9FzbqcPVl41x57s39
-=4sqN
+iQEcBAEBCAAGBQJR/3ORAAoJEEdUh39IaPFNq2sH/3wITsvA34zGn8AbCIv00Yyo
+QpBmIYH+wsu52UmiEm97XV7xVDTrRvQi/Z8hFo0T8Qn/sjSNXeyE01D8ioH8m3uF
+zzCSoKbM1WxtQ8BAX1Rour6uMWHAAFqavVG6FCygqBgalg1UeGWjHYeWHNDRYO/j
+CZnK4eXLQ9naJL7X4H1XSMMQiUquVD2EHz0GvXCGG5ywHFlBP9h4JR8kuw7/10U/
+4nICammT8jYX5wlyy/vPQY7duEVQsHnFSoZJfIVlDPcXo4uER/ivIvfD+u3Qa6qz
+KafgtVXn7MUtXaWhiOx+2lqemaJmG00FhA7AiNU7WyeW+btFuCX7LFTFJtX1oEk=
+=lqJc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tiff/tiff-4.0.3-r2.ebuild b/media-libs/tiff/tiff-4.0.3-r2.ebuild
index 869f1de4e05c..9ec23ed36cf0 100644
--- a/media-libs/tiff/tiff-4.0.3-r2.ebuild
+++ b/media-libs/tiff/tiff-4.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r2.ebuild,v 1.11 2013/05/26 06:43:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r2.ebuild,v 1.12 2013/08/05 09:44:22 ssuominen Exp $
 
 EAPI=5
 inherit eutils libtool
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"
 
-RDEPEND="jpeg? ( virtual/jpeg:= )
+RDEPEND="jpeg? ( virtual/jpeg:0= )
 	jbig? ( media-libs/jbigkit:= )
 	lzma? ( app-arch/xz-utils:= )
 	zlib? ( sys-libs/zlib:= )"