Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

12 files changed, 16 insertions, 800 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 9aa5c327067e..034af6fdc986 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.51 2014/06/16 07:46:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.52 2014/06/16 07:48:29 radhermit Exp $
+
+  16 Jun 2014; Tim Harder <radhermit@gentoo.org> -gmic-1.5.8.0.ebuild,
+  -gmic-1.5.8.1.ebuild, -gmic-1.5.8.2.ebuild, -gmic-1.5.8.3.ebuild,
+  -gmic-1.5.8.4.ebuild, -gmic-1.5.8.5.ebuild, -gmic-1.5.9.2.ebuild,
+  -files/gmic-1.5.2.2-ffmpeg.patch, -files/gmic-1.5.8.0-makefile.patch,
+  -files/gmic-1.5.8.3-makefile.patch:
+  Remove old.
 
 *gmic-1.5.9.2-r1 (16 Jun 2014)
 
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 89fae7df4993..c21c0037d0fb 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,44 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gmic-1.5.2.2-ffmpeg.patch 716 SHA256 068c3bbb808b8e68a8826203e124d8cc86c937b8c77bc998225510abf6080e1a SHA512 9697d41c7f0fb422eb70d9bca38e8822692d95be14c4c337bea3e02cae1ad039a4b1c007536bdda669ff95c30980d13183423504ae70be3da6da53de146b0c1a WHIRLPOOL 3e94e98a0c375573a3a936a281f3b28c0800d331189f21e6afa1d0c2b2b257a7b56e10419c2362eff726d0bdfb93d902d09e14cce76ae41d779b2ae208c80328
-AUX gmic-1.5.8.0-makefile.patch 5485 SHA256 39b5ff20a26b620f7cda95e1fa62c69532dfe3ecd34d8ef058f7144125ba564c SHA512 d8ea82f745f0bb5093ca328f569de74ba2e7a62f95045812b1932f086ebe9a2ac9adb645cc4a1d1b89f35c59f8bd10dac0a43f083ea6167ecbbb16a9a270f428 WHIRLPOOL 3d797b9d25966076c087ea87c07d9dc2aeceb1185cd4298a4ce2011864889d46aa8d2a2f6c01fe40dd78450b20661fb080a0aa3da4ea0e20634f28256680c4d6
 AUX gmic-1.5.8.2-ffmpeg.patch 750 SHA256 14eff8233639c8e3384b9abf4acfa08af72595f4f64df015e28a918a23d4cb07 SHA512 51e767fd4f4a9a6bc0090a22502c9ffc1ba41cbbd59223b8fb880ca252d5f49166db5b6a9abf83e5d8c24a893e404823e72336dc0a7b493825cfab868bba2b55 WHIRLPOOL b5793611498cc0483241b615147184bff6b2f10ceb398473c7ee6fc0b89a79ccd572671dc80652dd8e45effe09430891fa52528c21edbc405ede67424f98c215
-AUX gmic-1.5.8.3-makefile.patch 5037 SHA256 07e2f9d8a1c3d4a5053296f9b9a0f9a0718717e611493961d2907267c8cae380 SHA512 86f504b688bf4cc25fe698ed2d57d3bae719bb876688492b797927e76ac95326f6f2ab71fcc1e4b2f44d42500a90d6f7abe02d24dd7a22e4f617261f837fddb2 WHIRLPOOL f33a74d82fbeb91bd9712237f9e322b0f5aea426f2fff1da7088e0f90de8fb466f572fdc08eed8888dd51ba9235272b57f18de9d082724247bd6daa77355cf73
 AUX gmic-1.5.8.4-makefile.patch 5384 SHA256 48cd18f8e8086a21b62b59788d34185521dddfa9f42ec228f069d44aac2d7af0 SHA512 009cc63ce747ee0acd917795ff093d9aec4545105cb9a96f837d885d68f420b919557d569e2492cd016b96a723a932f8e7b19cf89f12b8ecb153b96dcf1e49b1 WHIRLPOOL 752c7849074e70f3bf10b5aa144917d9e18276c4d99a0a4b4139b217a1e8edd8036df0c95b9f7a3f3b12f03abc99e8c67666fab8365d5259e1e788096f512998
 AUX gmic-1.5.9.1-makefile.patch 5285 SHA256 75c0faee9e1fa0796ecd3583de9b81a7281be7fd80d46fede525d385f5c449c3 SHA512 71ffc20d5bc94766ed86012a3f720ab3c43fe229822ecd1325217713fcce4f4305ad34b6bb0a3fc07c1949bf0a1c581a22307b0f49a4302a58de7b3d0261de00 WHIRLPOOL df3b4b59b959e2a56ad829e2446295f6434a13c210d7c83b9dd173e54baf495dddbd71bfe3531670737ebe0769239e1a873635a11439f7cdf94b71ed3029aede
 AUX gmic-1.5.9.2-makefile.patch 16211 SHA256 222a8d530aab275b376b4272fc2f7a43fdfddf51a33fa70bd031ca05899b6bb7 SHA512 2e00b93ccc980823641a1704b2684e617ca64c44c00fb4aac0373f0338192b6c768356c806cef3b9baf86d299f492eb0414b7e7f42eb3bcae5e9ab04d8fe1013 WHIRLPOOL acb02abac8d6174afdbb982c29243b0a7e723b83b2d2c538fa9c77c99e1f09400960e0e8b108a770c75c9317ada029d6f8dea7ffe8de5dd14471262a7ccded21
