old

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

9 files changed, 20 insertions, 344 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 5d935dfe09f6..5e26962cafd8 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,12 @@
 # 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.252 2013/08/28 12:10:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.253 2013/08/28 12:57:12 ssuominen Exp $
+
+  28 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/tiff-3.9.5-CVE-2012-1173.patch, -tiff-3.9.5-r3.ebuild,
+  -tiff-4.0.3-r1.ebuild, -tiff-4.0.3-r2.ebuild, -tiff-4.0.3-r3.ebuild,
+  -tiff-4.0.3.ebuild, tiff-4.0.2-r1.ebuild:
+  old
 
   28 Aug 2013; Agostino Sarubbo <ago@gentoo.org> tiff-4.0.3-r4.ebuild:
   Stable for sparc, wrt bug #480466
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index e10b3e8543dd..03fe6ad4bac6 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,7 +1,6 @@
 -----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
 AUX tiff-3.9.7-CVE-2012-4564.patch 1987 SHA256 525f667e2148229520b50d6136c0ecd345b8db9acc62fde945a5f13dae4d51f3 SHA512 24ebe60ce6361561c15c8c5fb46b47942e58912de5efbf128374defc4382a7e800fae3dc0a9fe04876a5e2f61a109edc1c9533be2f8a15b4b0ed7215d7b08c9b WHIRLPOOL c59dfed1f43b75372e9e6bf3381db608d42291e8613c6f38d8b1310868b4f373b15a279144a8f06cb0d9ba5d147a81ca753b6ef118e23e47893902d1d00cf880
 AUX tiff-3.9.7-CVE-2012-5581.patch 8156 SHA256 f47b30c8fc0578df7285f6cf318f29d410db4b82550b3fbc9582beeb9a834415 SHA512 2e215edeb6f4f5d6e14753874a67d76cfec34b3f6ffc420e1c7ede2007a6b2f64c09505e879e83db1de87f28c82c806c4379b38bf7f8735bb2bae675543683f0 WHIRLPOOL 8f7cdca5ec968eab6ec8749e2185c7416fb2055da56ce3b159a637ede9f296e9a37af7c91ff8da1c743bb05371662725374d3febdde2109f18baa57391ac8e16
@@ -17,36 +16,24 @@ AUX tiff-4.0.3-CVE-2013-4231.patch 366 SHA256 a56b5397f736fd07188433dc5f228adc1f
 AUX tiff-4.0.3-CVE-2013-4232.patch 446 SHA256 766279d79885e1132c89fd0e1e786641c48d1bbe04888704b455baf52b7ccd04 SHA512 bef35509c24e47c948cd81eafb0c2afb24333dcb5e413e5ac694b6053fe145d008a1f65ec9ddfeb961181f70d34e3552ddd4f63e9b28e40b9ccbbad6d6680dc0 WHIRLPOOL ac96e9c343cce50b6fb2ad3ff7025b8d00ea2e89dda422b97a329391db1dea17c894a083b53dc1110dca9c7d0e2f7e638cd277f92f93db00df5057dd03ef28a7
 AUX tiff-4.0.3-libjpeg-turbo.patch 5054 SHA256 fd31eb80f5eaf37d689bc3d3dc3f40e050bb99ebfe5eb575e9f9e25281037740 SHA512 7cab63b47b2f67412dd8fa1a65231be17516e5f2a27820b3232b4f49c08be10c0899d3a238eedd9b8781d0304fc285202fc4e41726d8b99009cfc575af298cf9 WHIRLPOOL 93c25fc707e3776e802f0c65db1f9c710ecdfee039be5a10361772773b143c4f1790159c9a7f606e43287564770aecbe6d2bf16f24799693d2ea14f772d10103
 AUX tiff-4.0.3-tiff2pdf-colors.patch 529 SHA256 18c1446e15383bdb94884bc140002719c8ebffba5e43ae90c12f9de7041d456c SHA512 8de845a18412db883177753b5deef70e4ad9c2eecf72ce47df0383e3007a26ae1d9798d676c6f3d92e2a48c5074fbca6b19f7620bd9620e9f93e8d662062d925 WHIRLPOOL 14834eeb94307e0eaa4f34061d53f6b2b07d995285072bae7ad4dda116e963f1f4b87b08fe796a6c146e6d623f90cb10858a5be4dd8c466174f1bb00e3208037
