gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-gfx
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
147 files changed, 2116 insertions, 2876 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 00180d371758..7678eb89c6c5 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/bootsplash-themes/Manifest b/media-gfx/bootsplash-themes/Manifest
deleted file mode 100644
index 3f5491b83ce8..000000000000
--- a/media-gfx/bootsplash-themes/Manifest
+++ /dev/null
@@ -1,178 +0,0 @@
-DIST Theme-73labAllstar.tar.bz2 784795 BLAKE2B 1f13f2121f834f626a42f67ad2985f310d786debc968af207c705a08dc237c3f3fd26710083ab2cf27d5f8de8e379c3b542b25b05a56906db3f9b5186d794246 SHA512 125ca3e032e0ebd5cd0297b9525c57cd6642e09df8d562ac8572c3bb882da86f8acba65ce64a7c3016ae7ab4ab8a92302fac1080fca3f132b074bd556e8fd7a1
-DIST Theme-ASP.tar.bz2 876566 BLAKE2B 7b272139d9a9be01541f76ebe1f0711f57a8cd12a3a88a2899659cb10ac39e1b66df8589f148f73a45c62c5718ec6e4fde3f150310ebb33cc848d2b5ba75cefd SHA512 9faa2df6f31118d7ffd4758da95abc7e4c18f22a744a2bbb53935be8ff76e8018655c6fb31a6baf23a38be5923195001ad5d040de02c339f33656955438948a9
-DIST Theme-ASPLinux.tar.bz2 106075 BLAKE2B e47b4d2090b5d64da788a230d20bbfed10c3de7021512e87aa27d02003083d54ea75bc065e872079e3c9540653dd2a61f134770eec68efe983300c835144a744 SHA512 bbf5414bc3c58a21245a5b32928843c953c1b45b73f6bc795ec49fdaf48aac1811362b3eff66011df15d80922d58f78a594b8ae85f8b62b78b3c3bf771b205ee
-DIST Theme-AquaMatrix.tar.bz2 280020 BLAKE2B d851c9102d0bc1bff9356634211ea749e2da74489e2046bb25c4aaef86125663f48256c69f4192cc19e1ef8eb887ce0f8a5660094909fc7cb7ed4d40bd0b97af SHA512 8a9ded3fcab7fb4d3abdb79de945d1189e4b319d9077823dce82ce4889036e8cff7edd3aa9b32fabd90db0612fea862806557840b7105afe5bf5cdeb0c661aa6
-DIST Theme-Arch.tar.bz2 100598 BLAKE2B fc47e76fc1d354e822ac5d147602f555694b34ce72b352bc230436eb1b7d50a9eff3e485aac1814e21191d0a0f7e2f3b2deca2dad839b3b77a1cea7720e251c3 SHA512 f0992dd72c658916196f3fd1f6fc5343435e1f54bbc72a2ec2551e3e9c92c00083bc482ab48c17ec7db05dd14989c41d4485640c7dfaa434be83be022bc80a2b
-DIST Theme-ArchLinux.tar.bz2 101314 BLAKE2B 994a3c85553da1ebb38280737f955c8558839830e6e25bc74f5efb156413e936157cb954e607c16a995844771325a3a0e05783c1a753f0cb0df399e021b624cc SHA512 db204a284d59ea7ec5a64cfd7eec229a70a59bcda81e08bfd57a95c2e14b22045854474ddda3342971b38255637e6216865e5a43a5fc0f71e1ba63172efe85df
-DIST Theme-ArchPool.tar.bz2 133676 BLAKE2B 1c4a75bf498df08abe88d09cb23967070c77fe804edcb8b6696ab25fa130a3d845df78eacf04e13c77e21e8fcf636a55ccc478980ffbbddc312c9aa70ed52ce0 SHA512 b52a07ed1697df4dab0bd8100544594284f7ffe1291827c843eab621b837900e36f07efe79838d4d12f20ae60ea8c4b7dd08d88fb89d9a8cd552d6e73ee5960e
-DIST Theme-ArchRelief.tar.bz2 122528 BLAKE2B d6b83537513c9ab9d16b98139361b695f286018b172ad8888165e2caef20ee99e1bea9b694e6ffa28742c7b4ff4bdff596ea1dff3cc27f39beeb530ca69c19b7 SHA512 d9c8c1e86e981cb3c650270a4b03582059565b1af6dcbecd2fe3712c29f9f4a50cf11bdb5ee94b20f2fccc5b1454abe60b3d4a787914b6cb0c15d7848d65e820
-DIST Theme-AthlonXP.tar.bz2 83527 BLAKE2B dfc256c162ab2ca3a7893cd83b810faf431418f10ec1d6493d91f4add43296fe695e73f89701785a4d5e15a2d20e78b7dfd5b6e85dc6c47ef6e129fff1c7da52 SHA512 2f9796ec2cdec019bc7b8a79582050869e11943e9e0a63f23e07813a5ddc9479d15660cb08aadfa855b0aa4f8e560655b861ac835f5d41f433d75b8ef6b0f46f
-DIST Theme-Ayo.tar.bz2 137506 BLAKE2B 86712b8b255a2b1c9cbd076db2f9f06348695dc65385d33516a0e1ed3894199b596f6e32f70a3bac7737628bbd7ef2381551ec4e0b51ad86dc20dbd4e7062769 SHA512 9411b2d09a62d9dc0ff37f298dd32918fd0bce140b890718499e4b8467d8e4752dfbc6ecf967b8f0c91dcff456c0937c93968cbd394a03bf2dadbc05b7c90b73
-DIST Theme-BabyTux.tar.bz2 99004 BLAKE2B c135761cfd18019b94ac53fa53d53fd6b18fe755a0c19f5c82576b82c2fa8858c662562b87f6e96e03c4cdf0ac430b5072d9bcb3e22413de0dd09166f4188f53 SHA512 fada9d1d7cac4af5a253929f792e737c0e8e3e9dc0ee2bad483ec185d031ffb813c77d13e220528ac82d75e3d560c35ff36ee5407bb0744df2ce3757b362a1f9
-DIST Theme-Berry.tar.bz2 93159 BLAKE2B 6e68dc1be1740c8408f2433236dd2d1b7acab3598744adebd65bc9e09612550d837c279fa21e699566d694c609a65b9b31103f637a566d89883196b208e1f65f SHA512 235c7e6352a9d7ac22f62891b6c39e6f065fb81da1db832f44547dcd2c58f77a8a7e1cba6dbfd8ccbddb26887d2edbf277d8c14b2a090521fd0560adb34fec1c
-DIST Theme-Black.tar.bz2 115743 BLAKE2B 74c63b8b840154ca3fef3b9d90f76337e227025abadf46af6f753e733c6b5cfa1e62906f875967ca2e1492f4f7b008a1fcfeae0a3d68a8eb2b6077a8b94ac0a8 SHA512 6144fe5ba6c7d4d4aec3a120f607c05a292806ad804cbb973ae8c6c7456bd7bf559229642a7a217d14d9285d7627d42f171770ca8e04e2524dfc197fb60583ed
-DIST Theme-Burek.tar.bz2 7437 BLAKE2B f386d315cb009023b961a12589a129d341e550f4fb3c06f16dea30cc1eef720f9553edf16a4e839ea933da3ee12a7bf547c98981417c457a507f03a482e1b3fc SHA512 bd842eeece299572e4909226622fa481a5ce51d2cc6c4ad1b928056f6e00be88c8ebd8843150281e183f94556ee2bffaac272d2aae59a398170426644ed8aee2
-DIST Theme-CCux.tar.bz2 193017 BLAKE2B 3a307d92bbdc3b06f2ac3a7c6b746eb55413010cfb308ee1645f1503029d86ca059d02d745a767c4d13a05e76b720812315f3e759cd18ca5f94d05bfe858a77d SHA512 04b2604f290a62e8c0f2be7f341e0fcff77e96dd7b318c4054a35b29a3dd12ef390d8596d812b189eb8881050869122425694bf2d1a29d30c0eee2067ca54521
-DIST Theme-CLEE.tar.bz2 59585 BLAKE2B 5aaccbe4a0231354c8d584c3e532e155ec988481fc69b31dd88438195c3710f01be6c862694163bca46efef3d4673e86390e82b65a042a4b372e02f2c908002d SHA512 d26e976e50d20dafaafcddfa3641439c361b26b81a448bdfd82c2276dcf9776b9ea5bf6e0390e76cc5608b43e15ce5688398eb49ebe19f53338464388552f8d3
-DIST Theme-CM.tar.bz2 1221122 BLAKE2B 1f3e205dc38e67e9befca04a22e5b01d0c0202d4561cc4038d5c3206ff982b9df9732ff38dd2fa435afaea3328f2e476dfe0b6ad2b179de7a1f53cc17d2ca8fa SHA512 c043e1d558928c57efc8bd10cddb9f61ab413918d76c0ad6ccf98556c17eb34ac22ef1e3fafb68c740936e414febe19cf0a7090b2c4a3ccdf18abf26a96dac49
-DIST Theme-CRUX.tar.bz2 37445 BLAKE2B 0fb266e1e3d1671bca751e5bf0f75693249584dce04db41f314c5d53e4f5238fdfda7ed37c36037fb8af470964d02f9e3bed0479bfa0af322271346aecd0b00c SHA512 67d4c778211689cffb808d57228cb2a8774f8d84935cfd17a1a177db81321d4e0b553389c36a2d70065c35731b3266b897f9cb77d1cb454c175ffe18d7c4216d
-DIST Theme-CaixaMagica.tar.bz2 45267 BLAKE2B 172f024bc257eb15bab6d72f380b0195311bf8049fe2b552a07f9a2861ce5fed095143e0fe344f6a1e7455db0697be84ab119a48054964d7744ba5b47daaac83 SHA512 5c1c6c93281034b3746dfcfccf0e019dbc9c28f7aad23163b99b0a5f2013ff7728300023b194052d17ef6485381140d7084a477a0867929c28dda32a5200ca3b
-DIST Theme-Cargal.tar.bz2 2727458 BLAKE2B b5b8fc8938f301d2838bfc9dbfeea96afd1cf571ea759dbf5759d87d75dd7a195a6be5ae6629d69e20a773c707737a71eebd5515d0c3270bc1278cc53561c5ec SHA512 31ddadf7bf3d226f21a6e0090bf690a33c12cdae1ce3b24fc253c2bb91c8c379688afb20ec5d1b3a5916e72073aaa58d3336104afc89aeaa013fcf893679dc88
-DIST Theme-Compact.tar.bz2 247776 BLAKE2B cf7448ae74eb217134cf0d8ca3ef69eb34d3b9933b38d73eace94995e8a384ee83b8acb11bacd531232d2d672d77d60c31872ef6f4ed51ac9792bb3bee149edd SHA512 0a74329e0981f2473c298cbc17dd3b46c1d23a04cd709448ac1985089027ad5c230f40e46fa465d6c9082c68890aa49c0c64965554b2eb598b8e4309783e069d
-DIST Theme-Cybercity.tar.bz2 118704 BLAKE2B 4d386904c1cf95db6cd9dc393f509e8faa5504f62f000b55900405c2b1ea8ac7d78b3d91264ba604bf02fd53ee3e5d8fa2f7542c85b344b9ee96fa18596428dc SHA512 0277d7999ad80077d0a2433272ffcbb1aec77f579200f9b0a399965788166caee1824db19f688c0302ff6cf498b2b73cc00a1286a5e7c975f0af1a6aa8bc29fe
-DIST Theme-Cynapses.tar.bz2 296082 BLAKE2B 9576972dd2fad35f499cb63d3734e4523e605cd3b7c1ea50dcba3813da3640f73fee8135e05da02c386f9bcec25c7a02bceb2de0fe6084e2d4caccf4a80ce93c SHA512 b87167b618643d701f31e509bbce58976899a9235831ffa0c2e86898287c943583ca7ef8c3953474437298d417e44ed33591f2143893bf7cc709f9c115adb39c
-DIST Theme-DangerGirl.tar.bz2 72948 BLAKE2B 2d4272b7bd28879d8a0804fce81ac2058596f7b26d10252d2ec3d8810a8d0499a2ee71c574b9a53db16ccc69fa5d6a924a77b6df8381f1606e521b6e5eb22486 SHA512 fd019bfaa6c102b532e96fb21159a4e007f4d802850ab31c938c63685143f1198e1b62df280e9ebcf0cc25e841cf608983ffcbaaf2a126dc23a10681b6d9bc6c
-DIST Theme-Dark-0.1.tar.bz2 32133 BLAKE2B 95a41d70abb5c4c952f4260456dea42aecf7e1d058c698fc9a909892074d8f460e588946bbdfa2166f272deb88a09c423ff33a994b5c054c826edc7643488ae9 SHA512 1f74580d0557dce413003bcf5415aa05a2c1b035a9ea55aad7f87a5e3a3727fc4028cac86b2eeea2b0a5e5554495774452e28918123546696bc4c5120141f526
-DIST Theme-Dark-2-0.2.tar.bz2 147219 BLAKE2B 7e9b7d63847b1efc33fda8123a6d473dfb76c76f071a28614e8001249bf6b49ab11022e584b9f9208a3b4af84bed366d50b4dec379aca0eeaa257dbc2cfea648 SHA512 36690edaf1133a9f18231e9759957c524ec5b30be86233b081fa0d8e51db977a08da802e8b9706f5f98eba2d729ef75fff8e9e52a0b328ade78dd4b3a9b75338
-DIST Theme-DarkBlue.tar.bz2 791611 BLAKE2B b5cb8b90bd6dae7c34de9a950f17deb3ef05b4db28346ace5909393006fa3b00d2830476fd77ac9dc19833b8b1f5e784f9b6e87d4510d618281eb6e9a86d5441 SHA512 40836286929a063d6823a9914a017ea247f43936bb886041a9a55a305c83c81b892fd7c793bad5a7e1f89a1a7a431605c82ff5544374bb9a04d54eb452e93e80
-DIST Theme-DebBlue-Gnome.tar.bz2 470914 BLAKE2B 89599362a26a46dfd45d4a05f3eeb6ea41bb19b3dae0f91a024277792b46af83856d77157e197b019af52677bc4d1ad224e9cd9ae4b6d25d2c1b0c2b156aa2ff SHA512 0af0bc6a14ebfa388d840c337cc657aa7a2eee531ca6b476fb945148435ddbbb4b8f3965cccd5f14dfbd879af54d5f0d7772476bca2d79dccdb1efa26891c265
-DIST Theme-DebBlue-Gnoppix.tar.bz2 460763 BLAKE2B de311b879865f5e67122ebe62daa3a85bb4ed4e70d81c6860eb1313d0cff1910ae518aef975ac3d8818e62e0c4148a5091b4adaafe2cdfe4f28c7b39a4945405 SHA512 6284970f3910d17f30b6b70d888fccf699237c0cde3bb68a62105eca91edc39d2ca3fa0481edf6240f401575d5c9586a518cdca77067e2be464b938262d0c13d
-DIST Theme-DebBlue.tar.bz2 437544 BLAKE2B fe4093973f770f4c2b35744a448fab4b4a9e670ca0141df53f6114e7e4c059ecfd64c2deba1147be96625a691b9ad8ea73160468b7d82c198d0dacd70e2e8d9b SHA512 8cfd46859558cdae5478fd5202540146afdb01e980347bca027311d46dbcdfddd351fcc4a282d036a3a49a1ab8f4a84df31975c9cd94727ae9454302ea7470af
-DIST Theme-Debian-Mist.tar.bz2 332215 BLAKE2B f2497f76262f67ed499657ec380bbd67fa530db46d2100f4f38b8f9a5930424b84a1b62dd6843e25b40cb4cb668f75366fd86ef68278c0b660ac68a10c3207b1 SHA512 bd71687c0096c780a54444199da381186db0c39ee94f639b1cb6009ea21cf6a2695c9c6d7acf7134bafc281db55df2c90406a7f7766ab2722fb5d4029ba57ff4
-DIST Theme-Debian-Sarge.tar.bz2 355483 BLAKE2B 9316e679d2f3de351beb737ade6429707c612d0b787eac3b2e5c78149f822bddabf26228a8e57fac6b0313d38ce5ec662e13e62a7c92ecb2f0857ebb481990ca SHA512 b92993d86f1d3c92001e57d3ae2366cae293f66eea7609a9418e06e8d2b9588ff8274ad00bbd3a3dd35b643d4d854ae692c701b6bbd2bebe86296bb4cd9bbfd2
-DIST Theme-Debian-Tux-Gnulinex.tar.bz2 319946 BLAKE2B 864d6684017abe3761fd651a7520780acad4ad3b6d048cdbeb52167361b204708e68aec7d4767fcfb0a2fb77182f76174d981b48a0de5b4484d3803464031bd0 SHA512 c74f5ba4294b4259fe54f40a2986e4f7a41a8bb778eebae36bf846b156e63a7d29a42c1528e22fa455c988fe3728fdb6e1e6a87ebf098b0c87efd4f176e006e4
-DIST Theme-Debian-Tux.tar.bz2 36530 BLAKE2B a156701763cd579399496061c4f57f9e6e06efb299635d6216ab5dceb60dc676c2edf05c3914956f85c6b1ad1e41c1b36f4f556cf121fa66054ac53b9e0d75f2 SHA512 470637257de5f550a2745aaadb29fcb323845dc2ff4a77de7820545bd0c486baa72dc9aae855e479ffd10e5bfdef3c3da84114aebae345bf63f3a5fb0434d096
-DIST Theme-Debian-Wave.tar.bz2 39258 BLAKE2B 4a34df0e20d745b3ed99676b857d70266d829d0059cbbf9b2607f9719c38af77e3625b2d9d387072ef2e80e8af9ad9fbb5fb1c0a273aa907245f7677fcbb737d SHA512 fdc102b1c3a9e463b1ce84af32c85dfd5ca23212ccfbe6812e74453a80cb44dd17ae5abd2f8aef3c6e92cc260c8ab99addb78fdd4d78f21dbeec1b6fd26eb682
-DIST Theme-Debian.tar.bz2 2524384 BLAKE2B eb242591a9370f56a992f9746915a16a527061321c287f737ce6666e45690b7a54907f8ff27dd1bc8c81b8a9a03c564a21576126e5348653b4294d33bdd5d848 SHA512 3e50e40f747a37d10051e82b28a0b882a773bc2c5002c9758dc89c2f74a43f7625c298a33c4dba32c54e5019250102b01da3c1e8e3238d9650f83ca9df1e6e8a
-DIST Theme-Debian2.tar.bz2 36334 BLAKE2B 807d9dbaca4fab74607842415bf3175b88480a5c5a5d7106236e895a999466717dfe3c9e859333a3bed2182e7f1437b78cc4aeac1620c32ebba50e986ef03502 SHA512 1a6aa5a141ca39c0c1ad0c06f19d2989a4a08c5fd3f7d70e99ac316e70476365dd91c0d0f31f67cdceea51aca774c3e0b4ef7b6c2ffd33513696d324687bfb47
-DIST Theme-Debian3.tar.bz2 29542 BLAKE2B 4bcb37dc8d4efd6f466c4dc074fd33693a0b3832634c2aa9999f8a3ce56355d5ada4da2000d3ccbaf1725157adb1f8d63e9f8df42e05503ef28d362b99cfb139 SHA512 c3df76842e5080c18589b5eba9abd6a55ccac5cb3f24b9809c509474f9f1d6c37fd630227766fb0342e0c8b1be949e654a7e1e41f7e3c3237d024fde7b9ffe79
-DIST Theme-Deflorist.tar.bz2 58354 BLAKE2B 7de355b60e9e5c0ed7430fa524a7aeb3bb5f109dee34d96a23b63f69847db0b9e9e2678e8bc37845785dee8aba9e1b05a12cb12cbbe57f30e6c64b23bd24531c SHA512 d8e96300aff97a107bde7d00f2ef9d71a868c1f3e8b17f2aba25d72f78114f7e5a68d3debae99aa1f554d3c0fd935c36e91933d3a8bbb1999be292890ac271f0
-DIST Theme-DimmuBorgir.tar.bz2 153834 BLAKE2B cb1566caf2b125dd06f21c86a7d29d720ccadd7e69380a3489059428eed37ea91db0a8b87ced1101017aa7a0b9d26fe2df5b10a3721bd2c98df98818ddcf433a SHA512 6353f3e237652859812aadd4cb5ca07b34eb129974b48b52ab022caa496b4805ac448679308c189605d18e3d7d63c54bea02288972862e051afcf54e4b33a446
-DIST Theme-Dolphin.tar.bz2 266837 BLAKE2B 040a886566b9c24e289b4ca21ec863bcfb0be95660c536e79b6406944c5c27d40a55cb135c4dfb605c1e5e525def7d4f7f689fb6de7c8d67c54ca37b36667252 SHA512 7342ab29022fa03fe7facf0c108bea8df92d6c7a37825b94ec355780db9cd6c2ce81a51dc12e47845da8b1f60cdab059fb7eb7a4b016f81a68013b7db3193b47
-DIST Theme-Dragon.tar.bz2 310124 BLAKE2B 4572a6776fe16f5880a7ce129f1bf1aa8e57b9e7476f9c2d5e45344737e561c56562ee876c742d8a488fbba76e982582982566ac72736538ee4ffc9ba34c276a SHA512 f499e75726544957f7ae60cfc75b103a89571df03035a756e47f879ad1caed5b77eac246a652aed5d8adeb778780448cff88c75e7d5fb5284ea97ede7a7381d9
-DIST Theme-ERPOSS3.tar.bz2 60756 BLAKE2B b2ddb83e90f96f7b12b44653f03eba001d4f078c4e63edb0fc3a5b9252c69fda4264fddbe4aec85dc42a03a31d9a522d5f2af0394b7f27b0d64d4fd24c15d9bf SHA512 e3dd6f1dd1a47777d04575c20cc1321eef9081f3c6143fbdbd057c7e0af0707bd206ad26df08ad9719e61855a7ffae8d834136986f46ade01c3c20f1c4b1279b
-DIST Theme-ElvinTooka.tar.bz2 590257 BLAKE2B abcd56695455c328035b8886984244c4ce0843ed39765c7fbcdeafd963410aa37a0d564f7fa7341c02f02f670a3e9cdc7ac5d300ff266892bc5403bba93ea5c0 SHA512 6bcd288b8cf8295ba5f48c06cdffbb21b98a54a9c8d05fb28daebc040840835ed291c8718367b2a955e62f37d9ed658118a7c31b520d336c7379955d5c52a70a
-DIST Theme-Emergance.tar.bz2 5146952 BLAKE2B 2461231bff4c19ba69a1ff193da94fad267f92f0a32ce3ebf406e6f28e173838928c717eac73750c2c0744767aff9ddb09487a3d2e783698cc3d253f09a259c4 SHA512 cdfc6eb92acbd4bd0a770684248fc1e91d8f9d665fd6e27740a3add14e6e7dd08a994fc3e639019cc10c42b28ad6c7f0acb90951a0327e393d556a42b24f3671
-DIST Theme-Enterprise-spot.tar.bz2 150140 BLAKE2B 12da8d5fccca29b6d62323fe2f33de912cab97b958895f2570c49df910f74cabdaaec8fb717ebd0b69689f260cfa103b7a8973ba90211b541a40ce3ce81cf5c0 SHA512 2f15da34f1a96697d7e5a576a658dbc71f652b1de837dcb3fb389dfee1d3593f2fc348af5bc14c72800b11a7ecd811ffe5a6aeb8dca184132877bcda014d75e2
-DIST Theme-Enterprise.tar.bz2 229709 BLAKE2B 866e0fe1be16c3f1778285f856581b76575c6824c5d342517acf186b654fe910493684ec64d00f428b83e10cd3cfb2308b99268bcc4056b94273e96bd057b8a2 SHA512 f4f9d62ecf3d09e53b6ce39c4033f1089ecf004c614b24db81d77f2c0d6ab74e4e5cbff78eaf6072f384d453b4aab201eb0e611c2ac8be2415548fbf88ac9b50
-DIST Theme-EvenNewerTux.tar.bz2 71872 BLAKE2B 53c0868c014e01c52a5a4fae8c1239f85a915bd17142821661be39951c11a0945caabe72c15315c239876bd127746d8c84c670e77a5e7a27400c79360a3c7912 SHA512 fd4c626545ce1673e0889c514f813c69ae6b79b604672b258328c672431102c7c86a719508716b90004c3e910782bdcaabd86ebe5e24865f22578269db67a773
-DIST Theme-FarCry.tar.bz2 1280217 BLAKE2B ca87c4ae43ccc95a652ed003a34b48d5a6f6faf2c288acfddd5c59e9b9dc503fc03563ab608120d100e4431bfe5ae24ea3f9890edf37d57b8c2a9936ace47199 SHA512 426eb146101ee146f93fca49a6fb37b0922e85b58d1ebfd54725cdc8accebea3c5417c1f411867da2950fc3ec726a45ce0868aaa49ab8f0f415ca3d0eae61f59
-DIST Theme-Fedora.tar.bz2 934188 BLAKE2B 2f66b0a2c9401fb930df2e442706af78c6600058dc023e6d2d36898b1f27e68e17c4dd099282399cde2e2dff1592150112a3002d041caf0f5e260d9d57258167 SHA512 6b829a2f32a3a6ace3f3c3a170ab4226e0aafef01f0f70200ce70c57c0410afb6e90327480b683201808da87f6903d9156e1d804a5f1a7a27476d1fc4de5bf83
-DIST Theme-FedoraCore2.tar.bz2 327383 BLAKE2B 957466a46211c67ffa5d3ce32964625e66bdac37d25ff2d509bc62ae26057dc29007cafc9e56d869b8005e066dde64270ee5249fc5ff8854b648fe2eceb8adb5 SHA512 6334e84c7fbd5ef8921e3513d4fff4c423b16c497da1fb4ad852e678c040334511304f76fb85b4db79c853691eae70cc856c474cf313b0b9ed9da311bafe5a61
-DIST Theme-Flower.tar.bz2 55729 BLAKE2B 6a0ddbcc4969f9a1202854985a4db610ec23d4c55cc6fb1070725d6163bacc72c8eb310bf94054a949823257b935b2af0447423100b5e28fb526d8e025d31230 SHA512 db32cb1f1defa8d439a989d43abe5853a566a313c9b68b03321bd44f4264fad5ad1f5a5696ed3fbf9686b159c38186302e6fd32411c4e7ee6d6cb00ee2421aa3
-DIST Theme-Freepia.tar.bz2 157838 BLAKE2B 09947bcbd0de1c582b25e912800e2610273ca5d4ed6fbc7cdb706da5b06c8c559b5a88a238048484bd5137b0789b70a8cab84e88440eeced390886ec97a670c6 SHA512 b3063980da43686e0896a8803c3fa807ba0ccc14725e43e2d6f4813015134ac6de4609cda635e2b10cdc56b192e545befe4a806ee409aa332083ee383b7064a4
-DIST Theme-FrozenBubble.tar.bz2 654458 BLAKE2B b6f1224b690ff83f50cd0dd433dbae8a13f2b3ec4cdb708c8c07fe31962b41dfd70b1c1891d73f0bdffac711b9c0d4a5d1fc453dd389073e93a6cd8fa6a6eb2b SHA512 86d176590034d8ee0cb1aaeb00f94ca71828cb0d11ce47b0986507f87ba50e12beef73a59f0436e4eab1e7f0d43b6ce66557946aa76dca510811e5adfbb22604
-DIST Theme-Frugalware.tar.bz2 994818 BLAKE2B b29a2965c3bc194b02aa2d02c08c052907e0e5ab8ed6fb36840564587c49980cdce841e73bc52f60bee3b0bdfd73821a1b74bdc6ffb07a572ab045d75bf90876 SHA512 0c259a468e812865e4e4fa76c5fde9a6bd6fbd291625ad05a3720bc8ab457e77ca1de4bf251193ef2df8d1ca18af7838e23d56cb2e70d47771f29947ba378085
-DIST Theme-GANT.tar.bz2 511828 BLAKE2B 949329ceff9c2ff0ef80fbe8906695ad60d7172f00fe4c68983ff56ddb49b38cb335186160f93b769186ac0f6f9bebcc2352fc63a42872319c3d99dd9b8a276e SHA512 4655334093225d36e0adff5f01b6b1e27f44612353356204cffbfb7c9ed116764bd2c92e6cef6197e26953b398f4f3ab70ea25ed0a8619ee56e5daa473f91d92
-DIST Theme-GNU.tar.bz2 246036 BLAKE2B e42c32e8372086de032496bdf45d23fef3e2c29f6074d6322ff683e65d78dd0ab9ee391b6b7522c6f7f7d535b738ee12f1af8da8d882cd739016effe9273b3d6 SHA512 e45929f2cad0b664c7fc6028bd7c913d6d42e319e9b89fd199441a8da6e859700634e400f5c6b3e50c2c92c02ea35b5f57ff640e1a7c423f2ac30e28b4d7662b
-DIST Theme-Galantine.tar.bz2 17017 BLAKE2B efc177915dfb1d3ebc987949706b3db5dc1879b1236a659cad973021061ac83a2ec9221bd52d3cb8dc37c6f5bc859d24922d0440123136d9120cc49ff9b7ae86 SHA512 6931cfa11c68cc034b9e823c059208204f84c49df0b3f4a2fbff5d7c14ea3153717bb5f6aa1cd8172bd9a1a4457a93f9b35dca61e27d7f0987902bd6d813975b
-DIST Theme-GalaxySlack2.tar.bz2 619115 BLAKE2B 16625166e0853e7e40683eac1b8d4173d8134e3e5e8dd486038202746daefe42a83c10ca3b719c88caa0802a7fe50c6c45c9016cbca123740efc7b00abcebffe SHA512 0eddfa89ce0120bc7dc0bb0aca969fdaeafec1ff55c509041f3725dd4d4cfa6bcb620be43ac50d53e13a67ef779ad7a113b56eb456a9796425dfd2431f87f688
-DIST Theme-GeeXboX-Halloween.tar.bz2 72116 BLAKE2B b5577962f5c28bbfb2ac67531f0e102091d2f88a6ddfd6d22fc313fd83a9f4ae451a408aec1f8d0a182173ff5ad9f47c84e473d3c73e4e272cca8f71971ab8c3 SHA512 7cb3abdc707a8de8bd4693e4a2666d97ede0431ba5dcc009b8a8590c3d4dc06c807a85a27807bc6ffcf94c0e26f2882715529901a332fde9c9c0a22c81a2fe4f
-DIST Theme-GeeXboX-OMC.tar.bz2 93910 BLAKE2B b65cdd45e16a601d0ec4a043581f6ee77e220dfc2336aa5f0280c0ed93b3f156118cbe94ea690c05b8582a63aeae320af8719acebc9df879e5147ef54c5e2a17 SHA512 4f8862674877cb8a58bd76b4fce50e8705f5f66dbd6432491a344948d7fa739ca0ed4a87a3ae957fc11da86d10499de9a0bfd6f67ca0107e0729bb777c182ce8
-DIST Theme-GeeXboX-Xmas.tar.bz2 71215 BLAKE2B b6f8d46c12d58559b99f6fb4abf14b8cfcc1d92897f35b930401c521a2748453aab9934f26faaa83aa37e01de8f0885538fdf169822cb7f6b4b8b77c510ceb7a SHA512 c461e2b9ab73ef76b6bb28769b2dad54fda089a2283c94283746af3139d69a3125e228a6cce7d492c2f16066ccce229cbc895e9307e757880f5e310b3beb04b9
-DIST Theme-GeeXboX.tar.bz2 44022 BLAKE2B ffc18e5f9b5b73e9b8f8a2dc0bac2960a131c5201c258723d21a573d0ff42e0b9e81034508138dc6fbae0018837595beb7bedf26bc5c9e4d39f3dd64beaf4876 SHA512 c2881f0a659b900f8ccf58f57cac409c28d4c76bf70bc037da432137f47af9d25203ccbe423ffefb54d5adb29a460c7c338a7466569a84cf042eacdc57284a21
-DIST Theme-Gentoo-Hornet.tar.bz2 515773 BLAKE2B 8d3037779a7750701011deb67f7b60063c132be6280b773b910b7502394f9245328a7f3cd7d7feb73d945b271f5b40793ea44d3a2acc79f90ab8ab605361e43f SHA512 4d582c42b4ddfa3d7271134c0b9fbd44d41fd1d694b0e1b5909852d415b24409b3043a1af46f9ce8e05ccf7a636a79b7b7697008f98de2c7935088d484c9e482
-DIST Theme-Gentoo-LiveCD-2004.0.tar.bz2 116630 BLAKE2B e8d37cadfd26b2a6c71e5ed48d17cbfed178fdc9e1c36b6caaa120edf4a16b355f7983ec23cbfceae0789f88eeb586245f1dd6ab1ea5697473edd4e0982c4cde SHA512 a0ca9acb97959830c3b89deea7df71cf9383e03d527762180faedb34c833c375ecf8d9fb5a5336a30b821e253a9610f9bdbd0f37506250dd8df49dbf6cc44324
-DIST Theme-Gentoo-LiveCD-2004.1.tar.bz2 401040 BLAKE2B b3461d8be4d933067efc1df31e63b57161136f2a73216ce5979ea00072dafdcbedd2d4b039a2d2d31b991501b9c41652c553ba96177009520a79d15f16531f92 SHA512 b65826a3cf565b5f8330d653d2a0acd21909b433a822a4ca1056a46ad6c72e08e1df4a1d03e4917b4ff4281d456e297d2f1517246c1bdd1e07e7b48dc957ff9b
-DIST Theme-Gentoo-LiveCD-2004.2.tar.bz2 563636 BLAKE2B 76e2d7329aaa4ce7d685e674463618d74df96dc5f58ccd63b3aef73b9ae8cd709febb9eed9110175287f2b75cbfc4cf2398c8a3d63254ed11c4b114ab789c00f SHA512 24066e2a1358b9574e880d5ceeeb69828aa913368d1d5b115811f36e029c159e21b5b6536bf714ffad9dbfca4acac377306705de4b41ede57e2e3c9a576b285e
-DIST Theme-Gentoo-LiveCD-2004.3.tar.bz2 1794708 BLAKE2B 4133c57ae0b54555542ed0893a1530cb6790ad1dfaade102fc101d05b9a1c9043a340a6f463bbd1f006888815989579992b6e4b0cba1b2abbe02eebee52215ae SHA512 c1fc5d54fd152ecc9714764e97a1769ba4075a216894abc90f9ea02e086b26695cd9225c34f11925b78cb53669e64230cf6578dcf14c0d671af3870bee140142
-DIST Theme-Gentoo.tar.bz2 160689 BLAKE2B 268d499b1e649bfc7613d77070a7ba113939d2b3eb9411536da95e1e74f5a799d12c4b5cb819d4047fd154b0ed3eed0d5e0e8b311dfc1f2ce3041a7504d48e07 SHA512 a0ecd67b2f8182b5871dc757a4d5961a1d1d048de81b56fe4d19068b5d0a57e22f7c281727d6c113562d0ff6c27b010f7e858f9d63c07611d9f6fb53609309ed
-DIST Theme-Gentool.tar.bz2 286565 BLAKE2B 0876444f0ef98a7e6e140a72de8608a2d074b13355eec1d66a31ccdafdf9989e7fde6a525ada0aabd93dd96aced3701e25465357a2c831403228264fdbe2321b SHA512 2909ea80889e250e60bd54b4dd51eaf3ebe9813d635f151f9803507f092c4ca9964aa3224553382525f0915a12d25661fb6bc0e0a1595feee32d0c3222089274
-DIST Theme-GoGentooGo.tar.bz2 94136 BLAKE2B 980e00b054eb5e28c0b049972027c94485bbeb91345e298356b874bf5e22c918e006d284fe7f5d92c29d4b1775abf422fa5120ab07470f7fc77022e23965395c SHA512 fb0f66c00bd14fb0612cdb0411465b7789fbc7780ff6f16d0ab1e07bfedb91dcf5afc7cf1679c291c88c4e9de72bcfa83d0d416b709a3522bee378bba852028d
-DIST Theme-Ignite.tar.bz2 111923 BLAKE2B 849d34725c776d891b816dca5ce378c2be925bb2d244e674c8b1a74384d198e25b2e6d4a04fe003f2fce14ded30c956cb46a474d9dd588ff0352463fa3cae6dc SHA512 d6dea9edc8355cc32ca09cc955fbe26e4b95d12b8b3e18c0aac653a4b72fd4422d5f9d84efa9cfbd92345d2ad8dec12e19a561586c82a3c4e7298458e94a25c0
-DIST Theme-Jollix.tar.bz2 19617 BLAKE2B 764f9ca529077596befb67a57a0d1e42af798fdfab2f0332ab93628b2bcd2878e632b57f155834e79b76b4391c21026bdab07494f721838059a994bee1e7c23b SHA512 8d0f7b1846b3a619f84c17a34aa4cb4efd72e8a72bfcf759d6e8bc1d83412bb6c391935c0c17f70929b9982dd9480c1d17c7b46be05b5025a67825385973b677
-DIST Theme-Juicy.tar.bz2 60068 BLAKE2B 4a68aa2a240edf678fa28eec3ba47d439548c5817465aaabf09ab9a98e8b66f7ffb2390c05e0484aeecc1d049a5bd0e47f10f7dbd914453d74348d746032453f SHA512 7ee6973e6f646438d95e6f73f6939d6d56599e352bc8f42d9329cbef9ab6345fa076e184acde355dd9abd185b18ea20782d9891611b27c1c0941ac69ca689a60
-DIST Theme-Junior.tar.bz2 715631 BLAKE2B 0a4b6c6712e4ec49c9b7f9c6613b64598b832318f4684d32c1020843eef6bdb969f4d74a62ecb1825a670281605c3774aece3b68ab231d5b47c7f33c9afc89e5 SHA512 3bb1e8817c119b2948f69126b2e3f8a180c73e1aa2940498feb1820a67f091f5c70852cfbf95f9e61f149bf064741d63e373abbd723748c48c833f95f7005122
-DIST Theme-Kanotix.tar.bz2 87917 BLAKE2B a86779a74eb3fc32100d4ed87f61338f22383020d92c3b9c75ab368fc4760db82dedbbbe280e7cb14f625d18c74c2b5d94def629ce0abf2483dcb4680255413a SHA512 27cfe1b61ebc50e5df206073d4fe61323e357694c04dc5f7181f4329eb8f51b62e19cb1fb07a83a6ae4e301becd8dadb713121af9f3829b92cce4c12a902d74b
-DIST Theme-Keramik.tar.bz2 197880 BLAKE2B 9f028111bf8a4c83a55195a496e41d4006079a43749d9ac4572f5868916d1e4990e776f8a266d7462cfb0d72c5bccc4321c88f0be124aab486bcc68a77e538f0 SHA512 5e9dc2ae33dbdfc1989d84c2f6794cab1e8f8a0365ec96bbb1eaf2de73a850073f1aeb221f43fb8d1de54a2bf2f28201849a75714ebae5b143d82f6c156de92f
-DIST Theme-KillBillTux-Grey.tar.bz2 349563 BLAKE2B 61f83bafaccb5b87d9b3729c2a6c3537c7c83416ae3e1420b7d3e4679077a89dc88ad8b8461e3d023530ee98b39fb038776abe2ed4aa474fb2cd759b889c6ce1 SHA512 e037b70bd68f08f70de420cf7cd9328da6489daff42b3a2103e7a340554a06bc05595390f1f74193ba0639411a187e1fe198c964b0a1f889f11b430a6fd501b8
-DIST Theme-KillBillTux-Yellow.tar.bz2 296740 BLAKE2B 0a7ee94f6ce706744cfc15160446f1b73047035a4701a3016a798b186a007de36abf7a98976092656faecd0d5573a6bc014a3efd0445f98d005ec0536d1ef420 SHA512 ae2245e0e3ce198135a69ae1f45b0defcfbcb968655e2e83b13293b2e0a2c4871eb1584ab7e8aae3e7c9fca99d5c81cfc35ac0d8ee0ff6a6eee69a794ae2d546
-DIST Theme-KnoppMyth.tar.bz2 77720 BLAKE2B 1529648dafbd99fb941d66ea46c08432c7ebc1152b0d531cf16b2d83085f18d6ca974b67259ad0b47a0e5ad825af398b5ac75da0012827f6b54a5e4195691eea SHA512 3eef298965e841277226c976ce3122efc2a80b8c1eee275a4fbac19dd2a655c20afe959f618c7f90cb9f66f0ab814810a1a2c7753b330a2031518559417ff29d
-DIST Theme-KnoppixKDE.tar.bz2 51256 BLAKE2B 4f8c1a876e34451cf550902eca8a6995820244985348c34ee8ad4f93ed4e476dcfe5f93024f6c090fd75a498c0239f23d9e791847c255154c6f3a7a7afa696a0 SHA512 fd41774c124d9e259f537ce77f364c3c58115381b28885b346498c70d90c413ce8061502de4fb46c70e56145ffe9c20f609e4854d6bcdb635fceb5af980bd309
-DIST Theme-KnoppixLT.tar.bz2 347438 BLAKE2B e82a9c98e727d1a159a38b91f4fcfe2ea71068b3aa58491d0c0e8b3b8094e232e01ff2bb0f00c8ae9e5bde13d00d6faaa3bac58101729ddedd3909c041eea6e0 SHA512 63bd43ae0c425ad2eafa2c901344a6b79c9b856dca12bbc85e3735d6e914ff2f7276723892b38bd7e920945eb985726ac7ff240f0717d166427bb0900fd144bd
-DIST Theme-Konsole.tar.bz2 40194 BLAKE2B 11cab935b35cea7e4e85577417cb744e55a981bb779a0142c8f45f7bc10cfcd10ca786b622ac8ec0754b34950c04110aa6bfd67bdfec16079fb9084025b09bbe SHA512 881c1dbce74cdeb0bd0bc6b98b7077ff5e7d7f216dddfd6de17d8943aa93ece89b92db6d2f2e1e7ddd6d7d0f88638e326d6e6eee5802fd77564448c21c10b5eb
-DIST Theme-KuruminOrgBR.tar.bz2 496830 BLAKE2B bc1b378a2c07c5f88ecbb5a0bb0c1a24b4b8219d8dbe22633787941ea715f36537c4a26b092590efa55947da4aa3f960fe7b65d8c6356f6d5a3d47be7ad981eb SHA512 9e2be369f905b406b89c2c121a7a3d8cd46c874da62fc0fb24b8cb73203279c86d9ac1d0d3ce37e989a27779dc08f307b686b3d2d1a3e60998031a492664a129
-DIST Theme-Leopard.tar.bz2 17986 BLAKE2B 48dd67835a14ba144e24f3ed18f423e7ff57d3476a0d00245c22c71dadf28803bf293918a982aec3fe47a391ac2846c0fc71105bdd68140ab5b2e92fd5218d76 SHA512 b42dd1ee3b9231eff7472c56437acb04016ed5c9b5a7047a1c1bbeec20731b1a98e7a8825c5f72e1f0dba6d24305759a37a0a766b7c19765ac7bdfe9f9a761bb
-DIST Theme-Lila.tar.bz2 1374439 BLAKE2B c9f54b97cae2162045ca96c5bacd19ce8d9f950eb57b9df994fc692a3fef878b96d8503d0d52e373bf16b88dc8e71badf09f88721f341795b27f189c9a97c097 SHA512 496b6171a2af9c43d7ffe72449c541c82329a855bab92823aaccdb686fde2419f1118978e78bad5725062c1d71dddecc1233dcdfff537b193b59ab4bbbe3aef3
-DIST Theme-Linux.tar.bz2 32102 BLAKE2B 2fc29cf350678db062b7fd7d1f115f1ba98e382b726a8a91cc226d2240d1a60312b42af16fe90e7d25fae79a5d68f9dfdbe7e536424ca0bfa583c238082b3bcc SHA512 9282e9707e46e302bf25dcdc2d391d45e6ec0cae971f19b66f023d109e9b160e84c5474fe7cb86731902a2eb4e6cdc243f645ba89ba77aa1ad6f16eb5d28dc4a
-DIST Theme-Lunar.tar.bz2 27937 BLAKE2B f2f6d32c743317caa633168eb9ffb52b8331bcac3cd7f0960a3af710e022b4ec8b978a6e15bbfb055acdfaebf3ac00a430aace2610efec14b11ec536ade22e90 SHA512 79982c111d1161f3a02f2844870333287755675e52d2196a702e91ebfc52528f02df06547c446e31a5d3d1819569f087f234195cbf7e3a0ec962cc285e93dae6
-DIST Theme-MaiHoshino.tar.bz2 119900 BLAKE2B b0b090d24e529728fbf39bbf01e20457ffb9314e05b29225c7c81502ff04c2ccaea43c8efe024805b383f9d8bbe8bed3b0256ba3d33832566a7c7879df44724e SHA512 cb80bf46b729d881e3786e590b708d813a1cb10d2a42af1d122466efd0038c90eb7af4f6d443cf920420e7ccd030059dbc46c78f3789902f040c5b67bf62f06b
-DIST Theme-Mandrake-10.0.tar.bz2 2727424 BLAKE2B dde2bd54a96235ecd225488b871086b4f2cebfc7c22d1c6bba94f8959059e4ac6cddadcbe2ed57a86581816cbf4f8ba3a4eaa09f6423de6189a698150145a058 SHA512 6d03dfdb1359ea8ed3a6fc025d61fcf3994c6edde1eb07e508f34ccd05c7954b1b1d996f4814226d9d375b0501eede9550b9e8ddad1aff885452b2ab6cf8cdd2
-DIST Theme-Mandrake-9.2.tar.bz2 940925 BLAKE2B 52679981fe0145d1eee60488a1394ef96a0afa9f815436e321118c2b3caf247d6669cd25721f2ce226dbe5e60e11685371377ce4053d591db82f13e481daa3c5 SHA512 e9852ff9e34a6de4eac0e69b80bbfa0a25d8ad1b5101edd7d7cb1a34c3acb931a3d8e853b0affbe2c5751b1e600539d0f393885a6e3f34f89f5ee9730d3d7654
-DIST Theme-Master.tar.bz2 373889 BLAKE2B 7152a58f091a9b8963e79871b42b0f12281c8cd4c4ad93ef119b98830fc59c32d0e6e89924a2ba2f3a29fe9e26d4ca4123adc2aba62367a41c09251549e175c5 SHA512 5fd9a157f04bff3d9cce6d90893ddd9257d2daab7a8e8af2dbbd139a9b6c54acf56941d6d68d88b6e01519f981b95803babeaf00eaa35d7ad6db9c33e0516720
-DIST Theme-Matrix.tar.bz2 80637 BLAKE2B 24ec86f239ca000e675468bfd88001c99e862df89fa66c2f18f936fd213c289b43b98c49c3b5b37f71ca4b612118a451cbe459d7853c1e8de907a36381c010fc SHA512 352fd0c476cc88b5bbffa6e6cdf174b337277039b74661317da17b1bff5eb7ca57f7ea85a1ef010be66f5767c8fbf3be0622c5e4eebc48f9da19db7ea165a73c
-DIST Theme-Metal-Tosh.tar.bz2 344375 BLAKE2B 3aed9b6e21dfafa8752a9d50bb07ef0f9f18b2189fe6ae81c4c2dc34e5361da072d795795ea7488a1dbf22c2d397b74f7905a5ad317be174144a4064d8949f12 SHA512 668075df653bbd5a7f1cb52afd5fbabc56d8a50fb2d72a0f25f9d653cf0ed5fe0eaefd4c3be70bf6a4e8858300a0fb7bc3181c20d2246a7826f809ab2e85509f
-DIST Theme-MetallTux.tar.bz2 465799 BLAKE2B 86d176d85211be937f30ac1752d57a6f9c12cd269640cb910e7cf833b04d4eacb5e279fcea55ac126f616f00938f1cf3870711d27e6aac854129d527fb4fdb41 SHA512 29b8e09bdd079396baa9a6c647b77ed69d9f52ea8a7f0554bb7a04d14b3494274a84ba61687eff4f7fa837b73e2191034db5fc85af1bfc385f45615788a1280e
-DIST Theme-Misspingus3.tar.bz2 563448 BLAKE2B 98852adac006039e7abc61a7bdac23c435b23ee2d99436ee34c9818f7f08928908b7f0dbb13315161d2d858633d984c0b62b0f3118cc96f0d1b6f941957abf71 SHA512 9f20482998e2bf903211fa3f78119d112dceec026b9a5729daa9e55dfba031f66ee84a666f402c068938374a891cfc6203d0c8f68dda32be7fa7f043c2d0f3fa
-DIST Theme-Misspingus4.tar.bz2 491484 BLAKE2B de9dc99dade197377348960bfd4e05c07315ee40fc77b91b9ae94c2c585628c71fbc1c5d2d7f30740bfdc442143a5032070ef377c2361d1c54e5d46ecd18bade SHA512 d9230980c40aeb0f43e707d1fceaa554f00e6917608cf0ac4ff6b2041605c2b8196650a1a010e5a04720cf867604729cc03974bce56cf391db403eaaeae8b8da
-DIST Theme-Momonga.tar.bz2 53372 BLAKE2B 2ceda844cf85637795beeaa79a02dd610f57a87c29903956121dea2ccbc73fff162b68912d942cdba677332a91d1405fd2b6168108b9e1d60d53c33fb56ad641 SHA512 e282f4864706ae462ccc1030d5ab8d235284c9dc770eda9ab86022d2bcd078188cab16ed8fabfbe31266bc8c16076ca08c423a7ca9d03af42fc5a83a9ede3ff9
-DIST Theme-Morphix.tar.bz2 33408 BLAKE2B abf49a03ac9533b4e34721ce9abaad6c39753ae21c9ee4724cb0536ca503b80f6e398c273d5efc1f96abf59e6f9bb9d8cc75745191389e4c35d47096864f8c85 SHA512 aed1014d20c0eeb63471f867e28d375f86a6287711d8ac125cf50c532a9760664c9d58d6c2bd6a588d67bf0256d2078b87294d48abedc3706551b7a9f4f6d2e1
-DIST Theme-MyLittleTux.tar.bz2 96060 BLAKE2B 229855aeab6ff4c67096cb6f97f0690e9e50caa5e2405e7fc0d261491cb06d6c9050f62da3f2bac11eda54b2eca10b09224b131edbd07ea9d484ecb26b5f76dc SHA512 80db2d362cefb903719b170ee11f6ad60e02d8135f28213992427ed940b58f0382048747175976a4017147de217c216f4e37dd42bace6a363043bbe20162dfc4
-DIST Theme-MythTV.tar.bz2 57144 BLAKE2B 6b2a36eca8dfba86fedfc23778036183b95c9d1408950c99a78dbc43d52ea2931e2ebe506f1d8c67bd49ed98c83c999af3508479874567a5585b69d1c544d300 SHA512 fbbe48407a8eb6cfa4bfef30bea3dbb07df85272d6257c50b7a83d59b6e549d2ccd0e8414ca9bc23fcc62f678c065f5958bffa436904daa16b9306de5651cc53
-DIST Theme-NewFreepia.tar.bz2 157060 BLAKE2B e13e2f2e5f63f0d861718b86cf6ab53d32216995c15ae092c82d5a6fa51934e2486f3d7e728b5048228d67208901b48144d60e65a9810ced6f830f67369c0373 SHA512 7b38935aef5a619f29f5af668980f913e8a788246a223ccb19fd6b0901d5e1e711e4a9b3864e9cf5d52b90a63a1656e81fe39bf1efaebcbd8c0417540cb5f45b
-DIST Theme-NewLinux-Deb.tar.bz2 236685 BLAKE2B 4f48433f7a80885fe0f0aecb2f854b943b0640f3787b1fea19e6b833b6830cd8e338484104620b5d6b6cd427b064c245060b2102c82d7651aa6c5f845f0a4739 SHA512 4a799da86fc4ae15d08b279c1833bdc469ae6bcc9f775e1734b14d606f4397fedbc4b4e3bfa1c81bd7b1bc408438f7466234c777183527283f5dbe364901a6a3
-DIST Theme-NewLinux.tar.bz2 599559 BLAKE2B 40ab0d630f661306942e93f8bc9d7c277412cc6b80d3d7d1b023d184552a0b416364af92c0bc75f288450b5af03bf93f5271df2bb9fd56bef737fde184c5a97d SHA512 8936be88a76cd7bf8322e8bb5d3ba8c707baabd5dc6ff676aec42250a63645ff3977afd5174940636180f348ccdc4890ded9ece53f56d3ae6d74b993d493b6e7
-DIST Theme-NewTux.tar.bz2 336178 BLAKE2B d9fd875252e51b0514ad7c6d11e4ead4c8caa2611c3690433a40bf24efec51948b4ec219cb9784762fa5fa8f324fd994cf82cf2fdd5a9282f30651a108b9b5d5 SHA512 c58c0c8e64aa03ff9d35774d749f9d85a98a909b8f6dac16b8707e381b56cb5c44e7dca9f24c8616c313f5a4553f997ec03611e7d43e74f0f9b3df3eadd027fd
-DIST Theme-NightWorld.tar.bz2 108979 BLAKE2B a977caf27a7ff4774f24d610146da69fede52d72746cabfa4228af7868bc91bb378ede06bad4af21cd9914c6567a8e7db901b2edb5bc992da41c76fd3d0a0da5 SHA512 342b75b2a29da7174ca5c0c8ec3d5b6c1d629a698d9f6da6e030ee4ba7b6729925814bc682a1fc4fba563b0d4e9f49e9fd943843903351f93ec0ab76cb569e5e
-DIST Theme-Notes.tar.bz2 91586 BLAKE2B fd7d66feac8fce4d2dc155abf28e80ed2c3e68ee742d000874393f4473407c2bd5775e542e3b8d3aa4d2688c598fb137a602578fc4e8eccd368a3e82ca1e244d SHA512 16a23a2c2a80002c1bfe519723dbd23034502f6aa426f53d6b8f7c79089aca2787b0c5b078bf31316d24eedc6e175b882677d32af0f792fedbfb6140471009d7
-DIST Theme-OfficeDesktop.tar.bz2 830981 BLAKE2B 2833272cb000eb51fff577a9ea4499c098d8446d81dca1ca1f51d2ea707d3c8db0bd942a248aa553862c77f1afb3e2a1b5351a867fdbe7d40f205f19f8bb05a3 SHA512 0b11350df1c3add266fe6c8e0dbab64536f35a03af307d455f75c1619e2f70416cbf3bb0f3390cfcef4f1b5b849b0496b8e0ad49af8f2a1016327ee8cc044056
-DIST Theme-Oneill.tar.bz2 175655 BLAKE2B 0a5bc51be7cd4476ea6fc222e1e50ba7cac9ad76999ae36f371649932ff1e45c0c50444cf904f9c67a01f42cf4075698d8044b621e3a05a7149fba3f20c38ea5 SHA512 94c7c78b0736446d44333b043366752ae6a4fa5d2d389f8dd0fd54f8a0b491f87f8047f3b04e95d813b4adc3122fdc12f8d7485fea669066db57a3801aff5e8a
-DIST Theme-OpenSchool.tar.bz2 62027 BLAKE2B 422debe6deda3d50eb258e5c34a62954ef6e8d1aa7e5b8e598d165e588f37bf3fb660d7f155c8513a93aa2afe55e68ad39c6c77d70c6023de5a856e85149385a SHA512 32fb3059605cb77e3cbae87fa649bf1501ce4b0932b0f6187835dd8708659d0a94359646edcd031a3aa0df34812b1707c0ed304155b95648608a9d4f302bd640
-DIST Theme-OpenXchange.tar.bz2 107996 BLAKE2B 49707edcd819c088dafe31a4b8b12df7598d6e17cb049f127d5b7d907356b101dac7591d5f509ae74da06761337720fafda0e269b5c0d136f89178cc1bc67537 SHA512 5361a3d28bb3acff2531757dccfcbfa76844defd00205632ae49d411a227db71f7aed2dee5e60ce3af742a2273ab88c121f16f40ce6d0038a62a65e138a3db42
-DIST Theme-PLF1.tar.bz2 259193 BLAKE2B 4551ee49f828792398b8a457faa2bfbd6966d42c0f70d95acfde44c0084d53655c04867ae4523166f6b595ea43984147e3f202559ad41c86b502cd4838671eda SHA512 259a629853896f207e6d820447bdad8dcaf246c7217fc04126579087d215880553b800168b6bf2a5d4f20ad84fec72f968c8acca8173c969e177f2effb7d04e4
-DIST Theme-PLF2.tar.bz2 432658 BLAKE2B 9590dcc23c9a0e45d912c4ce3273a429414a227f9715a0ff65f61a0a743ceea9d77b1118970dd97e56848277bdd7249898dcbbff6718da191ce7ae4e1980f0a5 SHA512 a838d9c196501df9a7798473c92474cbb28ee2589631b963b4c1238f40e8e2dd7ef1ab28f8911c4eb0eeaa6807c55b5267c0f1b8a764fa4c38dcb389af3753c3
-DIST Theme-PLF5.tar.bz2 417145 BLAKE2B 20e7dd957ae949b5dd02377e6851900ea02db1e37558318ecfd71a5b224de07051fa40a94c7dc4cad9062b7d220f34a9fd5214ad8ea205b65ab9b45c4ad7616c SHA512 42a81df18bd972733404141a62b7828e2f9139cd06a149a536b5ac347a98db0fa581e29288e4dbb4f27f0e593717bf5fc317567351095c2f9c5b9502d9974031
-DIST Theme-Pativo.tar.bz2 1430390 BLAKE2B 99598548fb298ea83d72227bd97305e4fa2a550b2f6d0b8efc5779bb0e5f48a53aecdee958015df2f4234cae3646a36b2ed9482fa7f8f783593d6a9c2cc6dc24 SHA512 18e8949875f8b39a3b8505e0ae12d5cac81dda91d928266994fe717ac68fe8dc3138a5832d204642108fd60960b1fd449337060668085fae2949f1131baea9ef
-DIST Theme-Pho.tar.bz2 10796 BLAKE2B 18117ca28e9db8a51a04af1700ffdf0214b236767243c76d64a204568cb3874eccd4861f5366b4956454f0801f99b69b7b0113d2a877ab4822dde6b6afcd732c SHA512 e98ee312ac605c548c2bc0f6e9553438edf58c24af45766ef12f4de03d8f8a52365459b32a774c36956d2ad363bc3b23c6b366db757450cf0d762e28e3e983af
-DIST Theme-Popcorn.tar.bz2 46985 BLAKE2B a36541316d33c58e41f0084f9c07ff9bb83856eebb873b1703a926231893e972f43c531d02cf30dee10ffe704ba756d2cc0796bedd38407db0fae088ffeefdca SHA512 fa7be43e14dfa24f60c341601cb772b150338970b6824ff1528d00845395bdffcce20d2cd59246da4ed4b7262a468e4f4e34fd6257be3af4d657e08616e68fd4
-DIST Theme-PowerBook.tar.bz2 192282 BLAKE2B 2799c11c0b6d42327b4930610b57d0155108a7976cfc64da00e0fab4001a55a0261b6ac93ee45b7ac958dad9756fdc9dec2aba0fc5f70a048ccf7b238e7d4799 SHA512 9c3299468155dadb077e85d3d3d6bd0f9a9a917204f870e63374880320b7831bfcca6c8486c531d5177f0c8e2b0ea9a2777687af4f2dbacdf670450d96e6cc43
-DIST Theme-Psychotoxic.tar.bz2 272490 BLAKE2B 4d27d1f13bce061f98e0ec790ff3a0e426e2db4c3d9d7c78bcccee69ee81129acfbf306882389bdde386565c73d900bfe84ca9fc704fe6eb3d08369676b34eb2 SHA512 44a2b0427406ac594288014fa364b08b6139a8c8f632e7827be1cf778bdaaa3a729dccde1a0bc3452381d2603b20053e278ba57acf328be00dce27e0027c1d2b
-DIST Theme-Pyro.tar.bz2 51296 BLAKE2B 508d306045135d40023d4b27058c92f4d7867cbc4025f69e74e9583751bed71a91b6b4a4acb8d62bcf8923a38ea13f09e63e4f79cc5de1cc7c79aab41b2edaae SHA512 905949d3a21b1ba51bf54742106d64e5d05605b93c5cbc7f65fca454aa3e6a4ddc5367858fe6953272b946c2a2bf04e76dd38894958d59c726583f0e5a86b2c0
-DIST Theme-QiLinux-LiveCD-1.1.tar.bz2 20779 BLAKE2B 36a42aea1e9a4292e8713cc4972ed9c8d8d3c1a3c25f285cb5c4b438fed90b6114bec1239e084b052ad482449fa8c14a8c69ebb59a7e47e842946f36026aa5d0 SHA512 1e8ef465666437f5ed3c03a2ec23e1241e21f4e8bad6d62d0133d4d0d576274ff4de74de91b0c1dd53957bfccb0a18fed9c60666877462c9e96443413526c9fa
-DIST Theme-RH9.tar.bz2 40199 BLAKE2B dce9b17c70858f5e6c9480000b10ddb8dc480d6b1a197cd73c62a7962db86c213c6b7c6ad8a2e0825cfed91cff7e6718e56f4503e7e94cd97c606184c45534f8 SHA512 8f1308a422110a7776fd1de65a49865fb219d492ebaf2a603f6a95c1a8211e30048c83c188f8e050f6fa963a5747d9f5ac387b7de51e226ece13c432e032ef2c
-DIST Theme-RadiantStar.tar.bz2 186842 BLAKE2B 96db7b4a70ec2afa0bd76684b2f07e60a84824991c1e182f7e6684a7cc6b4f0b8dbfa2fbdd4f990fd1969790a946beacf8d8d935f56d6c68e6fd4136d64c1b77 SHA512 9881b50aa7f3af000598e29c2511a890028c44e40c06774cfbca1903b4e82846a151b6c03c2c513ec4c4ba0040e75e810fde53eec4e77ac246ddd94165f41b3f
-DIST Theme-Ratatouille.tar.bz2 11722 BLAKE2B ec4f97f19d3acc20ed47bdac1bf467141f0c80fd865c4810ff83c05f4969ccc08d7986df4e3101d67e23ecafc9f51db103903c4fd8deb14a81aaf395c7e28572 SHA512 a0236b3adc8dc2aba1ddc2eb630e5ec6769b578baa8b5e2e602f4fe763416dcc9328510cdd3ed8cf63a594b260f154d36a40687613e5c0e8a384946be9c560c2
-DIST Theme-Raziel.tar.bz2 41909 BLAKE2B a1eb1698025a1e9bfdec1896bb99065d91f8fc7521f0d669face445317d966728b9a27eabdb87679ee61c016a01e8677a034504ecd14fafaeb17714019af9da7 SHA512 2bb5602a1dfc032b5a2e39157816d7fc7cb34ce8be81764fd947a766436e1778934797ded64621343dd495a6f14ce7cda97749f12c3a4cd3dce7d2e4ca554d71
-DIST Theme-Redmond.tar.bz2 58717 BLAKE2B 762123b9a2e80e0e5e31f50f25a24775b2774109291f17693932281c1cc97d1094e1ee799cef6f80bfcce9e6002a79d59be612a356fe1e545e73f36978e8e997 SHA512 7432da2e550cf514c5ec0649df58dd46c097825ef9fbe3f26e9702f42bb4e7d166b9ff7a8a995e6cb0ff5055c6a68fbd1d03b94cc2bec01ad25a39ca353bee7b
-DIST Theme-Rojo.tar.bz2 144647 BLAKE2B 93eec3a0fdcde35b1635186bd3858e80964785e6b4b385b3ed82bbe58521298bd3770433308d9b6946ea978906e29c98f069e148ce6344514004a34a75ff2cb9 SHA512 7672775d6d9a29ac434e0e84b53aedd8c63d1a239d95384e45750616540020cd854ab1c206d575365acf57098947a56afc12ea29ddb67954838364f0e037c06a
-DIST Theme-Rollmops.tar.bz2 12993 BLAKE2B 9c7dc4cf86d106d2d5fada5671036f2afec8e4f79b01399b696398b1463968fe9c08180acac26cac3b90eca851ba5673b44c0b32aa607ec67ccb244058daefb7 SHA512 bc8e7d184ca558da5c739d8a106dc2db7350b6f9df51d97145d874b490825ba5062a05284b848e32e8043bc5a93f344a2b43a38506082966c2f93e8e558e1f07
-DIST Theme-Rustenguin.tar.bz2 38710 BLAKE2B 9161b23fbb9ee8f7c9780c55716b9e307a0c419e881888ce2ed53dc1e1a99949ac4e7b64df095111921a2a639a31535434817361f782145298681c1446fc6b0f SHA512 c45fada0fc7e103263c634b7059166bc16faee3e283c8528f37fd2e0c73adc83d0dc6c8a3b871100eb7e387973118cf5d10f92c95f2c5596170b093d4e8d905b
-DIST Theme-SMGL.tar.bz2 183775 BLAKE2B f715abd0b1b0760cf723cc5a61033830277b4ffeba93610b6f1ecaae8f55e069bd021f3dea31eebe99c031e67ea008694f13ebec3c511286013d87eb5849b241 SHA512 8b50b6aaf97bc02cd3da8a1ba8fc1b8bcb52c7dbc2c329a1e31a6d4578c66ac2080dface602f371572bdd064d44ba85676f9f0427e5c0c53ac4fd95fca24366c
-DIST Theme-Shodan.tar.bz2 1106979 BLAKE2B 422f8d77304f9742450cede4ec628543c30f16c800adc03916d834eeeaa5191eb9a7f5c015456335e428a34cd3fc3e489865c10a6ee624dc5b753f80cb66bbbb SHA512 58450265c8066278182b6a938fa8857c1e86feb6924a3bb0e527dc6aaa24fe268c07fbe6c5851fc1517e7d8aaa2ee5f6c93ad5db95d3c9e93caf6ab876b29496
-DIST Theme-Slack-3D.tar.bz2 100704 BLAKE2B 6bfbf83aff58fa2c2025776f5f46d9d3d58e3573d95977064fe10b25ef1ec893c99cbb34532a57ed0988fdae0c47a52426f4c384aa25d734468697f146ea5536 SHA512 11a55bed21bd8cd49201e583d0e370267944304de73716e96cda0f80e706d79c95e4f5b16eb67fce832bc57851d0c5c404e43769ab0452d867a1b92dbf40c4e2
-DIST Theme-Slack-Black-Tux.tar.bz2 52893 BLAKE2B 9e603d58604154db0b408ceb073ecb052151a79343bf92483c2fe7290f8dde00e1bfd01787277948e4a13e0b7d9a6fc832234a367316a8d4290b36d8443f41ed SHA512 e95b9dcabba9835ee42524f746e69beb8883cc756bcca5399b8e4a9f79aa40ef0e13e5c59556b0d07eb2e004032e1804b19baa800a9268a6e7cff5696de5705c
-DIST Theme-Slack-Blue.tar.bz2 51832 BLAKE2B 80fff0ce99f5bb76297bcd03adef61c4257519ed3506351b5972bb4444d505aec9843f8115c3004c3c61f88a8c8bcdb45c824e95741d74e44e64198b613db9d6 SHA512 404fc00e8d3da8cc98f364a104a56c7dfc86a8c5a3fa894e601744d4e1ff4a26a4ebcfed840de015b1795d458036624558fa5d2543fe8fb0f50af1aac2514373
-DIST Theme-Slack-Glass.tar.bz2 66775 BLAKE2B ff42731e6ee99d96f150f587b30c44cfd3458406bfbea4634dd1158ec9c4295578ff070e2044b8856cecdee9faf049084f608011f9ac49070148155455deccbc SHA512 54e46ad588a260a98c9152754e10a97528f0ef548b4a5b5d3fc19bcd238747058ed2db605797c04251a1daaf16a2d2cb5a88375a6809334fa3370ceac4cd5493
-DIST Theme-Slack-Gray-B.tar.bz2 74571 BLAKE2B 79d1f52533fb3d31064c752972df71181539333710f25f50ede8221c3edd9a6e96359f541553677644cb5f4f65d3aeb594d5ec36e67bda22c9214ab771d59280 SHA512 574e2c2dffd15d56a33d1ee6093c6c9e020645ebd3ae56d745ffa253bb2c9053e686cc1b728d4a04a0a99f937d5263ef46f64356bbd87bc62704beb719313360
-DIST Theme-Slack-Gray.tar.bz2 228060 BLAKE2B fb5f3fd6003b55323cf2f298a439c4bc6cc80b08207cb3ae5f224f73bb72934bb2afda57f9ae3a4d5493ee880dbe81592c5c8aa7a5e959451f1bcf681d240f75 SHA512 156394efe41f1e3332c54ec1737317b2e0122a2b4cdbb47890ab6fb318ba12e1268e82dc12167efbc5ba3b9678d0c589378598f4d337332fa146495dad01f069
-DIST Theme-Slack.tar.bz2 51752 BLAKE2B 945efb6d67b9170024d9abadfe55a1a756b9acf1b3ee1c810c7b752eb27421db0aa31f2fb43057d8fef5ce4568460ea05aa08cacb360171fcd4b061fc1e54632 SHA512 5e736f3559f095437a72e2bbe6a04b66387160de58fca08281ced1fa16b206d4fa9db3606b1ca09ce2dd0653a509f29d9eb96e3d823749740b0755d783f9f5f7
-DIST Theme-Slackware.tar.bz2 15541 BLAKE2B ac5e1bf3c2c1abf21faa0db38dcc5d87ebb50150d0e61636318318dc13119bc83b8ba6d98e2a9220862162e5658f932111db1a33d88de89fe54a719b88cf8e15 SHA512 2e9608311c2648f9d555da2078a2c56b942242e6b46d6c4e5aa2dc6b2cbc19846558788ca39361391f0ca20e4cf8da1f40dfbfd0da7fb6bcb8c1c306af5d83fa
-DIST Theme-Slackware2.tar.bz2 21591 BLAKE2B cc9658b69123be2d4e3cee89f19fee88d7306013746ddc807c1ca4a16cfb345f5419944b0487f86b6160a4dfb56a9c81b7cdfafdd18efe87a00bd9c8e8728c7f SHA512 a40da50f5beff72fe079ab9bf170202ca5aa2016940421b36bdf5ef5ea352b1393f4a96fbee6a1f1de8212be568982881b1d96f3b33bd09fd3a79af73659df52
-DIST Theme-SlackwareLinux.tar.bz2 60328 BLAKE2B f8904c82e0dd5a945fd150933ad2e5ce6f47cb5d1d963ab1051016ef67a86d4119f0c49824533be28146245105f23321b096d12a11b45c3845e65134f378d368 SHA512 a1249cb53b9b8ad0e7b7dffc11ef4c459d4b37a0e0b6e1549530446df4378abe853f84b06d2392b208ace5ef1d408d44f58a7be1a2483f396135d3efb10e3133
-DIST Theme-Slide.tar.bz2 316951 BLAKE2B cc30e28ec950e209c43952d24c201c2211d296918a7f539de2c5a4bccd883501ea2600479e899f26b64ede9e288cb80489bc01bd410c8bdc64ab0cc2c0662e3c SHA512 3cd480e811c0d35bdd1ac625d2824b51e3fcd70de13b3663ccca0797a0f66207ebd4c8f5f00d856301001d4144e6795c0e46c6b63213079bbc3ade3d1cabf071
-DIST Theme-Spinner.tar.bz2 482881 BLAKE2B 440f2f11450a6adcf31ce50c51552e8a4b9b2808d34376ffd670461583faa39299eb6210706cce346dee39968eb6a21cf56ea750ff5e2f3978aae974991dd3e1 SHA512 9e76d57adc1c6c1b3b6051fc500c2afb5f1169ddfc6f33ed07204419b8b6ff7e71e60d8b2d1a164508327f786074d2c600e0dd365379461d0765d12569ee6401
-DIST Theme-Stargate-Tux.tar.bz2 185069 BLAKE2B 507b4113cecd991b173267890a5cfecd70fea4bd17926b266eedd38571ea2b0c2f4baf6e7c01749d44d144e63b147c1cc96efeb6b0974ba15a5a71e620d0b022 SHA512 28c61d76d6159039c9ead13c325ccc0ed2c7a74786812105a60c9ee845bd06052607e2140c4af5cd106609e1f73a942fbc489795419370c749623530ce7941bd
-DIST Theme-SuSE-7.2.tar.bz2 59857 BLAKE2B 1264232dbabe0038b2ee1f7bf5b81c4ad654198bc1b725dee8c1b992bb3b33bf5c725ef0f33f73ce7054ac35d746df23dada3ac281deac6dfe035e148aec649b SHA512 3797135e0b12d5e6590a7c1111b35ae237d00304db43bedb43d8a9740327024e434d6b03943bbd8becfa04aa8ca313cd4b79d733901324e7b640dd363b55f3aa
-DIST Theme-SuSE-7.3.tar.bz2 4700377 BLAKE2B faf59a2fa8419944ece214fed7c08b4f61aa985b537313630fbeafa806cf74e2500b919dfc4792cd2ea1e7cdf42271a3a5380e69144c1c236db17b79697796e8 SHA512 3c6a1029df1b611f86f49e8ab5ac83de66142a6bfb1c6b7a6eb7a213649930686ff0903b87de5b3e10e771ba2e527b27eb4ec1bf16c2a72f5d5434a56f1cb8ea
-DIST Theme-SuSE-8.0.tar.bz2 175360 BLAKE2B 9c9fa0a694fccf3b316a89ce53dd3357213f3091a5fe1ccb416a441e2aed35c307e3fad9b5f30077c9c0716f0d7ba356f421ebf14ea60e08007b9995b376e432 SHA512 1ed7e1fd841754fbe38c4d115ece94086e918f73ec0c92c1b129e1de3d038620236286c358b02aa1e44c06bfc91ff576a97695d879b2be55216813ffd4844e92
-DIST Theme-SuSE-8.1.tar.bz2 782751 BLAKE2B 29f2daa313861596f70eac2b9c3688cf4f021b6ff965229c1c4e30a7081466a74446a1519c2b6d2300328c115391da83ec9b8a3498b02c263230d5aeef91fafe SHA512 1303bbf6911f41ebe2853bf9ef426f738ad0d1234ec58d18413173a27c0e5847414ddbb62e60c9d86ae02dafeb0cb0236b29d592144827b3b974e4f69285c7ce
-DIST Theme-SuSE-8.2.tar.bz2 431613 BLAKE2B ea686c88af3120272b7e4e3816e1070ce81ab22b8a6168ad0898a11e6912ae432a8e7c9cb346680a1942476954150ef47d9f6d8ce54758c2456db760c3a408c7 SHA512 8e57fbf6be93cd546e277039b506164053af7429fa718959870d059cb6ba4ea5664e2b263c187b2735e689aa18e7ec21e2bdb0e30a3c37a46ddb8f42af5ede54
-DIST Theme-SuSE-Home.tar.bz2 246575 BLAKE2B 92219e23342c002b059b4c1d9f8e762ed76bd14d77540c170cbea7a7e15e006ba7bef2bd4144b152545be90b2e4b8682ede4389012f0f0cc3285d260f577c72b SHA512 ba4d5c336cd10ce00fe0d819490327b15772a81be6f2971a03da5db2bc8e2a6e4347030e31bdc6dc77566f990e259debc671daa167f7fc0256418ac801e999d5
-DIST Theme-SuSE-SLES.tar.bz2 60132 BLAKE2B 9be46f62423692eac840b20fa016050f8138a23cc7da8032e708700f7b57033685bde1fa2fadfd3d88e24de2409b0e9dfde299927b7da5fd1b6d369907113f38 SHA512 8fc08307bd34def960d8731d5d9a9091ff95aa7ce7b93936ad844a7c58df6a1cbf372a9997e951e6d53b686fd16e6dbbd8dff92d66e7af05ff87229774ca6daf
-DIST Theme-SuSE.tar.bz2 160567 BLAKE2B 1085c3ccb83f8b751a802284a75f3179d8c7a7c683efc7cd9468c167cb3bf89523707916feded4602da056bd8dbc926d0a6a885df9f9599106f4ea084e78abfd SHA512 c32f6fb9de424f3580b3f197343ab7b09c1c76871c2aa65cc9e43eaabab6ece267cf73fc63d48b8412f06fe15d26a9a1e2c66db3dce41c95cb4351f446c0513b
-DIST Theme-SwirlPool.tar.bz2 336125 BLAKE2B c64b5f96e05da8f1b8c752ec8a446f5e0a161188160c533ac314c636522d58629b8521e6a9cc79b1c7fc0b258f242e799111679f6a643a399a26a9f89663ccb4 SHA512 3927500775cc75b3de50d0230844567db0bf6b89cee9b56d268637bfbeb8c93a76e2cd644650553657ae63d4bf2e5cf59c0de19aff447aeae473a829b621c1af
-DIST Theme-ThinkLinux.tar.bz2 254188 BLAKE2B acb6444e2cdeb2f1e10904d5c63a1bd2cfef79325939b6d6e9b17b29bced0261740bc7616a89739ee4faf59fa352fead85c219174145b3c0deb24a7ef5d1d17a SHA512 8d73137a3b51b95e280723b0bc41b3764c4531800d0e810d3d29d3df455dc92b84b8d6fc5de59208196d72e79ff987e0dd7f5715d12f9e7ccdd36e5f17095075
-DIST Theme-TuxInfo-Conectiva.tar.bz2 789900 BLAKE2B 5f64df71998867dcdbc127607c76b6440f1201285ffa0f8c30e6d388eed5f027c90d9848d243134ab717bcb51619c14f6c79e2b2ea9489a6d5a221c0d5cf91a4 SHA512 0aa375521d21c96e6b55f66d38218d85498085358fab047e8413efbc0f1c49a28e4383b8c28945a550d1c1c527c7039ba4e87941815ae7a401a2dd0512add580
-DIST Theme-TuxInfo-Debian.tar.bz2 793535 BLAKE2B be5e12428bc06c86abc169d4216a723a9e67162d4bc1b0b081fc27408fdb96e8bd8e6eeb8b1351298cba07ab70d8321d350cb83af00b443d680adcc6791c6ccb SHA512 9125391c1730e7ff5227809a2db3cd037f1b10be7da03a3dfa5e3b14022edc2c2a38361ba4f6c5df70245ef9f8d42c1122177a8b6d10217db20dd9796f8ccaff
-DIST Theme-TuxInfo-Mandrake.tar.bz2 793386 BLAKE2B 771b161d8fae3507138adbe570213cd6fd1ab586fc1ab6cd222150b8871733448b20423d586fab7a1c96bded3e27ae9b033d607ece8f764f5e777c5b61401230 SHA512 9ab26b9f747041800a8678ceac04a54212dcac723ff73a5d3a23805341dc6d21aa5e3f6ea5c6eb401292726adf7f52e98a3afb45bb17ca1fbe6b661751087d41
-DIST Theme-TuxInfo-RedHat.tar.bz2 791445 BLAKE2B 385cf878b4a38fc86e5e4efaea3c65659ddd2b074f6c49e69cbb5c865af981b16f07f431d884baee0b749e0bce67e4ebd92d0c8f51fae97cb78bfe1d8873a695 SHA512 4a49426bb45839b6bad6773b07a2a1afc1c96a18cc982e3f6e0b7810cfd2bdbb766b9a58582705f8dd521c7a4384280b4dfb4e0c8a2e9b50ea801d38fd275c65
-DIST Theme-TuxInfo-Slackware.tar.bz2 790916 BLAKE2B 432ccd114fa167a8e6dc354fcb400f4c38c9a54d80b7c4db0e37668b4c2e99dd527b6c28183500870aa38cb1c5a4ce91577febab2c69e0c64500a1b0114639e4 SHA512 72dbe60c6fa1ecce4176d57c533770dda8642f7e383379fa87f95939d140371a1866a293ebc5ba61e23f85dff07ec2b9856a7251ec67850c91c735db625c671a
-DIST Theme-TuxInfo-SuSE.tar.bz2 791698 BLAKE2B 3af7999b41ac2d592a917d6aad268399430bd70809b4188105ef62c73f78d27bd90387ea43847dd5c84548a9de5dc628fb28ec1204f0b6356e9ea52f0a60cdd3 SHA512 e5efc901b67ab60bef4802bfbbe09be861245bf3f49223e17d07eb03c055359e669742333ef15a2109563b22367e786862bdeacc9420ca0b06bf140890fc2da3
-DIST Theme-TuxInfo.tar.bz2 432888 BLAKE2B 907801d081c9ef46cac36afff31324587975de9f543c40893a9b101c80d143ad10675e97684f2eef58a6edb761397be7b3e4a9ab2ec6c19d97090ea15615715a SHA512 0e1c2bad1b4744f3cd6bb11d1d31d5588e18c2636907daf5cfde83f6b38ca9d96e5cc05b0c1661ae4ff568144783cc289b517a98c7bffe05cd27c79dc45c725b
-DIST Theme-TuxNTosh.tar.bz2 364177 BLAKE2B 91b7af50d62027f8abd5dc44b9a7842dc07613c65d7ba9582a5160cc04767e2ae4abc588a1bdd194c9e17d47f3813b824de3f08ade1267c9c9b28d2c95b937fd SHA512 b450820d81e062783af0eb6d7c0119b8dc8000c650dc8c5fc07ce337d622b5ee7911f97c86f74f438cee94c039ecdd471be442bc6b7bebe10c1cca92c5c41f91
-DIST Theme-TuxSplash.tar.bz2 189723 BLAKE2B 1d21c138f8b92efed068b2c4605867b9d234514cb8367e620e47ded8b787dbbabda5f7367605f4289f4b740cf2ed607ca2df66cda782bec127e8c9bb24c31edc SHA512 52b10b302d76c2c281a270b6caa87bbbe4b7ac44eeac661a310ebf26e9a2c89a3cf0fb7fe1fcc9fe8abc35e5cde388eab87918c66e7a4cfd49013cf8ff8df37e
-DIST Theme-Ubuntu.tar.bz2 130920 BLAKE2B da02ccf61bd1c17d76c16edb736d7dcfcb431ae3f3e07b0aa1ac4f91a78ebe5a8cacca8b449ddeaf8cde9c09edaa2f2c14bcf53682e48bb7f6ce475afbb2dd47 SHA512 b0a29d5961ad2563ce3016297a1c05dca29d0346d37c272b5f45689f16bc5fd8cc4fc2d7d149218c7c1fc9a0e6d67998638941c6f25215b62fb34d39621bfaae
-DIST Theme-UnitedLinux.tar.bz2 46702 BLAKE2B c21bcdd81124ebccc96268fd6801aaf684ab0ad67dcb5862e742638d3368a2e3c8e9b2bc74ebc173cee461d10d220ed675f9620749ad3ac3c90f583370ada93c SHA512 aae375b4683868dcbcc7ed9427b4992f8e4b4897527f60f2a12955ccd3fa897891ad00c44ac2af7d0d5cefbbd4c03bc8a25a0b16d08a80bdb2e51852f7235875
-DIST Theme-UrbanVisions-Debian.tar.bz2 300355 BLAKE2B 463d1fe2a1858a4f160da74fd08bb6c006061ab0d7f05cc5efc23ea07aec7d8ecbb749e601ed0842222eb6e24081103eb14a088d278f333634e93c60565165aa SHA512 ff429a4f3caf2e247ec312e87bfe680a4ad7b7a5ba35bece9904a7fef9cf7478daa3696b23b78c1f1855b90591cd33df7ad645bf94d9a08ed362d570e77cbe9c
-DIST Theme-UrbanVisions-Mandrake.tar.bz2 300935 BLAKE2B 80ede0c4818cb010697d03c3c1627ef05ed643cf754afdf3017acaad206f0bb6e42161b58ba34c6ca9f57767485d586cfbbb34fb3073233483373608da9768c0 SHA512 abd29686ca19fc3af192af7609aa2ab914cd7f2bb9323e56c3026db1ae498bb5d21163abfac2e1967a20bdcebb3af450bba06d4ed9848fd06a8ff87ac591f905
-DIST Theme-UrbanVisions-SuSE.tar.bz2 230867 BLAKE2B 768864a010f4ca0888fdb875ab76d036c8958fd8ea44f4c27ad0b4a5f66535b1e9a87df1a87509910503d678816973d203d943eba7515db3198c2f0e8f979f14 SHA512 cb616910ba799dc73bc594ff18030efc3a25b946e3cd24529c0f2ffc80f9a2666b3ac9619185f6858b18a790e8fe55e0eaf7f255890af66e6b9b3e3d886353c3
-DIST Theme-VDR.tar.bz2 45897 BLAKE2B 571b1d4b6b6b1608a4bc9bbe843a7aefea7fc69142c19a26847e24dad3b3be9ac06d4003974e12def5f82076809043598f308b3293ad26aaefe8147f4805ba08 SHA512 9d4bbae178606de9368bd490365ed950668ffe42b29f64df2c8bea53510fe8494f424c263ea571c8541a2292a4bbac2f6a9f490d0366535b0b6183840dbd6d02
-DIST Theme-Vortex.tar.bz2 82197 BLAKE2B 40ba372eb981a9fd5ea7bca034d95f44067b42429dd153f47da849b82a2fca1e9396a70f9730ba6edc4742cd31cb00bab5024a372b950f207d4b22506b797b7f SHA512 6898f193a4fdc681464459b17c66df5d915f03ecf4290b795563e0a20522aa4fac3951f570db8720d324dd9fdfb6d4285f9097e5973c6a4659c0563476329ca1
-DIST Theme-WarmAqua.tar.bz2 463243 BLAKE2B fd93330faf2cae36fb514c6de8127ccef25e75cb35112a7c2fc0661bf027c67b13d28b25e8abc742e88007b4889aa6f2a6073c364d8ce33b9bd6142934f93d8d SHA512 9a369fd9fc389bc8c18cc095a1dafe487042999e62d539375691d4f20423bd18fe19226df3c6adb26f900d88b516c8f5a0f23b8075a46d4e52ade3fcf0cd8913
-DIST Theme-Warty.tar.bz2 63131 BLAKE2B 4d7014158ad113c7dc2f66b5d710dfe802345a642138f8dfcd0675cc146e0124a9f6b25b4a8910135b280d870a8c84f93182c8b56200eef35a4ba56b538dc990 SHA512 15ba9c7995d5b660e65c943fb1cc0f7976fcc5e64b1520d696f13117699c65efb3e69e747a0cb5c8f89dbd662336a5cd35a6593f070d36abf8a7f2e0c07df5b0
-DIST Theme-acKme.tar.bz2 233757 BLAKE2B 0a47168ca64827b2c359341e13d1cb7cc979bf0c1830608f9874c47f7e9a16019e231f1d652621f501238dae90ccd3fdf489d2ab6877a9b38532d45d53244a05 SHA512 24f3705bfce94eece839703be913de1c02a2bfb1af9ae17b6329ee2d161a2b88a47a3154a14b6c2e586e2bd59c97fe708aa585588b276ea1da977a1d172c4ea9
-DIST Theme-dotf.tar.bz2 393510 BLAKE2B fb79d3512648aae781da799b15ae6b7cd5db1f29ccfd7562ec1f285ac7af8ab2d5cddd6f9566c846f4a46d1df16fb88639d45d19aecc9fd993121ccb59422d06 SHA512 da80d95dc157212bd8e0f1083afd6e3c82f77922105a0fae0ec94876ad23117f8ab9898dab47b76e8129a1c3fb30db6132e1fb13b77f45de6b46db569d250310
-DIST Theme-iRu.tar.bz2 81672 BLAKE2B 9632c0479e41dccd2eec1fba873c94e253111c325a07ed07fae19df0f503631b1c1103d37b7e3dd9d430d4414ccfc32dd5097851e2c5f40456813d71c4a89e44 SHA512 d496a68631cd3d4dc859289c177e2f572226f6e87d949ce8556895ddc29b9fbcbc21e8e49385f58022c7f08117da94a84c37ec60e95145611a1b1a3f5cd840d3
-DIST Theme-libertnl.tar.bz2 90035 BLAKE2B 939a8e9166e954dad1d917df4546ed4d939532b05b8ff7333389634841f447d413a883f020df15071761ab224f356dd6293b647789aa9459cbd2f563f70dae22 SHA512 4d01967e3713adb2ecbb9534b42f261bbae1a381185bc3838d642e6af28dcb0c254f2b713d52e3e757489006ee25658213375b7f8e08f6fc681bad52bab427b9
-EBUILD bootsplash-themes-20060913.ebuild 11221 BLAKE2B d25bfd2340d117503cfd5ce488cd062dbcb9df71f0507786562858c48828b5b611bae1f63fee60faa62bc2710dfeef5dc8e67d27695716ed5fe14ea47a77a164 SHA512 815819b32bbae6c9b7bc11c8d0fb338aa13d28a1f19c99725c9caeebca6271c93ea6a4a9256923aaaece6f250e35011a1c4b502492956bd23f58d721d1dda564
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/bootsplash-themes/bootsplash-themes-20060913.ebuild b/media-gfx/bootsplash-themes/bootsplash-themes-20060913.ebuild
deleted file mode 100644
index 80c9085d64ec..000000000000
--- a/media-gfx/bootsplash-themes/bootsplash-themes-20060913.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A collection of Bootsplash themes"
-HOMEPAGE="https://dev.gentoo.org/~spock/repos/bootsplash/"
-THEME_URI="mirror://gentoo"
-
-SRC_URI="${THEME_URI}/Theme-73labAllstar.tar.bz2
-	${THEME_URI}/Theme-acKme.tar.bz2
-	${THEME_URI}/Theme-AquaMatrix.tar.bz2
-	${THEME_URI}/Theme-ArchLinux.tar.bz2
-	${THEME_URI}/Theme-ArchPool.tar.bz2
-	${THEME_URI}/Theme-ArchRelief.tar.bz2
-	${THEME_URI}/Theme-Arch.tar.bz2
-	${THEME_URI}/Theme-ASPLinux.tar.bz2
-	${THEME_URI}/Theme-ASP.tar.bz2
-	${THEME_URI}/Theme-AthlonXP.tar.bz2
-	${THEME_URI}/Theme-Ayo.tar.bz2
-	${THEME_URI}/Theme-BabyTux.tar.bz2
-	${THEME_URI}/Theme-Berry.tar.bz2
-	${THEME_URI}/Theme-Black.tar.bz2
-	${THEME_URI}/Theme-Burek.tar.bz2
-	${THEME_URI}/Theme-CaixaMagica.tar.bz2
-	${THEME_URI}/Theme-Cargal.tar.bz2
-	${THEME_URI}/Theme-CCux.tar.bz2
-	${THEME_URI}/Theme-CLEE.tar.bz2
-	${THEME_URI}/Theme-CM.tar.bz2
-	${THEME_URI}/Theme-Compact.tar.bz2
-	${THEME_URI}/Theme-CRUX.tar.bz2
-	${THEME_URI}/Theme-Cybercity.tar.bz2
-	${THEME_URI}/Theme-Cynapses.tar.bz2
-	${THEME_URI}/Theme-DangerGirl.tar.bz2
-	${THEME_URI}/Theme-Dark-0.1.tar.bz2
-	${THEME_URI}/Theme-Dark-2-0.2.tar.bz2
-	${THEME_URI}/Theme-DarkBlue.tar.bz2
-	${THEME_URI}/Theme-DebBlue-Gnome.tar.bz2
-	${THEME_URI}/Theme-DebBlue-Gnoppix.tar.bz2
-	${THEME_URI}/Theme-DebBlue.tar.bz2
-	${THEME_URI}/Theme-Debian2.tar.bz2
-	${THEME_URI}/Theme-Debian3.tar.bz2
-	${THEME_URI}/Theme-Debian-Mist.tar.bz2
-	${THEME_URI}/Theme-Debian-Sarge.tar.bz2
-	${THEME_URI}/Theme-Debian.tar.bz2
-	${THEME_URI}/Theme-Debian-Tux-Gnulinex.tar.bz2
-	${THEME_URI}/Theme-Debian-Tux.tar.bz2
-	${THEME_URI}/Theme-Debian-Wave.tar.bz2
-	${THEME_URI}/Theme-Deflorist.tar.bz2
-	${THEME_URI}/Theme-DimmuBorgir.tar.bz2
-	${THEME_URI}/Theme-Dolphin.tar.bz2
-	${THEME_URI}/Theme-dotf.tar.bz2
-	${THEME_URI}/Theme-Dragon.tar.bz2
-	${THEME_URI}/Theme-ElvinTooka.tar.bz2
-	${THEME_URI}/Theme-Emergance.tar.bz2
-	${THEME_URI}/Theme-Enterprise-spot.tar.bz2
-	${THEME_URI}/Theme-Enterprise.tar.bz2
-	${THEME_URI}/Theme-ERPOSS3.tar.bz2
-	${THEME_URI}/Theme-EvenNewerTux.tar.bz2
-	${THEME_URI}/Theme-FarCry.tar.bz2
-	${THEME_URI}/Theme-FedoraCore2.tar.bz2
-	${THEME_URI}/Theme-Fedora.tar.bz2
-	${THEME_URI}/Theme-Flower.tar.bz2
-	${THEME_URI}/Theme-Freepia.tar.bz2
-	${THEME_URI}/Theme-FrozenBubble.tar.bz2
-	${THEME_URI}/Theme-Frugalware.tar.bz2
-	${THEME_URI}/Theme-Galantine.tar.bz2
-	${THEME_URI}/Theme-GalaxySlack2.tar.bz2
-	${THEME_URI}/Theme-GANT.tar.bz2
-	${THEME_URI}/Theme-GeeXboX-Halloween.tar.bz2
-	${THEME_URI}/Theme-GeeXboX-OMC.tar.bz2
-	${THEME_URI}/Theme-GeeXboX.tar.bz2
-	${THEME_URI}/Theme-GeeXboX-Xmas.tar.bz2
-	${THEME_URI}/Theme-Gentoo-Hornet.tar.bz2
-	${THEME_URI}/Theme-Gentoo-LiveCD-2004.0.tar.bz2
-	${THEME_URI}/Theme-Gentoo-LiveCD-2004.1.tar.bz2
-	${THEME_URI}/Theme-Gentoo-LiveCD-2004.2.tar.bz2
-	${THEME_URI}/Theme-Gentoo-LiveCD-2004.3.tar.bz2
-	${THEME_URI}/Theme-Gentool.tar.bz2
-	${THEME_URI}/Theme-Gentoo.tar.bz2
-	${THEME_URI}/Theme-GNU.tar.bz2
-	${THEME_URI}/Theme-GoGentooGo.tar.bz2
-	${THEME_URI}/Theme-Ignite.tar.bz2
-	${THEME_URI}/Theme-iRu.tar.bz2
-	${THEME_URI}/Theme-Jollix.tar.bz2
-	${THEME_URI}/Theme-Juicy.tar.bz2
-	${THEME_URI}/Theme-Junior.tar.bz2
-	${THEME_URI}/Theme-Kanotix.tar.bz2
-	${THEME_URI}/Theme-Keramik.tar.bz2
-	${THEME_URI}/Theme-KillBillTux-Grey.tar.bz2
-	${THEME_URI}/Theme-KillBillTux-Yellow.tar.bz2
-	${THEME_URI}/Theme-KnoppixKDE.tar.bz2
-	${THEME_URI}/Theme-KnoppixLT.tar.bz2
-	${THEME_URI}/Theme-KnoppMyth.tar.bz2
-	${THEME_URI}/Theme-Konsole.tar.bz2
-	${THEME_URI}/Theme-KuruminOrgBR.tar.bz2
-	${THEME_URI}/Theme-Leopard.tar.bz2
-	${THEME_URI}/Theme-libertnl.tar.bz2
-	${THEME_URI}/Theme-Lila.tar.bz2
-	${THEME_URI}/Theme-Linux.tar.bz2
-	${THEME_URI}/Theme-Lunar.tar.bz2
-	${THEME_URI}/Theme-MaiHoshino.tar.bz2
-	${THEME_URI}/Theme-Mandrake-10.0.tar.bz2
-	${THEME_URI}/Theme-Mandrake-9.2.tar.bz2
-	${THEME_URI}/Theme-Master.tar.bz2
-	${THEME_URI}/Theme-Matrix.tar.bz2
-	${THEME_URI}/Theme-MetallTux.tar.bz2
-	${THEME_URI}/Theme-Metal-Tosh.tar.bz2
-	${THEME_URI}/Theme-Misspingus3.tar.bz2
-	${THEME_URI}/Theme-Misspingus4.tar.bz2
-	${THEME_URI}/Theme-Momonga.tar.bz2
-	${THEME_URI}/Theme-Morphix.tar.bz2
-	${THEME_URI}/Theme-MyLittleTux.tar.bz2
-	${THEME_URI}/Theme-MythTV.tar.bz2
-	${THEME_URI}/Theme-NewFreepia.tar.bz2
-	${THEME_URI}/Theme-NewLinux-Deb.tar.bz2
-	${THEME_URI}/Theme-NewLinux.tar.bz2
-	${THEME_URI}/Theme-NewTux.tar.bz2
-	${THEME_URI}/Theme-NightWorld.tar.bz2
-	${THEME_URI}/Theme-Notes.tar.bz2
-	${THEME_URI}/Theme-OfficeDesktop.tar.bz2
-	${THEME_URI}/Theme-Oneill.tar.bz2
-	${THEME_URI}/Theme-OpenSchool.tar.bz2
-	${THEME_URI}/Theme-OpenXchange.tar.bz2
-	${THEME_URI}/Theme-Pativo.tar.bz2
-	${THEME_URI}/Theme-Pho.tar.bz2
-	${THEME_URI}/Theme-PLF1.tar.bz2
-	${THEME_URI}/Theme-PLF2.tar.bz2
-	${THEME_URI}/Theme-PLF5.tar.bz2
-	${THEME_URI}/Theme-Popcorn.tar.bz2
-	${THEME_URI}/Theme-PowerBook.tar.bz2
-	${THEME_URI}/Theme-Psychotoxic.tar.bz2
-	${THEME_URI}/Theme-Pyro.tar.bz2
-	${THEME_URI}/Theme-QiLinux-LiveCD-1.1.tar.bz2
-	${THEME_URI}/Theme-RadiantStar.tar.bz2
-	${THEME_URI}/Theme-Ratatouille.tar.bz2
-	${THEME_URI}/Theme-Raziel.tar.bz2
-	${THEME_URI}/Theme-Redmond.tar.bz2
-	${THEME_URI}/Theme-RH9.tar.bz2
-	${THEME_URI}/Theme-Rojo.tar.bz2
-	${THEME_URI}/Theme-Rollmops.tar.bz2
-	${THEME_URI}/Theme-Rustenguin.tar.bz2
-	${THEME_URI}/Theme-Shodan.tar.bz2
-	${THEME_URI}/Theme-Slack-3D.tar.bz2
-	${THEME_URI}/Theme-Slack-Black-Tux.tar.bz2
-	${THEME_URI}/Theme-Slack-Blue.tar.bz2
-	${THEME_URI}/Theme-Slack-Glass.tar.bz2
-	${THEME_URI}/Theme-Slack-Gray-B.tar.bz2
-	${THEME_URI}/Theme-Slack-Gray.tar.bz2
-	${THEME_URI}/Theme-Slack.tar.bz2
-	${THEME_URI}/Theme-Slackware2.tar.bz2
-	${THEME_URI}/Theme-SlackwareLinux.tar.bz2
-	${THEME_URI}/Theme-Slackware.tar.bz2
-	${THEME_URI}/Theme-Slide.tar.bz2
-	${THEME_URI}/Theme-SMGL.tar.bz2
-	${THEME_URI}/Theme-Spinner.tar.bz2
-	${THEME_URI}/Theme-Stargate-Tux.tar.bz2
-	${THEME_URI}/Theme-SuSE-7.2.tar.bz2
-	${THEME_URI}/Theme-SuSE-7.3.tar.bz2
-	${THEME_URI}/Theme-SuSE-8.0.tar.bz2
-	${THEME_URI}/Theme-SuSE-8.1.tar.bz2
-	${THEME_URI}/Theme-SuSE-8.2.tar.bz2
-	${THEME_URI}/Theme-SuSE-Home.tar.bz2
-	${THEME_URI}/Theme-SuSE-SLES.tar.bz2
-	${THEME_URI}/Theme-SuSE.tar.bz2
-	${THEME_URI}/Theme-SwirlPool.tar.bz2
-	${THEME_URI}/Theme-ThinkLinux.tar.bz2
-	${THEME_URI}/Theme-TuxInfo-Conectiva.tar.bz2
-	${THEME_URI}/Theme-TuxInfo-Debian.tar.bz2
-	${THEME_URI}/Theme-TuxInfo-Mandrake.tar.bz2
-	${THEME_URI}/Theme-TuxInfo-RedHat.tar.bz2
-	${THEME_URI}/Theme-TuxInfo-Slackware.tar.bz2
-	${THEME_URI}/Theme-TuxInfo-SuSE.tar.bz2
-	${THEME_URI}/Theme-TuxInfo.tar.bz2
-	${THEME_URI}/Theme-TuxNTosh.tar.bz2
-	${THEME_URI}/Theme-TuxSplash.tar.bz2
-	${THEME_URI}/Theme-Ubuntu.tar.bz2
-	${THEME_URI}/Theme-UnitedLinux.tar.bz2
-	${THEME_URI}/Theme-UrbanVisions-Debian.tar.bz2
-	${THEME_URI}/Theme-UrbanVisions-Mandrake.tar.bz2
-	${THEME_URI}/Theme-UrbanVisions-SuSE.tar.bz2
-	${THEME_URI}/Theme-VDR.tar.bz2
-	${THEME_URI}/Theme-Vortex.tar.bz2
-	${THEME_URI}/Theme-WarmAqua.tar.bz2
-	${THEME_URI}/Theme-Warty.tar.bz2"
-SLOT="0"
-LICENSE="freedist"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=media-gfx/splashutils-1.1.9.6"
-DEPEND="net-misc/wget ${RDEPEND}"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# clean it up a little, it's supposed to be config files, not scripts
-	elog "Cleaning up the themes"
-	find -name *.sh -exec rm -f "{}" \; 2>/dev/null
-	find -name rc.d -exec rm -rf "{}" \; 2>/dev/null
-	find -name rc* -exec rm -f "{}" \; 2>/dev/null
-	find -name 'Slackware 9.1.scripts' -exec rm -rf "{}" \; 2>/dev/null
-	find -name bootloader -exec rm -rf "{}" \; 2>/dev/null
-	find -name lilo -exec rm -rf "{}" \; 2>/dev/null
-	find -name Scripts -exec rm -rf "{}" \; 2>/dev/null
-	find -name example -exec rm -rf "{}" \; 2>/dev/null
-	find -name ".xvpics" -exec rm -rf "{}" \; 2>/dev/null
-	find -name INSTALL -exec rm -f "{}" \; 2>/dev/null
-	rm -rf "./SuSE-Home/var"
-
-	# backup files? no, thank you.
-	find -regex '.*~$' -exec rm -f "{}" \;
-
-	# we don't have images for these resolutions
-	rm -f Mandrake-10.0/config/bootsplash-1600x1200.cfg
-	rm -f Ayo/config/bootsplash-1600x1200.cfg
-
-	# gentooify all paths
-	elog "Gentoo-ifying all paths"
-	for i in `grep "/etc/bootsplash/themes" -lR *` ; do
-		sed -i 's#/etc/bootsplash/themes#/etc/bootsplash#g' "$i"
-	done
-}
-
-src_install() {
-	local mypath
-
-	if has_version "media-gfx/splashutils" ; then
-		dodir /etc/splash
-		mypath="/etc/splash"
-	else
-		dodir /etc/bootsplash
-		mypath="/etc/bootsplash"
-	fi
-
-	cd "${S}"
-
-	if has_version "media-gfx/splashutils" ; then
-		for i in * ; do
-			elog "Converting ${i}"
-			[ -z "$(cd ${i} ; find -regex '.*config/bootsplash-[0-9]+x[0-9]+.cfg')" ] && continue
-			sed -i "s#/etc/bootsplash#${S}#g" ${i}/config/*.cfg
-			bootsplash2fbsplash --bootsplash-path "${S}" --fbsplash-path "${D}/etc/splash" "${i}"
-			sed -i "s#${D}#/#g" "${D}"/etc/splash/${i}/*.cfg
-		done
-
-		# Add images that might not have been copied by the conversion script
-		cp Cybercity/images/bootsplash-1024x768.jpg "${D}"/etc/splash/Cybercity/images/verbose-1024x768.jpg
-		cp OpenSchool/images/bootsplash-800x600.jpg "${D}"/etc/splash/OpenSchool/images/verbose-800x600.jpg
-		cp OpenSchool/images/bootsplash-1024x768.jpg "${D}"/etc/splash/OpenSchool/images/verbose-1024x768.jpg
-		cp OpenSchool/images/bootsplash-1280x1024.jpg "${D}"/etc/splash/OpenSchool/images/verbose-1280x1024.jpg
-		cp OpenSchool/images/bootsplash-1600x1200.jpg "${D}"/etc/splash/OpenSchool/images/verbose-1600x1200.jpg
-
-		# Fix symlinks
-		for i in "${D}"/etc/splash/*/images/*.{png,jpg} ; do
-			if [ -L ${i} ]; then
-				tg=`readlink ${i} | sed -e "s#${D}etc/splash/[^/]*/images/##"`
-				rm -f ${i}
-				i=${i/${D}///}
-				dosym ${tg} ${i}
-			fi
-		done
-	else
-		mv * "${D}/etc/bootsplash"
-	fi
-
-	chown -R root:0 "${D}/${mypath}"
-	chmod -R o-w "${D}/${mypath}"
-}
-
-pkg_postinst() {
-	elog "The themes provided in this package come directly from bootsplash.de"
-	elog "with only some very basic fixes applied along the way. Some of them"
-	elog "might not work properly on your system, some might not support verbose"
-	elog "or silent mode, or might only support a single resolution."
-	elog ""
-
-	if has_version "media-gfx/splashutils" ; then
-		elog "The themes have been automatically converted to a format recognized"
-		elog "by splashutils. Note that the conversion process is purely automatical"
-		elog "and therefore 'dumb'. Some themes might not work, or work incorrectly."
-		elog "If you happen to find a theme that you like, but which doesn't work"
-		elog "after it has been automatically converted to the new format, please"
-		elog "fix it manually and submit for inclusion into a generic splashutils"
-		elog "theme package by posting it on bugzilla (https://bugs.gentoo.org/)"
-		elog "or sending it directly to the maintainer of this package."
-	else
-		elog "When testing the themes, please make sure you're running in a 16bpp"
-		elog "mode. 16bpp was the only supported color depth in the original bootsplash"
-		elog "patches. The version of the patch that you happen to be using might"
-		elog "work with other depths, but only 16bpp is guaranteed to be supported."
-		elog ""
-		elog "You might want to use:"
-		elog "  /sbin/splash -s -u 0 /etc/bootsplash/<theme>/config/<configfile>.cfg"
-		elog "to test the themes. Note, that some of them don't support verbose mode."
-	fi
-}
diff --git a/media-gfx/bootsplash-themes/metadata.xml b/media-gfx/bootsplash-themes/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-gfx/bootsplash-themes/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index 5e3c3222c407..c965315c07c5 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -2,8 +2,8 @@ AUX cropgui-0.1.1-PIL.patch 994 BLAKE2B 36d75764382c598c0bb58668d8c5e3882f58e899
 AUX cropgui-0.2-PIL.patch 831 BLAKE2B 936d4de690a45d9213f7337c1f2adc72dc39b370a9327bcb23f8d527c02397bb01e8ffe581eed734e4b99e2827c713e97e11bd6449623dade81ead6f4a3ce028 SHA512 b2b4be9f04c26906f998d5c693722d58e2d40270dcf41cb6027206adbbfeed0133858be7fbd44f846a83b23cd4da3f286fbb188b2547103a7320bcee0b35fa15
 AUX cropgui-0.2-tobytes.patch 1590 BLAKE2B e83066d2c80d4351d557d91e4d662515419b68579e07834d95da66a12b20bb891b913224c54bb6d4befba4a5a1c86989fbb0392d0e5e53fffaae1ada82ae3947 SHA512 2824a75de26eb200f991c759235a9da9ba5a61bc5f315e679920f1481b6826230432d91f2b710882463c8d8fb5856d001aa9d209de2a6d31fa027683cd57cd75
 DIST cropgui-0.2.tar.gz 842734 BLAKE2B 4a09fef84634cc07d81580f9652826dd4e388c27d9db33fb63e8f7c9ac2341cb532b81894fcab624df2495865af6f6580b03c871ed7d138bf5c7d2fc02386a7b SHA512 d6a9feea8c5de57455d0f7247465108d5a931f773f4df0c91629400bcc2c958c76559a84b6cde45709bcc8936ff7f5e2b3553897a14fbec14a9f032065ce83ba
-DIST cropgui_0.1.1.tar.gz 13142 BLAKE2B 0120be7b61687b5ab930fd7290b09527648ca92adba47a7a1c6a0cadb2d81c7390670ad8640c7183f7e75ca9c9d77551d20eea81d005dce6f33d231367f623a2 SHA512 abfe8dfd46a316e970b0355f6b05e2d2a4a54243e201dfc8434ee09f31c8715471dd1f00bd0c6cda646406e6398e5b43da3269bf74d1f2d9d436d5931d2b968f
-EBUILD cropgui-0.1.1-r3.ebuild 1303 BLAKE2B 25295075e9208db4284b5d87987be1b4ede8e1a1956b85f8c146b11e791c3378e7d7ee63565fe9b5eb15e6a15889cff53e035dbe96076a485631cb7a8ee326e7 SHA512 4c03300f1a39fba30ce6f9cccbdf6efed1496f7156295e9e0bc9d64fbf4d7424211a1febb0444f28120b84bc7d5b5508d260ce8acb43d30b30f7d5b9506a6e9b
-EBUILD cropgui-0.2-r1.ebuild 1332 BLAKE2B 87a40997f3b16656112356e2eed41d8cf21df3d1020780af67bcc511df71acdfc909e2bffb19cfd85ac52dec4c040dd3b3be7ee14f27c15654dc8fef0d41ddbe SHA512 13bcc6664b8cddad4bb948a4f46f6d301a28cb54ab31fcf319b754cdc891ee737e10cd7bbace3588c79bed58580c888e3b25926c50030289532e835d95aa7f24
+DIST cropgui-0.3.tar.gz 851911 BLAKE2B 57e8a013f1d0e9741e40657fcdd15c029a9cfd193d212389c4a98eb4520c64d7cb8d7d3adca9c727c2a7415ca8eaec8c7b3e621088e2d55747e60a1ab65306dd SHA512 ec8c15d25dd0eac1979a7cc20806cbf412cac9e5279538db0bf27a7c0ec98fc272650bb9f3d798408a96b6c49cd733e3df035f74b3bc6ef79d853c1a47a944ff
+EBUILD cropgui-0.2-r1.ebuild 1327 BLAKE2B 471d9ef156085cf203a0656800760837adf15d7c4d73108460d7a2a664bc1d44ddca22e4a6f4f8ee582e83257554c46e078ddea73d0f9b85a5377608296e5514 SHA512 1391e50029f995d1cddbeddc4c849b806ab0429ecabc50b0f14b953db4a2066a557bc3bbf990907e2400adaea0504fde28d49055e3349cfb626f1ed59bf2bff3
+EBUILD cropgui-0.3.ebuild 1223 BLAKE2B d2a9a6eb165789c1c74f263f6ecb3e211b154489f84f275afda80575375b8b7e52b4e5b07ed899ec90c1765dd348d161b36bf0363fefd054527885aa47ad77dd SHA512 0534383658a587adc17b4c4a517184fe80c21e38ec62f707a40c66075ab68a64ed08fc52e42f9aa15fbdc55dc4ff92387bfc7d3886d460ae0661901c93e9da01
 EBUILD cropgui-9999.ebuild 994 BLAKE2B 03eb7a7f4080709efa0789df9b4f2705b3765ec5859fdd2a79e8c2ad851a6c85b3df8a144720ac3654f60cace962a8bfebcb56366a2c7e9aaf00c51fcfdd4ea0 SHA512 7805c24d280653e05be9cafd97e8f3fc9d9a70538ad9efe473143667fa8ffee080cbd2139e1e5c8155ad4ddc2abc8f2e5ffa98efff3e4f512d29252cc7ae30aa
 MISC metadata.xml 326 BLAKE2B 9de42c9e878245c3e69bb73156b0f3531b2ef232d041d600c47ada3ff614354e37bfdf5ff6d1d11b872ebc73dcd729404ab4fb8caaa845e3cd571e636d0f8efe SHA512 7fa6076e0d39f2c2b5a7290ec75af076fbe2b0f4040861d5c2b428520e9e84447210245a6e66dea2742ddeeaf1534741e4b3dc1f18a411db4f3657fc3ee971a0
diff --git a/media-gfx/cropgui/cropgui-0.2-r1.ebuild b/media-gfx/cropgui/cropgui-0.2-r1.ebuild
index 89341edb6d18..4843bea19214 100644
--- a/media-gfx/cropgui/cropgui-0.2-r1.ebuild
+++ b/media-gfx/cropgui/cropgui-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild b/media-gfx/cropgui/cropgui-0.3.ebuild
index 5cd92de32b5a..e55631898440 100644
--- a/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild
+++ b/media-gfx/cropgui/cropgui-0.3.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit eutils python-r1
 
 DESCRIPTION="GUI for lossless cropping of jpeg images"
 HOMEPAGE="http://emergent.unpythonic.net/01248401946"
-SRC_URI="http://media.unpythonic.net/emergent-files/01248401946/${PN}_${PV}.tar.gz"
+SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
@@ -22,18 +23,14 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
 "
 
-S="${WORKDIR}/${PN}"
-
 src_prepare() {
 	sed -i  -e '/Encoding/d' \
 		-e '/Version/d' \
 		-e '/MimeType/s/$/&;/' \
 		-e '/Categories/s/Application;//' \
 		cropgui.desktop || die 'sed on cropgui.desktop failed'
-	# bug 471530
-	epatch "${FILESDIR}/${P}-PIL.patch"
 
-	epatch_user
+	eapply_user
 }
 
 install_cropgui_wrapper() {
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 6fe6e8021c08..dfe95a76f933 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,10 +2,12 @@ AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73
 DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
 DIST darktable-2.4.3.tar.xz 3422460 BLAKE2B 2fa1d7787301b6bc83b09e8d93bda251d2f9b7cf7d47979087b6da5126272d17c15f925be26652580aad6601f8613eac593c08e91638f2d445de1981f8694798 SHA512 adc0740f866890c53a1389b43042d76a4c668dd22654d91fd5a7eb728aa6979cb7dd3703d6e7d3689b6d3840e892432b3c3ce6953a76d4355dfc1f90a8f29506
 DIST darktable-2.4.4.tar.xz 3432268 BLAKE2B 75d22187c4a32eaf240803e68b8ffe9a29b4dfeaab3eb0061dd817e65c7118a5fe3f1832ce2d7b5adf1d8501c17adff7f1e87545774ca17bd2e33b749e993886 SHA512 143739b18217cb2b47f7c5cb29bbb17e0d78b380ccd9358e96e179639d8e3526c76f3822edace605856ec3272b099a09f052867479d20879bf36ef45dafe5df6
+DIST darktable-2.6.0.rc2.tar.xz 3802132 BLAKE2B 38ce77fae71f8b988d5ad6335568d7085ee69ce8262b64fb8471c8ad14182e87c8e9c7e6399d998d3ddd23d7c3407f44c570d29b8d8651f941fa4aa24fc3c9b0 SHA512 406083bb3debf1295a794b91eff96bc75cf0a6c71eeed7f60a4b72eba15cd8c658d73c90923f73a224545c281ff628c60334320a4d229500c21f66b613278080
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
 DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
 EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
 EBUILD darktable-2.4.3.ebuild 3998 BLAKE2B ab0356bea66039573ec818f3f93670cee2728230e71e07e9f4acbb89e369971112ecb8cc9186b0235847619d583dbd61edcf287c03ade0eee484d93df2f817f5 SHA512 3a33ecadd7229bce3c2645fe37ad8673a3c68ac3c071c87173206753701703819f6e1ad2e3ed07f822356fa0b0bcde70b9988a9c8e0f3705749424e7cf878079
 EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
+EBUILD darktable-2.6.0_rc2.ebuild 4038 BLAKE2B 9800f99171a5a7c9274fc19b02373ea9f1be4e884c5e0c3fcf66e850c812ead07752f82d9dc7779bd8aa07e4fc7e7edfddcae8462c0efc5bd7cfa55655019263 SHA512 3c269e52e954c7aeba582ac3303b2973010a45d3413e2d41590a74f99fcf054e23a27986fd76702441862abee6910be4829308f3176e94f0510524ef71a26321
 EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
 MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a
diff --git a/media-gfx/darktable/darktable-2.6.0_rc2.ebuild b/media-gfx/darktable/darktable-2.6.0_rc2.ebuild
new file mode 100644
index 000000000000..2dc5ceae9ca9
--- /dev/null
+++ b/media-gfx/darktable/darktable-2.6.0_rc2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
+
+DOC_PV="2.4.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+nls opencl openmp openexr pax_kernel webp
+${LANGS// / l10n_}"
+
+# sse3 support is required to build darktable
+REQUIRED_USE="cpu_flags_x86_sse3"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	dev-libs/pugixml:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/pango
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${CDEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)"
+
+PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PRINT=$(usex cups)
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DCUSTOM_CFLAGS=ON
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LUA=OFF
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	for lang in ${LANGS} ; do
+		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
+	done
+
+	if use pax_kernel && use opencl ; then
+		pax-mark Cm "${ED}"/usr/bin/${PN} || die
+		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
+		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
+		eqawarn "must be modified and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	elog "when updating from the currently stable 1.6 series,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
+	echo
+	ewarn "It will not be possible to downgrade!"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 5ce81c50f3f7..4976f3a8c6fe 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -5,5 +5,5 @@ DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
 EBUILD dcraw-9.27.0.ebuild 2961 BLAKE2B 7b8e95853e118b6262bb7996745c6ce375c6e7f56b6d5b957073966c3558b85a2ccf276dcff83b45df8232791b95ba41a2e3b946d25e0931215cf89d97532ace SHA512 30abf4256100ead2e7ca525cf365fb18e5d46afa6fe3bc0012f272ed3bc715349602d05a8b26d44c401138517848fa2a1796094efaff9df8244fd715d9a5f5c2
-EBUILD dcraw-9.28.0.ebuild 2975 BLAKE2B 7aa79016cb14ee338227b4c5adecfbc6369719e189687bb7f6755883f44eaee76a27e4e289745e4283b6c8b626608a846e5ba4ed7c43544e88ef433e09067ba2 SHA512 356259bff26fcc2fd182cdeec679af7ba7d9d755d681e84adb1517326a8c1405fa01ae640095cfb5fa0208f14c75261240c260ab906aeb63b34d2d0607ef35d3
+EBUILD dcraw-9.28.0.ebuild 2964 BLAKE2B a538ea284ef09c2d544fc87281cf2ea2f76ff16fe9d99877830f805f54f43ae302b2b4b552c7313851fc5074c11c31fcf6d4e8e2baead14b38bfb97abafb4a35 SHA512 af6eeb8898d9c35472d382139816aa4a62afaad0ceb62d4ae70a7933701631d5026af8f381b69d09136e92c8ad2c28d41c9672e43cd6594f254fda2c2e4df653
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0.ebuild b/media-gfx/dcraw/dcraw-9.28.0.ebuild
index 1c2627ff38a7..cbd814dae666 100644
--- a/media-gfx/dcraw/dcraw-9.28.0.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg jpeg2k lcms"
 
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index e0d376bd6560..67f8f3bcb1bb 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,11 +1,7 @@
-DIST DisplayCAL-3.5.3.0.tar.gz 10559161 BLAKE2B a3eb968dcd0b5edbcf22a0ec84da55d8660ffa8782135a908db8ea7a6480ce7be9a59528d35a73b7eb57c9c0dd46996407ea3de834a85e6da1c5d006b8aa33b3 SHA512 ddb405c1d8b7bc5aefac80fb79edbb03c2a3b32821c8bbbdd6d095312fff57e8ffe5e53cc5b53c56fa32e6bcbc10cd76598441d750008c38a512ed1f62d7cd9c
-DIST DisplayCAL-3.6.0.0.tar.gz 10565171 BLAKE2B 394a925d28f513ededc1bc40b3ce7b5a2687a0c172006fd14b9081188e3ca80c0cd5f634ac84a9917d6aa301e083bffd05db622e292262f6d41db2a86c23a920 SHA512 6d0cff6344bb0dfcff58e88f93e2d0f7a3cf5f8e32b596f9f5e07b0e80ccb9b4ff429aa9fa63b5941f7622e0a7dcd227d0a1066e82d0843454f01d96dea97993
-DIST DisplayCAL-3.6.1.1.tar.gz 10433827 BLAKE2B 3e06ea90d820bcc96eb8de8d2fabf9d60997092e1529b3a0a6544bfd42f89380bb2525e27c075a3b8c55721d659b485188e8e7f2e872622ed9e6b6ebc87ac662 SHA512 03835117f53fb8c9d7cedfe67719b70878c3b62c20894a999c971d1d820dc7ec386ad68b8d4cf19496005abf2235e789526e6632b11d82f971f944b5f4dfdac6
 DIST DisplayCAL-3.6.2.0.tar.gz 10437261 BLAKE2B c476c7834e2c723c48fb9ad9d2ea7f4919c2636814078d8f1a83a6af0e91586e0762ea3787c90f8625cba672ac72ef5e1d2dd6906fd3fd7f3b67637a180b81e3 SHA512 e66a20edf46d460caf5d2f7ddbc93cfe7c37937cd4933d2a2b7d141676696c6f22aadc07d229fbaefe0ced62066fc99d3290352c3e8fc9db4b95a8d0541f0be7
 DIST DisplayCAL-3.7.1.1.tar.gz 10472440 BLAKE2B 2e53537a7570c37120a462102269b5c042299df3de0926b0221bef8b5c29d75e7983b359d9ad162e2d9df2819c624d5f0c00c65fa181cce3fa831f1791d7a1fd SHA512 d5d18b25dd4ce6a2b328db6adb55c43ffcb3e3a495be38004d9e6a6e5c8d576b9477dc895668f82210ce955e7854a578218cb8c9ca2c206f58c47a011ad99c09
-EBUILD displaycal-3.5.3.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
-EBUILD displaycal-3.6.0.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
-EBUILD displaycal-3.6.1.1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
+DIST DisplayCAL-3.7.1.2.tar.gz 10472879 BLAKE2B a0722af9c8a6df8af57c0a66e792886b6aecb78bec79d0bed22567bd6ce540793ed6dd51437cbf1974b9070b9adb3708f841cf8cfae0e482056d90783be6ddbd SHA512 d708110e0528ffada5fd4a0ca7da9cf02a54964bc7d5af2b98738aa3e34079c0a4890f2cf6086750045915e06d6c943fc954e0f03653d25c080522a4b24795bd
 EBUILD displaycal-3.6.2.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 EBUILD displaycal-3.7.1.1.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
+EBUILD displaycal-3.7.1.2.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.6.0.0.ebuild b/media-gfx/displaycal/displaycal-3.6.0.0.ebuild
deleted file mode 100644
index 72a722b64356..000000000000
--- a/media-gfx/displaycal/displaycal-3.6.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.6.1.1.ebuild b/media-gfx/displaycal/displaycal-3.6.1.1.ebuild
deleted file mode 100644
index 72a722b64356..000000000000
--- a/media-gfx/displaycal/displaycal-3.6.1.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.5.3.0.ebuild b/media-gfx/displaycal/displaycal-3.7.1.2.ebuild
index 72a722b64356..02f4e0b4a7e5 100644
--- a/media-gfx/displaycal/displaycal-3.5.3.0.ebuild
+++ b/media-gfx/displaycal/displaycal-3.7.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 2eb401c114fd..82e454c684cc 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,7 @@
 DIST eog-3.24.1.tar.xz 4632496 BLAKE2B 24d6957285d5dae7fa2299165b1bac236e75dfa77938132c1d3f8f7312ed4a07d5d3a770fdbdbcf5ee1966a43b4443d331fbedec47575836e2170fa3022e657f SHA512 c007b6f2cd2b59747db72a5b86ecb34ac87fe0910a2d33df466eb05ebe5ff638fb9e57b15f2ea9328c95037334a2fd9010895241ff285628b7ed7b6d65912fb0
 DIST eog-3.26.2.tar.xz 5516240 BLAKE2B 5e63edd97c50e059af8d282d4596193fdb4e8a5767ebf9391c8c4f0b202136b1ef67c5d5d601e9863126b0db25e51927c4ac1fcb713fbd1a7ad21ccf207501af SHA512 40941d77739d1ed572dd7c4864435e5944c9dd48f5386b2ea11e16da52f7fa550844e4636ee35947172e921df596542d13928c79f7f511ef70ec92b832b1f1db
+DIST eog-3.28.4.tar.xz 5732396 BLAKE2B 9adf7e6793add9298dd879a0fe5ea7c736854d3a40473b2def84851a1e5a78ef84316b20b172c85c85f070278a51b06c1019aef1e5e9c5f31a87243c9229a579 SHA512 57ccb6269b2829a0606cbae08fc376bcd13028d3affe03d76c929a95faf9106dfd497872a12019158aeff5e8e101640d912cae0cece435121319820df7262c00
 EBUILD eog-3.24.1.ebuild 1343 BLAKE2B 63fa0d9614a37e9f3d40b2de61560a7642df4b14bb8196ff6de563b6afb5d0195f0832c27d41516659efbacadc977876b2ec09d736434d3026ddee8d913da0c2 SHA512 460f0f6c1e435cd970b0a67197d1885137c69d673eecd0e00dd5e7f9ebb8d52b2d22771b234786d3c31d175fcc24aad72314d0f0b14b11eea921b814fc725c50
 EBUILD eog-3.26.2.ebuild 1392 BLAKE2B ab4c6c3050f32db033e18892b4760207d5949ef5d160f7872554d234c8fe694ed90ce5d025363364485378ae1a6b80c6d2ec12fa4f582b78b707b30e6880ba08 SHA512 543ea9f99bef7802c2f1983f31f91125f5ece6f9eeee594ed0c050668557f1f9062623a99d0947af5a1ca39bcaa26d8fb736142804f95ffbeba357f808c71825
+EBUILD eog-3.28.4.ebuild 1508 BLAKE2B b294c3e8d7e2d8f0918f11baf2686efab9d9c2641885737bb1bd1b3e9e77814c10f6136ba5f05474cccf20e390cfd3d1820a97fe4700b4fc28c970c6e31fc588 SHA512 f61a81e5b641fe82b038fb91605022351a15b0d3f56eb0a948bfc3fa012dda1a02dccae0dd2c5d06d2bbebc8142a1eb73be5123f69c43f1da5d30722672802d3
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.28.4.ebuild b/media-gfx/eog/eog-3.28.4.ebuild
new file mode 100644
index 000000000000..62df2d95bc43
--- /dev/null
+++ b/media-gfx/eog/eog-3.28.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( virtual/jpeg:0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	gtk-doc? ( >=dev-util/gtk-doc-1.16 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/ephoto/Manifest b/media-gfx/ephoto/Manifest
index ff15c3b41dbe..7f4c6a124412 100644
--- a/media-gfx/ephoto/Manifest
+++ b/media-gfx/ephoto/Manifest
@@ -1,3 +1,3 @@
-DIST ephoto-1.5.tar.xz 324384 BLAKE2B 20e6a8904b2b80c67355b404ae39b10cb00f050f44336d899e63cc8e6d73b9b6d37dd9147479a2b6fa783ec90a07762fd31663d85d92d518e39cebc858489c9d SHA512 a60558230750f0edf7fb28f1d002a905a2c9afaf00f110c08e35f9d44f7d3939167065e0ef3819ac9ef0cfeed4ec260aef5267d631343dcce4628de70e7a5f23
-EBUILD ephoto-1.5.ebuild 533 BLAKE2B 1d5e884b4009853cede8eea909221999880fe2de12a08969b3facd3ede5ef7eb0e85e0d082f8f700a8b755ee2b3aeaf7def9282b711b4ef27bdb49209c892c4a SHA512 ae7b18946f3558c87c3c890b607bda83cfefa2e21477a7c9004d2a11f4a4b8e69fd00a0f0c7aca6eb5a2e1310a65241725f73d970d6feb87f4f21252d1e50f56
+DIST ephoto-1.5-1.tar.xz 327004 BLAKE2B 73b6f72085c845e3bc39a70f1a5b087741ee9d2b6d0a7678af90b78dd08cd68defd7256a12e4ce2f9acab1fc93aafcfcac0f2ee689e9ef0b68f8837446fbf58d SHA512 2c56103e6018ef0252dd5efcb0996e9346c383887b6d272f4fddc0b22e0f98dc032049c8521bca6707f1a5d172abc2d6c8e037104f4aa7a5f920fd55a2fad23e
+EBUILD ephoto-1.5.ebuild 564 BLAKE2B 4de5f23ddd9eacc9b5adc740e639c32470e1d2fd2d287fd612a8794f948e5cc32bc82eb699c9f7057101923e7ba8996dbea224b019f203c7b11f6660fc1212ee SHA512 b12b92b4f309aac575f03e91a9b8fa1a8e7d61a08a0cb8235e78c72a4d0f6af9033bdbc1fd0e840396be3d13fe48495a92d12e570e4366ded35b81124df716ba
 MISC metadata.xml 1203 BLAKE2B 81c54ec20b38cfbaac1af938c254c1b4a7a4f05f930c49221e4a7069dafa072c28dac491f314043b5df20cb459e068e9082ae10f4a8f84371127d842d5033ef1 SHA512 54f5e200874bfe2a33343f147f320960be3cfcffb710ddf20e4721c446f1d3cc67a87185d4347c64ba80ecae1836cff757e2d44bd368d96c7459776b67b411d7
diff --git a/media-gfx/ephoto/ephoto-1.5.ebuild b/media-gfx/ephoto/ephoto-1.5.ebuild
index 0d9b39d3494e..d7c2a75e3e21 100644
--- a/media-gfx/ephoto/ephoto-1.5.ebuild
+++ b/media-gfx/ephoto/ephoto-1.5.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Enlightenment image viewer written with EFL"
 HOMEPAGE="https://www.enlightenment.org/about-ephoto"
-SRC_URI="http://www.smhouston.us/stuff/${P}.tar.xz"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz -> ${P}-1.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND=">=dev-libs/efl-1.18.0[eet,X]"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
+RDEPEND="dev-libs/efl[eet,X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 src_configure() {
 	local myconf=(
diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index eea2e5ce38e1..68f84b6f3b61 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -1,7 +1,3 @@
-AUX fbgrab-1.0-Makefile.patch 428 BLAKE2B 6d2b35128b71ddde843351e79f221ce3c8ec6079975224d8cb1b077e23fbe11939a76906f7f9e532c191d9fab69706b049901cd52fa89e53d61631cc2094ed04 SHA512 21f6ea83a609f627112b6d77776c5f94269d6fdc86403b1e5aee2e8a497e29d22518bdac02731fc216b6178f3631659d3d7bcbd0a0ec73320635273785a5fb46
-AUX fbgrab-1.0-zlib_h.patch 263 BLAKE2B ef76dcd3320e31950beb9bc178533e8e99796790578faa8647ad58259aca7f6c0a5cb01422040b3cdac04f160fb25992ea45c275bdbdeb8d47788914af546cb7 SHA512 ac8576a25e963451ec298888208f92d8bb383c06655a96bf691779c5600db9c85c6e488b139519832b46878a46caba05d47f37ab27a3b2529f657341e5e93dbb
-DIST fbgrab-1.0.tar.gz 11928 BLAKE2B 7a87727eb428e9612f1575e119995bac06ea0cb5499f075a296a111e4f983cebede5b1b2c0c76304c320e2dff36331e085e1124f4d9c34d6d33dcc792d760e8a SHA512 83346be21b3dc393165cfbb210284679e9fc746380fde9939d96d8174cd320d71cc6bfbf23a9495a107c8f0a6ded43342f843b530996f695ebba0388669a35f0
 DIST fbgrab-1.3.tar.gz 13027 BLAKE2B 57acd93432b01befd99c73e45337bd2eecfdb18b9b5d98106e1a433b48bb03ef05cc5d3a99e0a34f501bb4d0731c8d6c92bcd8b145dd5f503632b63d41d902d5 SHA512 2d1166890f41d7de813a6c9b722db148980fcc802da38dea1a42d1f150cbdc16d0dd6757bc334586402f109b382e5039d44b03f9f19024f546958bdf21ca5d52
-EBUILD fbgrab-1.0-r2.ebuild 681 BLAKE2B 70a68abab4e8ae84ffa80bad0aa5465b5785e4018fb0ec6747c3a81fa06b4da7ec5808a43b9a3960c3068f2c3d7a416397d4da8f49717ef7ff03015ea82d5504 SHA512 11806c19157a92bf3b799fa7e4ee9ddc0aadc8703d10fde65cff260b1c66d02e9aed7af270d57eb72503cc82596cd5e1e8491dfe90ac69d997a6dca729e379e5
 EBUILD fbgrab-1.3.ebuild 621 BLAKE2B 3b77470a9c15d6ed2e846c621e1071ad116c2e6c1ef25dc88052b5ee76e90f4f58f97659c4515ee770c896b6abea3f97c0431171553c7b70f7a7c70e6a18807c SHA512 25b0a43aa49b49527892b0226fcd11e58a9260d7077bd9da9f22ef43b26a8889ff9d3f7444b0249553af15a923bd3bbe83ce51210d5c741b2a3f293e3f979896
 MISC metadata.xml 355 BLAKE2B 907ae0fec9a4a2284f98737d79de3747882c83bf3dee2588056ab3baa2720b987eda2930a3b79dae83327363d13fa72b98cc04d7b3d477f0b53f26eb6e11396b SHA512 31b407791cd97b141997fff192ac75298957edee59fe3a9c46d7a08f839b99ca2e4f3536632beca933d74a8e22464dbd7fd34fa61c106829c62c8dc69b1b8231
diff --git a/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild b/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
deleted file mode 100644
index a6a0d1458ef1..000000000000
--- a/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Framebuffer screenshot utility"
-HOMEPAGE="https://hem.bredband.net/gmogmo/fbgrab/"
-SRC_URI="https://hem.bredband.net/gmogmo/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/libpng
-	 sys-libs/zlib"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-zlib_h.patch" \
-	       "${FILESDIR}/${P}-Makefile.patch"
-
-		epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	newman ${PN}.1.man ${PN}.1
-}
diff --git a/media-gfx/fbgrab/files/fbgrab-1.0-Makefile.patch b/media-gfx/fbgrab/files/fbgrab-1.0-Makefile.patch
deleted file mode 100644
index 28fa840aa33a..000000000000
--- a/media-gfx/fbgrab/files/fbgrab-1.0-Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru fbgrab-1.0.origin/Makefile fbgrab-1.0/Makefile
---- fbgrab-1.0.origin/Makefile	2002-03-20 22:49:06.000000000 +0300
-+++ fbgrab-1.0/Makefile	2013-06-25 21:03:11.000000000 +0400
-@@ -4,8 +4,8 @@
- ###
- 
- fbgrab: fbgrab.c
--	splint +posixlib fbgrab.c
--	gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
-+	#splint +posixlib fbgrab.c
-+	$(CC) -Wall ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} fbgrab.c -lpng -lz -o fbgrab
- 
- install:
- 	strip fbgrab
diff --git a/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch b/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch
deleted file mode 100644
index 8318ab468994..000000000000
--- a/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fbgrab.c
-+++ fbgrab.c
-@@ -22,6 +22,7 @@
- 
- #include <getopt.h>
- #include <sys/vt.h>   /* to handle vt changing */
-+#include <zlib.h>     /* Z_BEST_COMPRESSION */
- #include <png.h>      /* PNG lib */
- #include <linux/fb.h> /* to handle framebuffer ioctls */
- 
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index a558ac9798f3..05bcb564e220 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -6,4 +6,4 @@ DIST fim-0.4-rc3.tar.bz2 504681 BLAKE2B 6a161e5b278b980a4442300f1c7d90b5ab690f63
 DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306
 EBUILD fim-0.4_rc3-r2.ebuild 2501 BLAKE2B 5f66202def62df300eddfed039655131adbd86a26cbe316c8dc67cb9753e99749893a65af02780ad120db625c87ba4fb652fb363677b8cd0348796e08b1f268b SHA512 b0839bab333a084bdc2d2864e3fd03d084af3522c99d5699c2fe9251ccdf585043f7dce491805a8ebae893906fa2054be034d50435b2d98ad14e634484421e97
 EBUILD fim-0.5_rc3.ebuild 2725 BLAKE2B dadbe6a87a5a3bdbaa02da27e40bbc4dd36568d570ec7dfdf879870a7af7ebf0c91360511f626ce7065bb97ff26cdba44be38c0e24932e69c282baee0883d346 SHA512 a08429dcdec86eca9e50267ab7bef1b04dbf042f9718822b13baa83b06a6e2af57ec4107aaee7b9a9d3ac278c52c0222508003eac2b1e49f25478ee9b6215722
-MISC metadata.xml 714 BLAKE2B cae2d5ed896e4abac20df176c20df975b38a4c1fb429134c2c829a07af07cb6db86f2081252ba893fc8124385c842227eac5cb44c96595b1c5e798a6f06586d3 SHA512 57b1bbbf3b980fc94b58dfa9f4631e65a49b1b21f62966acaae13a2401cfb0466a0dac068cad51948c9795144a8445595d7d27b1a9b8f0d0f0e3ee4bd28739cc
+MISC metadata.xml 610 BLAKE2B ef1a0623bedf204e2f261325be02fbb452355b2a9266afc320f81298cd1ae6b4bcb15f44713cb8640abcbf00b977294a6ca38f702e40fc5b6ce0c78b98b2b267 SHA512 4fdac65cfd930aac84e304c61addb77f7e19db8436ea477035615c93411449b5f3d314ee8b02864caed85d743d0f97c9d93e14dc4e513c048dd65223f788cef0
diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml
index e69460104901..d242506999ab 100644
--- a/media-gfx/fim/metadata.xml
+++ b/media-gfx/fim/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 050102c9834e..9eaaf3ee4eaf 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -1,3 +1,5 @@
 DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68cbf264e7954c2d2f402cb44cb2e6bf3c1c786d50285532c66167678f0fde053c317a0d23b6f4b210e69fa1 SHA512 82ca3ff1e97e7ff45bce1915f629809cc9efa6d33735b0e41b17bb8f69a31a2b035dd53045a3e56e7769d379b534a2468e37a684505438cfea70cc141103d1cb
+DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4
 EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d
+EBUILD frogr-1.5.ebuild 891 BLAKE2B 444fd6ab77b7bd9015785d6c4eeefcfef3990d83b314f11119e91621e84646d633664bc2527150052252b40b39edfddf1213f051c3ff90d3942cbc689881aff4 SHA512 22e34ccd09564056a188cf2486b1c47edad79e231f27f909b2b38184a0067df1f9762eec4b35d65e15096d37bb67b6eaaa3fe48640f6b783a8cf9aec2a83948f
 MISC metadata.xml 471 BLAKE2B 98553d988349910ccfe0ef4130d85d7cfa800907b6ab4f7823368fccfbfdb2cf5ecc05bb1b567e7749f92e240f2e2ec8bd95cb3ced30e9d0f3c011f3e8ad4664 SHA512 4c254ca88582b48b89673a930d4bc1e4d051b828c4241a8fd30c28375099fb78b8691ea65c90ddd3b60305ec68d3db9986959ac899b8f2341f562c6d435442e1
diff --git a/media-gfx/frogr/frogr-1.5.ebuild b/media-gfx/frogr/frogr-1.5.ebuild
new file mode 100644
index 000000000000..2cb753483f16
--- /dev/null
+++ b/media-gfx/frogr/frogr-1.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="flickr applications for GNOME"
+HOMEPAGE="https://live.gnome.org/Frogr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-1.2
+	>=x11-libs/gtk+-3.16:3[introspection]
+	>=media-libs/libexif-0.6.14
+	>=dev-libs/libxml2-2.6.8:2
+	media-libs/gstreamer:1.0
+	>=net-libs/libsoup-2.34:2.4
+	>=dev-libs/libgcrypt-1.5:*
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+# TODO add a useflag for enable-video or header-bar???
+
+src_configure() {
+	local emesonargs=()
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 13971c0957c0..e07bb68e52f3 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,7 +1,3 @@
-DIST gifsicle-1.86.tar.gz 563638 BLAKE2B b42065c11822542b75161f34054c3208ad5425570f025fa6bc3c842e759ed84156e6cf202a73f0efd57afc0dff5b9fc7ca8463b6304b97d3888b5e2b0f885b2e SHA512 d55609e5d71f63ec13c1eed6a9071d756f07c765d2496d468cc7291e3b9e29304be1c3a5b0e822d9dc2df29ac489bafca2650d226d5b3c51dad74dd22c725a13
-DIST gifsicle-1.90.tar.gz 571910 BLAKE2B 607f8ff93818c3ab9d3d74bd7735bcf1bb6412c0607c07cc33bdf9c20d9fa56a004e5aeb66d6fd49bafc12dcb9daf32736597d0377b3dfa1ff665a49f1b47180 SHA512 a5fd815c3aa1388690199edc16c0d5c0c32257cefd1cf8a1b660024b8e2324a6b4a54e19013984f905549df42d7719cdb1a875979b77729723f70d8e43f9bab7
 DIST gifsicle-1.91.tar.gz 571588 BLAKE2B be3973141e57618d50efb5205f79e485a4450ceed02d6c718e49305250941656f0d220c91d2056554348d14348ed1ddf03f0aa9c47e22589994c5e80046422f6 SHA512 49b89e6f99bffd0dd732c920b936c2430a2f4f595d46e41654e5f39f180acaf9b0a4aec6cf52597c470d7c60265f16b730f6ce82e08701a2054fc3d08754c6da
-EBUILD gifsicle-1.86.ebuild 653 BLAKE2B 2df49285519d1948d5d49f1f5957bf77d25be210057f605e3bb4c79ae9187bcb47f189e0a388384459c78f8d44571d7f72d5cbadaf5b92cecb84afbd597170f2 SHA512 c79392cae433fb0ab41486f8587a50c342c76b899e43a0024ab4ceb1ffda7b6d1fb09faaa0d48335e815368ef3b72b05a37feed56820ba07d406c7d9bc3afe1f
-EBUILD gifsicle-1.90.ebuild 625 BLAKE2B 8df3dc5fdcb3d648278b9cda9b9525a5e0b3347a18462d0ee3311d2d907f1021497e560106ce4dd1e79a43a9c052365c63de510c32852c14a62c92fc1fa0f31a SHA512 dec6aa40b49711d08671f04054b5b3d98c4ca9e365a736b19d7e97d4fbc033a902ce462dc5bd6125d72c1c039d7b72af3f3a21c3b77bc6192b3945c3a645d894
 EBUILD gifsicle-1.91.ebuild 664 BLAKE2B 68b81b9e33c05331fa0b57886797b3f5a7629b9736889604c1d284628719bcfec5b446ae43eb2711145ed107681c20896d18d58d2caa5a6a1e39ccab65da0619 SHA512 378e4bb6251fe7ffed3263229aa20a6c4f0d2c3be6154049f91c9535b27f5e0c105b31c82c28870941921c2c42da6d104bf5a877ab36f706b45a3cb463748f8c
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gifsicle/gifsicle-1.86.ebuild b/media-gfx/gifsicle/gifsicle-1.86.ebuild
deleted file mode 100644
index 4ce9c26ea623..000000000000
--- a/media-gfx/gifsicle/gifsicle-1.86.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Create, manipulate, and optimize GIF images and animations"
-HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle"
-SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_configure() {
-	local myconf
-	use X || myconf='--disable-gifview'
-
-	econf ${myconf}
-}
diff --git a/media-gfx/gifsicle/gifsicle-1.90.ebuild b/media-gfx/gifsicle/gifsicle-1.90.ebuild
deleted file mode 100644
index 0f7c030a5b2d..000000000000
--- a/media-gfx/gifsicle/gifsicle-1.90.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Create, manipulate, and optimize GIF images and animations"
-HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle"
-SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_configure() {
-	econf $(usex X "" "--disable-gifview")
-}
diff --git a/media-gfx/gimmage/Manifest b/media-gfx/gimmage/Manifest
deleted file mode 100644
index 60dafcc09821..000000000000
--- a/media-gfx/gimmage/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gimmage-0.2.3-as-needed.patch 454 BLAKE2B b0ef397985d7fb901dfb4b6f5f9e68b8d7d0fa9920ca4c0bd2bf7044e007c5ca4229e8a90db6216d6ba13e35b89664f4463c26f1626701f50022293c4a8d7fde SHA512 5f1a6b464ce58d98e500dad063b7fc88e12ae522b4ece3239ebfcc5205fd415422f3a9e4ca422a417aa67afb629d2eb303e069e7ea3f2206cb091219a3c75896
-AUX gimmage-0.2.3-desktop-entry.patch 950 BLAKE2B a18acf2212edb22609e18abf54cba35fdd0d7a2fb4996c92f62d1da3ced0ac7c4bb5fadeb49284539f62008e6e5828b6dce62f6d3191ec814ace5f00131363a2 SHA512 3ae966b8008992fe0d3ec4daf46a5760e785d20dce4c382a3368c96079a4bd929773996c6f4056ec3834e5dbc7a6c83fccdaee8e1b04e003b0cae38d8c05a19e
-AUX gimmage-0.2.3-gcc43.patch 304 BLAKE2B f550666bc458ddedfae4dd56c7a720c5b76a71050cc9b63b854d7c2726ed1973ce96d38e7b57ac321d4cc872932d776beff52ad7a4e8d2f53de9d6b0904d4655 SHA512 bd8b62588904ea4000b5b2fc846a29eae3fe48dbf22e91564e2015f263f5b47df580785fdc64d1632a6281a798c6a4d11468a3fd30eab3a6d7a7b30bdd31c3f0
-AUX gimmage-0.2.3-gcc47.patch 384 BLAKE2B 5adf46eebf25060f930a2c1aea77cfea29a47f334ca05a772d6e1419777b06b5a2205c4423ef2bc0894e845e6c05a6ede13fc5040023c26151f137756c0602ab SHA512 b7fae449c2d5ebdfae415df0ad9615fa4832998170dfcfd87110e45a6041b91216d8b3e91ab056929183fd0ff6cf9e9ab154c387299b3fe1d41f6e7952062459
-DIST gimmage-0.2.3.tar.gz 193777 BLAKE2B 3d6cdc709f798daf44e835b9e29cf7f3b1c7b8e78cdf13c24cfc649a24bbedaaffbe0388df5b3bcc073302ea09f884c0cc408fee119b07b876fe591f8e05ba35 SHA512 ff8fdf860d4712502e6e8656a14e5327a5b89af49f312e54de5f0e80cd6e406214a61228c79ad643c2640268d5eacfd760c83acbebdc7fa9b6e7c094728be167
-EBUILD gimmage-0.2.3-r1.ebuild 845 BLAKE2B 048fba96ed504d286846e99bc934bd6a1716e48a7e2173cfc1adc69d5a755fac264e5eb02885ff3b4c6cb4d7a5f18366d7e9de4bfa21632898b30d7b93b00ce6 SHA512 1418bc3cef0cb772e3514a7bad1041e7ee768d62b39e7b7ea4966d5cb4848ce50bf921b932d8d1509575cb4c0272631c499a65c684f54e392531732b5d3c9793
-MISC metadata.xml 427 BLAKE2B 0b3d1bd6ef4c0b2b881175c1a288ab90ba507f5e8a871b04bba6a9f06623d83cb2c22ba73d9fe39e9e4b8304527ffce43c41e9a49e51e758b88500c0256ce851 SHA512 a77c638e65d2026b56ce1868dea6d2045c331cb0bad022978a954ade85a5e5131c67d538f5c9e0e67292c22de117e0272e0b04f49f3fdfe76c7b19fc66c73265
diff --git a/media-gfx/gimmage/files/gimmage-0.2.3-as-needed.patch b/media-gfx/gimmage/files/gimmage-0.2.3-as-needed.patch
deleted file mode 100644
index 2e24078bd85d..000000000000
--- a/media-gfx/gimmage/files/gimmage-0.2.3-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru gimmage-0.2.3.orig/src/Makefile.am gimmage-0.2.3/src/Makefile.am
---- gimmage-0.2.3.orig/src/Makefile.am	2008-11-30 18:43:28.000000000 +0100
-+++ gimmage-0.2.3/src/Makefile.am	2008-11-30 18:43:40.000000000 +0100
-@@ -7,5 +7,5 @@
- SaveErrorDialog.cpp SaveErrorDialog.h \
- main.cpp defines.h
- 
--AM_CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -lcurl -lmagic
--LDADD = $(DEPS_LIBS)
-+AM_CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS)
-+LDADD = $(DEPS_LIBS) -lcurl -lmagic
diff --git a/media-gfx/gimmage/files/gimmage-0.2.3-desktop-entry.patch b/media-gfx/gimmage/files/gimmage-0.2.3-desktop-entry.patch
deleted file mode 100644
index c80b43d0b293..000000000000
--- a/media-gfx/gimmage/files/gimmage-0.2.3-desktop-entry.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur gimmage-0.2.3.orig/gimmage.desktop.in gimmage-0.2.3/gimmage.desktop.in
---- gimmage-0.2.3.orig/gimmage.desktop.in	2007-06-27 00:22:57.000000000 +0300
-+++ gimmage-0.2.3/gimmage.desktop.in	2010-08-06 20:42:55.000000000 +0300
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=gimmage
- Exec=@prefix@/bin/gimmage
--Icon=gimmage.png
-+Icon=gimmage
- Type=Application
--Categories=Application;Graphics;
-+Categories=Graphics;
- Comment=A simple image viewer.
--MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
-\ No newline at end of file
-+MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml;
diff --git a/media-gfx/gimmage/files/gimmage-0.2.3-gcc43.patch b/media-gfx/gimmage/files/gimmage-0.2.3-gcc43.patch
deleted file mode 100644
index 7dd6686c1314..000000000000
--- a/media-gfx/gimmage/files/gimmage-0.2.3-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gimmage-0.2.3/src/FileManager.cpp~	2007-06-26 15:51:15.000000000 +0200
-+++ gimmage-0.2.3/src/FileManager.cpp	2008-02-16 13:58:34.000000000 +0100
-@@ -21,6 +21,8 @@
- 
- // we make extensive use of get_current_dir_name() from Glib
- 
-+#include <cstring>
-+
- #include "FileManager.h"
- #include "defines.h"
-
diff --git a/media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch b/media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch
deleted file mode 100644
index bc39028cf161..000000000000
--- a/media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/422453
-
-error: 'get_current_dir_name' was not declared in this scope
-
-
- src/FileManager.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/FileManager.cpp
-+++ b/src/FileManager.cpp
-@@ -30,7 +30,7 @@ Copyright 2006 Bartek Kostrzewa
- 
- extern "C" {
- #include <libintl.h>
--// #include <unistd.h>
-+#include <unistd.h>
- #include <sys/stat.h>
- }
- 
diff --git a/media-gfx/gimmage/gimmage-0.2.3-r1.ebuild b/media-gfx/gimmage/gimmage-0.2.3-r1.ebuild
deleted file mode 100644
index 9cad305b05b6..000000000000
--- a/media-gfx/gimmage/gimmage-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A slim GTK-based image browser"
-HOMEPAGE="https://sourceforge.net/projects/gimmage.berlios/"
-SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-cpp/cairomm
-	>=dev-cpp/gtkmm-2.6.2:2.4
-	net-misc/curl
-	sys-apps/file"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-desktop-entry.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use debug && myconf="--enable-debug"
-
-	append-cxxflags -std=c++11
-	econf ${myconf}
-}
diff --git a/media-gfx/gimmage/metadata.xml b/media-gfx/gimmage/metadata.xml
deleted file mode 100644
index 64b2e5e3a9e1..000000000000
--- a/media-gfx/gimmage/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		gimmage: the gtkmm image viewer
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gimmage.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 8c4da5f5e974..328ca4757e68 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -12,12 +12,14 @@ AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a
 DIST gimp-2.10.2.tar.bz2 30863771 BLAKE2B a3525f7266ffe35be1daf973bee4ea107d9e7384e0c85a792f2fc69bd29fa8ee3d19409586b9b1e1bf36a1be4e30719c7ed945e5de9b7cb4be4f81be06ea1468 SHA512 6e351294e018a9f879993700355bdf5f10bccc6862604ae1950c4d235d32cdfcd6a0195b37377819adeef53ab3d24f32ed1de60cba6bafe58608ed0906a6fbcf
 DIST gimp-2.10.4.tar.bz2 31064613 BLAKE2B 66d815c830696923759146dce68049131078ddf4f67242c78a7755db34c1b7e31b1b25bfe52e8e47a7fb81e24e60e4161261043484242c4682ca6cf362d55816 SHA512 9d0cc8d97b82423687b579907edaab6044f19a8207426edf4f7428de23fa82481112bb0a53b06bb7037b68d92336517b1eddef4600519707e7feedb64e5414f7
 DIST gimp-2.10.6.tar.bz2 31447973 BLAKE2B 96df16c1d774726580ad09317cba31f36bac341aa53178bdb04444c87406465b2c56d508ba0b8c012ad8abc85136f8c635b6e9875e4da57c97e6a6832edbc296 SHA512 1330ec756ec5f57243435e66aeb5f6214a9783e26763be6679714010a631e47dbb8b5f610195587af29261d2183332a4a4c6202acafc3f2837ae7a6b7f9a30c2
+DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 EBUILD gimp-2.10.2.ebuild 5274 BLAKE2B b2ad4c07c37503dd243731b809995d063ec237a63ece2d84a9e84f39171d03a718cb262ad8520b9cc8a976a3a426877c28f7401773f4ff26baf36c1ea1ccee76 SHA512 7a5fb5056250cac3fe0842fd869701e6fb91af8ae99f97d4fdba13ae2fd3ed6b7a37acb5988258a61548bc720867357d5593c147d01997d7da3dd8e789fae281
 EBUILD gimp-2.10.4.ebuild 5274 BLAKE2B 3b3da266805208b6a2931ee06a9c0a4fab9de812283e799b0e76f12a2b7bf02b058dbb5a13654919b7514f4464ddb068e2c1b65280fa9bebb32d3814a10ebb5b SHA512 f9d7a30c93cc898bfc5c6a402cabe95d449315566f28644b5835849d49cfff39ac690a726ccf5a21ea98deba648a66f652eb93273d08baa9add5d6c4cff23c04
 EBUILD gimp-2.10.6-r1.ebuild 5964 BLAKE2B 4f834599caa6b9a2823dce38a8770d2383f2a63e3844e29b8a22e20485e7b9d6f8031eecd7820933b595f920905664aa878fa86d70c8aae942e4b766407ed151 SHA512 70f741ee3c68006d2488b8064b4e176e260c21a67517a3d6ebed8e2daa13ab1e87f1caa76d2b15d12fed6939bea32ada8e662865ff385508899d8299d74de05d
+EBUILD gimp-2.10.8-r1.ebuild 6056 BLAKE2B c691f2b1cdb3de92c4efa498b6a280732b4e151b0f5a56eb287a640a0eae291cf872c8f502fa37be75f4b66549d6e791a6242498ac74d5f4c5acd63f91d769c9 SHA512 cfd15d25c1154d00e551860256dc0c9566116342d587a95524e26b7ddfb24bc987733cb1888b9ae18fac5ab4f46f00bd360a733af91739a8db865d1a10d787da
 EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
 EBUILD gimp-2.9.8-r1.ebuild 5712 BLAKE2B f09f553f5d7eb8e8df0af0a316d2d98e9b0a32a204bb43c563927eae5a6dcb3bb4f5ff882bc05ce6ef3f8914939be6296683c382af45bcab877889042c96bc66 SHA512 7474ecdd5a1c785684b79c0007d77f45e475d7220f74960c48e686e7f6b15d82145b154caa802e2774eb34b46b03c5c4a1fc43a8ebc3716fb5f836be4d412886
-EBUILD gimp-9999.ebuild 5857 BLAKE2B 5bd2b47844018e3c8be33b30271781c978e01d8a0fe7a165e3ed58782eb12a020ad1a00f002da782d02a1b1447d9659a167a1e6c845230f4d2152985e0f56152 SHA512 e1d744c2802dbe14e1a70f0b0cc2968100143a27c91cdc5e6afd8d905bc43fc62955c2729aae3335bd123935010628556f23808a08ad99264710d29d07c6930e
+EBUILD gimp-9999.ebuild 5939 BLAKE2B 62e09bef788cd8e41f9c6a45b5f15ca74d5969c75c51854e768709fb5732bd2e55bc28c0f94ddcb5c2d392092369e4c1e7dfa81a38fcab205a5d98c0734a0441 SHA512 45ca4fc66b0c0edfc24a65fb928d560fd82c08ea8593c5b62f3b31d2f565dbef096cbc230f95be0c437114db469d9a46f1a54a58a286ce8a681836ca49e75a48
 MISC metadata.xml 474 BLAKE2B 7beaaa52a35415b9460b23f5031f71464008417e589105db607f0f86519cb7f19c9621dc77acea9aa9e67a1bf8f5887415761a69a29eb77aa205a89cc8b586ac SHA512 f1a58ab4fc0c7a4257648f35027d0860ee7b088ebd61703dde7622078bcc345168f3b747e79d71206ae36c479334925aac137e96c0d2134413f9e62aa27cee53
diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
new file mode 100644
index 000000000000..887d43c208e8
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+
+inherit versionator virtualx autotools gnome2 multilib python-single-r1 ltprune
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
+
+RDEPEND=">=dev-libs/glib-2.56.0:2
+	>=dev-libs/atk-2.2.0
+	>=x11-libs/gtk+-2.24.10:2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/pango-1.29.4
+	xpm? ( x11-libs/libXpm )
+	>=media-libs/freetype-2.1.7
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/libmypaint-1.3.0
+	>=media-gfx/mypaint-brushes-1.3.0
+	>=media-libs/fontconfig-2.12.4
+	sys-libs/zlib
+	dev-libs/libxml2
+	dev-libs/libxslt
+	x11-themes/hicolor-icon-theme
+	>=media-libs/babl-0.1.58
+	>=media-libs/gegl-0.4.12:0.4[cairo]
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	aqua? ( x11-libs/gtk-mac-integration )
+	gnome? ( gnome-base/gvfs )
+	virtual/jpeg:0
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	>=media-libs/lcms-2.8:2
+	mng? ( media-libs/libmng )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	>=app-text/poppler-0.44[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=media-libs/libpng-1.6.25:0=
+	python?	(
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+	)
+	>=media-libs/tiff-3.5.7:0
+	>=gnome-base/librsvg-2.40.6:2
+	webp? ( >=media-libs/libwebp-0.6.0 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	net-libs/glib-networking[ssl]
+	x11-libs/libXcursor
+	sys-libs/zlib
+	app-arch/bzip2
+	>=app-arch/xz-utils-5.0.0
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( virtual/libgudev:= )
+	unwind? ( sys-libs/libunwind:= )
+	heif? ( >=media-libs/libheif-1.1.0:= )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	sys-apps/findutils
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19
+	doc? ( >=dev-util/gtk-doc-1 )
+	>=sys-devel/libtool-2.2
+	>=sys-devel/automake-1.11
+	dev-util/gtk-doc-am"
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+src_configure() {
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+		--disable-silent-rules
+
+		$(use_with !aqua x)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_enable altivec)
+		--with-appdata-test
+		--without-libbacktrace
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--without-webkit
+		$(use_with jpeg2k jpeg2000)
+		$(use_with postscript gs)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with webp)
+		$(use_with heif libheif)
+		$(use_enable python)
+		$(use_enable smp mp)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with wmf)
+		--with-xmc
+		$(use_with xpm libxpm)
+		$(use_enable vector-icons)
+		--without-xvfb-run
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+	addwrite /dev/dri/  # bug #574038
+	addwrite /dev/ati/  # bug 589198
+	addwrite /proc/mtrr  # bug 589198
+
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+_clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
+	einfo "Cleaning up locales..."
+	for lang in ${LANGS}; do
+		has ${lang} ${LINGUAS} && {
+			einfo "- keeping ${lang}"
+			continue
+		}
+		rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
+	done
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	prune_libtool_files --all
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(get_version_component_range 1-2)
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	_rename_plugins || die
+	_clean_up_locales
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index ac017892f38c..b4f7112177ad 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -16,7 +16,7 @@ SLOT="2"
 KEYWORDS=""
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=dev-libs/atk-2.2.0
@@ -28,15 +28,15 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=media-libs/freetype-2.1.7
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/gexiv2-0.10.6
-	>=media-libs/libmypaint-1.3.0[gegl]
+	>=media-libs/libmypaint-1.3.0
 	>=media-gfx/mypaint-brushes-1.3.0
 	>=media-libs/fontconfig-2.12.4
 	sys-libs/zlib
 	dev-libs/libxml2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.56
-	>=media-libs/gegl-0.4.8:0.4[cairo]
+	>=media-libs/babl-0.1.58
+	>=media-libs/gegl-0.4.12:0.4[cairo]
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
@@ -65,6 +65,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
 	udev? ( virtual/libgudev:= )
+	unwind? ( sys-libs/libunwind:= )
 	heif? ( >=media-libs/libheif-1.1.0:= )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.10.0
@@ -114,6 +115,7 @@ src_configure() {
 		$(use_with alsa)
 		$(use_enable altivec)
 		--with-appdata-test
+		--without-libbacktrace
 		--with-bug-report-url=https://bugs.gentoo.org/
 		--without-webkit
 		$(use_with jpeg2k jpeg2000)
@@ -127,6 +129,7 @@ src_configure() {
 		$(use_enable smp mp)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_with udev gudev)
+		$(use_with unwind)
 		$(use_with wmf)
 		--with-xmc
 		$(use_with xpm libxpm)
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 489215b1b8b4..21624e11ccbb 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-font-viewer-3.24.0.tar.xz 321600 BLAKE2B 85fbd170ccf3b9464f51b6c6d556fa8d9fce155581b37d2db0ff37abb703b4fefad3b2f5db7ed09edd033bc36aacd4a574b84fefdac4cb516c43f1255d9c0d8a SHA512 b951e98161dde808aaea0666c0266a3381c82a264dc7280fcd4e4debcf07bd44c940e738a2dd5134276625e404f87323f57930764ed2faeedad831ba6a8bb591
 DIST gnome-font-viewer-3.30.0.tar.xz 139076 BLAKE2B 0c84b4e8550df6689f69da1f8b968d436721ba3a9cd97fd7f8f71ad7316af8146d368b65b0702bb7c25c4fd210cf8fb9634620b129505cb3f4f78e3e450c3718 SHA512 9ba3dffdd0152c9a1380b39f4f96de7e7d0281c675c0821d4c0be27b7aab9f23d3ca7497b70dcf47807be5cc7fcf252877e5cd0009f6cf1ec231d429477fe600
-EBUILD gnome-font-viewer-3.24.0.ebuild 603 BLAKE2B 2559d1e1155e5f877fbf7b74d662879b3deb7f4ffb65e58f214c86b8f62bba7537cfcb02e36e4974b88d56f249dcb7bb837ecad3b86a7708af874119fc85c7a4 SHA512 fed65120155408b85413622b6bdd607e0806cc32a2b769964119da41625a2c928a0f212ddf8738207e8e5b6a9541f167ae95606c4cf41b6d10a33161b88a1d77
-EBUILD gnome-font-viewer-3.30.0.ebuild 670 BLAKE2B 204c796e325387fcf943898bfb8f7ea6a648061719d7ab6b7cd1972405283c3c098316b6a43544164170efc97cde8201dfce6022138228f8af8891cbeb358e98 SHA512 334d4c79ba81115371fce5dc87fdb35ee882007f06f59c87b8a3d97e8643916a5d7fafa0eb2d3185d3720bab6b591f77ec6364dc81cd6dcbe724eefb927118f1
+EBUILD gnome-font-viewer-3.30.0.ebuild 668 BLAKE2B 86e474960a13944b1f003d94f032e0ce4c05ce4b53435cb8ec5271ed4a5815139808b76bc13d8fe19d85e1cfa6f009e322184ef68713bfeabb31bd24caad54dc SHA512 fbf8bf2a980ec5f5adb1be12253a3f3e04dcff2e67154032bdbe2826fccc02d5b3d10769109ca552316aa211c4d674650f1dca725b3802a468cebb5c3720a6f8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.24.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.24.0.ebuild
deleted file mode 100644
index 75353af23a5b..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.24.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Font viewer for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.35.1:2
-	gnome-base/gnome-desktop:3=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.9
-	>=x11-libs/gtk+-3.20:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
index fa4b9f210beb..5765b8624172 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 81c393b8452a..1bb7109d282c 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-screenshot-3.22.0.tar.xz 258888 BLAKE2B 48f997832a8e0f937283a2cfba8880dc9032ea7a3254b0f45dd1ffd3951d096f03899199497ca78fc9be22f83ae8c60bb4f72662a323dad3afc05d2229fd914c SHA512 a532e9cc8615ce22db5805c1857a3bad5bf69a3436a45574384c6c8f848ae67d6991dbfc5556e7cf08f630915c0666bba0c4bee9e4190340bbad57faa9af2ff9
+DIST gnome-screenshot-3.30.0.tar.xz 225244 BLAKE2B 69c75bb8e3d18578317343b549d4ad837b6e58420c6b49efbc01338697bc2251032d9158e658c9f4ae4e086a1c117eac818c18b6ed95d031c2b60c2ba62a56b6 SHA512 a42ff4f14bbb3a3feb438ee64f1dff3d3a792a6585fef92fde8546b9c3fc07013e8bd2ef42ddc880f2529cbc4241a50d441d4de2a4b26923036f1724aabafdba
 EBUILD gnome-screenshot-3.22.0.ebuild 1203 BLAKE2B 9f74f14b77d22c51394d9d131a5e03779594f405e2f95c3398b50df057fb7c854979e17ab02aaba1f73ef76dd61262a9d9e57795cac15f2c0946312316be6a6c SHA512 fed2aaf00f661cf23e83f0c86b610e94ed3100d62e8d18bb1fded4b8e72fd98e030e048a8c3aff442eaf990f6a9050431a8448ade68de2c54ce0f8af53b2bce4
+EBUILD gnome-screenshot-3.30.0.ebuild 1238 BLAKE2B 18dcfe3b8f6ef9c4ab2b2277acd8a6feb51eb722385258488dea827f86e1c02a63872bf8e76250ed6a03790cc293be78824c4f4895fe81a0f56f4fabd14acd98 SHA512 8ef1d69d80aa01cf9e5edcb1011af8bca83a5624e2f400dea162d06b366e26b1cd0d2582bfda9a9dd19e2687459710d59fd1421245ba222420845ee9a56bf35a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
new file mode 100644
index 000000000000..356eb6e133b5
--- /dev/null
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Screenshot utility for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# libcanberra 0.26-r2 is needed for gtk+:3 fixes
+COMMON_DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	>=dev-libs/glib-2.35.1:2[dbus]
+	>=x11-libs/gtk+-3.0.3:3
+	>=media-libs/libcanberra-0.26-r2[gtk3]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
+	non-interactive mode when launched from a terminal. If you want to choose
+	where to save the screenshot, run 'gnome-screenshot --interactive'"
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gnuclad/Manifest b/media-gfx/gnuclad/Manifest
index 1ca3c0f0e1d5..66452d55a8be 100644
--- a/media-gfx/gnuclad/Manifest
+++ b/media-gfx/gnuclad/Manifest
@@ -1,3 +1,4 @@
+AUX gnuclad-0.2.4-werror.patch 391 BLAKE2B 976bcc89bf56580acf13de66f1b540f06be7b0b6176c23cb9ff18bb3549737a417c26754286ec18593ba5c12e2d2ae87f4b02d08a94c7ee802bac2caa7b1914f SHA512 fc3680bec6a41d5f6b948d59990916add09654fca38e2193e34174838a24a439d9d8123f15dc2b2aa30a1cbc763bdc2025e1bfcdf3b1a1a112b6f8d8d5454b26
 DIST gnuclad-0.2.4.tar.gz 287763 BLAKE2B e70a16b6e2d032cfc0d79b7ec68386e1e70c98d4c30cd046157d4bac42fd9f91ad56fe18bc78a2380055ff952227572016381a5a6bbb88a74f6eb9e187d5d39e SHA512 881b1feab8cb7458223987c5a36359e31e7e00e94d60cd0002c289930b99236947aadbea40f96aaa6aa4b5d7953278bf581edbd6df3cb660bca1505950e66b67
-EBUILD gnuclad-0.2.4.ebuild 492 BLAKE2B aa0f24fddfac5029138ec60d3dca42887b4f8124f4d6b030be39bf93fcfa6b07d825f26f70cf14edcc29ee914ce8c4a56288f9bb10e5e559fb203ca87c15d2f6 SHA512 3947b22788843c39a146ca59c2f6296387c295d6b5f0b56775139d61576c720faba99ed3e11fe480dd74b2cbc0ce00ec8b6884ee9fbd8ce38ef2ce174339244a
+EBUILD gnuclad-0.2.4.ebuild 595 BLAKE2B 7e79cb7d7ba1d948237c2b07539d4e349bff90ccf16280b9fd9e1085a24b0ca09333f6415bd72f5ef4037172a56373d348472210ee8b337a9e77505dab10d63a SHA512 31421ec8edcaea0289e0f75f42b4d3a25ea5b59b854b2ee2d07728d16a5fe74daa00efed1f6bcfdf4b7baa2b13481f55f8f2bb699cf85557575f3b4867bb2702
 MISC metadata.xml 339 BLAKE2B 289743dbfe86bb16fbf2b479b1c5c2767b99019f2f43da5d0ceae35cb561dc33fabb728ceb4d709ab8965a1f6b0b51fe63c5dacc68166e8fab41b3b89a458af0 SHA512 a7b03367e25abd644a51dd72a7d21f3cfd571662233afc1094434373865ed01e2865b16f7e02f313448be372306be2ec842ea03e5015d68657b2c926fa365628
diff --git a/media-gfx/gnuclad/files/gnuclad-0.2.4-werror.patch b/media-gfx/gnuclad/files/gnuclad-0.2.4-werror.patch
new file mode 100644
index 000000000000..b8545d1d4cbc
--- /dev/null
+++ b/media-gfx/gnuclad/files/gnuclad-0.2.4-werror.patch
@@ -0,0 +1,9 @@
+diff -ruN gnuclad-0.2.4.orig/src/Makefile.am gnuclad-0.2.4/src/Makefile.am
+--- gnuclad-0.2.4.orig/src/Makefile.am	2011-01-07 19:28:05.000000000 +0100
++++ gnuclad-0.2.4/src/Makefile.am	2018-12-07 23:23:49.878123376 +0100
+@@ -18,4 +18,4 @@
+ 
+ CFLAGS =
+ AM_CXXFLAGS =
+-gnuclad_CPPFLAGS = -Wall -Wextra -Werror -pedantic-errors -ansi -O2
++gnuclad_CPPFLAGS = -Wall -Wextra -pedantic-errors -ansi
diff --git a/media-gfx/gnuclad/gnuclad-0.2.4.ebuild b/media-gfx/gnuclad/gnuclad-0.2.4.ebuild
index 77b5f29236f9..9d9826b28d99 100644
--- a/media-gfx/gnuclad/gnuclad-0.2.4.ebuild
+++ b/media-gfx/gnuclad/gnuclad-0.2.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit autotools
+
 DESCRIPTION="Cladogram tree generator mainly used by the GNU/Linux distro timeline project"
 HOMEPAGE="https://launchpad.net/gnuclad/"
 SRC_URI="http://launchpad.net/gnuclad/trunk/0.2/+download/${P}.tar.gz"
@@ -15,6 +17,15 @@ IUSE="examples"
 DEPEND=""
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${P}"-werror.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_install() {
 	default
 
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 2045ae4db0e1..a68a98c999ca 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,5 +1,8 @@
+AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c
 DIST gphoto2-2.5.14.tar.bz2 784442 BLAKE2B 185bd0d18e0b8d280c0ec366738850bd1fe2d1405179700fe25678c04a88b2092820aa5f049bcc6f97c964b5875bd32e3f8c7c5240ef3a71f2af04d6bfdaadb9 SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331
 DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40
+DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
 EBUILD gphoto2-2.5.14.ebuild 1392 BLAKE2B d9dad5be797d3f5e2f789c42060c62499d59f8f8aa5129608eea7f023b0257a38d1d3e2d54b4889128f0a867368a3abcac4e3f47bddf98c675049f0b9f24f314 SHA512 6ef5220aaf64e480a95e71d5596093179a41d93912c1d17614034e4814832ba8788a1e282a8711096482eb94c284a65365fb85c67a748fb060a38ef921349a8c
-EBUILD gphoto2-2.5.15.ebuild 1394 BLAKE2B 37ee8b2690588d840705c0892cbfeecce0b374ef1f61d6786de4602c3360ccdcbb8c586ca970978d90cc5ca9e6c9756d103c2a9ebb1186d12f140d955dc49f76 SHA512 d31216163f52a33ada64f20e0892b9208b7b468524517c799778df7ef7b53dfc9492a9a81a39be625bf43a4d6e02538b2205ff04a4b665acc0c31e0e94376538
+EBUILD gphoto2-2.5.15.ebuild 1390 BLAKE2B f932004b8728e3bc850d93e4bdb95bf181f4396961919634683b0524e1f02e4e576703d9438b5ba82c390c3e697ca6f8e7a97935939ac755f7094d9ee30703c8 SHA512 3668c7919a7f32273797172b331d83d9dcbf3fcd8fb4d6aae90f8fe49bfef26b4160819112a963f75ae630411fb47a4393c6756a26a34cdee64079fed4b24182
+EBUILD gphoto2-2.5.20.ebuild 1331 BLAKE2B 89ef478df066b8824503bea7a1dcbad7257974b22731080a6eeadb16ef45885c72edeef77b600c6088a72ee4007bbf54a28befce6f536f400cc7c10cfdd9e7e9 SHA512 31d763dd83771ad375011cab0d9a8ff563b47654677db787f1b953a239b7d977a70ca412a5ba8bc85bb847c2019fe322a79cbe1b2a794ed6f51788071d450825
 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
diff --git a/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
new file mode 100644
index 000000000000..8e78578d71d1
--- /dev/null
+++ b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
@@ -0,0 +1,37 @@
+From 45fb2a39195b5b31f61f376323ff78ab40940760 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 8 Dec 2018 16:19:35 +0100
+Subject: [PATCH] Fix unwanted automagic activation of aalib support
+
+---
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a6068c9..c19fed9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -306,8 +306,9 @@ aa_msg="no (http://www.sourceforge.net/projects/aa-project)"
+ try_aa=:
+ have_aa=false
+ AC_ARG_WITH([aalib],AS_HELP_STRING([--with-aalib],[Do use aalib for preview ASCII rendering]),[
+-        if test x$withval = xyes; then
+-                try_aa=:
++        if test x$withval = xno; then
++                try_aa=false
++                aa_msg="no (not requested)"
+         fi
+ ])
+ if $try_aa; then
+@@ -323,8 +324,6 @@ if $try_aa; then
+                         AA_LIBS="-laa"
+                 fi
+ 	])
+-else
+-        aa_msg="no (not requested)"
+ fi
+ AM_CONDITIONAL([HAVE_AA], [$have_aa])
+ AC_SUBST([AA_LIBS])
+-- 
+2.19.2
+
diff --git a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
index bf31c418c6d9..7fb110bd99d0 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
new file mode 100644
index 000000000000..5470646b4f22
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib exif ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+	dev-libs/popt
+	>=media-libs/libgphoto2-2.5.17:=[exif?]
+	aalib? (
+		media-libs/aalib
+		virtual/jpeg:0 )
+	exif? (	media-libs/libexif )
+	ncurses? ( dev-libs/cdk:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+PATCHES=(
+	# https://github.com/gphoto/gphoto2/pull/179
+	"${FILESDIR}"/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
+)
+
+src_prepare() {
+	default
+	if ! use exif ; then
+		# Remove tests that require EXIF to pass, bug 610024
+		rm "${S}"/tests/data/test0{35,36,37,40}* || die
+	fi
+	# Leave GCC debug builds under user control
+	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+		-i configure{.ac,} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with aalib) \
+		$(use_with aalib jpeg) \
+		$(use_with exif libexif auto) \
+		$(use_with ncurses cdk) \
+		$(use_enable nls) \
+		$(use_with readline)
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 89e8e3a81f3f..dbca42c5c4ce 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,11 +1,6 @@
 AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0c9714a776868303bda17af26cca8f3c4160d7f9060d0a8a116ad30a17b416ddd2963da0e66d4ca76fdc351507c51ae30998 SHA512 fa1bdbe718ae8ae49a58f6fc1728f1bb6b869a907f77e41eec92c452f86e05cf821548409f2a5d55dcdb38b8a80d7ef2b1d37d2111c3fd5088a118626479ad2c
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
-AUX graphicsmagick-1.3.27-version.sh-fix.patch 310 BLAKE2B 0a9a0c97c675af889207393a5123ef3d4c8367a4f0ab9f9c20a9056a5ad6ab021a010f1519b9ed25cc4e0473bd43ce353c1513d843d0ed33f1d1ac0a11246b01 SHA512 e7b497506aa480bbb301a9adfc5ee4332ca6520e62c5e3636aa960d2f4da32b08e887969e7c9477d021c953b74616c82c9c8168a7896f4c6c33ad25d7848d5a3
-DIST GraphicsMagick-1.3.27.tar.xz 5412544 BLAKE2B 130ce964f3745f4a9f3b54180529fb45afb4ecc63ecb88f626fa4dd2c6fb54675ff9b5b79527dc89d375cad5c4f1136063e612d91cc9d69b0c330c32c786fd96 SHA512 27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c
-DIST GraphicsMagick-1.3.28.tar.xz 5416660 BLAKE2B 874e1e2669db46c458b0e7aa68b24efa07249145b4dd3e1ff2802ec07ad7ea70e4484d0ffcc255454adf4b2be72d6e19f4352db65e22def6e12dfde4cf5987f8 SHA512 c372212e54e6403a44a973113764bf1fee6dde5df08a6ee015ae03c32823f96316018cafd34a355ff8a35ad3581aa7d455d30d664b9d68d3ea2ad277d7cf45e6
 DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
-EBUILD graphicsmagick-1.3.27.ebuild 3324 BLAKE2B 309ac3fb37a14f5aef75015135b678a79165b5f915a1954595e15321992856474703efb49fdbce07c06f41a53ac9381e52356de171a204d456d1883428c5ed69 SHA512 1db593b2b9df429e57b33346c1b3fe83fee14d6902a1175b38e8e62aa58018ab6c3ad1fe58ec9b662324fe57b9163f0c55098d98724fd656dd159c5635559498
-EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
 EBUILD graphicsmagick-1.3.30.ebuild 3251 BLAKE2B 78eecba484d87f81e0ee12d119a84fabc3c052ab7b63b92acff37c0b9b751a4e99fde3c1bd14c6e8dc20a97ecbd94c0f0c558d28a13e4b1523b29c75d61899cd SHA512 165fc7bad883df3be55c9b5714d6a284d9c97e5c06f0e13a08ac783fd946e39b6b929bd9ea17b4284c312830f46edfb536131bf730eec52bd2249c5420569519
 EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
 MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
deleted file mode 100644
index e21b8e7de7e8..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/version.sh
-+++ b/version.sh
-@@ -27,7 +27,7 @@ PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
- #
- # Formal Package release date
- # Set to string "unreleased" if package is not a formal release.
--PACKAGE_RELEASE_DATE="2017-12-09
-+PACKAGE_RELEASE_DATE="2017-12-09"
- #PACKAGE_RELEASE_DATE="unreleased"
- 
- #
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
deleted file mode 100644
index ea52ca5e1e59..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
-	perl png postscript q16 q32 static-libs svg test threads tiff truetype
-	webp wmf X zlib"
-
-RDEPEND="dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	fpx? ( media-libs/libfpx )
-	imagemagick? ( !media-gfx/imagemagick )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	lcms? ( media-libs/lcms:2 )
-	lzma? ( app-arch/xz-utils )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0 )
-	postscript? ( app-text/ghostscript-gpl )
-	svg? ( dev-libs/libxml2 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libSM
-		x11-libs/libXext
-		)
-	zlib? ( sys-libs/zlib )"
-# corefonts are required because needed arial font (bug #588398).
-DEPEND="${RDEPEND}
-	test? ( media-fonts/corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.19-flags.patch
-	"${FILESDIR}"/${PN}-1.3.19-perl.patch
-	"${FILESDIR}"/${PN}-1.3.27-version.sh-fix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local depth=8
-	use q16 && depth=16
-	use q32 && depth=32
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	econf \
-		--${openmp}-openmp \
-		--enable-largefile \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug prof) \
-		$(use_enable debug gcov) \
-		$(use_enable imagemagick magick-compat) \
-		$(use_with threads) \
-		$(use_with modules) \
-		--with-quantum-depth=${depth} \
-		--without-frozenpaths \
-		$(use_with cxx magick-plus-plus) \
-		$(use_with perl) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		$(use_with bzip2 bzlib) \
-		$(use_with postscript dps) \
-		$(use_with fpx) \
-		--without-gslib \
-		$(use_with jbig) \
-		$(use_with webp) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms lcms2) \
-		$(use_with lzma) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		$(use_with wmf) \
-		--with-fontpath="${EPREFIX}"/usr/share/fonts \
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
-		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
-		$(use_with svg xml) \
-		$(use_with zlib) \
-		$(use_with X x)
-}
-
-src_compile() {
-	default
-	use perl && emake perl-build
-}
-
-src_test() {
-	unset DISPLAY # some perl tests fail when DISPLAY is set
-	default
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		emake -C PerlMagick DESTDIR="${D}" install
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.28.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.28.ebuild
deleted file mode 100644
index c5f11fb693d3..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.28.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
-	perl png postscript q16 q32 static-libs svg test threads tiff truetype
-	webp wmf X zlib"
-
-RDEPEND="dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	fpx? ( media-libs/libfpx )
-	imagemagick? ( !media-gfx/imagemagick )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	lcms? ( media-libs/lcms:2 )
-	lzma? ( app-arch/xz-utils )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0 )
-	postscript? ( app-text/ghostscript-gpl )
-	svg? ( dev-libs/libxml2 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libSM
-		x11-libs/libXext
-		)
-	zlib? ( sys-libs/zlib )"
-# corefonts are required because needed arial font (bug #588398).
-DEPEND="${RDEPEND}
-	test? ( media-fonts/corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.19-flags.patch
-	"${FILESDIR}"/${PN}-1.3.19-perl.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local depth=8
-	use q16 && depth=16
-	use q32 && depth=32
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	local myeconfargs=(
-		--${openmp}-openmp
-		--enable-largefile
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable debug prof)
-		$(use_enable debug gcov)
-		$(use_enable imagemagick magick-compat)
-		$(use_with threads)
-		$(use_with modules)
-		--with-quantum-depth=${depth}
-		--without-frozenpaths
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options=INSTALLDIRS=vendor
-		$(use_with bzip2 bzlib)
-		$(use_with postscript dps)
-		$(use_with fpx)
-		--without-gslib
-		$(use_with jbig)
-		$(use_with webp)
-		$(use_with jpeg)
-		$(use_with jpeg2k jp2)
-		$(use_with lcms lcms2)
-		$(use_with lzma)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype ttf)
-		$(use_with wmf)
-		--with-fontpath="${EPREFIX}"/usr/share/fonts
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
-		$(use_with svg xml)
-		$(use_with zlib)
-		$(use_with X x)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use perl && emake perl-build
-}
-
-src_test() {
-	unset DISPLAY # some perl tests fail when DISPLAY is set
-	default
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		emake -C PerlMagick DESTDIR="${D}" install
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index e8126cab3793..36900d82a2e3 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,5 +1,5 @@
-DIST gthumb-3.4.5.tar.xz 3391492 BLAKE2B 62b3cd9be6954f734f3ae6d9e2d06364350a78b7415945d44526d35100b18617ef83359eb794a6b7d16fcb226b3c42aee0afb2a6a517b8c0b8055287b1879a29 SHA512 a709e9af9626578a6121fc6d60aa8ec2ee9f1758e9078f2e77498cbfc28cd0f1c8631aeb5c9312496b344ff889f4545935871409af5e3cd625c9a62df5d22d85
 DIST gthumb-3.6.1.tar.xz 3415564 BLAKE2B 363c1c927557f69a4dc0980174b31dd414267c0110205b4406f7fbf02953fd9ad00255d327363c6dcab663e10401b42a7aa23bc33796e944540ad21e778db67d SHA512 8b545626b041f91b8a3ad9caa5930aa431529f660c5a705efff667c78ddccd25683e598f7b1fc08f8e73553cedec00f0187387833e6081f504fc67ebd86f7a42
-EBUILD gthumb-3.4.5.ebuild 2289 BLAKE2B 8c98f4b9d534a11cdf789d823626a52e92fb949aaf867ab2caf7a776c2b545bcdb4bab4086911990cb11d2eda8feb2d26f19a81a36856dfb7a1b42ff4238cb91 SHA512 be7f25a32c4f313769a93964e5dbf06c2327ea23bfa755e74a9e9fb7cca3957375ab34f183587f22d7b9df8031fda7ef2a321e88deb8cac4cc8c0cc2de4d30aa
-EBUILD gthumb-3.6.1.ebuild 2579 BLAKE2B f13c9c84ea8466ab95b9dc75e724df532ab19fc967bec165c22619442976ee543da4515d701ee9f1322495d5faebb4ad5f9abd66210d3fab8329cff567814a0d SHA512 4ab95396f427e5daf332e17a8af023ff691b2a9cfee8b0a067add47ff8d8360a4cec0debf1749002990eb97e2e8831ce1951c19611c72886d5f7b9c66e3e7ebf
+DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
+EBUILD gthumb-3.6.1.ebuild 2595 BLAKE2B 64912212a1e032ee927272bd77fee83367a678569d7ef58b67e27629404019b5fd101445973a81a870563c756f49de3ee290a9ae50a50abc0b61e913bc02f4ce SHA512 4f7ab17a2331dc0b592a267254d70e7f80d3ecd66aa069200500acf8488f0bdbbfdd1874829468556e25d71c38a0e7d6ead8d894e5085ee68100abe9bfd4c424
+EBUILD gthumb-3.6.2.ebuild 2594 BLAKE2B a6c6a68c0914793b7cde5cc13e730944a0e3476dbfe6f2d47a4e61e3d60d2217dadd42e44355ac59f492422493d02c8ba35cb0ddc8dbd32635c6807f50bfefe3 SHA512 fea6507344884d23a5f298d98295f17b220d1987612f9f027ab07df1d06649acad8ce0bffad57ab1cfbe7ce18f6d85ae2e120195f6dd2cb9d1b2a653a75fcf3c
 MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e
diff --git a/media-gfx/gthumb/gthumb-3.6.1.ebuild b/media-gfx/gthumb/gthumb-3.6.1.ebuild
index 52269a4056d9..8f1c52090c00 100644
--- a/media-gfx/gthumb/gthumb-3.6.1.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 RDEPEND="
@@ -44,6 +44,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
 	sys-devel/bison
 	sys-devel/flex
diff --git a/media-gfx/gthumb/gthumb-3.4.5.ebuild b/media-gfx/gthumb/gthumb-3.6.2.ebuild
index e2b90746de92..1eab1eda6c7d 100644
--- a/media-gfx/gthumb/gthumb-3.4.5.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,12 +11,12 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2[dbus]
-	>=x11-libs/gtk+-3.10.0:3
+	>=x11-libs/gtk+-3.16.0:3
 	exif? ( >=media-gfx/exiv2-0.21:= )
 	slideshow? (
 		>=media-libs/clutter-1.12.0:1.0
@@ -33,17 +33,19 @@ RDEPEND="
 	json? ( >=dev-libs/json-glib-0.15.0 )
 	webkit? ( >=net-libs/webkit-gtk-1.10.0:4 )
 	lcms? ( >=media-libs/lcms-2.6:2 )
+	colord? ( >=x11-misc/colord-1.3
+		>=media-libs/lcms-2.6:2 )
 
 	media-libs/libpng:0=
 	sys-libs/zlib
 	>=gnome-base/gsettings-desktop-schemas-0.1.4
 	jpeg? ( virtual/jpeg:0= )
 	tiff? ( media-libs/tiff:= )
-	!raw? ( media-gfx/dcraw )
 "
 DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -63,23 +65,31 @@ src_prepare() {
 src_configure() {
 	# Upstream says in configure help that libchamplain support
 	# crashes frequently
-	gnome2_src_configure \
-		--disable-static \
-		--disable-libchamplain \
-		$(use_enable cdr libbrasero) \
-		$(use_enable debug) \
-		$(use_enable exif exiv2) \
-		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gstreamer) \
-		$(use_enable http libsoup) \
-		$(use_enable jpeg) \
-		$(use_enable json libjson-glib) \
-		$(use_enable lcms lcms2) \
-		$(use_enable raw libraw) \
-		$(use_enable slideshow clutter) \
-		$(use_enable svg librsvg) \
-		$(use_enable test test-suite) \
-		$(use_enable tiff) \
-		$(use_enable webkit webkit2) \
+	local myeconfargs=(
+		--disable-static
+		--disable-libchamplain
+		$(use_enable cdr libbrasero)
+		$(use_enable colord)
+		$(use_enable debug)
+		$(use_enable exif exiv2)
+		$(use_enable gnome-keyring libsecret)
+		$(use_enable gstreamer)
+		$(use_enable http libsoup)
+		$(use_enable jpeg)
+		$(use_enable json libjson-glib)
+		$(use_enable raw libraw)
+		$(use_enable slideshow clutter)
+		$(use_enable svg librsvg)
+		$(use_enable test test-suite)
+		$(use_enable tiff)
+		$(use_enable webkit webkit2)
 		$(use_enable webp libwebp)
+	)
+	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
+	if use lcms || use colord; then
+		myeconfargs+=( --enable-lcms2 )
+	else
+		myeconfargs+=( --disable-lcms2 )
+	fi
+	gnome2_src_configure "${myeconfargs[@]}"
 }
diff --git a/media-gfx/icc-examin/Manifest b/media-gfx/icc-examin/Manifest
new file mode 100644
index 000000000000..4aa833563660
--- /dev/null
+++ b/media-gfx/icc-examin/Manifest
@@ -0,0 +1,5 @@
+AUX icc-examin-0.56-fltk.patch 754 BLAKE2B 277178b84aaeb5b06daa63d2c167ff7a93f8dd53e34801af672a4cd9d0a07b2985810bc365995f7eac2e49b9e8211a25506f73ca4835d388c54320190220b93a SHA512 ae8bb21951107f9424abafe81015fba13556b2eaaf49f16a6694ce68e7f86ea4cff1d977364dd7c3c3fd5c7163739860a0f0ec74b28200c7d0f0ad2c43711f0c
+DIST icc-examin-0.56_p20171007.tar.gz 724698 BLAKE2B 291edcb81a931a9e7659ff0605d9e8c5c54e36a68dc51a6609cc2cd19e134c782158fcfb89dc10d2b8be953e0c0efff69d5187d5812f9cd5a3302061d1e79aa8 SHA512 79d4e42c0ae389128ee6514892d0019b0cec17466e8d8e47efbc0a5114c0d365732e26a9abb442a3bca3c2e83ede4dca407cad3bf250492a36832f8bdebeb2b6
+EBUILD icc-examin-0.56_p20171007.ebuild 1078 BLAKE2B f72b3c362808ca1f0f6e1922d6d83f77aaa92f8fb699eb6f9bd4cde12842f1aa412fda81910f9d1803c616a324c208124a0e8f3e42c92eb6e5600b1e6a914e3e SHA512 7da32bff96d2287e040cbfbc0c779c570d4763a281408cf18f3a1218cd41bcb2a8ce2e35c536aee8f1414dea71b4df1d226662ffd0ef4dc91ef42b6a3c216933
+EBUILD icc-examin-9999.ebuild 990 BLAKE2B 30a150e8183820e63892dbfc4f7acca8697671a2f9aa42ba6e62187f193a51663d70a6478bed95347645012fc84bccda32b8dd9c7d40afae693aac17e3064e71 SHA512 d57ddb8dce6093c84e3eb00d429d773c678425d87189e9abb3a8050e1a999e0218c1e044e5f5c258a4974d376eedbae6fc7972d33d585a8c4e4a4e1834d958dd
+MISC metadata.xml 306 BLAKE2B 504a3d1b41ad6e24126018e4f9f5d9b43ffbed2dad6c5d0ccb3b3fd0483916992dda6f0d3e590d77f5e1503fa69a71625e44042e07bdc7a987dbc30dc18e94b5 SHA512 2abf907350ae10a05019fa4732b8581bbc3a383e25cb880541fc49ad5c4f303b8ca101bd795f40ac31579c1b5a7e7d3ebf031a09721f2eafcfd153f6e2a13ae9
diff --git a/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch b/media-gfx/icc-examin/files/icc-examin-0.56-fltk.patch
index 5e4645a8b0ef..5e4645a8b0ef 100644
--- a/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch
+++ b/media-gfx/icc-examin/files/icc-examin-0.56-fltk.patch
diff --git a/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild b/media-gfx/icc-examin/icc-examin-0.56_p20171007.ebuild
index fd9e3b7ee0e5..065e372da875 100644
--- a/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild
+++ b/media-gfx/icc-examin/icc-examin-0.56_p20171007.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ COMMIT=ee9e8cd013766b0df2c5e3b4416f985322b22966
 inherit cmake-utils flag-o-matic vcs-snapshot xdg-utils
 
 DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
-HOMEPAGE="http://www.oyranos.org/icc-examin/"
-SRC_URI="https://github.com/oyranos-cms/${PN/_/-}/tarball/${COMMIT} -> ${P/_/-}.tar.gz"
+HOMEPAGE="https://www.oyranos.org/icc-examin/"
+SRC_URI="https://github.com/oyranos-cms/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,9 +37,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" )
-
-S="${WORKDIR}/${P/_/-}"
+PATCHES=( "${FILESDIR}/${PN}-0.56-fltk.patch" )
 
 src_configure() {
 	append-cxxflags -fpermissive
diff --git a/media-gfx/icc_examin/icc_examin-9999.ebuild b/media-gfx/icc-examin/icc-examin-9999.ebuild
index ceb2821c90c8..4201a5e2c0e3 100644
--- a/media-gfx/icc_examin/icc_examin-9999.ebuild
+++ b/media-gfx/icc-examin/icc-examin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-utils flag-o-matic git-r3 xdg-utils
 
 DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
-HOMEPAGE="http://www.oyranos.org/icc-examin/"
-EGIT_REPO_URI="https://github.com/oyranos-cms/${PN/_/-}.git"
+HOMEPAGE="https://www.oyranos.org/icc-examin/"
+EGIT_REPO_URI="https://github.com/oyranos-cms/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.56-fltk.patch" )
 
 src_configure() {
 	append-cxxflags -fpermissive
diff --git a/media-gfx/icc_examin/metadata.xml b/media-gfx/icc-examin/metadata.xml
index 6f7073269406..322fc08818ee 100644
--- a/media-gfx/icc_examin/metadata.xml
+++ b/media-gfx/icc-examin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">oyranos-cms/icc-examin</remote-id>
 		<remote-id type="sourceforge">oyranos</remote-id>
diff --git a/media-gfx/icc_examin/Manifest b/media-gfx/icc_examin/Manifest
deleted file mode 100644
index 45aaba689fb0..000000000000
--- a/media-gfx/icc_examin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX icc-examin-0.56-fltk.patch 754 BLAKE2B 277178b84aaeb5b06daa63d2c167ff7a93f8dd53e34801af672a4cd9d0a07b2985810bc365995f7eac2e49b9e8211a25506f73ca4835d388c54320190220b93a SHA512 ae8bb21951107f9424abafe81015fba13556b2eaaf49f16a6694ce68e7f86ea4cff1d977364dd7c3c3fd5c7163739860a0f0ec74b28200c7d0f0ad2c43711f0c
-DIST icc-examin-0.56_p20171007.tar.gz 724698 BLAKE2B 291edcb81a931a9e7659ff0605d9e8c5c54e36a68dc51a6609cc2cd19e134c782158fcfb89dc10d2b8be953e0c0efff69d5187d5812f9cd5a3302061d1e79aa8 SHA512 79d4e42c0ae389128ee6514892d0019b0cec17466e8d8e47efbc0a5114c0d365732e26a9abb442a3bca3c2e83ede4dca407cad3bf250492a36832f8bdebeb2b6
-EBUILD icc_examin-0.56_p20171007.ebuild 1117 BLAKE2B d3cf534387408cde7f5de25df9945f5a7aa3ba492489977fb5bc458e055082f30a5ea3cd067dde3095962bee5f1e8a39a5a4b7bbd8b84eecc8181db5588284ea SHA512 678456e641ed9ef1a91401dac6c3a80ba66c145885521b1d3ec3d68c4e3ac83fa938351876e6b0fb698686261185605bac7d0bcdffd0f7692873cb4170896da9
-EBUILD icc_examin-9999.ebuild 1000 BLAKE2B 43a2004a56aca2e244d232add12fc5c033db2395e0db7b548969107e4b236c25cab9602991187133cdcf1a1a9ec6251abae6e8a027674fb964d5da9bccd7b3d0 SHA512 1a068527b8785ace85775815d5d3296ea4d9e19bcd1caac8ae5a066e547db75aaaa82b1e280b6be939bad351052d0a79dc87f78d5608b4f439fec26c698088ce
-MISC metadata.xml 382 BLAKE2B ce0c6aedea9f1b6da34b313a1e27d937fcac042f06f34a874e80b49e9d07fd4f3a43841b0bc5d7ef118ea0438f28e7d762c0a5114f8c198eac75f71f303811b8 SHA512 7a5dc10551b676b47699b1a41a1016528efd794de47216fbf68eea9645cb4db32179eacf87fb4b986308b9a64c0cfd36406ed8326859e5247c8f9eb6083be8be
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 95e1ed39f2e5..ab17767ad4b1 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,13 @@
+AUX imagemagick-6.9.10.16-fix-MagickCore-config.patch 831 BLAKE2B 87421ba8c9d9bd2e45955c4650bbb14552eea2676d87217603618f4a82fb49b884da16a89f0f084440dff9c16dfa64198db2c6f5d6722d7f2daad173932d20fa SHA512 3d6644019414ce9a14ea9794a1a3608dc7be12e9bccb920ffa804c2209fee06705ba8c8342592f313e54d074b79a6364387f2d5945c4fbe56b80a13ee323eb01
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-14.tar.xz 8931552 BLAKE2B e064648947f661c41fe86dea6484c0b9e01e54fcd3428b8d6dd39b2b7f93735200af9e4b49f0bdc92b574afbaa53ed044aab2b4b751e087ba126e58cdda1f497 SHA512 1a2c9fb717b0441a18c638991cf5365c42d00c19c0f67bc7cce4bd2cba42bac602e4dba8bd4abc1dbc6609a08b1292403acc3657b61c58ed0609e2bf740d0725
-DIST ImageMagick-7.0.8-14.tar.xz 8634400 BLAKE2B 1d5ad294ce29f275790c3b6ba76445ffb4aeaa2ff94d91af4d52a00b407dca0e5a4f589ec1a860bf6695952f8e7943d507baee58b885dc5fca3510de1d84c8eb SHA512 0a5f3357f4ce5b245d60b178d81b58c3483effb45b669791d4686514a8c3b0ad04244e31caf0a4a614e73e3e071c17d851992670917ebcf2761c977d77c58dd6
-EBUILD imagemagick-6.9.10.14.ebuild 6789 BLAKE2B 55c818f40bca0a41d46c28e5adcbf4bcb6f5cb96496de91d2651624f1d2edc768b2915a8d1c6aaaaf2058e747991282c513fb366a15f775a4bc95c7ce1f20748 SHA512 cac9776476b2d7d05bff3163a109a7514b51d7b362f6696791c1e0ff7ed18ccc5cdd3ebe3a90e2d94bad18b09c0eedfcc95fc629663ef211fc7e194ff9ddf815
-EBUILD imagemagick-7.0.8.14.ebuild 6911 BLAKE2B 83a934d821a8a5b8a2d1c0f15038792c9fc09f1b4c2f2b306041d23a6fb0dc586e87c08dc4b0d79edd6d6943fae9c4ccd21ca04ca2bb7f01b1632a0dd6abf8fc SHA512 1f4732f65f6725013a4d88dc01183ffed52d20687234b50a45130f6e999f1a22986c625ea57d070985429053e908d91e53d63c09ae0201c5051a0fc1eec16d83
-EBUILD imagemagick-9999.ebuild 6920 BLAKE2B c48c6fcf967b904616a5bdc0ec0f06451956776f308cfd9064ef15bf2b75d55496d85eebaaef50961ea980bbd5a30eda33ffde2b774ff160af468341e92270d4 SHA512 2949766ec9289e1003cde57c1487d34989becea06ccbf8b2c4a980afe03cae06b91f04164421d2420b6432f7c60f4751a4dd217b27966d265f485e5df43d6e78
+DIST ImageMagick-6.9.10-16.tar.xz 8929036 BLAKE2B 1eb3150c5725d96bb2a9f9f7c07b5037e3da7e8f3871a9ae448352a967e5d8f5ccffdb7c27b608e4d6d9c8c13f7e8a219760292b6b191d37378c17ff182a2d09 SHA512 0adc57158260797df6db68256e87848135b52eba91dc65978e255061e3b22bfe7b3fbee3626ee8fb0183d37649143f0a46cbcbd6e090604cc4bb8e0752255fbd
+DIST ImageMagick-6.9.10-19.tar.xz 8934480 BLAKE2B d456acd5c40e7149839f7fea93826ce67c8a34b45b2435e2e6e35cdf3487163e47eddc9e81d251ba75d7c7125b5cb67ca58a945f380cc2bda90d9e6b4a6271eb SHA512 17cad58549b7e195693ce8f7c4dc936136792be10a15f47af66b60c3db2c4580b56d413d3034dd597d6e9c36f01d6b9b277bfd7c3b0828792e03ff5e8803dd40
+DIST ImageMagick-7.0.8-16.tar.xz 8646148 BLAKE2B 5a9c287164f99886c411cbb1416aaa72bdf527ba3be097a0ea6638cc6b0ae383057acab09974c7d3954a2985ec39e0ce4f6d6a2423ff4bb020d011bd1988c337 SHA512 fbc0b0410702c15352989652c055e4e1a099878e30b859c75322e162eccd384cabb98e14cac14e3fb2c902f25f80a5b62f94380ef78f891731980de9a40b6867
+DIST ImageMagick-7.0.8-19.tar.xz 8652452 BLAKE2B 0b6507ce98a7a609b834b00fc709fc6d25266716b74eea0ff1f0208daa9966aced70294c92e181fc21e43426cfd40a4614e12e7bd1c89ff74dbd65739d3bdbeb SHA512 f00ee21a8367202ea4bb25c99894679bbc3c2dd0c0e644292b8565bfda41cd8b0a8aa45bde85066347dc182bf8396de39166556a357d91383cc0fab8f9182276
+EBUILD imagemagick-6.9.10.16-r1.ebuild 6938 BLAKE2B 64aa7128cd3b932654f1d0e355cb8447f02f997cda9c177ad2e3b0905ccde30e3e4b3e4a6297b4f03ef68f161f999f78359470500943f886e994f9519f9a3d3b SHA512 ceb36ea8997802ea03082329f074f0e123c410750446cd248fce01425ea45f5e990b1c47d7506007aefa81ee7f4ffd412f2fb0977b24bda952e4df44955b8c7a
+EBUILD imagemagick-6.9.10.19.ebuild 6892 BLAKE2B d925550c450fabe11f11cf817c25e4aa3c1b25b0ca1dcae4910b8112fa8a38ed625260743046736ce23cd27b299974b22239607e9c68496262e43e5cd19da0c2 SHA512 6005a9964507d87fd0c0c1e1d1daa10e5503740ba9474f1659f7bd4255f5cc22ef8137baf3e1e61c6f9d0c93eef403637cf91833397a6a2ab16f15a7bbd48e58
+EBUILD imagemagick-7.0.8.16.ebuild 7151 BLAKE2B 100dad30713a78c3aa72a939874e295bf3c55c3015ddf833d6c5bf696448af666a5088451e3ce83d2549216041675df5d3034517172fa5bb4d7005674b37394d SHA512 7fa1d1eb8715f8cb8d674fb7c619743970dfe8ca8e7e744448fb569442242aa703e7f8d1c568e73147dcece484db1031311529b7b0482b9c2ae9c83282d02d1e
+EBUILD imagemagick-7.0.8.19.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
+EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/files/imagemagick-6.9.10.16-fix-MagickCore-config.patch b/media-gfx/imagemagick/files/imagemagick-6.9.10.16-fix-MagickCore-config.patch
new file mode 100644
index 000000000000..1fce48d48660
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.9.10.16-fix-MagickCore-config.patch
@@ -0,0 +1,23 @@
+From 02701e96029c4e2a9902685a9aca84ae21ab1c4c Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Fri, 14 Dec 2018 02:03:07 +0300
+Subject: [PATCH] Remove non-existing "-config" option from pkg-config
+
+This bug produces "Unknown option -config" error.
+---
+ magick/MagickCore-config.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/magick/MagickCore-config.in b/magick/MagickCore-config.in
+index 94bc87b95..e56f34a76 100644
+--- a/magick/MagickCore-config.in
++++ b/magick/MagickCore-config.in
+@@ -38,7 +38,7 @@ while test $# -gt 0; do
+       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
+       ;;
+     --cflags)
+-      @PKG_CONFIG@ -config --cflags MagickCore
++      @PKG_CONFIG@ --cflags MagickCore
+       ;;
+     --cxxflags)
+       @PKG_CONFIG@ --cflags MagickCore
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.16-r1.ebuild
index ba0ba14a935f..a658d37a58de 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.16-r1.ebuild
@@ -5,7 +5,8 @@ EAPI="6"
 
 inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
 
-MY_P=ImageMagick-$(ver_rs 3 '-')
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
@@ -68,6 +69,7 @@ REQUIRED_USE="corefonts? ( truetype )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-fix-MagickCore-config.patch
 	default
 
 	# Apply hardening #664236
@@ -173,13 +175,14 @@ src_test() {
 		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
 
 	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
 	IM_COMMANDS+=( "emake check" ) # Run tests
 
 	for im_command in "${IM_COMMANDS[@]}"; do
-		"${S}"/magick.sh \
-		${im_command} || die
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
 	done
 }
 
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.19.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.19.ebuild
new file mode 100644
index 000000000000..51d1439ebc56
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.19.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.16.ebuild
index f7b720973aae..c8f205eafd0f 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.16.ebuild
@@ -10,7 +10,8 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="imagemagick-9999"
 else
-	MY_P=ImageMagick-$(ver_rs 3 '-')
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
@@ -177,13 +178,18 @@ src_test() {
 		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
 
 	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
 	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
 	IM_COMMANDS+=( "emake check" ) # Run tests
 
 	for im_command in "${IM_COMMANDS[@]}"; do
-		"${S}"/magick.sh \
-		${im_command} || die
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
 	done
 }
 
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.19.ebuild
new file mode 100644
index 000000000000..91e101eeefc0
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.19.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index adf47c49a562..91e101eeefc0 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -10,7 +10,8 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="imagemagick-9999"
 else
-	MY_P=ImageMagick-$(ver_rs 3 '-')
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
@@ -177,13 +178,18 @@ src_test() {
 		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
 
 	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
 	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
 	IM_COMMANDS+=( "emake check" ) # Run tests
 
 	for im_command in "${IM_COMMANDS[@]}"; do
-		"${S}"/magick.sh \
-		${im_command} || die
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
 	done
 }
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 84cd787e70ee..25eaa9903192 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -14,5 +14,5 @@ DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335
 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
 EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500
-EBUILD inkscape-0.92.3-r1.ebuild 4074 BLAKE2B 1db4afc8585fd09e4d08c7331ca30a2ed291a16a078726e1c0fad6627997342a39427e4c4613319ec8e60064bfb5a81957e7e2805714e1c9f206c1d3a3572f03 SHA512 a43e8d5e50d04b0930ce0f09040da708dc772f442d0b4aaf9e61dea81d00acd58cbc5ac122d967fdb2e58f959e907b1b07f28ee09034621eeaef1e372219e220
+EBUILD inkscape-0.92.3-r1.ebuild 4070 BLAKE2B 740861b67fba0f9b7cb37ceb5019c55a581a37b7e419289fe444df0484f21b637cd523d5b5a76425798f5701f96477fb58b92ab06969a4441b4a9da01b5afc3a SHA512 48b64d03cabcfd5b8430ece46fe68b366bec787e0f16852f874a7e275089062f50250008f9330f83c1ee5c21a141bee5d2e3ed8324a628cffd91674abc5b134a
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index bc4433cc9962..f07d0bbf1f7d 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index ad742ac65df5..c26fca0d2869 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,7 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 AUX krita-4.1.5-desktopfile.patch 1587 BLAKE2B 7155223dfa5a9bace62729f71a298953c9c2b9ec426693b539bcab961287ee172d8c6151f028508efdfc4e0983b3a8903affefc8ee1a30eb48a51f807c3545df SHA512 ad2a265d287a8e5de9752a83f697f49470ec9984b69a24dd351708372f7c3f1b5dabbbd671a53e5e0fdfa4dae2a0ab1b90ebfc19e6e8ba745a673f1cff607707
 DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
+DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de SHA512 8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
 EBUILD krita-4.1.5.ebuild 3169 BLAKE2B bb899ccaecd54bb8ba069631692aac6a64a0ed9618175b4e685ff9198818fae355814af4cb550f025f6093c6e2eb314b63a3f33da64d1e5d48c002189e6ea5a6 SHA512 33b4e2e836b187428f92620d590cfd3ed068ca48d6811a9290cf582db11e118463b13fc933b3948b5f4dd9d4addefc416f8cdf41cbdf51a1e2930060a28221f2
+EBUILD krita-4.1.7.ebuild 3242 BLAKE2B 8c72fdf5dcb6860bdd64dc2bde0cd2034b1992c34da03949eb4f7c2752b2670be40e5ed4145632dcb3e547f4038f6382d10aaf067b9385f5027e836228f45e59 SHA512 e5f402188757181f806126fec2030dc0479747bcffcff9c397efbc5c225db426bbd66d908453323d0c427247f3be14e758ab5ab7f778c29bf8fca41d0e1ca406
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.1.7.ebuild b/media-gfx/krita/krita-4.1.7.ebuild
new file mode 100644
index 000000000000..9982412f267b
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.7.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.11.3"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: Drop subslot operator when QTBUG is fixed:
+# https://bugreports.qt.io/browse/QTBUG-72488
+COMMON_DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+
+S="${S}.101"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gif GIF)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package heif HEIF)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 471a6ef6c01a..c886cd02a2a6 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,3 +1,7 @@
+AUX libimagequant-2.12.2-fix-pkgconfig.patch 840 BLAKE2B 6b16c3b0a7b916c60814817b69a9d653802e67da5d3431dd0bd00bea21cea7eb60a6d046ec380fc68ca25182c1863a81336f0c76259bb8fcdeeb30644eca06cd SHA512 bb0b1a502dee7126cf64e48628469729a12abafd9a9f58cb76b18d250cb578a49e38c1b05009173ebb4acfbf54e2696f0fa5f7f660248653a8bb8600843fa157
+AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
-EBUILD libimagequant-2.11.7.ebuild 1185 BLAKE2B 89fe4eca4607c132955d18f54a116df6000f3c76a3dfa007ddded42bc36a307a77823ae81d64e43e2c5dbe02785de903e72246ad1943909b3d2a225618b2deac SHA512 6434d31f4ad8d4262adc60a93e8e408207e8696fc303761aa7962b8554dff710c7a5713c333c34fae42059a625ca228a061f025305e7ad92f004432f6bbd90f1
+DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
+EBUILD libimagequant-2.11.7.ebuild 1184 BLAKE2B dfc603c736d9d8061b406152a4cc73f0bf0ddd7acff0ff734646b976e5d972195a04f3d10327bf713b549d17ec4286b31063e7b0f452112e0c8c8e7f090cc861 SHA512 a43f2e98875b9e3dd68062c47e74adf7b0e5a1bffe5eaa21850e26929edc0af41b09a352e1feae12e3dbe23d3af1a296e78874cc6e82ea05860ffb4fa08956bd
+EBUILD libimagequant-2.12.2.ebuild 1438 BLAKE2B ebcfdc7e952468596aafab3f9c822c790bdccad8548647410b18b6a57c2121ddd14d98c9ec14cf7a461c9268283c1c1334773ee7124bbe2db30094513fe97d35 SHA512 20ef40f430fd9bcde1370e71c9b4d5413bbf94050199b70c81910639da7658e66e5e9d4e399203cbd0d807fea08f93b2c817a15c49b24aa7f362c50e39bd2179
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
new file mode 100644
index 000000000000..0b058fbecc23
--- /dev/null
+++ b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile b/Makefile
+index 2666b3d..ba58cf1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -133,7 +133,7 @@ ifeq ($(filter %clean %distclean, $(MAKECMDGOALS)), )
+ endif
+ 
+ $(PKGCONFIG): config.mk
+-	sed 's|PREFIX|$(PREFIX)|;s|VERSION|$(VERSION)|' < imagequant.pc.in > $(PKGCONFIG)
++	sed 's|PREFIX|$(PREFIX)|;s|VERSION|$(VERSION)|;s|LIBDIR|$(LIBDIR)|' < imagequant.pc.in > $(PKGCONFIG)
+ 
+ .PHONY: all static shared clean dist distclean dll java cargo
+ .DELETE_ON_ERROR:
+diff --git a/imagequant.pc.in b/imagequant.pc.in
+index 980da8c..6c6569d 100644
+--- a/imagequant.pc.in
++++ b/imagequant.pc.in
+@@ -1,6 +1,6 @@
+ prefix=PREFIX
+ includedir=${prefix}/include
+-libdir=${prefix}/lib
++libdir=LIBDIR
+ 
+ Name: imagequant
+ Description: Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.
diff --git a/media-gfx/libimagequant/files/libimagequant-2.12.2-respect-CFLAGS.patch b/media-gfx/libimagequant/files/libimagequant-2.12.2-respect-CFLAGS.patch
new file mode 100644
index 000000000000..c290af36fe5f
--- /dev/null
+++ b/media-gfx/libimagequant/files/libimagequant-2.12.2-respect-CFLAGS.patch
@@ -0,0 +1,17 @@
+--- a/configure
++++ b/configure
+@@ -152,12 +152,12 @@ rm -f pngquant-gcccheck pngquant-gcccheck.c
+ status "Compiler" "$CC"
+ 
+ # init flags
+-CFLAGS=${CFLAGS:--fno-math-errno -funroll-loops -fomit-frame-pointer -Wall}
++CFLAGS=${CFLAGS:--fno-math-errno -funroll-loops -fomit-frame-pointer}
+ cflags "-std=c99 -I."
+ 
+ # DEBUG
+ if [ -z "$DEBUG" ]; then
+-    cflags "-O3 -DNDEBUG"
++    cflags "-DNDEBUG"
+     status "Debug" "no"
+ else
+     cflags "-O1 -g"
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
index 092a935042fc..ba95dbc6cf98 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
new file mode 100644
index 000000000000..f9e1c3ed54cb
--- /dev/null
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
+HOMEPAGE="https://pngquant.org/lib/"
+SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
+	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	tc-export AR CC
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX%/}/usr" \
+		--libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+		$(use debug && echo --enable-debug) \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use_with openmp) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	emake shared imagequant.pc || die "make failed"
+	use static-libs && (emake static || die "make failed")
+}
+
+src_install() {
+	dolib.so libimagequant.so
+	dolib.so libimagequant.so.*
+	use static-libs && dolib.a libimagequant.a
+	doheader libimagequant.h
+	einstalldocs
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins imagequant.pc
+}
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index d213c74d91b7..a93032133d4b 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,7 +1,5 @@
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
-DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
-EBUILD librecad-2.1.3-r2.ebuild 1239 BLAKE2B 39a94d6a4804a225549c5e4b7f74ebf79578bcff2a1189347694fd39673c2c73a5513a35fbe6cf5214b5a26d5b729d404dc6a46c98ac6aeb33ffe8b05cb6eef4 SHA512 05095a8861c0c884afe82a5637ad0218ff0ac6a2d68a7610c8a4e49dbed73e2845d7b33e93549cdd039f12fe2364b7fac8e0f0dd497c246f49230d67030812bb
 EBUILD librecad-2.1.3-r4.ebuild 1098 BLAKE2B 16890e1fe27531314e8951cea944308cec88f3bd0d3824a4cc3739e5a92b43f840da0abeb2fb21af4f9fb9c69f4c78265a7e551cbb326a58472da6f611025c41 SHA512 139d713066a0507d9dfb056a1954d822afa3096e8da56342c143fcdbb203cc601d987834883f4bb0fd72bc67c8300b1ecf46a7400c2478e31b503da3dd05e0b2
 EBUILD librecad-9999.ebuild 997 BLAKE2B c2f46819e1188ac08ff278385f696c578dac20c707b666d5fe297c2ff19b3f8c37f048e8c3083acacf4f7165378ed5f5de37209b6eff50fd73b8970dd7377b18 SHA512 8e8633998807024c30de31be9eb996b5a6abb1ab416247258e35b1497ea9824b7035556201b3a9c8c546cb3402406344353cfca37ce5d2fbe268bfaafe693b77
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r2.ebuild b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
deleted file mode 100644
index aedbfb3814e6..000000000000
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="https://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="3d debug doc tools"
-
-DEPEND="
-	dev-cpp/muParser
-	dev-libs/boost:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/freetype:2"
-
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_prepare() {
-# 	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
-
-	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
-	if ! use 3d; then
-		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
-	fi
-}
-
-src_configure() {
-	eqmake5 -r
-}
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && insinto html && dodoc -r librecad/support/doc/*
-	insinto /usr/share/appdata
-	doins unix/appdata/librecad.appdata.xml
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/llgal/Manifest b/media-gfx/llgal/Manifest
index b5cc41fef643..568f10279181 100644
--- a/media-gfx/llgal/Manifest
+++ b/media-gfx/llgal/Manifest
@@ -1,5 +1,7 @@
 DIST llgal-0.13.17.tar.bz2 81365 BLAKE2B 3af18f6f3ae699a1ddd577cd97780e9795ff77faffd50866cb11a9ee6170b718144806fb01b7959e2fe1dcfeec39bb0a34482a75e64d5eeb7df73c99ef14547c SHA512 2b100053a804985e7f59674e6a0886bffe5231cf3735a8dbbf7c8db56285a5a4ca88880299aac25d5cecb6a4f0cc024dc87fdf084eb281f7cb578f0d7cba5293
 DIST llgal-0.13.18.tar.bz2 81674 BLAKE2B 96b48e9d6ad91ad2b11cd898563c7640f047ddbfd7f5ba8d6e4fb2d304199936b3fdbc6c8bf2647ec7141b85857c79d4e2e76bab2b3c6daa07ee0b4933b79aed SHA512 d01c1060616bb602af8b75aa5ae04384c19ed4bcc717112b9d5cfe48a9a823ce9ba381d675b4f4e89f35a56d7cbf580f27405fcb65b785e8ea6b6732784b0655
+DIST llgal-0.13.19.tar.gz 96675 BLAKE2B b306eed900a1071898ebe2d0dcbfeb9c505271ec8d5889e75fcf189dee22489fb8d671ede05a1af74a7761b604d8af8e3b26b8771ec50c8e49036000e90258fd SHA512 24f247071678f21c79e37002a443ff222e9e99e9bf04363fc123c5d9538a35db100ea814408e2bcc9e20781982145301df3337e521413651547828654a92d169
 EBUILD llgal-0.13.17-r2.ebuild 914 BLAKE2B d52a3d2ae2de6da933bbd651fa215dfd7609bf6e34afcda0b753f5be1dd5a5cf269ceb508c0c50f2b2497f6f8998904ded0f51d639a16f207da495f99d1cd05e SHA512 c7150f19b551b77c7934f4a12fe9b60c0ec2ef96eacdc0e4de192b0d8ba088609373436499ef2351983f8d279fb269908479ee12da26bcb1dbf3b50110cf419f
 EBUILD llgal-0.13.18.ebuild 916 BLAKE2B 0b6156409e0440708cd37e45d7e16c326c643c5ef35090de4e40fa8c802ee5d457db139ffb0149e59d4f80417a6c6b408deea06a1e9802f9589b3eaa67d7a690 SHA512 9960069fcf88897ddbfd5cc026ca9dea6f1bbcfa0fd5ab437af970a260db06bf52268730ea425af451fb0847c070ec07305de126884c8f550f0329c266d52b9a
+EBUILD llgal-0.13.19.ebuild 1073 BLAKE2B 0b2291b5fc2436668c0f5f5d369570ca64532d46dae3b35e2460d87cec55bc06f79ffa2c0c89bc01ed4bfcf705c6d499daddcf7bc43bf5cc59a6bdad573c616f SHA512 d091c8d29096227d33ba56a385dad69976b063dbcf777d3e090c24f94524f1465ca4077f12b67269359f77d774c29aa147163fa550fd917486b4f6799b7c4f39
 MISC metadata.xml 365 BLAKE2B 91e30c99cee02f64efac65038cd7e3e04b37f466b83d423cef36a31a071ee9ffd38fc1d46b71f736ee87d846d9787348720b49c83fd2aa6e402dd2817b18fec3 SHA512 2abbab6015809e7c8f484a40cfd646173763f54cec04f2aa71a550dcc8c4dde96f8d692d03de6280411b480a0597708da655eaf0005e3f8b4b87e65cbc44f04a
diff --git a/media-gfx/llgal/llgal-0.13.19.ebuild b/media-gfx/llgal/llgal-0.13.19.ebuild
new file mode 100644
index 000000000000..bc446bec1942
--- /dev/null
+++ b/media-gfx/llgal/llgal-0.13.19.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+
+DESCRIPTION="Command-line static web gallery generator"
+HOMEPAGE="http://bgoglin.free.fr/llgal/"
+SRC_URI="https://github.com/bgoglin/llgal/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+# Package warrants IUSE doc and possibly examples
+IUSE="exif"
+
+RDEPEND="media-gfx/imagemagick
+	 dev-perl/Image-Size
+	 dev-perl/URI
+	 dev-perl/Locale-gettext
+	 exif? ( media-libs/exiftool )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}"/usr \
+		SYSCONFDIR="${EPREFIX}"/etc \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		PERL_INSTALLDIRS=vendor
+	mv doc/llgalrc . || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		LOCALES="${LINGUAS}" \
+		PREFIX="${EPREFIX}"/usr \
+		SYSCONFDIR="${EPREFIX}"/etc \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html \
+		PERL_INSTALLDIRS=vendor \
+		install install-doc install-man
+	perl_delete_localpod
+	dodoc README llgalrc llgalrc.5
+}
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 8c21883b8ccb..6a47cd0d80ed 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -5,4 +5,4 @@ DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da
 EBUILD openscad-2015.03_p2-r3.ebuild 1572 BLAKE2B 747dcdacc2a08772b1d64d2908978fe16a6a04496e7ad2d053d622c733835f0055edbae1d3a400a0a3293168ee5935b7ab17b4379ee80531df0654ea49559833 SHA512 c7cbef11976633ccad4f0f947a07fffb1a7974220f46af1a2bb81ca577236126ce14d642bff0d5a182cb2c5519bbe669fcbe4806678294795cc0afe71aeca589
 EBUILD openscad-2015.03_p3.ebuild 1584 BLAKE2B b283c7b93ac0797ec7a7884047568e07773c6714ca0ea787ad8c4003fe85cfc7219bcca0dbcb1149063580109d2e6c419ce4a9a6f2ef0cbbb8a87d33907637e5 SHA512 e5ce533fce3fe8bdcdcd86b62a7aa77073a2acf572f1c386e4fded6d023bc3571757f8513c1ab538d59f70ee1e3a11c63b951e93224abbfd2baf09dec7430419
 EBUILD openscad-9999.ebuild 1463 BLAKE2B afe4a5aa2b53e6667626605fe869a76318d9f74933cb0e1f6f8e1ad7d7e17e42bdd93cb306689fac49622fb8f62659911512cacc762406e488068fd738ec3a97 SHA512 04900830eef04f18fcb64ad35a7e60ef00247acfcdfbe63f3a685ddd39bc699198f4addf2a47141018c5c4cf551f01f60d7b3ee48088f9aaf9cbe4ae216d987b
-MISC metadata.xml 830 BLAKE2B 762f6ceb15d94a41dcdefc38f8dfc1bf652f97f687da7a336653aca1d64b31837d09cea3c1d311772e67368ddaa4876c845f5ca3cbf7a7c4e9c6b6f13219c021 SHA512 8c12064c65b8ffca0ad8ec585d3de5ed4ac17bec6e4c7340aba2980d2ddb047d1f7b0c5405cdb4b72869749f6ebaddf29bd6fa03eec8e71c8fa2ea3910767617
+MISC metadata.xml 754 BLAKE2B d8247b4210f8e5470a0e2bbbb21c4b0755b7aa0beac0f75845bdda5135eb86a9214888cca436a02b7e566520865aae7714a9942bb5871c8e8fd54240b933abb4 SHA512 23905b2fb9ff937bdaee469086c9eefc3404de22e72be73f470ee51b9d078da20c856918d320c7156221708c11855a7e12ff6f277f4d5cfad671dcb4d9911c40
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 9e07fd9d7834..a11c32d6c96b 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>michael weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 OpenSCAD is a software for creating solid 3D CAD objects.  Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.  OpenSCAD is free software and available for Linux/UNIX, MS Windows and Mac OS X.
 	</longdescription>
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 34de40707050..ded3eca4ad8c 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,5 +1,8 @@
+AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
 DIST pngquant-2.11.4-src.tar.gz 142149 BLAKE2B eccf0c7a279d62981cfdf44ab0e378b2331377cd892019161b453edc7ffe73616a2aa83a07cf5f8d7292a0f96bf25612c23129348463cac73647021eae44f160 SHA512 171949977e1fd71c05bd75552f2e62535f6c15f31c3192cbe31df7451091634a6fbbfd08b47dd040f353af3b5f41fcc13db4421a212ca07cc6836f029635ddd0
 DIST pngquant-2.11.7-src.tar.gz 141959 BLAKE2B 00e36a818a2150aeb3c927daeb8621bafa41497a6fe32afe30e41ad04d788946390f382139aea9878f58fc7a84fdbaf597681c9d8769e0e23b785a10d2e0233c SHA512 5325577dcb16acf5dff81a5f3bcf8cfa2a12df07a7c2308ebb9a343b74e56ea21184ed3f87819122c8bb97b4a7ffd3b61046c60f7f339da9a93e76dfa17ebee6
+DIST pngquant-2.12.2-src.tar.gz 143404 BLAKE2B b06b1185fdeb1990e6b6f0cb77e33051729731fc2c2f4b1f618bd9077057354eabc21405872c938dbdf5395040860b4a884e9780bbd439da36f2af61d53e82a9 SHA512 ed82e0a57d9f4f3ee40258c4cbbf7ed086177dee1e2afdcb7d308f779c83fb2be9c7226c0713b9c72e6b6c22161dbaca3d14f2bdc2f0468daa608be80e9ef1c9
 EBUILD pngquant-2.11.4.ebuild 1003 BLAKE2B 6e56ca1685dbbd7bf9f5e6d45a02770e59b392ffb1494e819d74afd59e54b05532ab2925fab620a19bee90291e66e8cca9ab22ccb4b6a1d81f16e29330e1f5f3 SHA512 c7540c0565652abf15efaeef55b929577265e30df9759b00d53bff81002cbbcc42bc9b27873ab76b9869d776e6ff53ef75b53729c60d3e5399141cbc44d93507
 EBUILD pngquant-2.11.7.ebuild 1003 BLAKE2B 6e56ca1685dbbd7bf9f5e6d45a02770e59b392ffb1494e819d74afd59e54b05532ab2925fab620a19bee90291e66e8cca9ab22ccb4b6a1d81f16e29330e1f5f3 SHA512 c7540c0565652abf15efaeef55b929577265e30df9759b00d53bff81002cbbcc42bc9b27873ab76b9869d776e6ff53ef75b53729c60d3e5399141cbc44d93507
+EBUILD pngquant-2.12.2.ebuild 1170 BLAKE2B 64b37bdd0875cb2b856925b6223fb79adbf426b5cda1c821e715ad198ecaa8e9e8392e870d22985574834e0c1235c70207ae0bf63b666ebd5b8a49155a126e07 SHA512 c44a4060fb2f3aa56d9077b1cd15df78fb283c3fbddbf85e383b6289f94f6fc0aa1ad7e02a9babf2d9ccfa1fc9fefb32cd61dac90311734450871fa07072d1cc
 MISC metadata.xml 492 BLAKE2B c60cb6917ca56946f1941feb2de555e4ced9c56ea3f25fae727bbfd2a49567ef3b581e877b7304dffe090ed898cc285f1baf5465380eb30582bc086854fdbc8a SHA512 5afec8077fc4f303cc76de855558049bdebf0d40a76381077866fd9d3e658912936fc2cd63411d378475743f8649e68dcc08793eb066d6adf9b232b8c669cb1b
diff --git a/media-gfx/pngquant/files/pngquant-2.12.2-respect-CFLAGS.patch b/media-gfx/pngquant/files/pngquant-2.12.2-respect-CFLAGS.patch
new file mode 100644
index 000000000000..c290af36fe5f
--- /dev/null
+++ b/media-gfx/pngquant/files/pngquant-2.12.2-respect-CFLAGS.patch
@@ -0,0 +1,17 @@
+--- a/configure
++++ b/configure
+@@ -152,12 +152,12 @@ rm -f pngquant-gcccheck pngquant-gcccheck.c
+ status "Compiler" "$CC"
+ 
+ # init flags
+-CFLAGS=${CFLAGS:--fno-math-errno -funroll-loops -fomit-frame-pointer -Wall}
++CFLAGS=${CFLAGS:--fno-math-errno -funroll-loops -fomit-frame-pointer}
+ cflags "-std=c99 -I."
+ 
+ # DEBUG
+ if [ -z "$DEBUG" ]; then
+-    cflags "-O3 -DNDEBUG"
++    cflags "-DNDEBUG"
+     status "Debug" "no"
+ else
+     cflags "-O1 -g"
diff --git a/media-gfx/pngquant/pngquant-2.12.2.ebuild b/media-gfx/pngquant/pngquant-2.12.2.ebuild
new file mode 100644
index 000000000000..5bc16502eb65
--- /dev/null
+++ b/media-gfx/pngquant/pngquant-2.12.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="command-line utility and library for lossy compression of PNG images"
+HOMEPAGE="https://pngquant.org/"
+SRC_URI="https://pngquant.org/${P}-src.tar.gz"
+
+LICENSE="GPL-3 HPND rwpng"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug lcms openmp cpu_flags_x86_sse2"
+
+RDEPEND="media-libs/libpng:0=
+	media-gfx/libimagequant:=
+	sys-libs/zlib:=
+	lcms? ( media-libs/lcms:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch )
+
+src_prepare() {
+	default
+
+	# avoid silent fallback to bundled lib
+	rm -rv lib || die
+}
+
+src_configure() {
+	tc-export AR CC
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--with-libimagequant \
+		$(use debug && echo --enable-debug) \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use openmp && tc-has-openmp && echo --with-openmp) \
+		$(use_with lcms lcms2) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc CHANGELOG README.md
+}
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index 1f32b7e9c2a7..0b4f6979e5c7 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,6 +1,6 @@
-DIST pqiv-2.10.2.tar.gz 138506 BLAKE2B 255104acec9d42eac52d8aaf05207fc8071ecbef14a04c5952e70347d0cd83b54b00725b9bb949184bcd9437982701814b6a09c4c2397336f26ce9f50896d2e6 SHA512 99cb3a187fa2cc0df7b7f768b2f801fbec78aa8d76aacd12085f3b8ccbfaf931a2379e7b05a92f83dacf511489518a75f9e5bf528e4152158d8bb75cffb0d6f7
 DIST pqiv-2.10.4.tar.gz 138644 BLAKE2B 7dc358379d463e6b421c082942a2171b749ea41b4e655c64425d6cfdf8f251ce89d431b45a28d8b30eb5c022814bec7e365c3b3272ebf0cc7e994b803ddfd4ec SHA512 52534ed4728466b7c710db65115d7e79ad97546750946fa5c3a26b65055387b15c6239fdf1bb8c8345fe7ed2dfc7ed5586ffa2a864de44fd8213cff59f76048a
-EBUILD pqiv-2.10.2.ebuild 1799 BLAKE2B afbd89f9774f1c988ad617f3431335b2274210d926f2355de279cd435175b1c26ff7361ca3a460931ca31bc880c8db9b967693ccb6e8826640be06c4aa751d74 SHA512 6bf9ac25f68e166fa303818dfe4f83a421071ff4745878c76f76cbab7a70508a6f0bea8f8b9112a55d00fa78f436b41c6ee90e60b7f159a34b40e6c639611722
-EBUILD pqiv-2.10.4.ebuild 1801 BLAKE2B ca7328eaa6f2ad7f087cc6c83f45bf89d796a5e6d584f364976f027a87c4235db202380d30fc30d2d8c5005519566c4c12bd40efad8a9db646e3f64b45e644fb SHA512 bb814792bdbab1c9085d03f34930c9463b4ebfa7cee03c619974efe3566073e00519c8f26b2cc2e9269607044e10db2a798bc16408b10f00df2c0b00d47e0a28
-EBUILD pqiv-9999.ebuild 1801 BLAKE2B ca7328eaa6f2ad7f087cc6c83f45bf89d796a5e6d584f364976f027a87c4235db202380d30fc30d2d8c5005519566c4c12bd40efad8a9db646e3f64b45e644fb SHA512 bb814792bdbab1c9085d03f34930c9463b4ebfa7cee03c619974efe3566073e00519c8f26b2cc2e9269607044e10db2a798bc16408b10f00df2c0b00d47e0a28
+DIST pqiv-2.11.tar.gz 139825 BLAKE2B 981d472ccd3284b2e9ad3da8e84233c95555a927af797f8421ac820225d3d39cab2275f01269a986bab54994e0fce2095b7c33b1201e7a6117e1c8399617341b SHA512 6017a9d7ed332915a9f6fa788bb02c3b9d4d83c2ae2f9a8ab7d7738caa14ba3e9d253906f2e73fdfd368bb5e7bc51380ee9906fd9921e5f7f113811fd3da66f7
+EBUILD pqiv-2.10.4.ebuild 1796 BLAKE2B 3708b1f8969a498f3582db811e53a8c3a3fb58071abfdd9089a45ffccb7596c856afbab014094103df9ca0f788127dff22f103e7c23ca04ac9294275fe36c05f SHA512 e42bdb8f10bb1474e3c32c8164c2e208bfb3035108ccb21698b4736e96f98de7fcfb819e4a73085a2b3a34effd1348af06bdb2a60722226274bc3bc6777db8fa
+EBUILD pqiv-2.11.ebuild 1798 BLAKE2B 7ef990a30f601a6e3651e643f8b013cdfbe82300e2e69e100573b968d9358ea177ce5fd5aebdcafd339f0ce8c6d61063b3f0c0da6e95d753a01e7d1a94774802 SHA512 980df3cbbcafc40946a7cfa17b86580637457d2549f69e63dc4443e0829b90e58b7adc14db6a025e4bf0866252600ecd782609584a0f7c62ba737db372924a96
+EBUILD pqiv-9999.ebuild 1798 BLAKE2B 7ef990a30f601a6e3651e643f8b013cdfbe82300e2e69e100573b968d9358ea177ce5fd5aebdcafd339f0ce8c6d61063b3f0c0da6e95d753a01e7d1a94774802 SHA512 980df3cbbcafc40946a7cfa17b86580637457d2549f69e63dc4443e0829b90e58b7adc14db6a025e4bf0866252600ecd782609584a0f7c62ba737db372924a96
 MISC metadata.xml 584 BLAKE2B 5d617c553a0f5f4be6268f17dae36d3bb52e984c4c7c89df44b40e1bde1cff3e5619210548b93bf6ffc2e0ea32839d6b4fd39714b237aea23f1cad966c92b3ec SHA512 0d589cf085f6e6335aae5f6e32ccd153ddae1f0fa926fd3a135eabcdc20d5c560e2694216ba93b6d8c6c16bd8541f9d7aaa496e7ee4bc82fea90228a28320fbd
diff --git a/media-gfx/pqiv/pqiv-2.10.4.ebuild b/media-gfx/pqiv/pqiv-2.10.4.ebuild
index 92c15ed6806f..28b7ffe93510 100644
--- a/media-gfx/pqiv/pqiv-2.10.4.ebuild
+++ b/media-gfx/pqiv/pqiv-2.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
diff --git a/media-gfx/pqiv/pqiv-2.10.2.ebuild b/media-gfx/pqiv/pqiv-2.11.ebuild
index 4a4742d3c92c..499cd72f5f50 100644
--- a/media-gfx/pqiv/pqiv-2.10.2.ebuild
+++ b/media-gfx/pqiv/pqiv-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
diff --git a/media-gfx/pqiv/pqiv-9999.ebuild b/media-gfx/pqiv/pqiv-9999.ebuild
index 92c15ed6806f..499cd72f5f50 100644
--- a/media-gfx/pqiv/pqiv-9999.ebuild
+++ b/media-gfx/pqiv/pqiv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-gfx/recoverjpeg/Manifest b/media-gfx/recoverjpeg/Manifest
index 6e6f59ace96d..7c4224c17569 100644
--- a/media-gfx/recoverjpeg/Manifest
+++ b/media-gfx/recoverjpeg/Manifest
@@ -8,4 +8,4 @@ EBUILD recoverjpeg-2.1.1-r1.ebuild 469 BLAKE2B d5ef888436ad280508b95fad54220f598
 EBUILD recoverjpeg-2.2.1-r1.ebuild 467 BLAKE2B 4fbad01e2a807f0c1cc25f65e5f889d3c159d655490c78c339d7d6a3b21f11a999a12c35009e0e039562eed1a4e83b1747da74cb128dac19fa94f339a4bff4fa SHA512 25003f0d99a2ae64b2f4103d4e77bc33fb4ddbc4614549ae6f5f2f8d26bd35253c746c699ce5b12667c1502f8720fcc3cc5c58ed8b71a1b7ff8aa4b8dc7142b3
 EBUILD recoverjpeg-2.2.2-r1.ebuild 469 BLAKE2B d5ef888436ad280508b95fad54220f5982aba84f9cd41fe0ad221227422f2394b4fd11586563a023367b55eade5d09dba5972e279880a20baa5d8334f1174ffc SHA512 ccebb94370c5c9ed496ccf7eba0f6e992d11d5c2d680517fa5f5273be0e6b2a827b51b7495bc24ba229f8fe1881c2cf0a097cfa3e40aee876a1b35e532d51d5a
 EBUILD recoverjpeg-2.2.3-r1.ebuild 467 BLAKE2B 4fbad01e2a807f0c1cc25f65e5f889d3c159d655490c78c339d7d6a3b21f11a999a12c35009e0e039562eed1a4e83b1747da74cb128dac19fa94f339a4bff4fa SHA512 25003f0d99a2ae64b2f4103d4e77bc33fb4ddbc4614549ae6f5f2f8d26bd35253c746c699ce5b12667c1502f8720fcc3cc5c58ed8b71a1b7ff8aa4b8dc7142b3
-MISC metadata.xml 241 BLAKE2B 86bf39fec9721fb3046313016fee4dc0ffad2db1c24d7de563dad8b161761e8750b51042e54f83bd15ce9538371e7e00d05682495ffeb4742b83d2cb04af7fdd SHA512 36d2c19e9be1e9b7cb9448aad02e7601fed141574c932ef6c6f1cf2e65ae89832a6d276a18497e845ab584ff5a0f6425b15a325963c123e1070da3fc416f83bd
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/recoverjpeg/metadata.xml b/media-gfx/recoverjpeg/metadata.xml
index d15a3ebeaa10..6f49eba8f496 100644
--- a/media-gfx/recoverjpeg/metadata.xml
+++ b/media-gfx/recoverjpeg/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>xmw@gentoo.org</email>
-  <name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/replicatorg/Manifest b/media-gfx/replicatorg/Manifest
deleted file mode 100644
index fac08f8b97c4..000000000000
--- a/media-gfx/replicatorg/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX replicatorg 52 BLAKE2B 165fed22febafa650c6a20085cf6709b9c93132068fb4af0208ee79c46923d0c7a1bf783d5eaa51ee85a3c53579c6a18d5c823a1b5bd7feaf3bdd9fcf751de71 SHA512 93e5c726d4252d1ebe9d8283d1bb9c0857c8a8385f35762a9ca972fb79fd9723b60faa39e2553cdf1da790405bbc74863e72da26c27081ed96d5d9ca4715c095
-DIST replicatorg-0037-linux.tgz 52627038 BLAKE2B 04a11093da4c7ef57dce25648518d5a6233a95eb6733d128fdd1e6c16c1c2dae7314c00d3e151aaad92fe66687cad27f6c203a494a3235be7c1f9ab9cf8f20a4 SHA512 9fabfe64a6ff6c059abe66404349739cd74bcc244a4f37d020d506fd82d318f5103daeb289f615fe47203c43ea8842487acbe21b6cdbb9cdb4d9b20bfbfd845c
-DIST replicatorg-0040-linux.tgz 45962287 BLAKE2B 9aae435b150d96129be027658a3fd65ffc2f3335ecb40e219bff8919c9d14625ee059e899f576a8580d6fffdcea59e1d9e096377068a378a302ac82bd782df9c SHA512 c2be8679ebcb722a01f46bbd5a3dd771ebda0eb5e5546627f9064b412be0e5ae0b63f9d44dc7f03d9b3fb862c45dbe09edfb15018a075f39ca57d725ca804205
-EBUILD replicatorg-37-r3.ebuild 2552 BLAKE2B 55047f7bf450c60196c5f60bbf472b7f7cd9697293ae423e58438d51adb0b15047efef1cc7be945f1162faefce8c80c60cce0cb42fcc6927c48a0f20bdbf60b0 SHA512 18106d35768a4b9a9c416eb2d138e717d461203ce0f6b46127fba903e46d982ef014465278042b510cf6a1dc77c30c552b2c94762a987dd071ac21de53d9d8a4
-EBUILD replicatorg-40-r2.ebuild 2541 BLAKE2B 6c64fdf09201b81ecac18cffbc0d89c13148569375f0d2928b5b1dc027e5b34bd494b8764a8fdae7dac495064dec9644f560bfb6fcc9b3c578098736379801c5 SHA512 e948d106cc079c5868e6dee9b55a69e54bb1fe23c031059906086262446a517bd43651216dad04bd01e6b9a605493e0ca756a29b8e4c01f0a35630b3e1caf0d7
-MISC metadata.xml 651 BLAKE2B 632ffdf62dcc19c95406d96667fb4f73fcb1d745840031227c31c4476f20207f93fc9f93eab8ed2730b4c36859e9443af33a1a95df6178a51616805265186bab SHA512 7174fd352ffee5c45009306a23db9dbe613c8045483df7ddefd6cb465161904d6055951c9d3b2a89cfff33726ac4601dd72f25a0b5331ec14b1e88602f181c7c
diff --git a/media-gfx/replicatorg/files/replicatorg b/media-gfx/replicatorg/files/replicatorg
deleted file mode 100644
index 2c91bf254346..000000000000
--- a/media-gfx/replicatorg/files/replicatorg
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-( cd /opt/replicatorg ; ./replicatorg )
diff --git a/media-gfx/replicatorg/metadata.xml b/media-gfx/replicatorg/metadata.xml
deleted file mode 100644
index d193ce4f0dbf..000000000000
--- a/media-gfx/replicatorg/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->	
-	<longdescription>
-		This is the software that will drive your MakerBot Replicator, 
-		Thing-O-Matic, CupCake CNC, RepRap machine, or generic CNC machine. 
-		You can give it a GCode or STL file to process, and it takes it from 
-		there. It's cross platform, easily installed, and is based on the 
-		familiar Arduino / Processing environments. ReplicatorG is used by 
-		thousands of MakerBot Operators, and has printed tens of thousands 
-		of objects and counting.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-gfx/replicatorg/replicatorg-37-r3.ebuild b/media-gfx/replicatorg/replicatorg-37-r3.ebuild
deleted file mode 100644
index 2daae54f2969..000000000000
--- a/media-gfx/replicatorg/replicatorg-37-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator user
-
-MY_P="${PN}-00${PV}"
-
-DESCRIPTION="ReplicatorG is a simple, open source 3D printing program"
-HOMEPAGE="http://replicat.org/start https://github.com/makerbot/ReplicatorG"
-SRC_URI="https://replicatorg.googlecode.com/files/${MY_P}-linux.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/oracle-jre-bin:*"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so
-	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so"
-QA_TEXTRELS="
-	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so
-	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so
-	/opt/replicatorg/lib-i686/libj3dcore-ogl.so
-	/opt/replicatorg/lib-i686/libj3dcore-ogl-cg.so"
-
-pkg_setup() {
-	enewgroup replicator
-}
-
-src_install() {
-	dodir \
-		/opt/replicatorg \
-		/usr/share/replicatorg
-
-	keepdir \
-		/opt/replicatorg \
-		/usr/share/replicatorg
-
-	dobin "${FILESDIR}"/replicatorg
-
-	insinto /opt/replicatorg/
-	doins -r \
-		docs \
-		examples \
-		lib \
-		lib-i686 \
-		lib-x86_64 \
-		machines \
-		scripts \
-		replicatorg \
-		skein_engines \
-		tools
-
-	insinto /usr/share/replicatorg
-	doins -r \
-		contributors.txt \
-		license.txt \
-		readme.txt \
-		todo.txt
-}
-
-pkg_postinst() {
-	elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK."
-	elog
-	elog "Ensure that your user account has permissions to access serial port,"
-	elog "if you plan to connect directly to a 3d printer rather than using"
-	elog "a flash card. Printing directly from replicatorg is preferred."
-	elog
-	elog "The replicator printer will likely show up in /dev as ttyACM0."
-	elog "You may want to autoload the cdc_acm kernel module."
-	elog
-	elog "Note that replicatorg includes its own version of skeinforge."
-	elog "There doesn't seem to be a simple way to depend on an external"
-	elog "version."
-	elog
-	elog "Replicatorg users should add themselves to the replicator group"
-	elog "to avoid upstream warnings about not being able to modify shared"
-	elog "skeinforge scripts."
-	elog
-
-	chmod -R g+w "${EROOT%/}"/opt/replicatorg
-	chown -R root:replicator "${EROOT%/}"/opt/replicatorg
-	chmod 0755 /opt/replicatorg
-}
diff --git a/media-gfx/replicatorg/replicatorg-40-r2.ebuild b/media-gfx/replicatorg/replicatorg-40-r2.ebuild
deleted file mode 100644
index 7e12c97224b2..000000000000
--- a/media-gfx/replicatorg/replicatorg-40-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator user
-
-MY_P="${PN}-00${PV}"
-
-DESCRIPTION="ReplicatorG is a simple, open source 3D printing program"
-HOMEPAGE="http://replicat.org/start https://github.com/makerbot/ReplicatorG"
-SRC_URI="https://replicatorg.googlecode.com/files/${MY_P}-linux.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="dev-java/oracle-jre-bin:*"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so
-	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so"
-QA_TEXTRELS="
-	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so
-	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so
-	/opt/replicatorg/lib-i686/libj3dcore-ogl.so
-	/opt/replicatorg/lib-i686/libj3dcore-ogl-cg.so"
-
-pkg_setup() {
-	enewgroup replicator
-}
-
-src_install() {
-	dodir \
-		/opt/replicatorg \
-		/usr/share/replicatorg
-
-	keepdir \
-		/opt/replicatorg \
-		/usr/share/replicatorg
-
-	dobin "${FILESDIR}"/replicatorg
-
-	insinto /opt/replicatorg/
-	doins -r \
-		docs \
-		examples \
-		lib \
-		lib-i686 \
-		lib-x86_64 \
-		machines \
-		scripts \
-		replicatorg \
-		skein_engines \
-		tools
-
-	insinto /usr/share/replicatorg
-	doins -r \
-		contributors.txt \
-		license.txt \
-		readme.txt \
-		todo.txt
-}
-
-pkg_postinst() {
-	elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK."
-	elog
-	elog "Ensure that your user account has permissions to access serial port,"
-	elog "if you plan to connect directly to a 3d printer rather than using"
-	elog "a flash card. Printing directly from replicatorg is preferred."
-	elog
-	elog "The replicator printer will likely show up in /dev as ttyACM0."
-	elog "You may want to autoload the cdc_acm kernel module."
-	elog
-	elog "Note that replicatorg includes its own version of skeinforge."
-	elog "There doesn't seem to be a simple way to depend on an external"
-	elog "version."
-	elog
-	elog "Replicatorg users should add themselves to the replicator group"
-	elog "to avoid upstream warnings about not being able to modify shared"
-	elog "skeinforge scripts."
-	elog
-
-	chmod -R g+w "${EROOT%/}"/opt/replicatorg
-	chown -R root:replicator "${EROOT%/}"/opt/replicatorg
-	chmod 0755 /opt/replicatorg
-}
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 20023b87bd2e..d90bd1b56b8e 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,11 +1,7 @@
-DIST shotwell-0.26.4.tar.xz 5619280 BLAKE2B 0ca9ecf6e96019aa8e9bd4bae09d1b888902fc054633271854e09e1fa9b474774b7b5f2e6e3bcfed60a5b0f3ba30a2d89133d2676a94db5f4da6ee6a0af41102 SHA512 6a0772a40759d636807652ef27814306cbc2217119b071590db36c628b6e9d04f876ae1748c88476fbebc1db0c83e6a108c9f74261b7faa348c6bd37c1da198d
-DIST shotwell-0.28.2.tar.xz 5582276 BLAKE2B 20d35f714543d35bd04fe81617040419664e662664ae504cbfb0b3bb160d97a5469478e1e134b6432b174fc19bb4fc370b5eb38c576c805e876d00999fb7d979 SHA512 dc00f45e55eabadaaf825de5a4152d40db2eb652f966b870a08d36006887a18aacf570b05d232a9fc7ef7df097a468a497778022bf7b86ae2143877c02540cc0
 DIST shotwell-0.28.3.tar.xz 5531900 BLAKE2B b585989434e3da9b2d5f43aabf41451e33b7b2f537a21305ff9decd9992d42e5422971d1f89836936630f641efdac1242dc21574d86f61a4c71562b657e0300d SHA512 9a0c15bfe856dabaa85038fe875cc178be6a3e104397b36555005615212ac92579234fc6277f1a4a7bddba517e9ea0db5ed06e0fc30614453e3db1153b47dc16
 DIST shotwell-0.29.2.tar.xz 2321576 BLAKE2B 2dd3c959ca8aba6ecb7c3c15ca491291a2c6ead860fac9c1fb1b97ad22140ce9e67617dd268b2d4d362bb8a0c2606d97b5cc71c12e19fcb59fec0185f27c3f0f SHA512 98c57d511a384ced717e2fb410af16326080e2291fce77ea953a377430459c7a81de73118925b2d42bf96b8b717efc93a898d0d859fbab1364c0c192dbb60311
 DIST shotwell-0.29.3.tar.xz 2416332 BLAKE2B 8f95e3e1b71eb20b10571b5689e9817112935c4d31c8b7800157f7771df04adb4559acc9885ec43032a7619ffefb8899fd90a7740798de4a150c4c78033e890c SHA512 f600db86adf5caece4ed4c8a3ca4309540f9eeb1caded8e3f062fd56fa54f2030568c8168fc662fcf80c9905e9b735d52a2578bc2401faf28876a6f5aed01121
-EBUILD shotwell-0.26.4.ebuild 1488 BLAKE2B a18a437d65ca3a9999f0f238d7442564c012b08d209384d8b47fedd12a8eca4c1e91e28ba18b456ff860c56a16cd1059b2d7a0541d06f10d2937efcf893a607b SHA512 2cd5b9e390f61de3d0db9ff5d0ea59ff36eef745afb237ea82d87f584fda7ca200b95eb7273e1a74f401e5a7187e8eb78c98910723d68dccdf90535a094bd0d6
-EBUILD shotwell-0.28.2.ebuild 1488 BLAKE2B a18a437d65ca3a9999f0f238d7442564c012b08d209384d8b47fedd12a8eca4c1e91e28ba18b456ff860c56a16cd1059b2d7a0541d06f10d2937efcf893a607b SHA512 2cd5b9e390f61de3d0db9ff5d0ea59ff36eef745afb237ea82d87f584fda7ca200b95eb7273e1a74f401e5a7187e8eb78c98910723d68dccdf90535a094bd0d6
-EBUILD shotwell-0.28.3.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
+EBUILD shotwell-0.28.3.ebuild 1485 BLAKE2B 248f0309213445e4ba17c9d8e401fdc3a063c8e2f2df7c2f028d89d772ca668aac0e70986d80053cc879061dec21df87b3da941d08cf153ca802a914b01b3b31 SHA512 8273d6ece7dca82443499d7881f4f790baf2c80c2fe252d83e0eadee288afc9810b833486b9743670e1768141eb3e077798fee744b1a1a60a07227db9bd39d00
 EBUILD shotwell-0.29.2.ebuild 738 BLAKE2B 33f7584f897f980cc14a6823150cf9a2228bebd78d62b953ef3d757b11a37d348287a4f7776cd25c0c6db8450f5b5e6254c22a185afbe5baf01cbf1a915dcc7b SHA512 847163fa58acdb6eb326082e4c21d712c9e908d549330e7913205f3ea37b18049b46b6ac0cc1daa549e36d5487b1f65429ee0c544aa8ac3b1e8c834521d5dccb
 EBUILD shotwell-0.29.3.ebuild 738 BLAKE2B 33f7584f897f980cc14a6823150cf9a2228bebd78d62b953ef3d757b11a37d348287a4f7776cd25c0c6db8450f5b5e6254c22a185afbe5baf01cbf1a915dcc7b SHA512 847163fa58acdb6eb326082e4c21d712c9e908d549330e7913205f3ea37b18049b46b6ac0cc1daa549e36d5487b1f65429ee0c544aa8ac3b1e8c834521d5dccb
 MISC metadata.xml 789 BLAKE2B ea120210a69912ba02fc9e2d52b4d415254504427a38f572f23d5dca0df8d679b62218428fe588ff429ab74727d017f5a9bc709b400b357c0508e7624ae2d1a2 SHA512 ad52dde0111094d2ccccc8a9d2eebe2d03bab4735903acba5d74dc7cbdf1923a8cc51a299b44189c4c33a206eac34c8e186a954747f9bd3520a64c7080c83330
diff --git a/media-gfx/shotwell/shotwell-0.26.4.ebuild b/media-gfx/shotwell/shotwell-0.26.4.ebuild
deleted file mode 100644
index 5b1b6cd4fc14..000000000000
--- a/media-gfx/shotwell/shotwell-0.26.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-	dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.28.2.ebuild b/media-gfx/shotwell/shotwell-0.28.2.ebuild
deleted file mode 100644
index 5b1b6cd4fc14..000000000000
--- a/media-gfx/shotwell/shotwell-0.28.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-	dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.28.3.ebuild b/media-gfx/shotwell/shotwell-0.28.3.ebuild
index ed1f73414218..1d1f9124eb96 100644
--- a/media-gfx/shotwell/shotwell-0.28.3.ebuild
+++ b/media-gfx/shotwell/shotwell-0.28.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index fa6698357d57..14fdd4d51109 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,3 +1,6 @@
+AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 DIST simple-scan-3.24.1.tar.xz 669452 BLAKE2B 927c3479a96525e2996aab7c8d37b585f93fb07315a4f5cb0292b29befb0417df6e6afb059158d9840903d7474bf0d4fb97e634c585ca7654581b82a264e80f0 SHA512 9f0ced644b13dcaad4f1e23a6520b1cbe3c36d995fca4791383f959986cd396f123638a23dbd02a9511ef7e1c9c915b3a025e9b7e4de4542a4c180c4fe29e2b9
+DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6
 EBUILD simple-scan-3.24.1.ebuild 1303 BLAKE2B 86538dcf27e462ebc43f598d32c584235409e91610be9e03216b7384d7b296c81b050cb9f0d0d785a08afbdc4f1b7bb705fdc1654363342530d049e09a31f14e SHA512 04a4cddaf9711c7ca99bf6446c1578b955755bd8885ba405ab2f13f84b59112d8657a03b58e2d9016b506064825fd8ca43797199911dac75280514f48a168646
+EBUILD simple-scan-3.30.2.ebuild 1392 BLAKE2B 842721db7010f1062c38014bba990973a032d08fa2b9b6dc8a1dbc02a8a4ad15b4ef990631568103048040d7963864bcccd532b5cecee46782bb9ab8e3ea7a20 SHA512 de89acb3d3ef6f71cbf0fd776dfdc42b87871d81e340e5b3c5337404d93ac1230d1d412f9e91408d6ef0aab1bf5be66ff577c2cd19743885de65362760154cef
 MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca
diff --git a/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch b/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch
new file mode 100644
index 000000000000..868ef9a76a1a
--- /dev/null
+++ b/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch
@@ -0,0 +1,83 @@
+From 02845c57b2bf1b6170efb57c59db5ea0a2b60091 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 30 May 2018 08:44:18 +0200
+Subject: [PATCH] Add control for optional dependencies
+
+---
+ meson.build       | 18 ++++++++++++++----
+ meson_options.txt |  3 +++
+ src/meson.build   | 12 ++++++++----
+ 3 files changed, 25 insertions(+), 8 deletions(-)
+ create mode 100644 meson_options.txt
+
+diff --git a/meson.build b/meson.build
+index cd2e452..f39ca51 100644
+--- a/meson.build
++++ b/meson.build
+@@ -25,10 +25,20 @@ zlib_dep = dependency ('zlib')
+ cairo_dep = dependency ('cairo')
+ gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0')
+ gusb_dep = dependency ('gusb', version: '>= 0.2.7')
+-colord_dep = dependency ('colord', required: false)
+-packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false)
+-webp_dep = dependency ('libwebp', required: false)
+-webpmux_dep = dependency ('libwebpmux', required: false)
++
++if get_option('colord')
++    colord_dep = dependency ('colord')
++endif
++
++if get_option('packagekit')
++    packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5')
++endif
++
++if get_option('webp')
++    webp_dep = dependency ('libwebp')
++    webpmux_dep = dependency ('libwebpmux')
++endif
++
+ sane_dep = dependency ('sane-backends')
+ msgfmt = find_program  ('msgfmt')
+ itstool = find_program  ('itstool')
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..570ecdd
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,3 @@
++option('colord', type: 'boolean', value: false)
++option('packagekit', type: 'boolean', value: false)
++option('webp', type: 'boolean', value: false)
+diff --git a/src/meson.build b/src/meson.build
+index 9e40e42..83ca3a9 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -4,17 +4,21 @@ resources = gnome.compile_resources ('resources', 'simple-scan.gresource.xml',
+ 
+ vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ]
+ dependencies = [ glib_dep, gtk_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ]
+-if colord_dep.found ()
++if get_option('colord')
+     vala_args += [ '-D', 'HAVE_COLORD' ]
+     dependencies += colord_dep
+ endif
+-if packagekit_dep.found ()
++if get_option('packagekit')
+     vala_args += [ '-D', 'HAVE_PACKAGEKIT' ]
+     dependencies += packagekit_dep
+ endif
+-if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord
++if get_option('webp')
+     vala_args += [ '-D', 'HAVE_WEBP' ]
+-    dependencies += [ webp_dep, webpmux_dep ]
++    dependencies += [ webp_dep ]
++    # Webpmux only required if colord
++    if get_option('colord')
++        dependencies += [ webpmux_dep ]
++    endif
+ endif
+ 
+ simple_scan = executable ('simple-scan',
+-- 
+2.17.0
+
diff --git a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
new file mode 100644
index 000000000000..4a9b7167affd
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://launchpad.net/simple-scan"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="colord webp" # packagekit
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.22:3
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	>=dev-libs/libgusb-0.2.7[vala]
+	colord? ( >=x11-misc/colord-0.1.24:=[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/3.26-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dpackagekit=false
+		$(meson_use colord)
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/splash-themes-gentoo/Manifest b/media-gfx/splash-themes-gentoo/Manifest
deleted file mode 100644
index ffb9eb78d346..000000000000
--- a/media-gfx/splash-themes-gentoo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST fbsplash-theme-emerge-world-1.0.tar.bz2 3963650 BLAKE2B 141601b1cfc49546d5efc73a19f82fddcd57fdade3d3812d69382c596b2842e3e05984a8f9045dd34c9d0d78d406429159e7044134239fa98f02878bc8d5b03c SHA512 a77f0a97cc97c60159dfa3f445de827c26c261d7194a7716277a8ae5c197ffd31cc7c703aec053fc59fad5e855e049d65ad3eb313789d7e1524c574fedc2ec7b
-DIST fbsplash-theme-emergence-r2.tar.bz2 4794297 BLAKE2B 533d77af791ac1188628ba0b0bfa4c089e9faeebb85624d97cbb27fe2470b1506e0ec01a97fb9e80b0d50fcc93b4be4c18f40bfe48c6ef6a1ab1e3a2d2c29342 SHA512 eefb2c1e09e9efbe6f574d007633a85d83227a526711845f5ede36b4664d781c2de05f3a79ba8d710114dd98559328aaee816983a5dc486cce089e4afb0dd260
-DIST fbsplash-theme-gentoo-r2.tar.bz2 5605891 BLAKE2B bac2913a8e1419995f069cf190aaaf38183f74ff099fb994823123a4b1cabb88767d335ec8f0ee12a98e15f9b231d429e784cc14e02b5f2b36a76d28b5cccdd3 SHA512 eb7b90f8e3821e76ca75706841cd6a170a3bcdc0bfff6e876eb5425f211e3501ad78479e7b8f232eb1e221dfacf450620ffd10191790173359ee053ab9843eea
-DIST natural_gentoo-9.0-r2.tar.bz2 433306 BLAKE2B 9a6c63ca5a538921e762e8b39b5dd0529e91276dfa74f591ded1ba49c316adb3e358277f7f2efb0e696c296fd466bee4a5d3b15976b4ab4bbfe4516b09ac8314 SHA512 ba24da013d2f9c63d7974d443c8529bdd10b552b02006ee107b0b4b1f1034c27448754f220ae153557058f1b359061036c83e687ead2a179392f9239f9fcf686
-EBUILD splash-themes-gentoo-20101212-r1.ebuild 1115 BLAKE2B 7ebf5af9fb95f5d50159aa92c876f65312dd39940888ca26112594ac2f727bdcda70c19539369c2de1cc4e28018139d3117949afb7a7a8cbee0efe2f15ccf5bf SHA512 f1cf653fc790db5389b7d4f2521d6c1c9bd3ee57620ee1a13a4ea0f1c74acc6a64bb47413e0bdc56f2f91366ed3ab0a0d9312da72ca182490c35d6b47bdd3198
-EBUILD splash-themes-gentoo-20101212-r2.ebuild 1439 BLAKE2B 5314c4dfc3eea3cc18116382d7dd081979c974b9b93f0a5ae395b9ee498e3412a5d2114a2b250a18ed7a2f9f87a8c3d852154ae5555e4c08881855df2dfd7e65 SHA512 9676581cd65783644ecd709057693f91be7c854fd6119c4494e22de860cfc0e62d4b33ac604131360f73a5b5d85b2d4d06adb8005bf899eb5f63c3948082d9ed
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/splash-themes-gentoo/metadata.xml b/media-gfx/splash-themes-gentoo/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-gfx/splash-themes-gentoo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r1.ebuild b/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r1.ebuild
deleted file mode 100644
index e007a46b0632..000000000000
--- a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="A collection of Gentoo themes for splashutils"
-HOMEPAGE="https://dev.gentoo.org/~spock/"
-SRC_URI="mirror://gentoo/fbsplash-theme-emergence-r2.tar.bz2
-	 mirror://gentoo/fbsplash-theme-gentoo-r2.tar.bz2
-	 mirror://gentoo/fbsplash-theme-emerge-world-1.0.tar.bz2
-	 http://fbsplash.berlios.de/themes/repo/natural_gentoo-9.0-r2.tar.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=media-gfx/splashutils-1.1.9.5[png]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	sed -i -e 's/natural-gentoo/natural_gentoo/g' natural_gentoo/*.cfg || die 'sed failed'
-}
-
-src_install() {
-	insinto /etc/splash
-	doins -r *
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The upstream tarball for the 'Natural Gentoo' theme also contains a GRUB"
-		elog "splash image which is not installed by this ebuild.  See:"
-		elog "  http://www.kde-look.org/content/show.php?content=49074"
-		elog "if you are interested in this."
-	fi
-}
diff --git a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r2.ebuild b/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r2.ebuild
deleted file mode 100644
index 225ed6c22066..000000000000
--- a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="A collection of Gentoo themes for splashutils"
-HOMEPAGE="https://dev.gentoo.org/~spock/"
-SRC_URI="mirror://gentoo/fbsplash-theme-emergence-r2.tar.bz2
-	 mirror://gentoo/fbsplash-theme-gentoo-r2.tar.bz2
-	 mirror://gentoo/fbsplash-theme-emerge-world-1.0.tar.bz2
-	 http://fbsplash.berlios.de/themes/repo/natural_gentoo-9.0-r2.tar.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=media-gfx/splashutils-1.1.9.5[png]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	sed -i -e 's/natural-gentoo/natural_gentoo/g' natural_gentoo/*.cfg || die 'sed failed'
-}
-
-src_install() {
-	# They need to be executable, bug #470100
-	insinto /etc/splash
-	doins -r *
-
-	# They need to be executable, bug #470100
-	fperms +x /etc/splash/emerge-world/scripts/svc_started-pre
-	fperms +x /etc/splash/emerge-world/scripts/svc_start-pre
-	fperms +x /etc/splash/emerge-world/scripts/svc_stopped-pre
-	fperms +x /etc/splash/emerge-world/scripts/svc_stop-pre
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The upstream tarball for the 'Natural Gentoo' theme also contains a GRUB"
-		elog "splash image which is not installed by this ebuild.  See:"
-		elog "  http://www.kde-look.org/content/show.php?content=49074"
-		elog "if you are interested in this."
-	fi
-}
diff --git a/media-gfx/splash-themes-livecd/Manifest b/media-gfx/splash-themes-livecd/Manifest
deleted file mode 100644
index aa9d5fcb943a..000000000000
--- a/media-gfx/splash-themes-livecd/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX use-new-path-for-functions.sh.patch 355 BLAKE2B cd3fa4f25db67c152b0800ee85abc0edbc36fbda9858b237eda212685462c786302c437ea5de4b96cf6f4ffb7880bc0faa6eecbb14566d6de1dc1399b62f0a75 SHA512 7476b91df9caaf06c409947bb2c970b297dfccb17eec5a5c2f016090a6a8e76a4f42e98986317f64e1d3c5a548a1d0a10e2cdc8a7f6cde16e54b80ade0cf094e
-DIST gentoo-livecd-2005.0-0.9.1.tar.bz2 4887028 BLAKE2B d8eb2ad479b8dcf47061b8f63519a37b40c8ba1bdc116d6a26cb428c93d180d0947f0ed060fba92c796d0ec8e764965e59ce13c8f44507c571a16268a6784a31 SHA512 5728363564a8d98d62c478b9b196e7d7e596da66f8640fddd68b161ad6d037e5f3be9f16d84ecbbd97b9dcbd7f30b40cbc69774aa354f58d9619cfb6e313cf85
-DIST gentoo-livecd-2005.1-0.9.2.tar.bz2 13000381 BLAKE2B bb92a7ae7d3313b05969e491db2cbe9594142dc4f623f3cc0ce36a0514821ef849ba99a8fc209daabe4412d814b527d583fec1a658a23b73f5f960207336cd45 SHA512 eca90d70cc0f3d8e7f5d10a56f7e7fcbc7ed251d43506ae2797b8cbb5be506a12a60454804917c535b17fb8fd8fb47fb9864f7c27d0d12da10869a3288f8b7e4
-DIST gentoo-livecd-2006.0-0.9.3.tar.bz2 3207382 BLAKE2B 0da84d7afb5fc819c29a380e6669f2b97d7f8af09a6551b282df1dfb20e5f96050f56570a79feaaca33d52549f9410737383419fddd2ffb738bc16f939cc98e1 SHA512 79f0007f6c4d3b0056ca8d1d1ed6f021140ffefb5cdaa651483f2c4d8cfbd0b001cf27ab96474c17eeb61ffb72cb8d9d003db8bfa6fc7b737071c46ed9c6aca1
-DIST gentoo-livecd-2006.1-0.9.4.tar.bz2 3447608 BLAKE2B 4374a37e28efad824d0fdacae9cc26ed5f5a35ec89fd6a3c01b78a98c8f49c5b02b6d035843e3bfdf1c96a143c8d8832dcdbb0cde95e60e6e75c83cc96e085ff SHA512 e2928b547c6e7fe5e8c633f0a2e0363802c2b8f1fc5eb112a7be727b1a81b95bbb9889509efacbe7d6f555750438a1da7ad3705d9a2315ab15152c3794ac024c
-DIST gentoo-livecd-2007.0-0.9.6.tar.bz2 4760433 BLAKE2B a942ecf0976e605b10f861d73e2009ba215fbd3ff4f313b8c04f2fbca623d584660405a92a0976f9101e0a371e3016c9ce032d1912fd8d07470fe4230e710682 SHA512 a5a1ef2f10c9880d546184772108c56d5c700707199408ae63389a5bd7bec9c526f73631dfe782cceb88242ab8e8a56d14755552500c589fe1958e75e8b5015d
-DIST splash-themes-livecd-2004.3.tar.bz2 1790707 BLAKE2B af0ad28814b07f0e5ba5d91d656077e6e1e2fe81102887fd22c288146c7ae3405a18722f7ff14042869bf4e320a4f38bda8f0219444b2db39f82a64a378b8a91 SHA512 75c897965cec7173c09027a8578e5047f7121e4b64f09f169ab40616bda412d555e5a4e42375082d685dd73d2d1026e18788408b36e9a690c41a0ba83759498f
-EBUILD splash-themes-livecd-2004.3.ebuild 519 BLAKE2B cca7808a9dc949ccd2674ff3c0ebb7927ea928922924357014e81fcbb17068f800458e2095a2d8c590ca881875ce2c27a33eeaf2a9ef16a102ab3268f3c4a954 SHA512 792f55e53308d1ac8be957a4f62e3ebf5ff6672671f370aee8d8cfd14ce2ad668928b398b7600f6ef9151ec8755beb25ddde43f8fa0028f9a1404bf83788756e
-EBUILD splash-themes-livecd-2005.0.ebuild 742 BLAKE2B 3801fad364a566a2430044146cb2b54c0c9928d213c22c3563d57bfe116e79d9236865055f89ea0916cbc10a53f17b963f2ef9d184f93deee55533a587a47b8f SHA512 de2127b1a4cf104489afc696767052a4dde5878f4764a6970bd83e5bffdb388cfe9a20a67a6c68c4dcdb6d5555905be59f8ed0355e327d61246769da9860652f
-EBUILD splash-themes-livecd-2005.1.ebuild 841 BLAKE2B 7985bf3a777f36fe41287b87e4d25eca78ae188637d835d44f721e8c744f5eda92bb7dd68be29b45eca3858a9d7174c138c570c11fc7cb301a7b320a63fac9cb SHA512 50fbecf77d7431cd3a7167ca3cea32d93da4244a74bc845a4acf2afb1a79270b003bcfa008f79813d72dea9039daf2218583f39219183ee3276a0d192eef1370
-EBUILD splash-themes-livecd-2006.0.ebuild 724 BLAKE2B 930d5fa2933c46c42af37cff288a5b6d1fbec525dad88e5f23ea26ef5fd8f996a8b15d301f6a11ac461a32ff25a064c16bd655eb3034d5b5f03b08ef92647c5b SHA512 a3759bed721200907f7169d0d693b1dc7d3eb4eda26a1b4f6425c7c721fafb167f895d4ca4d4c934d946d34e0cd0d284180f19a803ce712a5cbe4960880a4189
-EBUILD splash-themes-livecd-2006.1.ebuild 728 BLAKE2B 5a3806a98c01bad9377b95e909c78401508ca9eafac4f8557f847d273a59fcd0fda06f309a970ba7f19d169a877e052c9ec4a87aec7520de410ad77eb9e8c5d3 SHA512 c3c23dfd418907bf240905f3c486bf689799bc6f42038e877a4e54102504a181fcc5eacae9b9240842efdbc508a0259d9ff43bd54aac9d1e3297e0543ed18a59
-EBUILD splash-themes-livecd-2007.0-r3.ebuild 721 BLAKE2B 177e95111706f28e088597b6768504e7b376f9b04e743d6d7ffd8f16c0150073637c098a90ce4bb6f5bcf1d6256b65be915850ce76bffc960f7f8d3cccfd1389 SHA512 3efd8574dae88e32a0c56a090bc13517d0bc3ca9c0508f8df48292e56c1bb1d583f4c5e02fdaf892987dae124c016c0be74b0c1bdd31cef9fed1a30cd3b02225
-MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/media-gfx/splash-themes-livecd/files/use-new-path-for-functions.sh.patch b/media-gfx/splash-themes-livecd/files/use-new-path-for-functions.sh.patch
deleted file mode 100644
index 67128fbe5393..000000000000
--- a/media-gfx/splash-themes-livecd/files/use-new-path-for-functions.sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/rc_init-pre.orig	2016-02-18 13:31:23.610276701 -0200
-+++ scripts/rc_init-pre	2016-02-18 13:31:57.405275206 -0200
-@@ -77,7 +77,7 @@
-   return 0
- }
- 
--[ -r /etc/init.d/functions.sh ] && . /etc/init.d/functions.sh
-+[ -r /lib/gentoo/functions.sh ] && . /lib/gentoo/functions.sh
- 
- if [ -z "${1}" ]; then
-   log err "no internal runlevel provided"
diff --git a/media-gfx/splash-themes-livecd/metadata.xml b/media-gfx/splash-themes-livecd/metadata.xml
deleted file mode 100644
index 767266dca141..000000000000
--- a/media-gfx/splash-themes-livecd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>livecd@gentoo.org</email>
-	<name>Gentoo LiveCD Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild
deleted file mode 100644
index 47cedc02f9bc..000000000000
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-S="${WORKDIR}/livecd-${PV}"
-DESCRIPTION="Gentoo theme for gensplash consoles"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~wolf31o2/sources/${PN}/${PF}.tar.bz2"
-
-SLOT=${PV}
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-RESTRICT="binchecks strip"
-
-DEPEND="media-gfx/splashutils"
-
-src_install() {
-	dodir /etc/splash/livecd-${PV}
-	cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV}
-}
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild
deleted file mode 100644
index 7a0bff437888..000000000000
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="gentoo-livecd-${PV}"
-MY_REV="0.9.1"
-DESCRIPTION="Gentoo theme for gensplash consoles"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~wolf31o2/sources/${PN}/${MY_P}-${MY_REV}.tar.bz2"
-
-SLOT=${PV}
-LICENSE="Artistic GPL-2 BitstreamVera"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-RESTRICT="binchecks strip"
-
-DEPEND=">=media-gfx/splashutils-0.9.1"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre scripts/list_svc.sh
-}
-
-src_install() {
-	dodir /etc/splash/livecd-${PV}
-	cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV}
-}
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
deleted file mode 100644
index 9f3806493a10..000000000000
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="gentoo-livecd-${PV}"
-MY_REV="0.9.2"
-DESCRIPTION="Gentoo theme for gensplash consoles"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~wolf31o2/sources/${PN}/${MY_P}-${MY_REV}.tar.bz2"
-
-SLOT=${PV}
-LICENSE="Artistic GPL-2 BitstreamVera"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-RESTRICT="binchecks strip"
-
-DEPEND=">=media-gfx/splashutils-1.1.9.7"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^\/bin\/umount -l "\/etc\/splash\/${SPLASH_THEME}"$/s/^\(.*\)$/\1 \&>\/dev\/null/' scripts/rc_exit-post
-	sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre
-}
-
-src_install() {
-	dodir /etc/splash/livecd-${PV}
-	cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV}
-}
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild
deleted file mode 100644
index 17bc45e58a98..000000000000
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="gentoo-livecd-${PV}"
-MY_REV="0.9.3"
-DESCRIPTION="Gentoo theme for gensplash consoles"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~wolf31o2/sources/${PN}/${MY_P}-${MY_REV}.tar.bz2"
-
-SLOT=${PV}
-LICENSE="Artistic GPL-2 BitstreamVera"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-RESTRICT="binchecks strip"
-
-DEPEND=">=media-gfx/splashutils-1.1.9.7"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre
-}
-
-src_install() {
-	dodir /etc/splash/livecd-${PV}
-	cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV}
-}
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild
deleted file mode 100644
index a47bd26782b6..000000000000
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="gentoo-livecd-${PV}"
-MY_REV="0.9.4"
-DESCRIPTION="Gentoo theme for gensplash consoles"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~wolf31o2/sources/${PN}/${MY_P}-${MY_REV}.tar.bz2"
-
-SLOT=${PV}
-LICENSE="Artistic GPL-2 BitstreamVera"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-RESTRICT="binchecks strip"
-
-DEPEND=">=media-gfx/splashutils-1.1.9.10-r1"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre
-}
-
-src_install() {
-	dodir /etc/splash/livecd-${PV}
-	cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV}
-}
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild
deleted file mode 100644
index 874af82e6768..000000000000
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils
-
-MY_P="gentoo-livecd-${PV}"
-MY_REV="0.9.6"
-DESCRIPTION="Gentoo theme for gensplash consoles"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${PN}/${MY_P}-${MY_REV}.tar.bz2"
-
-SLOT=${PV}
-LICENSE="Artistic GPL-2 BitstreamVera"
-KEYWORDS="amd64 ~ppc x86"
-RESTRICT="binchecks strip"
-
-RDEPEND=">=media-gfx/splashutils-1.5.4[png]
-	sys-apps/gentoo-functions"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-}
-
-src_install() {
-	dodir /etc/splash/livecd-${PV}
-	cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV} || die
-}
diff --git a/media-gfx/splash-themes-livedvd/Manifest b/media-gfx/splash-themes-livedvd/Manifest
deleted file mode 100644
index e85e10b56b6e..000000000000
--- a/media-gfx/splash-themes-livedvd/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX use-new-path-for-functions.sh.patch 353 BLAKE2B 2590ff39525908b62d5926d399e9f5a750df16a17b47ee2298dd84ead2c9cfb13a7d38a59af5bb8d5898d0219cde5953a5dff59fd5c79383745fac5becff0aa1 SHA512 5018fc07c5a7031f567185e1f15cf02a30a20cf65bb44163e0372945b2f458f811d447be2e8080ef610397ede4c0477ed70248d01e565ab82d909d045687b463
-DIST splash-themes-livedvd-12.0.tar.bz2 5416705 BLAKE2B 309fcadee007765153af8fa419c8beb997befe43cdbe60f4f42c4805d5b6fb18a30de70a253f546dda0461f18dbf5dc4eec622663bd4be2f3c5c531c57412910 SHA512 ba0cd1cba44793a48a6aae1b91248fb699389e26d30b851ecb2d809857e0d1159c5f190c5b35390aa394cf14d5c7df39811b2ba6018ae8f10c7e886636c92686
-EBUILD splash-themes-livedvd-12.0-r1.ebuild 689 BLAKE2B 97f4deec2d243e2c85891dfd6eb5cd6d3c6eadc72ad3d0fbf9d49e97ed2d12433cebb1ba9483b8c966f353acc6ff0554e6a1f68e7232902505539e0558de03e4 SHA512 dcf1ff7b3642d6a98bc293d664e032faf5d69c0af7f21646dca60381884919ae9a47bcca226cd6f4ea76e2729c02cfdbde433398658bcd1b1c0444002ab4872b
-EBUILD splash-themes-livedvd-12.0-r2.ebuild 694 BLAKE2B 3cc58dfa1d4acb69007d5a8fec539443db3d710155a67124014588e33a8e031fca2ab16383543d251352ded9ce5df9fa5454c0acda98dbc5c982d69b191f78ed SHA512 65393de608d86acd495e99e43c128e58c949a8d5b514d4d9941db283dce08855f54c87ab70f8369b5ffd96fb81297b0aa1f11b5f54b83a2ad54e2598f82c9fdb
-MISC metadata.xml 464 BLAKE2B 3e6945bac8a009cbe934c9ecb0e2fa0b94623fd519ceedc9f5274b29800b10f4339e893cd050ff08e3c6bd0ddad4f0d7351049870b4eeed3090d75c997a8ae5e SHA512 0b843092fa149744df1ed46557ca0eb5a36a33c090868358b546066f776b08bcb11f2c6ccc6877fa2056e5f63673654bd2732ce89a6dc478549db8eabea93f7e
diff --git a/media-gfx/splash-themes-livedvd/files/use-new-path-for-functions.sh.patch b/media-gfx/splash-themes-livedvd/files/use-new-path-for-functions.sh.patch
deleted file mode 100644
index 62f269ed862f..000000000000
--- a/media-gfx/splash-themes-livedvd/files/use-new-path-for-functions.sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/rc_init-pre.orig	2016-02-18 13:31:23.610276701 -0200
-+++ scripts/rc_init-pre	2016-02-18 13:31:57.405275206 -0200
-@@ -77,7 +77,7 @@
-   return 0
- }
-
--[ -r /etc/init.d/functions.sh ] && . /etc/init.d/functions.sh
-+[ -r /lib/gentoo/functions.sh ] && . /lib/gentoo/functions.sh
-
- if [ -z "${1}" ]; then
-   log err "no internal runlevel provided"
diff --git a/media-gfx/splash-themes-livedvd/metadata.xml b/media-gfx/splash-themes-livedvd/metadata.xml
deleted file mode 100644
index ea182c6e924b..000000000000
--- a/media-gfx/splash-themes-livedvd/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription lang="en">
-A collection of Gentoo themes for splashutils.
-</longdescription>
-<maintainer type="person">
-  <email>email@missionaccomplish.com</email>
-  <name>Fernando Orocu</name>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-gfx/splash-themes-livedvd/splash-themes-livedvd-12.0-r1.ebuild b/media-gfx/splash-themes-livedvd/splash-themes-livedvd-12.0-r1.ebuild
deleted file mode 100644
index 63dcf6a54071..000000000000
--- a/media-gfx/splash-themes-livedvd/splash-themes-livedvd-12.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Gentoo theme for gensplash consoles"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.bz2"
-
-LICENSE="Artistic GPL-2 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-DEPEND=">=media-gfx/splashutils-1.4.1[png]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's:/sbin/functions.sh:/etc/init.d/functions.sh:' scripts/rc_init-pre
-}
-
-src_install() {
-	dodir /etc/splash/livedvd-${PV}
-	insinto /etc/splash/livedvd-${PV}
-	doins -r *
-	insopts -m 0755
-	doins -r scripts
-}
diff --git a/media-gfx/splash-themes-livedvd/splash-themes-livedvd-12.0-r2.ebuild b/media-gfx/splash-themes-livedvd/splash-themes-livedvd-12.0-r2.ebuild
deleted file mode 100644
index bc3b40319231..000000000000
--- a/media-gfx/splash-themes-livedvd/splash-themes-livedvd-12.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Gentoo theme for gensplash consoles"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.bz2"
-
-LICENSE="Artistic GPL-2 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-DEPEND=">=media-gfx/splashutils-1.4.1[png]"
-RDEPEND="${DEPEND}
-	sys-apps/gentoo-functions"
-
-src_prepare() {
-	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-}
-
-src_install() {
-	dodir /etc/splash/livedvd-${PV}
-	insinto /etc/splash/livedvd-${PV}
-	doins -r *
-	insopts -m 0755
-	doins -r scripts
-}
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
deleted file mode 100644
index e7d058791789..000000000000
--- a/media-gfx/splashutils/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX splashutils-1.5.4.4-freetype-bz2.patch 515 BLAKE2B a0df29a4078c4a0dddf6114cabdf4cf29764b3e29c94390e818d732e72ea87285046a7a4f6dc6c0f1721b664c832c03d0804338699420e807722bdc9398ba51b SHA512 880cc0703de76c3c145680f1e85e461473df3dd41817757878bd18dc4c0d10484d1f93f995e6818ddcf3309e6b9febc1447ce7880006df8e08626bac5aae2e5c
-AUX splashutils-1.5.4.4-ft25.patch 1221 BLAKE2B d4fd828b1e8f64463e1d2eec45335ea9e2fe6d0cc4b5c2c39e262bc2eaa01ee500a61d982efc771421698360070e21a557f95f05bc4a943e2f81f53867f5b630 SHA512 5a6d80ed51c7c57ff9ab5930bdbb50d8c594076c0a8a5e72d2d1014f32d2413a2c5b366a777da2cd4292d4e8246caa05c69892930a7a17719e989edd7b749051
-AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 BLAKE2B 651afa1f81c8f132c47faa3ae77b4cc2d41ac99707750c4690c5b8641882f431057f826bc457cfeb6d30da296fa5d511183902beb9b5e20006a459839b2a8a19 SHA512 f5d5fd222b5dea9906e5a7541ad2ab1ff161061c6bb5e013929767d3f6aa9fe245092e201b8d42a086938be3320b77384301c22bc307cf7872daac33184127f2
-AUX splashutils-1.5.4.4-multi-keyboard.patch 10158 BLAKE2B 4aa0e5887fddd85ef8c3e9aee353df8365915051e97459d9ae670242e4e21017d0b51306cf601031e41971172cee29692e0bf1d440320d36455304b5b55dbf2c SHA512 71056d599f4465ef424444d717ce1597295e0228f548c69cb36ef617075af430b1ac50f5be27bca65a50ed9e7d0169ceb256dbc66cf4b635fd9f8310d32baeae
-AUX splashutils-1.5.4.4-no-la.patch 504 BLAKE2B 990b328d84b2fa95102c541deddf86410003fd28bd8a12f1ba6ac74b5b5bfb89870274c21905a57817c25e6db7b603bbcd24256973b3106c413bcd4f83f3a9d9 SHA512 e513e0440fa3383dd368c777ac96717ffe94b8dd2b87c36d0dc0daf890b0f7082234ff5086b4c34144c0589a2c45137ec43158605ce50e58879646cd2a68e1c0
-AUX splashutils-1.5.4.4-sys-queue.patch 233 BLAKE2B 392d4ef1bc0590c1896062c4cbd8f85fcd926c22e9ae1879c055c43c6ace7ee072db45ef7df9d5ffaa2e64c69ef0369258a98a2dbb48008c63503eb3ebabdf9a SHA512 27181754bffb312360cc5834587a6cb68154cdac3a771956f3d4165db0cd079e884a7af5ee1910003882ad7b8835f8947ba9fc7dcc14800635206ac8bd7ada76
-AUX splashutils-1.5.4.4-sysmacros.patch 301 BLAKE2B 1d0cc9bff34dcd176255e0003cc61876f9c4023d8788d05570abaa64412d1c2d2335f17d354edebe198b40c1d3d4cb0f943641e16f65f81feaf38124122b2d56 SHA512 9b9ab646bec87373bed75fd44395819fb03d19b47457cd7e12de71705c3a1023e031906e4a0d67381301d4d2b322caab2723c30c620e64415724b8c204b6599a
-DIST freetype-2.3.12.tar.bz2 1453034 BLAKE2B f0b0da50ecd6685a5c0b645252f99399ddcdcf823b4ce712e861899dab41009308473f149646101ca59f597f99b8e7659a8605475d7c6c912a941cb76d9d65fd SHA512 becb0f138ee13181513d3f03b943f0a474e492cab151992fa78d0c84127819dc91ec6d2bd1528af7e111ab150b3a29104f2f7ab79650cebc35ce4d966b19f34b
-DIST jpegsrc.v8a.tar.gz 962018 BLAKE2B 6f776ca7cbe6b4d8095914f95f968cfef14e91f2b888fe92376d72c36b5b4fa72e9f1089611e2ad257bac5e77262e0523dde596f12305ccde35e51cfdea2d513 SHA512 4020e82e16b99189b1a50bad18b09616775559740b94a988692aa33f9302d4b5abe3ccaa30895b49e6950fb3d9a830deeb7df750d128ec5c7e1844583db4524d
-DIST libpng-1.4.3.tar.bz2 658335 BLAKE2B 21c6e134a4f0877543ae1b229a3d26348b4b8dcc7ea17a5874399c8736220969c726d64a07a8954fa9c948e4aa57802bf58a41c42a44003f4ac50ec5154198fb SHA512 aaa137ebc2312805d58caf19702d24a34ee81593d4250c4e807ce66ba7edb829926919cd0a2b0e5975421451c8eb6674798c06dbaf745175b16c9d3c92b63f61
-DIST miscsplashutils-0.1.8.tar.bz2 91997 BLAKE2B f0b47b51b7270ce8ba57fd989f289a940f4dfbab406cfdab9e2ad1e770a00928e169b75acb80e7525295483224e9cdcba0646f61630f1ef4875af392d078c674 SHA512 fa017e264249feda45839030728e90c82f775354c3f2c29a88362938c4a31b19e6d61f967512305642f8b96575f4d756ba197e672a361760e40080c23ec0442a
-DIST splashutils-gentoo-1.0.17.tar.bz2 15814 BLAKE2B 8c6e2fea3825e5821ab2a20d0f95dc7050438544b9cdc31dc972e3792050dc7d1687842bfda69f93a721103ced5c7168391f53c0f18906a7def2df4a6fb6127c SHA512 75f1fbfdf165f571b0bf09235235827f370e1b940f1717c4faf5b223caba0b80f853a910ba492c776512aecfafa6e74fd964239bbc6cf412620143d5ffc74167
-DIST splashutils-lite-1.5.4.4.tar.bz2 441340 BLAKE2B a2b348fe675a45d54b25ab60b20f5d4f92e673f5639b674027d0e78496c06948026670e2073c9257a3a0134a18752cc1381b2ba2be2d89d66b711cc7ad68ee2b SHA512 1a78216a1de1fdccff514494d7301640e447c65466e1fe02428e5114485507f67fe4394094880d927d074a8ab2d9c786ba03f9fb0371eb7ab6ef4e3b01aa4613
-DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
-EBUILD splashutils-1.5.4.4-r8.ebuild 6936 BLAKE2B 41539451da24db7372912edbb76de036a17f2367edbd1997b199c00104dcb8a356dc49898895c02901cf0c3c504fc36ca5a7c6fc03e3fa03e5892a2be0cfc984 SHA512 3bd655e53a90383d5d92c8d3714b555bc5ffcdd0a379ac0066350b8d90d485cd4d1391be21c9894aa30524d657ff74733ef4d2213ddd6b6a56ca8c77d5e8fbd2
-MISC metadata.xml 338 BLAKE2B b1acfec719af910d8c2be2d5224c15c240b2f85ee046e4eb8ebcdd17cfe40c6699d35cf6b2bc68fc73d0bc8ed03643cacd7431409161cfad6a32e551c6ad70ba SHA512 589b371956889ba3388b3c734b51b36605ca0c5e9ba2b1507126cfd805bdc9cd02756c1d8d8b9f10cbffbacecc9e6bd41afc9e8ff505d27612c4d1158fc7cb72
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch
deleted file mode 100644
index 3438fd523b2a..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-=== modified file 'fbtruetype/Makefile'
---- fbtruetype/Makefile	2011-10-01 14:10:17 +0000
-+++ fbtruetype/Makefile	2011-10-01 14:15:02 +0000
-@@ -23,8 +23,8 @@
- OBJECTS  = fbtruetype.o messages.o console.o ttf.o luxisri.o
- 
- LDFLAGS  += -L$(LIBDIR)
--LIBSS    = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a -lm
--LIBSD    = -lfreetype -lm
-+LIBSS    = $(shell pkg-config freetype2 --libs --static) -lm
-+LIBSD    = $(shell pkg-config freetype2 --libs) -lm
- 
- CFLAGS   += -I/usr/include/freetype2
- COMPILE  = $(CC) $(CFLAGS)
-
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch
deleted file mode 100644
index b5194d5499a8..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/506124
-Signed-off-by: Lars Wendler (Polynomial-C)
-Modified-by: Sergey Popov (Pinkbyte)
---- miscsplashutils-0.1.8/fbtruetype/ttf.c
-+++ miscsplashutils-0.1.8/fbtruetype/ttf.c
-@@ -13,8 +13,8 @@
- #include <ft2build.h>
- #include FT_FREETYPE_H
- /* #include <freetype/freetype.h> */
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
-+#include FT_OUTLINE_H
-+#include FT_TRUETYPE_IDS_H
- 
- #include "ttf.h"
- 
---- splashutils-1.5.4.4/src/ttf.c       2015-02-01 11:35:04.330595381 +0300
-+++ splashutils-1.5.4.4/src/ttf.c       2015-02-01 11:35:24.287596342 +0300
-@@ -25,8 +25,8 @@
- #include <assert.h>
- 
- #include <ft2build.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
-+#include FT_OUTLINE_H
-+#include FT_TRUETYPE_IDS_H
- 
- #include "common.h"
- #include "render.h"
---- splashutils-1.5.4.4/src/ttf.h       2015-02-01 11:38:33.852605470 +0300
-+++ splashutils-1.5.4.4/src/ttf.h       2015-02-01 11:38:52.504606368 +0300
-@@ -1,8 +1,8 @@
- #ifndef _TTF_H
- #define _TTF_H
- #include <ft2build.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
-+#include FT_OUTLINE_H
-+#include FT_TRUETYPE_IDS_H
- 
- #define CACHED_METRICS  0x10
- #define CACHED_BITMAP   0x01
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch
deleted file mode 100644
index 4b8d51375e71..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 74dda8291efae78f00bb781148c8fd4fccaeb764
-Author: Michał Januszewski <spock@gentoo.org>
-Date:   Tue Jun 14 23:23:33 2011 +0200
-
-    Fix typo in the Gentoo initscript.
-
-diff --git a/gentoo/init-fbcondecor b/gentoo/init-fbcondecor
-index b66f40a..ce921b6 100755
---- a/gentoo/init-fbcondecor
-+++ b/gentoo/init-fbcondecor
-@@ -12,7 +12,7 @@ start() {
- 	splash_setup
- 
- 	if [ -z "${FBCONDECOR_TTYS}" ]; then
--		FBCONDECOR_TTYS=$(seq 1 "${rc_tty_number:-${RC_TTY_NUMBER}:-12}")
-+		FBCONDECOR_TTYS=$(seq 1 "${rc_tty_number:-${RC_TTY_NUMBER:-12}}")
- 	fi
- 
- 	local err=0
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-multi-keyboard.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-multi-keyboard.patch
deleted file mode 100644
index 23f15fd8f9c5..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-multi-keyboard.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-diff -ru a/core/src/common.h b/core/src/common.h
---- a/core/src/common.h	2013-01-11 06:35:35.000000000 +0200
-+++ b/core/src/common.h	2013-01-11 06:34:08.000000000 +0200
-@@ -34,6 +34,10 @@
- 	#define PATH_PROC	FBSPLASH_DIR"/proc"
- #endif
- 
-+/* Maximum number of keyboard connected to a machine.
-+ * The number is big (8) to be on the safe side */
-+#define MAX_KBDS 8
-+
- /* Useful short-named types */
- typedef u_int8_t	u8;
- typedef u_int16_t	u16;
-diff -ru a/core/src/daemon.c b/core/src/daemon.c
---- a/core/src/daemon.c	2013-01-11 06:35:35.000000000 +0200
-+++ b/core/src/daemon.c	2013-01-11 06:34:08.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <sys/ioctl.h>
- #include <sys/wait.h>
- #include <sys/mman.h>
-+#include <sys/select.h>
- #include <pthread.h>
- #include <errno.h>
- #include <dirent.h>
-@@ -29,6 +30,8 @@
- #include "common.h"
- #include "daemon.h"
- 
-+#define EV_BUF_SIZE 8
-+
- /* Threading structures */
- pthread_mutex_t mtx_tty = PTHREAD_MUTEX_INITIALIZER;
- pthread_mutex_t mtx_paint = PTHREAD_MUTEX_INITIALIZER;
-@@ -41,7 +44,8 @@
- int ctty = CTTY_VERBOSE;
- 
- /* File descriptors */
--int fd_evdev = -1;
-+int fd_evdevs[MAX_KBDS];
-+int evdev_count = 0;
- #ifdef CONFIG_GPM
- int fd_gpm = -1;
- #endif
-@@ -51,7 +55,6 @@
- 
- /* Misc settings */
- char *notify[2];
--char *evdev = NULL;
- 
- /* Service list */
- list svcs = { NULL, NULL };
-@@ -400,56 +403,83 @@
- 	}
- }
- 
-+__u16 get_ev_key_pressed(int fd_evdev, int ev_buf_size, 
-+		struct input_event *ev_buf) {
-+	size_t rb;
-+	int i;
-+	rb = read(fd_evdev, ev_buf, sizeof(struct input_event) * ev_buf_size);
-+	if (rb < (int) sizeof(struct input_event))
-+		return 0;
-+
-+	for (i = 0; i < (int) (rb / sizeof(struct input_event)); i++) {
-+		if (ev_buf[i].type != EV_KEY || ev_buf[i].value != 0)
-+			continue;
-+		return ev_buf[i].code;
-+	}	
-+}
-+
- /*
-  * Event device monitor thread.
-  */
- void* thf_switch_evdev(void *unused)
- {
--	int i, h, oldstate;
--	size_t rb;
--	struct input_event ev[8];
-+	int i, h, oldstate, nfds, retval, fd_evdev;
-+	fd_set rfds;
-+	struct input_event ev_buf[EV_BUF_SIZE];
-+	__u16 key_pressed = 0;
- 
- 	while (1) {
--		rb = read(fd_evdev, ev, sizeof(struct input_event)*8);
--		if (rb < (int) sizeof(struct input_event))
--			continue;
-+		nfds = 0, fd_evdev = -1;		
-+		FD_ZERO(&rfds);
-+		for (i = 0;i < evdev_count;i++) {
-+			FD_SET(fd_evdevs[i], &rfds);
-+			nfds = max(nfds, fd_evdevs[i]);
-+		}
- 
--		for (i = 0; i < (int) (rb / sizeof(struct input_event)); i++) {
--			if (ev[i].type != EV_KEY || ev[i].value != 0)
--				continue;
-+		nfds++;
- 
--			switch (ev[i].code) {
--			case KEY_F2:
--				pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
--				pthread_mutex_lock(&mtx_paint);
--				if (ctty == CTTY_SILENT) {
--					h = config.tty_v;
--				} else {
--					h = config.tty_s;
-+		retval = select(nfds, &rfds, NULL, NULL, NULL);
-+		if (retval == -1)
-+			perror("select()");
-+		else if (retval) {
-+			for (i = 0;i < evdev_count;i++) {
-+				if (FD_ISSET(fd_evdevs[i], &rfds)) {
-+					fd_evdev = fd_evdevs[i];
-+					break;
- 				}
--				pthread_mutex_unlock(&mtx_paint);
--				pthread_setcancelstate(oldstate, NULL);
-+			}
-+			key_pressed = get_ev_key_pressed(fd_evdev, EV_BUF_SIZE, ev_buf);
-+			if (key_pressed == -1)
-+				continue;
-+			switch (key_pressed) {
-+				case KEY_F2:
-+					pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
-+					pthread_mutex_lock(&mtx_paint);
-+					h = (ctty == CTTY_SILENT) ? config.tty_v : config.tty_s;
-+					pthread_mutex_unlock(&mtx_paint);
-+					pthread_setcancelstate(oldstate, NULL);
-+
-+					/* Switch to the new tty. This ioctl has to be done on
-+					 * the silent tty. Sometimes init will mess with the
-+					 * settings of the verbose console which will prevent
-+					 * console switching from working properly.
-+					 *
-+					 * Don't worry about fd_tty[config.tty_s] 
-+					 * not being protected by a mutex -- 
-+					 * this thread is always killed before any changes
-+					 * are made to fd_tty[config.tty_s].
-+					 */
-+					ioctl(fd_tty[config.tty_s], VT_ACTIVATE, h);
-+					break;
- 
--				/* Switch to the new tty. This ioctl has to be done on
--				 * the silent tty. Sometimes init will mess with the
--				 * settings of the verbose console which will prevent
--				 * console switching from working properly.
--				 *
--				 * Don't worry about fd_tty[config.tty_s] not being protected by a
--				 * mutex -- this thread is always killed before any changes
--				 * are made to fd_tty[config.tty_s].
--				 */
--				ioctl(fd_tty[config.tty_s], VT_ACTIVATE, h);
--				break;
--
--			case KEY_F3:
--				config.textbox_visible = !config.textbox_visible;
--				invalidate_textbox(theme, config.textbox_visible);
--				cmd_paint(NULL);
--				break;
-+				case KEY_F3:
-+					config.textbox_visible = !config.textbox_visible;
-+					invalidate_textbox(theme, config.textbox_visible);
-+					cmd_paint(NULL);
-+					break;
- 			}
--		}
--	}
-+		} /* end of else if (retval) */
-+	} /* end of while(1) */
- 
- 	pthread_exit(NULL);
- }
-@@ -519,7 +549,7 @@
- 
- 	/* Do we have to start a monitor thread? */
- 	if (update & UPD_MON) {
--		if (fd_evdev != -1) {
-+		if (evdev_count >= 0) {
- 			if (pthread_create(&th_switchmon, NULL, &thf_switch_evdev, NULL)) {
- 				iprint(MSG_ERROR, "Evdev monitor thread creation failed.\n");
- 				exit(3);
-diff -ru a/core/src/daemon.h b/core/src/daemon.h
---- a/core/src/daemon.h	2013-01-11 06:35:35.000000000 +0200
-+++ b/core/src/daemon.h	2013-01-11 06:34:08.000000000 +0200
-@@ -40,13 +40,13 @@
- extern int fd_tty_s, fd_tty1, fd_tty0;
- 
- /*
-- * Event device on which the daemon listens for F2 keypresses.
-- * The proper device has to be detected by an external program and
-+ * Event devices on which the daemon listens for F2 keypresses.
-+ * The proper devices have to be detected by an external program and
-  * then enabled by sending an appropriate command to the splash
-  * daemon.
-  */
--extern int fd_evdev;
--extern char *evdev;
-+extern int fd_evdevs[];
-+extern int evdev_count;
- 
- #ifdef CONFIG_GPM
- #include <gpm.h>
-diff -ru a/core/src/daemon_cmd.c b/core/src/daemon_cmd.c
---- a/core/src/daemon_cmd.c	2013-01-11 06:35:35.000000000 +0200
-+++ b/core/src/daemon_cmd.c	2013-01-11 06:34:08.000000000 +0200
-@@ -239,18 +239,35 @@
-  */
- int cmd_set_event_dev(void **args)
- {
--	if (evdev)
--		free(evdev);
--
--	evdev = strdup(args[0]);
-+	char *evdevs;
-+	char *evdev;
-+	int i, j, fd_evdev = -1;
- 
- 	pthread_cancel(th_switchmon);
-+	for (i = 0;i < evdev_count;i++) {
-+		close(fd_evdevs[i]);
-+	}
-+	evdevs = strdup(args[1]);
-+	evdev_count = *(int*)args[0];	
-+	j = 0;
-+	for (i = 0;i < evdev_count;i++, evdevs = NULL) {
-+		evdev = strtok(evdevs, ",");
-+		fd_evdev = open(evdev, O_RDONLY);
-+		if (fd_evdev != -1) {
-+			fd_evdevs[j] = fd_evdev;
-+			j++;
-+		} else {
-+			perror("failed to open event device");
-+		}
-+	}
-+	if (j == 0) { /* all input devices failed to open */
-+		evdev_count = -1;
-+		free(evdevs);
-+		return -1;
-+	}
- 
--	if (fd_evdev != -1)
--		close(fd_evdev);
--
--	fd_evdev = open(evdev, O_RDONLY);
--
-+	evdev_count = j;
-+	free(evdevs);
- 	switchmon_start(UPD_MON, config.tty_s);
- 
- 	return 0;
-@@ -524,8 +541,8 @@
- 
- 	{	.cmd = "set event dev",
- 		.handler = cmd_set_event_dev,
--		.args = 1,
--		.specs = "s"
-+		.args = 2,
-+		.specs = "ds"
- 	},
- 
- 	{	.cmd = "set message",
-@@ -628,7 +645,7 @@
- 					continue;
- 
- 				for (j = 0; j < known_cmds[i].args; j++) {
--					for (; buf[k] == ' '; buf[k] = 0, k++);
-+					for (; buf[k] == ' '; buf[k] = '\0', k++);
- 					if (!buf[k]) {
- 						args[j] = NULL;
- 						continue;
-diff -ru a/core/src/libfbsplash.c b/core/src/libfbsplash.c
---- a/core/src/libfbsplash.c	2013-01-11 06:35:35.000000000 +0200
-+++ b/core/src/libfbsplash.c	2013-01-11 06:34:08.000000000 +0200
-@@ -588,6 +588,8 @@
- 	return -1;
- }
- 
-+#define EVDV_BUF_LEN 128 
-+
- /**
-  * Try to set the event device for the splash daemon.
-  *
-@@ -595,10 +597,14 @@
-  */
- int fbsplash_set_evdev(void)
- {
--	char buf[128];
-+	char buf[EVDV_BUF_LEN];
-+	char evdev_devs[EVDV_BUF_LEN * MAX_KBDS];
- 	FILE *fp;
- 	int i, j;
--
-+	int kbd_count;
-+	int max_chars, chars_left, dev_path_len;
-+	char dev_path[] = PATH_DEV "/input/";
-+	dev_path_len = strlen(dev_path);
- 	char *evdev_cmds[] = {
- 		"/bin/grep -Hsi keyboard " PATH_SYS "/class/input/input*/name | /bin/sed -e 's#.*input\\([0-9]*\\)/name.*#event\\1#'",
- 		"/bin/grep -Hsi keyboard " PATH_SYS "/class/input/event*/device/driver/description | /bin/grep -o 'event[0-9]\\+'",
-@@ -608,22 +614,43 @@
- 
- 	/* Try to activate the event device interface so that F2 can
- 	 * be used to switch from verbose to silent. */
--	buf[0] = 0;
--	for (i = 0; i < sizeof(evdev_cmds)/sizeof(char*); i++) {
-+	buf[0] = '\0';
-+	kbd_count = 0;
-+	max_chars = sizeof(evdev_devs) / sizeof(char*);
-+	chars_left = max_chars - 1;
-+	evdev_devs[0] = '\0';
-+	for (i = 0; i < sizeof(evdev_cmds) / sizeof(char*); i++) {
- 		fp = popen(evdev_cmds[i], "r");
- 		if (fp) {
--			fgets(buf, 128, fp);
--			if ((j = strlen(buf)) > 0) {
--				if (buf[j-1] == '\n')
--					buf[j-1] = 0;
--				break;
-+			while (fgets(buf, 128, fp) && kbd_count < MAX_KBDS) {
-+				if ((j = strlen(buf)) > 0) {
-+					if (buf[j-1] == '\n')
-+						buf[j-1] = ',';
-+					if (chars_left < (j + dev_path_len)) {
-+						break;
-+					}
-+					kbd_count++;
-+					strncat(evdev_devs, dev_path, chars_left);
-+					chars_left -= dev_path_len;
-+					strncat(evdev_devs, buf, chars_left);
-+					chars_left -= j;
-+				}
-+			}
-+			/* replace the last ',' with '\n' */
-+			if (chars_left > 0 && evdev_devs[0] != '\0') {
-+				j = strlen(evdev_devs);
-+				if (j > 2) {
-+					evdev_devs[j - 1] = '\n';
-+				}
- 			}
- 			pclose(fp);
- 		}
-+		if (kbd_count > 0) 
-+			break;
- 	}
- 
--	if (buf[0] != 0) {
--		fbsplash_send("set event dev " PATH_DEV "/input/%s\n", buf);
-+	if (evdev_devs[0] != '\0') {
-+		fbsplash_send("set event dev %d %s", kbd_count, evdev_devs);
- 		return 0;
- 	} else {
- 		return -1;
-@@ -661,6 +688,8 @@
- 	return 0;
- }
- 
-+#define MAX_CMD 2048
-+
- /**
-  * Send stuff to the splash daemon using the splash FIFO.
-  *
-@@ -668,7 +697,7 @@
-  */
- int fbsplash_send(const char *fmt, ...)
- {
--	char cmd[256];
-+	char cmd[MAX_CMD];
- 	va_list ap;
- 
- 	if (!fp_fifo) {
-@@ -690,7 +719,7 @@
- 	}
- 
- 	va_start(ap, fmt);
--	vsnprintf(cmd, 256, fmt, ap);
-+	vsnprintf(cmd, MAX_CMD, fmt, ap);
- 	va_end(ap);
- 
- 	fprintf(fp_fifo, cmd);
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-no-la.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-no-la.patch
deleted file mode 100644
index 0dae2589b7fb..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-no-la.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- splashutils-1.5.4.4/src/Makefile.am.orig	2011-06-13 01:43:39.000000000 +0400
-+++ splashutils-1.5.4.4/src/Makefile.am	2015-08-09 23:37:23.191078543 +0300
-@@ -119,7 +119,7 @@
- 	fbsplash.h
- libfbsplashrender_la_CFLAGS   = $(AM_CFLAGS)
- libfbsplashrender_la_LDFLAGS  = $(AM_LDFLAGS) -version-info $(libfbsplashrender_version)
--libfbsplashrender_la_LIBADD   = libfbsplash.la
-+libfbsplashrender_la_LIBADD   =
- 
- libfbsplashrender_la_CFLAGS  += $(JPEG_CFLAGS)
- libfbsplashrender_la_LIBADD  += $(JPEG_LIBS)
-
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch
deleted file mode 100644
index 8ede7322c0d1..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- splash.c	2011-06-13 04:45:59.000000000 +0700
-+++ splash.c	2014-11-14 20:04:43.000000000 +0700
-@@ -21,4 +21,5 @@
- #include <sys/wait.h>
- #include <sys/ioctl.h>
-+#include <sys/queue.h>
- #include <linux/kd.h>
- #include <linux/fb.h>
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch
deleted file mode 100644
index 7ed37ea6aff2..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common.c.old        2018-02-25 22:23:32.382369471 +0800
-+++ src/common.c    2018-02-25 22:23:02.236854316 +0800
-@@ -19,6 +19,7 @@
- #include <termios.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/mman.h>
- #include <dirent.h>
- #include <errno.h>
-
diff --git a/media-gfx/splashutils/metadata.xml b/media-gfx/splashutils/metadata.xml
deleted file mode 100644
index c3a139b7fba0..000000000000
--- a/media-gfx/splashutils/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<use>
-		<flag name="fbcondecor">
-		Support for the fbcondecor kernel patch.
-	</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">freetype</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
deleted file mode 100644
index 824b27602945..000000000000
--- a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib toolchain-funcs
-
-MISCSPLASH="miscsplashutils-0.1.8"
-GENTOOSPLASH="splashutils-gentoo-1.0.17"
-V_JPEG="8a"
-V_PNG="1.4.3"
-V_ZLIB="1.2.3"
-V_FT="2.3.12"
-
-ZLIBSRC="libs/zlib-${V_ZLIB}"
-LPNGSRC="libs/libpng-${V_PNG}"
-JPEGSRC="libs/jpeg-${V_JPEG}"
-FT2SRC="libs/freetype-${V_FT}"
-
-RESTRICT="test"
-IUSE="hardened +png +truetype gpm fbcondecor"
-
-DESCRIPTION="Framebuffer splash utilities"
-HOMEPAGE="https://sourceforge.net/projects/fbsplash.berlios/"
-SRC_URI="
-	mirror://sourceforge/fbsplash.berlios/${PN}-lite-${PV}.tar.bz2
-	mirror://sourceforge/fbsplash.berlios/${GENTOOSPLASH}.tar.bz2
-	mirror://gentoo/${MISCSPLASH}.tar.bz2
-	mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
-	ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
-	mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
-	http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	gpm? ( sys-libs/gpm[static-libs(+)] )
-	truetype? (
-		>=media-libs/freetype-2[static-libs]
-		app-arch/bzip2[static-libs(+)]
-		sys-libs/zlib[static-libs(+)]
-	)
-	png? (
-		>=media-libs/libpng-1.4.3[static-libs]
-		sys-libs/zlib[static-libs(+)]
-	)
-	virtual/jpeg:0[static-libs]
-	app-arch/cpio
-	media-gfx/fbgrab
-	!sys-apps/lcdsplash
-	sys-apps/openrc"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/klibc-1.5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-SG="${WORKDIR}/${GENTOOSPLASH}"
-SM="${WORKDIR}/${MISCSPLASH}"
-
-pkg_setup() {
-	if use hardened; then
-		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
-		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
-		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
-		ewarn "the splash kernel helper."
-	fi
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
-
-	# We need to delete the Makefile and let it be rebuilt when splashutils
-	# is being configured. Either that, or we end up with a segfaulting kernel
-	# helper.
-	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
-
-	cd "${SG}"
-	epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
-	epatch "${FILESDIR}/splashutils-1.5.4.4-sys-queue.patch"
-
-	if use truetype ; then
-		cd "${SM}"
-		epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
-		cd "${WORKDIR}"
-		epatch "${FILESDIR}/splashutils-1.5.4.4-ft25.patch"
-	fi
-
-	cd "${S}"
-	ln -sf "${S}/src" "${WORKDIR}/core"
-
-	#epatch "${FILESDIR}/${P}-bzip2.patch"
-	epatch "${FILESDIR}/${P}-multi-keyboard.patch"
-	# Bug #557126
-	epatch "${FILESDIR}/${P}-no-la.patch"
-
-	if ! tc-is-cross-compiler && \
-	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
-		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
-		ewarn "splashutils, you're on your own, as this configuration is not supported."
-	else
-		# This should make splashutils compile on systems with hardened GCC.
-		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
-	fi
-
-	if ! use truetype ; then
-		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
-	fi
-
-	# Latest version of klibc defined its own version of ferror, so there is
-	# not need for the hack in klibc_compat.h
-	if has_version ">=dev-libs/klibc-1.5.20"; then
-		echo > "libs/klibc_compat.h"
-	fi
-
-	rm -f m4/*
-	epatch_user
-	export PKG_CONFIG="pkg-config --static"
-	eautoreconf
-	epatch "${FILESDIR}"/splashutils-1.5.4.4-sysmacros.patch
-}
-
-src_configure() {
-	tc-export CC
-	cd "${SM}"
-	emake CC="${CC}" LIB=$(get_libdir) STRIP=true
-
-	cd "${S}"
-	econf \
-		$(use_with png) \
-		--without-mng \
-		$(use_with gpm) \
-		$(use_with truetype ttf) \
-		$(use_with truetype ttf-kernel) \
-		$(use_enable fbcondecor) \
-		--docdir=/usr/share/doc/${PF} \
-		--with-freetype2-src=${FT2SRC} \
-		--with-jpeg-src=${JPEGSRC} \
-		--with-lpng-src=${LPNGSRC} \
-		--with-zlib-src=${ZLIBSRC} \
-		--with-essential-libdir=/$(get_libdir)
-}
-
-src_compile() {
-	emake CC="${CC}" STRIP="true"
-
-	cd "${SG}"
-	emake LIB=$(get_libdir)
-}
-
-src_install() {
-	local LIB=$(get_libdir)
-
-	cd "${SM}"
-	emake DESTDIR="${D}" LIB=${LIB} install
-
-	cd "${S}"
-	emake DESTDIR="${D}" STRIP="true" install
-
-	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
-	gen_usr_ldscript libfbsplash.so
-
-	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
-	doenvd 99splash
-
-	if use fbcondecor ; then
-		newinitd "${SG}"/init-fbcondecor fbcondecor
-		newconfd "${SG}"/fbcondecor.conf fbcondecor
-	fi
-	newconfd "${SG}"/splash.conf splash
-
-	insinto /usr/share/${PN}
-	doins "${SG}"/initrd.splash
-
-	insinto /etc/splash
-	doins "${SM}"/fbtruetype/luxisri.ttf
-
-	cd "${SG}"
-	make DESTDIR="${D}" LIB=${LIB} install
-	prune_libtool_files
-
-	sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
-	keepdir /${LIB}/splash/{tmp,cache,bin,sys}
-	dosym /${LIB}/splash/bin/fbres /sbin/fbres
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.0"
-	previous_less_than_1_0=$?
-
-	has_version "<${CATEGORY}/${PN}-1.5.3"
-	previous_less_than_1_5_3=$?
-}
-
-pkg_postinst() {
-	if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
-		elog "This package has been designed with udev in mind. Other solutions, such as"
-		elog "devfs or a static /dev tree might work, but are generally discouraged and"
-		elog "not supported. If you decide to switch to udev, you might want to have a"
-		elog "look at 'The Gentoo udev Guide', which can be found at"
-		elog "  https://wiki.gentoo.org/wiki/Udev"
-		elog ""
-	fi
-
-	if [[ $previous_less_than_1_0 = 0 ]] ; then
-		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
-		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
-		elog ""
-	fi
-
-	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
-		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
-		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
-		elog "to use fbcondecor, run:"
-		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
-		elog "and re-emerge splashutils."
-	fi
-
-	if ! test -f /proc/cmdline ||
-		! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
-		elog "It is required that you add 'console=tty1' to your kernel"
-		elog "command line parameters."
-		elog ""
-		elog "After these modifications, the relevant part of the kernel command"
-		elog "line might look like:"
-		elog "  splash=silent,fadein,theme:emergence console=tty1"
-		elog ""
-	fi
-
-	if ! has_version 'media-gfx/splash-themes-livecd' &&
-		! has_version 'media-gfx/splash-themes-gentoo'; then
-		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
-		elog "core splashutils package. To get some themes you might want to emerge:"
-		elog "  media-gfx/splash-themes-livecd"
-		elog "  media-gfx/splash-themes-gentoo"
-	fi
-}
diff --git a/media-gfx/synnefo/Manifest b/media-gfx/synnefo/Manifest
index 1df0cdb6eaef..bcce8ab89275 100644
--- a/media-gfx/synnefo/Manifest
+++ b/media-gfx/synnefo/Manifest
@@ -1,3 +1,3 @@
 DIST synnefo-1.1.0.tar.gz 161822 BLAKE2B 1d1981ae815e692cd9230690214bff039c2b523f78faab34d35ad8f25cefbc656ace2ba2ca240baa7d305417f17ea0c4d0cad5d300a638b15cc81d315fdf474c SHA512 f4c50e6e018b0dcf91715c379cd5b79452886fb7fda189ad47a22b9d5f47b3ca710b959b773a1e0a42564e881d09da088a88eef505719b1b1fbfbb5e21fb26ef
-EBUILD synnefo-1.1.0.ebuild 721 BLAKE2B eeb2c7d5dca498eb6b2fff73145c5cdb6c6e0c9e7c815c1a2f3ddbec586a09029579b565f902e36dc9f0857bbd08bfd6b98a6c80fd71989048a605ba048cdd96 SHA512 7218facf8db96f0ae85a1274c5eee70037a2581fc058a94a364a77b7fda097c940e4a096a3b101c80c6f940eca9789e7aee15b1ffc3882bc282c19b2d79d0410
+EBUILD synnefo-1.1.0.ebuild 718 BLAKE2B fce0b646a1338cd7bed563fa444622a1a2ee8b8e4954ad0a246bd4b8e416735e970edf3d6ba6a7cb8fd77411de64ca687e88a3cb45c5ce033b2f16f6c75dd48c SHA512 f44c40c3e43ddd4023318e6789a0994abfe8d8cd4672ec6047979552dedb8e477a4cb139352e5478750524f0d4925616966e8cd0c430a4add24a39cb0b814bfe
 MISC metadata.xml 333 BLAKE2B ae4c40964873b751ece7a62f6f8c4cbc7d6d6cb9d4008e958a243f8a6c5ba3461156a5032097997b3d90a5b9dde516bd5351f4e7cde27f83cbaf82224c7ee1d0 SHA512 49d4f64a95ddf7b75f0e3efe44bc03e8df9f565aec70c52838dea32badc5809d0b3945f87a4de3bc6704f0a3e1732e683412d4ffd480e5ef40bf763c958b7936
diff --git a/media-gfx/synnefo/synnefo-1.1.0.ebuild b/media-gfx/synnefo/synnefo-1.1.0.ebuild
index a2e194042a75..5605351edcd4 100644
--- a/media-gfx/synnefo/synnefo-1.1.0.ebuild
+++ b/media-gfx/synnefo/synnefo-1.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 if [[ ${PV} == "9999" ]]; then
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 851f43c63324..79054711f1a3 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -1,3 +1,6 @@
+AUX 0.17-Replace-calls-to-getenv-with-g_getenv.patch 1182 BLAKE2B 37a7f395e35a8ac3edbfd3b8d057275c1981347c6e5018c8bca29322ebc33a32b16e0880bddcd394cb9da4315eb26592f9342d8cf58c88f1a29f902e858d8f97 SHA512 190f6b1fd7f4640022274207254be0967718c3d602bc521557a3e4eed6afca274bf650cf9e06ed4ec9a0527eca6b45c39c4b8e1091064b8408dac8033ca07c9d
 DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b4299c105eb6de7ec3fe74b350b49605dbe5246a5acd93562fd904923053ab99a5741b929abd99ace8b2ad148cc SHA512 4b150078573bfd3b8c5863d73087a51cd3b7ed5781e26c842fab44eec3e67ea9aea3feba064538578878df1ccb386525a6a84362dae7f92315fb7de735ace617
+DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
 EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
-MISC metadata.xml 223 BLAKE2B db9722a650a3dd6a2457e8cfb4e45c95e4d435077a01d701d9ee8d1bd9f6c162060281a70762e72b57812f6a868eb172ab60b49f21319f1d143bb00ecf59e4f6 SHA512 1cdd15a0170f1ef8245c80abb67291759667b5ff4631b7a172b4797169198cec8fbd10e7226313e99f86ceb01f87d3a5faf010471aadf6c4d1559c63676c84a9
+EBUILD viewnior-1.7-r1.ebuild 1281 BLAKE2B 8511b12f5b8385a0bbe72487581e48bd07b8114bf5a1b9123eb52a9931548009c5890e224308a00b8b0ad903124e61bd9d2f0f56e724dd31d6f7ead393167f23 SHA512 26230d6decb78d12cea8cf2ee5d333622b7c02bcae848396b7fb7cceea76096617423e1b6d125c74281dd07fdc0d358fd0029fac0b0442292e06ef5868148224
+MISC metadata.xml 522 BLAKE2B 3f08e8b96d95c32bc0c2265afa2b580b92258060f4964c9f595da738fe96814406f8d8cc67965b985b714abded06d848df43bbd9fb72641b1123bbe1fd6f348a SHA512 94a9310a1eb358b2468caf0c21a5d799b81049483443b87e0fd4abe644295390f1703ec1b7a58562db89b353632f682f555cec64f41969e3a3e90017cb5913da
diff --git a/media-gfx/viewnior/files/0.17-Replace-calls-to-getenv-with-g_getenv.patch b/media-gfx/viewnior/files/0.17-Replace-calls-to-getenv-with-g_getenv.patch
new file mode 100644
index 000000000000..fc7fc119359a
--- /dev/null
+++ b/media-gfx/viewnior/files/0.17-Replace-calls-to-getenv-with-g_getenv.patch
@@ -0,0 +1,28 @@
+Using getenv() triggers compile errors in Open Build Service.
+Thanks to Axel Köllhofer for the patch.
+---
+ src/uni-utils.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/uni-utils.c b/src/uni-utils.c
+index 8152848..1b4992a 100755
+--- a/src/uni-utils.c
++++ b/src/uni-utils.c
+@@ -106,10 +106,10 @@ uni_detect_desktop_environment ()
+ {
+     VnrPrefsDesktop environment = VNR_PREFS_DESKTOP_GNOME3;
+ 
+-    gchar *xdg_current_desktop = g_ascii_strup(getenv("XDG_CURRENT_DESKTOP"), -1);
+-    gchar *xdg_session_desktop = g_ascii_strup(getenv("XDG_SESSION_DESKTOP"), -1);
+-    gchar *desktop_session = g_ascii_strdown(getenv("DESKTOP_SESSION"), -1);
+-    gchar *gdmsession = g_ascii_strdown(getenv("GDMSESSION"), -1);
++    gchar *xdg_current_desktop = g_ascii_strup(g_getenv("XDG_CURRENT_DESKTOP"), -1);
++    gchar *xdg_session_desktop = g_ascii_strup(g_getenv("XDG_SESSION_DESKTOP"), -1);
++    gchar *desktop_session = g_ascii_strdown(g_getenv("DESKTOP_SESSION"), -1);
++    gchar *gdmsession = g_ascii_strdown(g_getenv("GDMSESSION"), -1);
+ 
+     if (!g_strcmp0(xdg_current_desktop, "GNOME") || !g_strcmp0(xdg_session_desktop, "GNOME"))
+     {
+-- 
+2.18.1
+
diff --git a/media-gfx/viewnior/metadata.xml b/media-gfx/viewnior/metadata.xml
index ad6627d4c88e..0b0a73b6d999 100644
--- a/media-gfx/viewnior/metadata.xml
+++ b/media-gfx/viewnior/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny Gutbrod</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hellosiyan/Viewnior</remote-id>
+		<changelog>https://siyanpanayotov.com/project/viewnior/news</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/viewnior/viewnior-1.7-r1.ebuild b/media-gfx/viewnior/viewnior-1.7-r1.ebuild
new file mode 100644
index 000000000000..57b9250ec62d
--- /dev/null
+++ b/media-gfx/viewnior/viewnior-1.7-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson xdg-utils
+
+MY_PN=Viewnior
+DESCRIPTION="Fast and simple image viewer"
+HOMEPAGE="https://siyanpanayotov.com/project/viewnior/ https://github.com/hellosiyan/Viewnior"
+SRC_URI="https://github.com/hellosiyan/${MY_PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/exiv2:0=
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+"
+
+S="${WORKDIR}/${MY_PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/0.17-Replace-calls-to-getenv-with-g_getenv.patch"
+)
+
+src_prepare() {
+	default
+	# That script would update icon cache and desktop database
+	sed -i "s/meson.add_install_script('meson_post_install.py')//" meson.build || die 'Failed to remove post-install-script invocation from meson.build'
+	# Don't let meson compress the manpage
+	sed -i "s/subdir('man')//" meson.build || die 'Failed to remove manpage compression from meson.build'
+}
+
+src_install() {
+	meson_src_install
+	doman man/viewnior.1
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 392e18b6e00e..abebb2977bfe 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,7 +1,9 @@
 AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
 AUX zbar-0.10-python-crash.patch 604 BLAKE2B 463f23b6338455b0029fce845fcbb02168c86b9ddc116f34f15668459d8ac86d77dabe388cd61af9182c02be37475363ff832d7c8c705d29bf1829f7ccb167b3 SHA512 56e1848466b2178fb25a1f88f1a35113c01d370927b5778af96f1b96bcdaa8349308ac7ef14fb247bc5ec4165b2f7daa717159f3f7786ced9c043428afd641ba
 AUX zbar-0.10-v4l2-uvcvideo.patch 1487 BLAKE2B 61486465183a50ee0e515d6232923c63819e707d4a429a653f94ea6b7f404e8a5ab54602e074df0fab3f0188c50e8f4fc12a6ac5a63509484d7cd24925bb1957 SHA512 6a53eb54ed3ad83cacb9a09d0b119550d364e586990725f0a423a180fab790e18c2c6d8201d185a51bd26ea3955018416b2993fbdb5e5a555e13183b3bce7b1a
-AUX zbar-0.10_p20121015-ImageMagick-7.diff 1064 BLAKE2B 95d67582bbc8ad65aa23c8a7a5152c198c0a9c105189c769b785d418128871d326ff3b9c8ed52e316e3e0b0fc5c6e9c247c0115b6d82ccb812f243cfaab93138 SHA512 90e09dabfaec0f1e68e8bdb040a2903377c658a39f9d0beb1a92546c26acf7e68115a6f6a745f930edc7c55353f51c7f58888fea564c259d1f5155ff1f35d6f9
+AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc
 DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
-EBUILD zbar-0.10_p20121015-r3.ebuild 3551 BLAKE2B 3e3b0d7557555561cbab893a3fc8c0be9add582606919c7c50cb257cebe84c5b8c2f863df7744c770aa51508220bd9a3290d7d4f9b5ab662858d88c4866fb41a SHA512 130c52b8e2d7ecadfd6e248309fb649bfff97c458c173e2b64ae1b82bdfed5f3ec255c02f1e2de99db0c6316b2fbc052d7823ebc74d3a355f8803e08be4ff6c5
-MISC metadata.xml 317 BLAKE2B f900040957f979d0931359e9399f89d60de14ef9e7d359de21f5c02807748a3efb0004926ab2890708511908b21aba7b824eace5bd13f5194c7f6bb633d4bd98 SHA512 911dee4073890017c8816d892b3e77e460328fc8e25e59c3ba74eafc909de73d743ac8c1c3015385bcbba1e7f175796704f6b1be6b1f37e0ce652da1749ee830
+DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
+EBUILD zbar-0.10_p20121015-r3.ebuild 3548 BLAKE2B 24e764ae81a68d9d98c9b8e8c8cf7a8dd7b39575c7f24069a466cdd042e1b86029f23fb72247dee0dfccf0505c6126f06cac9ac0f3b731d9d02082bec4380618 SHA512 2ff8dd34f79079d14e09b7a206a2f1f6944be1b6ff24e8b8b0ff1a27857aa6ccd34c5777cbf23e32736cbf39be3acc803c459259fe501f6784122a5a19cafd16
+EBUILD zbar-0.20.1.ebuild 3692 BLAKE2B 58f3c764c385c869bd62e26942631c0e4da54b9cc7a9cc36c65eefb3e6b92d3c8392bd6bd2b30ce0a37cbacc640124d6c6d6afa3b19f70f67e25dfb53cc09b4a SHA512 9dd2b3770af1385288f3e69bef96a3f92428dde72b7a8c938d1a6591e337d9e4f1b9c527833f89b6d5e09de56adad2db498d58bf9a4156493d6d525f92ffc6d0
+MISC metadata.xml 353 BLAKE2B 7b2ecbdb282d7be372b33efc762ff91d574edf1f176e65c300a2a1cdab0d9c86a12be1d4c49f48a684237eb265ee7491ef9bebbfd62a6005246031f7271b7e32 SHA512 8547b611ca96a01ec0d6dcd01c61203984af10306223a77071fe9be348d1ca7ceb290c4160ca9eb8ebc04227caa9b9f5bf3d3d436b97f140fc534fbd3236826c
diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
index a56ab7d913b0..f58c3e4d9c45 100644
--- a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff
+++ b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
@@ -1,3 +1,6 @@
+Fixed build with imagemagick-7 (bug #592324).
+Thanks-to: Jürgen Rose
+
 diff -r -U3 zbar-0.10_p20121015_orig/configure.ac zbar-0.10_p20121015/configure.ac
 --- zbar-0.10_p20121015_orig/configure.ac	2016-08-28 16:59:23.969753652 +0200
 +++ zbar-0.10_p20121015/configure.ac	2016-08-28 17:17:15.384494517 +0200
diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index 4c17cb6e9bf7..fd5ad454e03a 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">zbar</remote-id>
+		<remote-id type="github">mchehab/zbar</remote-id>
+		<bugs-to>https://github.com/mchehab/zbar/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
index ecdd0ad2dbfc..6990df2d2b35 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal \
-	python-single-r1 virtualx
+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
 
 DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="http://zbar.sourceforge.net/"
+HOMEPAGE="https://github.com/mchehab/zbar"
 SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
 
 LICENSE="LGPL-2.1"
@@ -65,7 +63,7 @@ src_prepare() {
 		-i "${S}"/include/zbar/QZBarImage.h || die
 
 	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${P}-ImageMagick-7.diff"
+		eapply "${FILESDIR}/${P}-ImageMagick-7.patch"
 	fi
 
 	use python && python_fix_shebang examples/upcrpc.py test/*.py
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild
new file mode 100644
index 000000000000..1299e249e153
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="https://github.com/mchehab/zbar"
+SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm x86"
+IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( X ${PYTHON_REQUIRED_USE} )
+"
+
+COMMON_DEPEND="
+	gtk? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	)
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:= )
+		graphicsmagick? ( media-gfx/graphicsmagick:= )
+	)
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8 )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk? ( dev-util/glib-utils )
+	java? (
+		>=virtual/jdk-1.8
+		test? (
+			dev-java/junit:4
+			dev-java/hamcrest-core:1.3
+		)
+	)
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
+	fi
+
+	use python && python_fix_shebang examples/upcrpc.py test/*.py
+	java-pkg-opt-2_src_prepare
+
+	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+		-e '/^AM_CFLAGS=/s: -Werror::' \
+		-i configure.ac || die
+	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+		-i java/Makefile.am || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		$(use_with gtk)
+		$(multilib_native_use_with graphicsmagick graphicsmagick)
+		$(multilib_native_use_with imagemagick)
+		$(multilib_native_use_with java)
+		$(use_with jpeg)
+		$(multilib_native_use_with python python2)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		$(use_enable v4l video)
+		$(use_with X x)
+		$(use_with X xshm)
+		$(use_with xv xv)
+	)
+
+	if multilib_is_native_abi; then
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+			if use test ; then # bug 629078
+				java-pkg_append_ CLASSPATH .
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
+			fi
+		fi
+		if use qt5; then
+			myeconfargs+=(
+				$(use_with qt5 qt)
+				$(use_with qt5)
+			)
+		else
+			myeconfargs+=( --without-qt )
+		fi
+	else
+			myeconfargs+=( --without-qt )
+	fi
+
+	ECONF_SOURCE=${S} \
+		econf "${myeconfargs[@]}"
+
+	# work around out-of-source build issues for multilib systems
+	# https://bugs.gentoo.org/672184
+	mkdir gtk pygtk qt test zbarcam || die
+}
+
+src_test() {
+	virtx multilib-minimal_src_test
+}
+
+src_install() {
+	if use qt5; then
+		local MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/zbar/QZBar.h
+			/usr/include/zbar/QZBarImage.h
+		)
+	fi
+	multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-gfx
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)