-DIST gmic_1.5.8.0.tar.gz 2257558 SHA256 94382a599c23dd0be2ed9bf539072c057b7f780a8ac63b391a27522fec28f1e9 SHA512 46c7d46da2fd1f063dbb23df9cc8e894ff741871cc8d7ee570de54c5313ed101a3352915a71d952913e5bca97e35074fb025646aa05fd087d1575383ac2972b8 WHIRLPOOL 33ea1d72619bb40cc89357732b0f12c14377c9a5c7ab61d40300f9e81570d4e7fb01089597b9bb45e09358c67bbcf0ca2e25841e5e5e7c7b998feb870fccbad9
-DIST gmic_1.5.8.1.tar.gz 2265467 SHA256 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea SHA512 6fea97ae18abe770ba827946457955c74cb4180a272e7fb0a6e2a0f612bec6f8fd83daa4c1010eb236886ebacef331d9b1b0a4f0c64dbde27261e76f71244ef7 WHIRLPOOL f9fc34c21f87c222b081bcef2ae819cbe6f25c1b66a890a569ffae667acbdc5f334496ba8d1d5ddf811550ec0844bd2936ee3564f131bb7f5b1b35ba7a70dcde
-DIST gmic_1.5.8.2.tar.gz 2319666 SHA256 459d0f8cf6ee0a9e8b2254ef93be18cf985bbec699de5354b52671e15f67c3b4 SHA512 5f54147a8903d49667c825afb28564753b0636d21812bc8f12fc1effc3586063c95fe5676c7e69924c69cd790cc4399c5a87a535195bbbecc1656d3de8bc398c WHIRLPOOL 07601508c81be6d3cc8b79ef0f524a36c507696148ec11524f978ae2df4c1326035de908f5d467d24b6482544a5a02f77f7a2847f74cef8806b50213d937e5a9
-DIST gmic_1.5.8.3.tar.gz 2341936 SHA256 ed200f839c6b7cfa7df37a5b286d6dc106708a4466fe8d5e316b0a92681ad983 SHA512 70824a618365c9a0a46604ee3892f48284199b34888fc020860091e7ec9f93f5754d030427faa164c3542fa85a198f1dda82e4b7ee598958acfb48269c255663 WHIRLPOOL a0d677dead2038bf286d0e03a000c8c95971ab0868f375febf6637caddf7f1a0bdd90f49e5a9e71b1234a6b1711afa1559d9da37b589e07de7e2255f1c1d1e38
-DIST gmic_1.5.8.4.tar.gz 2359343 SHA256 1e8d20e93b37bfeee8b402c3a23fe8326f49304218a1537d027983e225726076 SHA512 cbe22391ab86e59707c734f641b79035fc230a696593f0f51c7e622bf4e0ce0c8f3fc14f4b40fa35bb80895e25cb5ec3d4c50511e1dd71fe30a957f078ae9c75 WHIRLPOOL 0c7ac6bba29d1453472a6488488f1f20fd349f84d002db93bf69d4f4cce392b1f7bd85283e0c698106da75f12311268096954e10333807c2dfd9e94900dcc84e
-DIST gmic_1.5.8.5.tar.gz 2564862 SHA256 823c909f04f333b2d0c420221db1e038a4b9c57891bdbc364b5aef58d25b15e7 SHA512 40461b17a315fd85d16831815a692dfc584326352fb1da10786fe0c486deb51787ed5e20591c24240dd29d113daa42c962ad99e24e9ec063f4856568bafde4ca WHIRLPOOL b4ea08e86e486013aa126e8f06eeab8b750b72b910c5a1a407b76849e69efdb516ddc46c21070a844722992cf8d0351a6508fa9f86178d1dc2d8d90808d3a268
 DIST gmic_1.5.8.6.tar.gz 2691672 SHA256 21f90a37f2b63070c3d31ad19139c90d3241e62c3b1cca04eb1a5ca45838ad91 SHA512 1687fac247b922cc1d4c42821d3d79eb25e5ab6be0bf6b9b5bf026edec71ba39d2a627cfa604ae9779c49b66e12c56dae2dfdae163e5a3c13d2cf21b2ad5f3a6 WHIRLPOOL c106a7780ef1c542974a78ae2208dcd7dbf8ec714746264ee124876651b7bf3590d75c8c0fef27b3e2fd63627644da52b5572be9935209958a8aa3b5eae7edb8
 DIST gmic_1.5.9.1.tar.gz 2780328 SHA256 6ef0f700a34398c550ec8c44c53393ef222c0bf6dc998fe14b6e434069158cc9 SHA512 a0298925fca007fc95a4d892e41785050bddff4d891e996217af5110c34d550f935cdd1033338e30495fbcb27b76f16a9f201b7b4ce5eb6af2e030c61a040e85 WHIRLPOOL 7b3e9ec6a38369feea423ebf9e76787e8135a8985a164789e45493b98448f97524508d18d2ae9dd784e5b53f94e22702d0c48f871d283c5544c4f4fcd4a42a08
 DIST gmic_1.5.9.2.tar.gz 2784355 SHA256 8fffca4cf2964f75961f165e507101444da593da8a525551bc359a3e7542d3dc SHA512 f451baabfc3a4e51a9e882a970bb26551c72f3802d3c6bdf76ffe37be9dd69eeada75e02457572037124f914fbed6f96ddf0620771b6c71901a4478f38ad3e53 WHIRLPOOL 9760484589e1e84949e6059d0b681644773259ed9242dfcc43440a6bfedec75fa8e969b4e7eb74c6208b0d21a9d311a6751916850dccfd903593c4b78cc7d659