-DIST tiff-3.9.5.tar.gz 1455502 SHA256 ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33 SHA512 814d5b2b488c8332ab1e17095004d42d44717a530ab2675740ef4256050971fb5feb35f804001e1bc5081f4a02c38922555fdc4c947b041876c96a32385da094 WHIRLPOOL 24e348c6d7c754f70706faab72956dc85b48225c4e31a10f4a16536f434fd269a20aa3beed9bddff6a0af2fb67fc73fd946c9e0397f4a6d8599d20b79c2215aa
 DIST tiff-3.9.7.tar.gz 1468097 SHA256 f5d64dd4ce61c55f5e9f6dc3920fbe5a41e02c2e607da7117a35eb5c320cef6a SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77 WHIRLPOOL c06b35da66c365c1fe7f0e6e06a400e139d3e2b5b280aa764015c2f0383a6191ffb3d335cdf2211b687bbb0caacf641be409148986a9813dfde5822a650a9b1c
 DIST tiff-4.0.2.tar.gz 2022814 SHA256 aa29f1f5bfe3f443c3eb4dac472ebde15adc8ff0464b83376f35e3b2fef935da SHA512 bfc82b2780f2a7d89b1cd6d73ba45091fc74de996b2dad616cfdba59770b192449d6a9effba305f478a8e527d7246443a4e2bc1c5e2e6673a0037972f4a13413 WHIRLPOOL 1c89f2760413035f37dfde47d7c8884fa899e86b7911fd6b52b2920c830898b8f26f8d9a287ed6dc3820feb7fa21c50fb1dba278c57fb548806e8700c23e1ec9
 DIST tiff-4.0.3.tar.gz 2051630 SHA256 ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872 SHA512 d80e18b00e9e696a30b954c0d92e5f2f773fd9a7a0a944cf6cabb69c1798e671506580daa1cd2ebf493ae922000170c2491dfc6d4c0a9cd0b865684070595a73 WHIRLPOOL 762ace7c66dec7a6f350bc8c000a9e1f4b775e7b148b1d923eb3f7c015f47bda65a54bc0b5974ce665c7d836ec0b275c9307d1f18f3b6bee8b0949a6cceb319e
-EBUILD tiff-3.9.5-r3.ebuild 1799 SHA256 10fc18a8ada9f8763ff295b6f42326b0f6866e235aeac1261f42dd1ad62a12fd SHA512 9434a31ccb4603d0278cfa0b51df4d902a627466f8243045585064db73627418ea871ea4a6f749acbe9f4792bddb6b7f2d28bc3a035da5daea8067338ae8d157 WHIRLPOOL 1cbc9bd3e518d48c8b42420c7db495bd95810ed571dc13ee4be5378c816383f75ae19e2d02f711c61a95642777458840340b15e8e438bc48cd2d72309955ce15
 EBUILD tiff-3.9.7-r1.ebuild 2280 SHA256 b6deee19673f3aef169e6d06d2a0a60ab7a0863bf54beafef7867d4bff7564e2 SHA512 54e37902bcca4305ae6ac9afc4f2acd4b11969979eea04a8f35fef6fea73944d4534f0858db54a3236901fa8920de542c2059ab6b29718eeca188f00c91ef784 WHIRLPOOL 5bdd0df1a7d5b870907c1b443b3fdb7040cee6e650c37f20b03a5f8386dc6e23ce50ceb4e9bd879642b0659f7702e5f7a028ab343a8fbe6bd04a18966ea9e23b
 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 1602 SHA256 745db9df119c066bf90f0dad327600ce575324272e9adb688a939be0d50e8320 SHA512 b1565cd640e3d30bcc5ac3df9516889a72152b7f36850d71c2fc1d2014d3c9e5103f27f6d2b607d0845eb9554af0f453aaab8d134d8b8609e61a7604d3fe7346 WHIRLPOOL f006d4e7770615e663c27013dbc65fc8c9608964dcdb011a6140e1f1b0041562472685a46a84836f81e780ab838713ec7ed079a8aef924edfcbccb137387b26c
-EBUILD tiff-4.0.3-r3.ebuild 2223 SHA256 b20e62cfc132093ae0a8fec6ab7ef8bbc21ce6c626572d259895f8818dbf4f55 SHA512 e0142b19b1ccf2a64f92c5a8d07cb6332ecb2cd742bef686dac21ba3435ac75f3d6a6e58c0f2b60f721734d11f0f5a7a04824db4289a25697cec911fbdbdf870 WHIRLPOOL a96667e99a31ef0c5583655b5b21a624baf294da15a3d909d9f2854a3f053d5af35b2be83f58f33479a8fdb4aa5a25af9b64028981b1a3c8bc56b19b5597e305
+EBUILD tiff-4.0.2-r1.ebuild 1204 SHA256 18fcb95b8568571847596316fab00ad926c765a62945f3f9bd5314d0491dc56c SHA512 3bb541f5ab07e4dabcdeb0790269242bb4eafbd812124b5a9041253c8172c8af2debdc027cd72eb9dabd8b7b34f7a9889ffa5d8f17815d7e3f564fcb531d7baa WHIRLPOOL b5f19721fbc5ec476bf854a300161457875a38f735adb88237d77342460f1ffc96bd4e503f663e5c6cdc685df2da61fff3d77342326a711e3b745d3d05f01bed
 EBUILD tiff-4.0.3-r4.ebuild 1658 SHA256 cd8b66ff3535b8f9f37534c64659c7519882bf50258190ff6fd676cc1ad67a3e SHA512 e1fc9b39eaff52460b3caa7d8d77347e0e5b61ad0a843de971954e18d0a703b7855d5a611c9d49acd43dc30abc00cf1a068378fdc8add38103526aabb580bf4a WHIRLPOOL ea62d2ffe08304b2745f61f2437bb82b88485f2845ab5a7d3a3298d39e9353f384cd8fc08e37a8ada529a65a3d458559c8825315db760c7ff28f3fba7761a8a1
 EBUILD tiff-4.0.3-r5.ebuild 2286 SHA256 5c8728077f2f47c950643c0719110cceb9d834f00e3ea6068bbd98f1c5d54557 SHA512 863488f94656ea77a574dd15dab51f4089ab5ba3dfaa9b5797994b041c10d749f5288492e1c3af47fdcd310b5b6fac351c9b8d84f50c43577ea1ab04f5872508 WHIRLPOOL cb6a341f46e54d17edd1758321d905d29c3ad2f429043c758c1823882e27ef68d2e39b91f8124b6d71a9f792073d6d2eaf5706ad1b8d9e55a1688d346a8bf7ab