-DIST gmic_reference-1.5.8.0.pdf.xz 16097444 SHA256 42b7c29d141fa382d5cdaa2236382682b13f64d705c7c42ac7959decbdfae08b SHA512 6222a729a5d1fdd0ccab50c45b5ce60f92a8122570938e8c71f50e86d91f10bb91f7853d59fc4e6d1b918498fe0483ad4a513192b3f46863a0b7580ffc51d1a7 WHIRLPOOL b1900f4ccb34aebd1a8e5c3cfff901b4fa09ae1f26b8ef96ce298d98d23338e3f9d71bf7a777821e43322dc9fe5ad3d0da452b82b86248467575b5b6b03b4b97
-DIST gmic_reference-1.5.8.1.pdf.xz 16100496 SHA256 15aa3e4d4e67b8263640dee2a1eae4bb6de6ae6f4f681c320c0f33841e231799 SHA512 aaae69edb2833edd82568449cc428d03dc426001c69ed588442be65c5de75ee5f19d41852fb84b10f0c6c55279d5275eb6aaf929fb4e331e33aa51ecaae276b6 WHIRLPOOL 1003a188d2153046cf463a55ffd45e9693a1be4ad87653af2e76613d634f7e858479f9e1915f351061a7525d197cd3685556222968013e8700aadb8acd1dfd5a
-EBUILD gmic-1.5.8.0.ebuild 2048 SHA256 e09a8538c5155a31d082ce30e2f1b6f965cf6999823b3c5e0331ad6fda6247a6 SHA512 45875c92a8d056b4808a8d8c78d02d898963d8ae55b8958249450064ce64d0504abaca343ac052450cd6ccbc3bc3b8772c2253c2d31996aa2043bd75c09f7e7e WHIRLPOOL 90e64fa218cbb9c81485c31c90fcf2791b50b04af57c54bcd3b3b04025ed1855b1b71120616b0b63165276d227651c3e556912774a1cb134c3562086237edeff
-EBUILD gmic-1.5.8.1.ebuild 2036 SHA256 700fe5b0a92b7dcc2aa7b2e44fec5c33d5799b9c55b072a941f1dfaec6bf8670 SHA512 2976745c93d4e422f278c89c72814aa0d12c44a14253c7820781db7010b36e4188a166fded6a643a391ab782799646fca489c7d3145faec1850ebabce8cce159 WHIRLPOOL 364c142e1471c9db5f0cace1d8be0ef2c8454dbc049b25d675ecc5191c483fb7953b9f447d0ea9df569386da218c06aed2ddcaa89e81c8a54f531338046b59d3
-EBUILD gmic-1.5.8.2.ebuild 1862 SHA256 c58bb113e420ae7d23ceadede576adb41102ca0215786bc688b17e5df7740a49 SHA512 3f3289ed6b776f87f72301f5053aa6d209d6da712fa3a7fd128e58e078e2f0bbdf0ef5cec6d860ab1a102eb1c74ac1583528a3674f167a058c48e6e0a3df68dd WHIRLPOOL 53e4bfca5c76edf845c9b9b9146f00ea3ed1b708f58dcfee87d30f7cd915fcf248c45ab692c28ac9d16b68811ee3a05228237d12a7f3944b818f37e757ea26bb
-EBUILD gmic-1.5.8.3.ebuild 1888 SHA256 e77fc9d9fb17989c3a791b72cc63dd6afddafc218bf0846bb223f7e5eab56598 SHA512 970dfd4bc2533d644d327214f24c9985404441272e974e3c12314f9176229656abde38bffd1972176fb3cae1960decfdaa6b0ffca7d56d07da3f831849e4b0d9 WHIRLPOOL 0483593d4f91b0211a8707a97129fcd758c3be720b3870ea97c9e81312fc7c3637c0cb40f683071ac10d5177081f6b9327810560d3ecaa9bc3a708f732f1e782
-EBUILD gmic-1.5.8.4.ebuild 1888 SHA256 1a5913de3ade9b2f711b310fee3468d9d2a5a9fa7266afae7052aede0a874126 SHA512 e64edc8f0f1efabb4c7cd487a435006972c6e5d67cc9b067289fd0f6e61c1c66336d7d2646906e0d5b038a08cfca1ea31bb969fd9ac0e8c043ddf0d4e61b8909 WHIRLPOOL 0f58500d1b315075648adaa75cd64920011b1a70542ead1b5b46768afb54bb7bd9a8bb3e0c47165b52775621f49b1b70c89234aa610456ac9bd7c774e65c4f35
-EBUILD gmic-1.5.8.5.ebuild 1897 SHA256 5f8f1bbbb2477c31fc35d77ec17bcbb08d75ee55a7dc5f82f21b52b664ee6ceb SHA512 76e6e20a2cf8ba941ef9f8c1c97184ac1c39aed9d621dc6607a1fbd411480933de77bb77eeeb4673f9122f4dc88a7c5f89054797891ed32f86e0b5c10f996c25 WHIRLPOOL 5bca286a564c52d7927741586660b4d466fb715a9727f894d7a5420f4cfbca62328fd4b32e30af6be3a42b39c8401166d8481c5bbece6033a86e9ff3eb478bf8
 EBUILD gmic-1.5.8.6.ebuild 2021 SHA256 ab9535da9cac4aee07f2611903b29a0d7422f44d801c04f6dc6546d0f4f30171 SHA512 39f750fd7313ff1a12acdb031fda95c559844d36f1e90d124fb9aedce830b028da0da0b3275a08649c13bbc1a0c45cd52ae5ef8c295c523b9b0f6d0c1c4ed2d3 WHIRLPOOL 711186da5d60281273b1368438d86f022884cfe5827dc8f4eabcb21ba17d117f99655584216774df18a75d2528cd2efd910945c8f64b041b3900d9f2c328b475
 EBUILD gmic-1.5.9.1.ebuild 1900 SHA256 c14987c386db5af951cab7c0b090c4f0ff1e7c9f6cf33d6a9fbf02e208df9cf1 SHA512 bf8b3a56ac3a4b2f79b52da03dba5568aaedfdaabd8a73e3b2b44d4dfb539c82f203629724bc5b53e5179a2e5be06a7b725fdabb2f3c9ca7a123aefec7f94c24 WHIRLPOOL c706d64909e6831ab30ad4ef81a0c774a8c5c4df1027258f77230ca73cf914f9e32de09b59748ffbd6a45badb973fc878d0e5a7c8db2582cf366b28ae8940a80
 EBUILD gmic-1.5.9.2-r1.ebuild 1911 SHA256 6370dee1e51c1e299c1a503966eddc857e8fb33c8f5270f960035011f95faad7 SHA512 5905eb47378d61fe0eafec3d834ba0232e17f8097351a5c44487019a08c0c3c860a6c6766cd6d62dc7d08755b4f2ca45467f408dbd0b95d4f89bead93a84ead4 WHIRLPOOL 589162076161c3e95adffe0e56c82970542531a33d7dcd0f789429d84524c69263479bea2358774f3a631decbb4be2ed72dddaf46cc78c1b8036c2d579b2d653