-EBUILD tiff-4.0.3.ebuild 1353 SHA256 ae60d4451163f8fde953b0ba1120f3a10d01601a23d457ecf05f2ea0007c477f SHA512 a5aabfa782dc9c97e9a93e7f1a224152d7a561d0c8131042ca24e5ab40744125be8fc1e1a892a4f6f808003bd2d8c881ccaafd1165522f829adf15956d9d3689 WHIRLPOOL 4841ce497247a05952c1b83f718983422b819642a133acea9ab5daa6daeccc2ceb6f6faa2b26957fa9f965751d99ed533575c550e93205386d0c427965745eb2
-MISC ChangeLog 35213 SHA256 55f22f634344080cdb7209fc7ae2fe8fc5a10dda9aecacae1377c4b8ca40b07c SHA512 e61d82016b7da9fe4f5c912989f7bc78c09c497293aa01677bac3dc15299ffc6e76712aa0d07b0f0a2ddf54928c57c45127e0ddd288b42c3744b361da15524a5 WHIRLPOOL c0e21f9aa32b663054314cc3cd829d14fb9449de6000976f1478dabcc9c72bb9edba29a89e044e1ffc7136b220115e212d239bd3761befbc59e5e393318b642f
+MISC ChangeLog 35459 SHA256 d6efe3a21971816c0d3e4e875404c6b3b04060e69a4ff239f7f77451a15a4f04 SHA512 7436999ccb27d6339de29c062394719b9f9418b218e5a58f27498604d95bda73289339938f7cce61d911af3499b87c3043b79b4e55ed007bdb6c685e4afac5b1 WHIRLPOOL fa0242043b5e5f5c4988295f82d7e70bd4e6eecd56067616535745dbef38d436ed4f1bc0fa9f2b79bcfe5fe41a92e9f8c8aa818c0e43cb62a640e99d0d0859a4
 MISC metadata.xml 309 SHA256 c1893fd7aaa763da14257353ceca7356500d8c8112f635f587c4ef407bd6ca51 SHA512 435eddb4a4280b37dd5948f305f88c5b3c8d193d50776a4c608132addcff03016fb00b218ad8be93a59dfdde28b57fc9d1327b18dc772344057147a5d3826f4b WHIRLPOOL b3323fa861535082bd475896c3cd5490c584cfe0262ffa25288bcda76e36ee58c42c825811ccc34078ed624e48467842012750cd650cf91398313cf4c6b60892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSHeiiAAoJELp701BxlEWfWsQP/RIEXxoIz3J5mH1ag3mqF82K
-5eYZEmilnDVfEE4z9HCGxCgO//KyC6K8Ev/EFyhmmzG58H/LkWdBhHLc0plNe9s6
-GAuam7W+QGlmHGqVywCFvvMzFM+sl4HU/mOTTfM1RUt109TDjmZjSY9rP5uvtjmh
-Vn6SHga9yHfEFTCwR67j18W90lJ+dkXTxOlSbTGOcCqkSukwppEbPrdIQTST2Lib
-Hz5XMO/ppQbHnTeiWDJWwggvd1/73MBXD0CyKzZYEgp+zOP+6VGxdmOoVqlh8Prp
-xNDVO3BZRJHRqeqgTgNeASIcXKhzQ1B4W7b41k5wj4Tkhwdhqfxh2gPKV3RFI2P1
-6Z/UY6cBSh9oJxpwC65cyN3Iw2NR/cce8A5oTRdEvjiO8HeOHsJLxd0iKiCiQAEh
-DoImYk1KEsO5RrSIvJIrEYpTgKB1PV8+JmVtvzY0SxpLDlN9BTg6pQ02TZ2ll3Su
-eNZ6vFciq3XqwP5Efp7LYQFF0S7ZlBET86oAGCdMJ831JdQSx0Aj4oix7MUiuO8P
-5EsNKg4ijJLgUEyQaijM+Pbpl88gPgVCuH/3f+OxDUJet5Ncv3ZzMz++//32WLj9
-4D7oAt+cMepjXFW/SfsNxOlt4bsRhMsT2eNwgDvgfyD8Ami/doaYzwjJY+is5R7I
-xJ56HZZTA9Hc8y7qfvh2
-=ww3h
+iQEcBAEBCAAGBQJSHfOQAAoJEEdUh39IaPFN6nsIAI49LIlJk9JfkMWu155t06vl
+2ipCRxJNx/mtmY1C11aZ71ap88chMeejjo7WrNsDC3DghVq2Q+4xOqj8ebkRgsQ2
+eEzAplnKp/DMIv3vgSPJI5+44ZPp4rwv6zgAre9zi9gqdrWAmBgJFTvgyrz1GsvE
+2P7piBUNjjZ1Q2TxAd1MfHjvS+FogSLAsmO7Qe0MvsNzFJ6m0j3DuPElZOoUn0W3
+3BcFjigIvqmGNigOg+Zxu242xciT0catPpSut4TqMgdZpuWSlbwAK4OcSaYZIGlS
+NqW54ay9vWQaFYHRw8tgx8AqD5eDXVsxd8G/Jnf1FkZ3clkjQdUyVg/om6ZMIQk=
+=5/8G
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tiff/files/tiff-3.9.5-CVE-2012-1173.patch b/media-libs/tiff/files/tiff-3.9.5-CVE-2012-1173.patch
deleted file mode 100644
index 4e9dca811143..000000000000
--- a/media-libs/tiff/files/tiff-3.9.5-CVE-2012-1173.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-http://bugzilla.maptools.org/show_bug.cgi?id=2369#c5
-
-Index: libtiff/tif_getimage.c
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_getimage.c,v
-retrieving revision 1.63.2.6
-diff -r1.63.2.6 tif_getimage.c
-675a676
-> 	tsize_t bufsize;
-682c683,688
-< 	buf = (unsigned char*) _TIFFmalloc((alpha?4:3)*tilesize);
----
-> 	bufsize = TIFFSafeMultiply(tsize_t,alpha?4:3,tilesize);
-> 	if (bufsize == 0) {
-> 		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate");
-> 		return (0);
-> 	}
-> 	buf = (unsigned char*) _TIFFmalloc(bufsize);
-687c693
-< 	_TIFFmemset(buf, 0, (alpha?4:3)*tilesize);
----
-> 	_TIFFmemset(buf, 0, bufsize);
-882a889
-> 	tsize_t bufsize;
-888c895,900
-< 	p0 = buf = (unsigned char *)_TIFFmalloc((alpha?4:3)*stripsize);
----
-> 	bufsize = TIFFSafeMultiply(tsize_t,alpha?4:3,stripsize);
-> 	if (bufsize == 0) {
-> 		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate");
-> 		return (0);
-> 	}
-> 	p0 = buf = (unsigned char *)_TIFFmalloc(bufsize);
-893c905
-< 	_TIFFmemset(buf, 0, (alpha?4:3)*stripsize);
----
-> 	_TIFFmemset(buf, 0, bufsize);
-Index: libtiff/tiffiop.h
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tiffiop.h,v
-retrieving revision 1.51.2.7
-diff -r1.51.2.7 tiffiop.h
-249c249
-< #define TIFFSafeMultiply(t,v,m) ((((t)m != (t)0) && (((t)((v*m)/m)) == (t)v)) ? (t)(v*m) : (t)0)
----
-> #define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0)
diff --git a/media-libs/tiff/tiff-3.9.5-r3.ebuild b/media-libs/tiff/tiff-3.9.5-r3.ebuild
deleted file mode 100644
index 255c99a37698..000000000000
--- a/media-libs/tiff/tiff-3.9.5-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.5-r3.ebuild,v 1.5 2012/12/11 08:44:51 ssuominen Exp $
-
-# this ebuild is only for the libtiff.so.3 (+ 4) and libtiffxx.so.3 (+ 4) SONAME for ABI compat
-
-EAPI=4
-inherit eutils libtool multilib
-
-DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
-HOMEPAGE="http://www.remotesensing.org/libtiff/"
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg zlib"
-
-RDEPEND="jpeg? ( virtual/jpeg )
-	jbig? ( media-libs/jbigkit )
-	zlib? ( sys-libs/zlib )
-	!media-libs/tiff-compat
-	!=media-libs/tiff-3*:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-*.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--libdir=/libdir \
-		--disable-static \
-		$(use_enable cxx) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		--without-x
-}
-
-src_install() {
-	# Let `make install` and libtool handle insecure runpath(s)
-	dodir tmp
-	emake DESTDIR="${ED}/tmp" install
-
-	# .so.3 (upstream) is used by sci-chemistry/icm
-	# .so.4 (Debian) is used by net-im/skype
-	exeinto /usr/$(get_libdir)
-	doexe "${ED}"/tmp/libdir/libtiff$(get_libname 3)
-	dosym libtiff$(get_libname 3) /usr/$(get_libdir)/libtiff$(get_libname 4)
-	if use cxx; then
-		doexe "${ED}"/tmp/libdir/libtiffxx$(get_libname 3)
-		dosym libtiffxx$(get_libname 3) /usr/$(get_libdir)/libtiffxx$(get_libname 4)
-	fi
-
-	rm -rf "${ED}"/tmp
-}
diff --git a/media-libs/tiff/tiff-4.0.2-r1.ebuild b/media-libs/tiff/tiff-4.0.2-r1.ebuild
index 09be9dc27074..39e13dba3e39 100644
--- a/media-libs/tiff/tiff-4.0.2-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.2-r1.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/tiff/tiff-4.0.2-r1.ebuild,v 1.7 2012/12/11 08:44:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.2-r1.ebuild,v 1.8 2013/08/28 12:57:12 ssuominen Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="m68k"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-libs/tiff/tiff-4.0.3-r1.ebuild b/media-libs/tiff/tiff-4.0.3-r1.ebuild
deleted file mode 100644
index 5debabdf6cc0..000000000000
--- a/media-libs/tiff/tiff-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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-r1.ebuild,v 1.3 2013/02/18 22:41:23 zmedico Exp $
-
-EAPI=4
-inherit eutils libtool
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://www.remotesensing.org/libtiff/"
-SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
-	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-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 )
-	jbig? ( media-libs/jbigkit )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		$(use_enable lzma) \
-		$(use_enable cxx) \
-		--without-x \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}
diff --git a/media-libs/tiff/tiff-4.0.3-r2.ebuild b/media-libs/tiff/tiff-4.0.3-r2.ebuild
deleted file mode 100644
index 9ec23ed36cf0..000000000000
--- a/media-libs/tiff/tiff-4.0.3-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.12 2013/08/05 09:44:22 ssuominen Exp $
-
-EAPI=5
-inherit eutils libtool
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://www.remotesensing.org/libtiff/"
-SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
-	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-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:0= )
-	jbig? ( media-libs/jbigkit:= )
-	lzma? ( app-arch/xz-utils:= )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
-	epatch "${FILESDIR}"/${P}-CVE-2012-{4447,4564}.patch #440944
-	epatch "${FILESDIR}"/${P}-CVE-2013-{1960,1961}.patch #468334
-	epatch "${FILESDIR}"/${P}-libjpeg-turbo.patch
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		$(use_enable lzma) \
-		$(use_enable cxx) \
-		--without-x \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}
diff --git a/media-libs/tiff/tiff-4.0.3-r3.ebuild b/media-libs/tiff/tiff-4.0.3-r3.ebuild
deleted file mode 100644
index b30bbe7270bf..000000000000
--- a/media-libs/tiff/tiff-4.0.3-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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-r3.ebuild,v 1.2 2013/08/10 17:15:29 aballier Exp $
-
-EAPI=5
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://www.remotesensing.org/libtiff/"
-SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
-	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-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:0=[${MULTILIB_USEDEP}] )
-	jbig? ( media-libs/jbigkit:=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
-	epatch "${FILESDIR}"/${P}-CVE-2012-{4447,4564}.patch #440944
-	epatch "${FILESDIR}"/${P}-CVE-2013-{1960,1961}.patch #468334
-	epatch "${FILESDIR}"/${P}-libjpeg-turbo.patch
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		$(use_enable lzma) \
-		$(use_enable cxx) \
-		--without-x \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		cd tools
-		emake
-		cd "${BUILD_DIR}"
-	fi
-	emake check
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}
diff --git a/media-libs/tiff/tiff-4.0.3.ebuild b/media-libs/tiff/tiff-4.0.3.ebuild
deleted file mode 100644
index 6f050e1dac93..000000000000
--- a/media-libs/tiff/tiff-4.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.2 2012/12/11 08:44:51 ssuominen Exp $
-
-EAPI=4
-inherit eutils libtool
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://www.remotesensing.org/libtiff/"
-SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
-	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-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 ~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 )
-	jbig? ( media-libs/jbigkit )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		$(use_enable lzma) \
-		$(use_enable cxx) \
-		--without-x \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}