-EBUILD gmic-1.5.9.2.ebuild 1909 SHA256 23a2785021c75c6b6651a51484c126c00a29f8d0ada21fbaabe6ec636b78597c SHA512 557575da74db131176d22515619f0498e85cd690a3b46dc88aa9de29f544508b14a5e964535d39d5d1b22b2719cf24a3b7b1c10c0d6198f392858b51070fab48 WHIRLPOOL 2463df94d9fe2b127fc4b254962154b9f496f5b07e5d0b72288b2045ebfb0886bfaa904cbf8e230c57b29e5a95d77e067b44fe70d07d6cd849dd43d080c490dd
-MISC ChangeLog 7434 SHA256 c8a17f0759c58882737974f19b32b2481b0afa6c7866439ed6718491cc28d994 SHA512 d1f83e3644c16a5270092aede6cee3ffa14dc362e1f3485e497c6c03421c16886233d965994e0d02d7cada68f4106a4a277f6223d8f72e46f0c46e74536f94bd WHIRLPOOL ae13bd36293dff33577237a3184c8568e4b883e8d867265f76455bcff70d28d724a9efbd66cb948ae1061b4f7702731b9097d3e7b85720cd8caa15b900530588
+MISC ChangeLog 7766 SHA256 ab635719f01363fa6bbc926817e4319b5cb0e39f17ca664c0cb7a339913b1f68 SHA512 166809d42c2b9c059a963930ec5decdd699289a270af9bc02a463ef1bf8dda2f74598f7a487fe9d9acee79203bb4b0443136f7a61b25457b8781834335e2e9c9 WHIRLPOOL 79571740e18a472021eedaec45182792bfaa451a5157586e5db39ff4156ea06a94725ef751aca355ecab7b2b62e06b66c205482d6eda78cb825098cabe254a81
 MISC metadata.xml 473 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c SHA512 4bd720129471c24a6b71e32f11054d96bd2eefb3316489806a06b8deed45e5544fe1c74a73c129ec90fe30c8a4c0646c50e6690717046ad93255771627588f32 WHIRLPOOL 9a356f4c399b7a6fdf217b2dbeaeb4fd40dffc080b86c0ad913690c0b0007aaad52ea79d3b7b5b21591432c99a1e59ed02ead94e2578f1915afe2ee0c9f7d090
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTnqDjAAoJEEqz6FtPBkyjD34H/0VYRV3Sw3j0UvJSmYgiTpcq
-hC9doJu7Wzv972Saa6exrmhSep0r66oGK6m6EUKivgtepzNjiksMW8n22l/32roJ
-2jTppLHhgLxA8DhrvtSitubSGv/O1l398/dG59S9p3PZR14gGDY+EP8fVu+WYmQY
-6Prni1QK1RGGExUV2pvZH1g+ARSeFXPNIpg1OFAlWPKkreWWFLtaEzgZS05x+yE9
-eJpLP7A0RIoOEbhgkiUJCH6QNeJAHfbQ0MBQTVoNSwZEE+hbVkGcDn21cHiah6cC
-RhjRKE2vqa1W3imfZehZPxTiKx1+VoXwhY0BbAYJFiJRPoibGqHc+puaj3hV/eU=
-=hQf6
+iQEcBAEBCAAGBQJTnqFPAAoJEEqz6FtPBkyjviEH/R6UKHzuR62LVCudGC4pZZL7
+5d5ssuDltifKOt2H8NTEqVESQXihcgNFyyf+H7KAsQgEKMtiXqLS05WCnUYOplxc
+QSfnn3hEkdYnGtmvh6Dw9M9gFEqOrl0N9CJdsgsDPwKxJgYZOxw7e+5JZaGHbtJY
+c88sjWYhdH1HFWuaETi9oYyZJe6x+CPfIBqMwDXBuOHxtildv4NeZNHniAHqdxH/
+70CIWia01fB4oHHdNkFAgU28qI8DEiQPlJE/0631NQXxi19OzjSjl/n39FhzFpx5
+XncaERJzctgNs7P14djfP3cEvWABIbbhOoxLt5lOhw106kc/eHm68ITgfQW0REg=
+=lw7/
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gmic/files/gmic-1.5.2.2-ffmpeg.patch b/media-gfx/gmic/files/gmic-1.5.2.2-ffmpeg.patch
deleted file mode 100644
index 2305d991147f..000000000000
--- a/media-gfx/gmic/files/gmic-1.5.2.2-ffmpeg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gmic-1.5.2.2/src/CImg.h
-+++ gmic-1.5.2.2/src/CImg.h
-@@ -318,6 +318,7 @@
- extern "C" {
- #include "avformat.h"
- #include "avcodec.h"
-+#include "libavutil/mathematics.h"
- #include "swscale.h"
- }
- #endif
-@@ -44795,7 +44796,11 @@
-         AVPacket pkt;
-         int got_packet;
-         av_init_packet(&pkt);
-+#if LIBAVCODEC_VERSION_INT<AV_VERSION_INT(54,1,0)
-+        out_size = avcodec_encode_video(c,video_outbuf,video_outbuf_size,picture);
-+#else
-         out_size = avcodec_encode_video2(c,&pkt,picture,&got_packet);
-+#endif
-         if (got_packet) {
-           pkt.pts = av_rescale_q(c->coded_frame->pts,c->time_base,video_str->time_base);
-           if (c->coded_frame->key_frame) pkt.flags|=AV_PKT_FLAG_KEY;
diff --git a/media-gfx/gmic/files/gmic-1.5.8.0-makefile.patch b/media-gfx/gmic/files/gmic-1.5.8.0-makefile.patch
deleted file mode 100644
index e5a8779f6135..000000000000
--- a/media-gfx/gmic/files/gmic-1.5.8.0-makefile.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- gmic-1.5.8.0/src/Makefile
-+++ gmic-1.5.8.0/src/Makefile
-@@ -77,7 +77,6 @@
- 
- # Flags that are mandatory to compile 'gmic'.
- MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
--MANDATORY_LDFLAGS += -L$(USR)/lib
- ifeq ($(CC),g++)
- MANDATORY_CFLAGS += -Wall -W
- MANDATORY_LDFLAGS += -lm
-@@ -88,18 +87,7 @@
- endif
- 
- # Flags to enable debugging.
--DEBUG_CFLAGS = -Dcimg_verbosity=3 -g
--
--# Flags to enable optimizations.
--ifeq ($(CC),g++)
--OPT_CFLAGS = -O3 -mtune=generic # -fno-tree-pre # -ffast-math
--endif
--ifeq ($(CC),clang++)
--OPT_CFLAGS = -O1
--endif
--ifeq ($(CC),icc)
--OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits
--endif
-+DEBUG_CFLAGS = -Dcimg_verbosity=3
- 
- # Flags to enable parallel processing.
- ifneq ($(OSTYPE),Darwin)
-@@ -113,14 +101,14 @@
- # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
- # This requires the presence of the X11 include and library files.
- # (package 'libx11-dev' on Debian).
--X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
--X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
-+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
-+X11_LDFLAGS = -lX11 -lpthread #-lXrandr
- 
- # Flags to enable fast display, using XShm.
- # This requires the presence of the X11 extension include and library files.
- # (package 'libx11-dev' on Debian).
- XSHM_CFLAGS = -Dcimg_use_xshm
--XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
-+XSHM_LDFLAGS = -lXext
- 
- # Flags to enable image display, using GDI32.
- # This requires the presence of the GDI32 include and library files.
-@@ -155,7 +143,7 @@
- # This requires the presence of the FFMPEG include and library files.
- # (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian).
- FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg
--FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale
-+FFMPEG_LDFLAGS = -lavcodec -lavformat -lavutil -lswscale
- 
- # Flags to enable native support for compressed .cimgz files, using the Zlib library.
- # This requires the presence of the Zlib include and library files.
-@@ -166,14 +154,8 @@
- # Flags to enable native support of webcams, using the OpenCV library.
- # This requires the presence of the OpenCV include and library files.
- # (package 'libcv3-2-dev' on Debian).
--ifeq ($(OS),Darwin)
- OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
- OPENCV_LDFLAGS = `pkg-config opencv --libs`   #-> Use this for OpenCV 2.2.0 !
--else
--OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
--# OPENCV_LDFLAGS = -lcv -lhighgui
--OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   #-> Use this for OpenCV >= 2.2.0 !
--endif
- 
- # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
- # This requires the presence of the GraphicsMagick++ include and library files.
-@@ -306,10 +288,10 @@
- endif
- 
- gimp:
--	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
-+	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp
- 
- lib:
--	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
-+	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
- 
- zart: lib
- ifneq ($(OS),Darwin)
-@@ -329,10 +311,10 @@
- 	$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_minimal
- 
- linux:
--	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
- 
- custom:
--	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+	$(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
- 
- solaris:
- 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
-@@ -350,10 +332,9 @@
- gmic_lib.o: gmic.cpp gmic_def.h
- 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only
- gmic_lib: gmic_lib.o
--	ar rcs libgmic.a gmic_lib.o
-+	$(AR) rcs libgmic.a gmic_lib.o
- ifneq ($(OS),Darwin)
- 	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS)
--	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LDFLAGS)
- else
- 	$(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS)
- endif
-@@ -362,7 +343,6 @@
- 	$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only
- gmic_gimp : gmic_gimp.o gmic_gimp.cpp
- 	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS)
--	strip gmic_gimp$(EXE)
- 
- gmic_minimal: gmic.cpp
- 	$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)
-@@ -387,7 +367,6 @@
- 	$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double
- gmic_gmic: gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h
- 	$(CC) -o gmic gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
--	strip gmic$(EXE)
- 
- def:
- 	@echo "#ifndef gmic_gimp" > gmic_def.h
diff --git a/media-gfx/gmic/files/gmic-1.5.8.3-makefile.patch b/media-gfx/gmic/files/gmic-1.5.8.3-makefile.patch
deleted file mode 100644
index 24045124c19a..000000000000
--- a/media-gfx/gmic/files/gmic-1.5.8.3-makefile.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- gmic-1.5.8.3/src/Makefile
-+++ gmic-1.5.8.3/src/Makefile
-@@ -77,7 +77,6 @@
- 
- # Flags that are mandatory to compile 'gmic'.
- MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
--MANDATORY_LDFLAGS += -L$(USR)/lib
- ifeq ($(CC),g++)
- MANDATORY_CFLAGS += -Wall -W
- MANDATORY_LDFLAGS += -lm
-@@ -118,14 +117,14 @@
- # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
- # This requires the presence of the X11 include and library files.
- # (package 'libx11-dev' on Debian).
--X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
--X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
-+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
-+X11_LDFLAGS = -lX11 -lpthread #-lXrandr
- 
- # Flags to enable fast display, using XShm.
- # This requires the presence of the X11 extension include and library files.
- # (package 'libx11-dev' on Debian).
- XSHM_CFLAGS = -Dcimg_use_xshm
--XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
-+XSHM_LDFLAGS = -lXext
- 
- # Flags to enable image display, using GDI32.
- # This requires the presence of the GDI32 include and library files.
-@@ -160,7 +159,7 @@
- # This requires the presence of the FFMPEG include and library files.
- # (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian).
- FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg
--FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale
-+FFMPEG_LDFLAGS = -lavcodec -lavformat -lavutil -lswscale
- 
- # Flags to enable native support for compressed .cimgz files, using the Zlib library.
- # This requires the presence of the Zlib include and library files.
-@@ -171,14 +170,8 @@
- # Flags to enable native support of webcams, using the OpenCV library.
- # This requires the presence of the OpenCV include and library files.
- # (package 'libcv3-2-dev' on Debian).
--ifeq ($(OS),Darwin)
- OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
- OPENCV_LDFLAGS = `pkg-config opencv --libs`   #-> Use this for OpenCV 2.2.0 !
--else
--OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
--# OPENCV_LDFLAGS = -lcv -lhighgui
--OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   #-> Use this for OpenCV >= 2.2.0 !
--endif
- 
- # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
- # This requires the presence of the GraphicsMagick++ include and library files.
-@@ -311,10 +304,10 @@
- endif
- 
- gimp:
--	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
-+	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp
- 
- lib:
--	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
-+	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
- 
- zart: lib
- ifneq ($(OS),Darwin)
-@@ -334,10 +327,10 @@
- 	$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_minimal
- 
- linux:
--	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
- 
- custom:
--	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+	$(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
- 
- solaris:
- 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
-@@ -355,10 +348,9 @@
- gmic_lib.o: gmic.cpp gmic_def.h
- 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only
- gmic_lib: gmic_lib.o
--	ar rcs libgmic.a gmic_lib.o
-+	$(AR) rcs libgmic.a gmic_lib.o
- ifneq ($(OS),Darwin)
- 	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS)
--	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LDFLAGS)
- else
- 	$(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS)
- endif
-@@ -367,7 +359,6 @@
- 	$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only
- gmic_gimp : gmic_gimp.o gmic_gimp.cpp
- 	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS)
--	strip gmic_gimp$(EXE)
- 
- gmic_minimal: gmic.cpp
- 	$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)
-@@ -392,7 +383,6 @@
- 	$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double
- gmic_gmic: gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h
- 	$(CC) -o gmic gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
--	strip gmic$(EXE)
- 
- def:
- 	@echo "#ifndef gmic_gimp" > gmic_def.h
diff --git a/media-gfx/gmic/gmic-1.5.8.0.ebuild b/media-gfx/gmic/gmic-1.5.8.0.ebuild
deleted file mode 100644
index f74c60faa86e..000000000000
--- a/media-gfx/gmic/gmic-1.5.8.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.8.0.ebuild,v 1.1 2013/12/11 05:35:48 radhermit Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz
-	doc? ( http://dev.gentoo.org/~radhermit/dist/gmic_reference-${PV}.pdf.xz )"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/xz-utils )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.8.0-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.5.2.2-ffmpeg.patch
-
-	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
-
-		# Disable display capabilities when X support is disabled
-		append-cppflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS} ${CPPFLAGS}" custom lib
-}
-
-src_install() {
-	dobin gmic
-	newlib.so libgmic.so libgmic.so.1
-
-	insinto /usr/include
-	doins gmic.h
-
-	doman ../man/gmic.1.gz
-	dodoc ../README
-
-	use doc && dodoc "${WORKDIR}"/gmic_reference-${PV}.pdf
-
-	newbashcomp gmic_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-1.5.8.1.ebuild b/media-gfx/gmic/gmic-1.5.8.1.ebuild
deleted file mode 100644
index 2322f3ef7ea0..000000000000
--- a/media-gfx/gmic/gmic-1.5.8.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.8.1.ebuild,v 1.1 2013/12/18 10:55:50 radhermit Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz
-	doc? ( http://dev.gentoo.org/~radhermit/dist/gmic_reference-${PV}.pdf.xz )"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/xz-utils )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.8.0-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.5.2.2-ffmpeg.patch
-
-	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cppflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" custom lib
-}
-
-src_install() {
-	dobin gmic
-	newlib.so libgmic.so libgmic.so.1
-
-	insinto /usr/include
-	doins gmic.h
-
-	doman ../man/gmic.1.gz
-	dodoc ../README
-
-	use doc && dodoc "${WORKDIR}"/gmic_reference-${PV}.pdf
-
-	newbashcomp gmic_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-1.5.8.2.ebuild b/media-gfx/gmic/gmic-1.5.8.2.ebuild
deleted file mode 100644
index 6c39a2e4bc62..000000000000
--- a/media-gfx/gmic/gmic-1.5.8.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.8.2.ebuild,v 1.1 2014/01/27 02:51:07 radhermit Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.8.0-makefile.patch
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-
-	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cppflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" custom lib
-}
-
-src_install() {
-	dobin gmic
-	newlib.so libgmic.so libgmic.so.1
-
-	insinto /usr/include
-	doins gmic.h
-
-	doman ../man/gmic.1.gz
-	dodoc ../README
-
-	newbashcomp gmic_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-1.5.8.3.ebuild b/media-gfx/gmic/gmic-1.5.8.3.ebuild
deleted file mode 100644
index 00445ea7319f..000000000000
--- a/media-gfx/gmic/gmic-1.5.8.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.8.3.ebuild,v 1.1 2014/02/11 05:30:27 radhermit Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.5.8.2-ffmpeg.patch
-
-	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cppflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= custom lib
-}
-
-src_install() {
-	dobin gmic
-	newlib.so libgmic.so libgmic.so.1
-
-	insinto /usr/include
-	doins gmic.h
-
-	doman ../man/gmic.1.gz
-	dodoc ../README
-
-	newbashcomp gmic_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-1.5.8.4.ebuild b/media-gfx/gmic/gmic-1.5.8.4.ebuild
deleted file mode 100644
index 04553acd8093..000000000000
--- a/media-gfx/gmic/gmic-1.5.8.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.8.4.ebuild,v 1.1 2014/03/19 08:03:17 radhermit Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.5.8.2-ffmpeg.patch
-
-	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cppflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= custom lib
-}
-
-src_install() {
-	dobin gmic
-	newlib.so libgmic.so libgmic.so.1
-
-	insinto /usr/include
-	doins gmic.h
-
-	doman ../man/gmic.1.gz
-	dodoc ../README
-
-	newbashcomp gmic_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-1.5.8.5.ebuild b/media-gfx/gmic/gmic-1.5.8.5.ebuild
deleted file mode 100644
index d2746fb90580..000000000000
--- a/media-gfx/gmic/gmic-1.5.8.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.8.5.ebuild,v 1.1 2014/03/27 04:51:19 radhermit Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.8.4-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.5.8.2-ffmpeg.patch
-
-	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cppflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= custom lib
-}
-
-src_install() {
-	dobin gmic
-	newlib.so libgmic.so libgmic.so.1
-
-	insinto /usr/include
-	doins gmic.h
-
-	doman ../man/gmic.1.gz
-	dodoc ../README
-
-	newbashcomp gmic_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-1.5.9.2.ebuild b/media-gfx/gmic/gmic-1.5.9.2.ebuild
deleted file mode 100644
index 9cbeb4c6aa26..000000000000
--- a/media-gfx/gmic/gmic-1.5.9.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.9.2.ebuild,v 1.1 2014/06/16 06:37:59 radhermit Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.9.1-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.5.8.2-ffmpeg.patch
-
-	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cppflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= linux lib
-}
-
-src_install() {
-	dobin gmic
-	newlib.so libgmic.so libgmic.so.1
-
-	insinto /usr/include
-	doins gmic.h
-
-	doman ../man/gmic.1.gz
-	dodoc ../README
-
-	newbashcomp ../resources/gmic_bashcompletion.sh ${PN}
-}