gentoo resync : 26.11.2017

19 files changed, 715 insertions, 393 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index e704aed477ae..f359eaa83829 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,31 +1,34 @@
-AUX cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch 6045 SHA256 b42f2b4fda5a3c2b92a7cfa19853c4dcee737f43adf4b1423b7d03775a3a2e17 SHA512 c29e75830be3e60a89fbf11ea3e76ccfa598b77bcf7fe89bf6d763fc945947d3b6ea4e1af7998a22e7ed61d71c096024d59d404add0a1493244bbd460f0191cc WHIRLPOOL dd2d2edf8850733b440a15d1b2206dd68c8d4960e429bdd4df1d8967eb37cb5eb03704ca516b632797a4b099e0a805e9cad0181c5186f31a6d5e5de6cd361fb4
-AUX cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch 762 SHA256 9bf935f7d33fdea10b613d374e184eab159c5bc6125c9a52d3b1588447ce8bac SHA512 680fa980f95dad86eb04605c665a888813bed236b07d2935bd794606cbdd28fb00dd9d3f69197d7a9358b61279f3df55f17f0075a6be0189fe4025f14d80de7c WHIRLPOOL 5dfe89d0baf45b298de77f808fbb0bcad9da03c544556fdc8b533f073f0e323acaab324bef89a50115a60023e39eecf5b9ccfe8b5eb2480d6e5ba35767a27693
-AUX cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch 1095 SHA256 de6443dd25c0ffcc59c3bc89fc656399479c2c3f9025a27a861d1387b2810e54 SHA512 fe323a7f8c068d13df7764b8cb7f24b35fda0a5948aef200b88ce8adbaaa8870740ab4574f0673a75b4e430df52ae646926e525353919cb5b16bcd0896265c4f WHIRLPOOL d5e6753e08aaf0332cc9575bec120355f376f5d2b94232475d9e8f5ebc7b44638afac1c5c31818b92aa0e67f61bcd65b4a6a14793d6fd0700344cc2ff4bd0a5c
-AUX cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch 1676 SHA256 2dc073e15aa1751dea2234794bb1171c49a6fe2266c55331cf669389e92c8247 SHA512 e31ceb3f66a0f4e948e6008a6802412ba4c2b5cb26a9b1aa10e08f14e8b86aef359fa48133e134c444202ce02966a5ae06d8c7e98199c4fea6fd924ef73a0e28 WHIRLPOOL 351b2313478dadb45d4c33aa1793df647fb00b3cfe292a6ab89d35f21a3b20799fb63986ee7674f885d88f1bc5e1bea847b307ea0ccfe34902510afe0258ee6e
-AUX poppler-0.26.0-qt5-dependencies.patch 1112 SHA256 f32f81e4fa0b39799acc5f4c3b36ffdf9d1674b8da902e14b1ff7e5ea01eec56 SHA512 94353b0c94b9385496074888e04e11e2349a9e1c60131c661bfb4c7df3df3c5c2494761b94b2bd47f8fe69c17aab4ea3c3d0812df6491554085001148d70477b WHIRLPOOL ef6e1b94a0d5f1085723ae3c80684772b4a30ae0628fe69548bb61468df14c17ae16e4a562f4edbd0dd41f28453657e3b17213ee97ba3907e396745b0738fa55
-AUX poppler-0.28.1-fix-multilib-configuration.patch 813 SHA256 c2107ff3bfdbb4176e3febfe9efada4bd5ab2a198ef3ab44688e2e05c1d42a56 SHA512 fc12ae5a484bd231a10bd31860f07d773899ba034cb43f55bc53da7701dc8a3d8ce86885330cdad1a4d32fd8ce712105d3c8b984855857fabd4d4e92bb54dfed WHIRLPOOL b578e6e93595409557af0fb2907f7e022ad73f1561d9e98f8fbbe0e4c5e30c61fd7fa1f1368b504a6a3136799595c0d5213e6ab5db35c85f9664275675069cc1
-AUX poppler-0.28.1-respect-cflags.patch 2733 SHA256 f654924d669cc61ac5be0d3d6075e835ae8b5d5c9c849ad73e86f7996833383d SHA512 f36671cb51cd6c45f2db5fedcae73763b300067f732d8c546d3f0b30af6aa7fcdcfe07e5349d43d93cee0f0a420f85c031b3482ce8bc514a5180e1c968bb465a WHIRLPOOL 53b1ef9d4f052fc0cafaa3a645d11f9a615861d505abec4412721b4a8a9d93c7fa624d8be676f248f81a4d4094826e36ab6c1f2f84577fd54c17be9bc89465b4
-AUX poppler-0.33.0-openjpeg2.patch 667 SHA256 439a6a79440be4777e9f6568eaced07896ef614d6049ee33a22443fdf71916a7 SHA512 7ab16d1a4200a963c2fbae9917445c4536660acfdccc266cf6bd04a16bd329dec12cd0dae9bf26aa9da8e9d7882ffb66876f5bf85095bdb57e1d981a325ad494 WHIRLPOOL e18118ca42e075bc8fcd6f21a336cf0d9719e6b86a1d4017d3eff091a1b194fd538beb43eaece23980083d3293b409223ea9d9ee75c9905fee89507a195c9478
-AUX poppler-0.40-FindQt4.patch 1169 SHA256 2bbf9d7b7b95ac818f9d665797a2a5a539718b314dc7d6cd6d1e9b7b279e7172 SHA512 e7fb511c6b28228f81eee57cc40296657d7bd454faeb3ab7b4e4175c62c78ef8c5ed9f9127b77aefbef28ed04ab234e1fb9faef113ab009733e4c23a540a5b23 WHIRLPOOL 41a2516d255a6754fbb4bc41d4d376ed1655da8037fc3eb70587e3d463613e5fbaf12eca0ab907ec1cecaa66ca48e7afbfe46b4c653b3587587259fea2e63131
-AUX poppler-0.53.0-respect-cflags.patch 2879 SHA256 bd9e3064b77ca827b0cce615922c703464e3d74231ebd33dbf9008ecd7310b71 SHA512 a342a43a36f636d7960038b96b42e6c00f498d2ff3218ba33c50329971be30e7d30342b50ab30828b4c3b80bd69be11af545d60657f8318c4191d0000c9db25e WHIRLPOOL 8a1d60a6085adb91b5b64d992314c3cd80cb3ddae7ca9ee8c72030251b914dd30a086baba2ce217b412870c27f6280b9c4c47bec6c099c789cac51dd32db2536
-AUX poppler-0.59.0-qt5-dependencies.patch 944 SHA256 4fb00d04ca2df0eb6aa20f0704e9c3c25478cf54ba47bbb9ad761f30130e6f45 SHA512 d42d83601968f013d22018e80b2feb9ed275200f5585b2d8724486f22da24ca665a9c279c300cc1bc5b4ab69f6d945ed4044368e1ae1092e87dbe720ab35db8d WHIRLPOOL dde1d5afd870d6f361e57a83d4bcb5b0c58f47d3c52b0dcf7684f293c733c4da1f779e82cbad32dfd532d25f51cbf5ec6b4bd6df600078fe07496f890682a334
-AUX poppler-0.59.0-respect-cflags.patch 2749 SHA256 7cd2f99440c6dd29d2a1395d298e5d17b8c252209328e49cfabccf2287b4f1b4 SHA512 5078957d4b73a8f6bf1f9e4ccf46acabdb3b52cf58b3717dfda23518047648ad371e1aa60b371a72314a2171ec21ed4e0e2162c43876b512d8ca07eafda1702c WHIRLPOOL 78344be54fcfc37f517d0f2ddbe9471be4fc6773776cbb282ca79d669aa5ad9aec8353e78b431ae5e8d8eaaf0f3b22a025112142665aed0515d3ee5390c2a1df
-AUX poppler-0.60.1-qt5-dependencies.patch 934 SHA256 2230542bd9154b2905a2c3f274e55c9817502ceaa14f30a0cd57806137f5d887 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c WHIRLPOOL dd1ea8dac84c2aef744a412d37146dfd0a39952ab55ea1be5eaf608b49d82e366974335e5ca38ecb3236574e9081c9b189ca7581f26c236fbbcf352529cfd16f
-AUX poppler-0.60.1-respect-cflags.patch 2956 SHA256 0c32d963dd61af1a3c88f0f50268bc08b285638f08cb91df45a6a75452156e1c SHA512 905ba703b71f637946f5adae510034a47cdc6dadb987d3c50de12e6275b53cc7d3f91456a62b4af8ef096592fd19b611888c37c7867ec44cfd82d3b252a4ac43 WHIRLPOOL b90741ed5ec1916f7b7be9a3a5420b103298a2310bd2866f6ed58fafcbce22cef60e692a1187eb56f2093ebf681108dabafd3125c164dd2f5b27af30ce9d8b43
-AUX poppler-0.61.0-respect-cflags.patch 3012 SHA256 4bc423b407b5f94764619c2011313970f06221b7fa48313c660235ce58dbcd92 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d WHIRLPOOL dc20cc06fbddf5085a1b429afc79dd53aebcdec54e6b0152b4e1722dad05692455b191edc9e6d0f4950de864385ac5d46ae60d4a787b4a79453691ff77c97df8
-DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8
-DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f WHIRLPOOL fb0c15e4834f23b2956014748f92557de9996b8a2a37cf4a7ba62ca22f01866455a933bcf0412775a8d5a8f6ba1ba463f2fd63e27fa406b5fb5bf1fd25d32000
-DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837
+AUX poppler-0.26.0-qt5-dependencies.patch 1112 BLAKE2B 63516a17a335408198a5b7493d338e1fe8fedc0076f43b510659747a749230acd757265a1bce38f9fa1393dfd8ec2afefc8aefb2266bf8fed6e700a15e5a1315 SHA512 94353b0c94b9385496074888e04e11e2349a9e1c60131c661bfb4c7df3df3c5c2494761b94b2bd47f8fe69c17aab4ea3c3d0812df6491554085001148d70477b
+AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80d4839f61beb22ba8ede9d594d4978c1311219268c3c97f8f9b6e939e2d0870acf6406a01ceafcbd982dcf93ee738a6451b86f7f48d270ec9 SHA512 fc12ae5a484bd231a10bd31860f07d773899ba034cb43f55bc53da7701dc8a3d8ce86885330cdad1a4d32fd8ce712105d3c8b984855857fabd4d4e92bb54dfed
+AUX poppler-0.33.0-openjpeg2.patch 667 BLAKE2B 1614e54104d6d82e1ee4eaf8785e7149c1ce4f32d89dcd4cd3c872f74d88ee301215949a3a461c84be588cc267f629c1c238b7d2aa7ef298ad6e1888f2dd6db5 SHA512 7ab16d1a4200a963c2fbae9917445c4536660acfdccc266cf6bd04a16bd329dec12cd0dae9bf26aa9da8e9d7882ffb66876f5bf85095bdb57e1d981a325ad494
+AUX poppler-0.40-FindQt4.patch 1169 BLAKE2B c29f9979c52d77e7c104020bf54a7bc6c95a617001e188124a9e0fb4a95c3213bf2f8d97292732ed22ef546257deaae384c80eefce6253363b68dd8d53c197e3 SHA512 e7fb511c6b28228f81eee57cc40296657d7bd454faeb3ab7b4e4175c62c78ef8c5ed9f9127b77aefbef28ed04ab234e1fb9faef113ab009733e4c23a540a5b23
+AUX poppler-0.53.0-respect-cflags.patch 2879 BLAKE2B 0ee99a762cd329e3c9d55d926b954a3f9d3226ea64ae36ccfef1d34c06b5ae93929827cf3b003ed264a5fc70d83d49a504b285faba130be3b756b0db15a4fd47 SHA512 a342a43a36f636d7960038b96b42e6c00f498d2ff3218ba33c50329971be30e7d30342b50ab30828b4c3b80bd69be11af545d60657f8318c4191d0000c9db25e
+AUX poppler-0.57.0-CVE-2017-14517.patch 659 BLAKE2B 38f63d47aa5877550a90ff37c29dc96e3a1cf736ca23758593fa4a1d5ffe2311b10bab969da09949eb92b709175efe7d807d12dcade12856dafde565a75d3358 SHA512 0b44c0203ababe44b598143a3f015dc712904bcdef64cefc512b38538d77234044ebbcc717095616efca9cd921df9c654f7bab94b75c8172edd6babdc9ea4d62
+AUX poppler-0.57.0-CVE-2017-14518.patch 962 BLAKE2B 860a6498e3041c353ac8a10cca2e22cb86b1f9ba4d527dfe5b5d9ea339047179bbf37b145b6b9ecd4b0745aa21d9b9fe143ecddd1730de0383794572c4743c97 SHA512 142e2348b0d7f93bf0d56f4db395fe89575bbe4935ac6c2395cc7a44950444630cc4f9445c3d64237374fbe4fefad8b67ab5c25a2b429cbcb5d7ea8d24585062
+AUX poppler-0.57.0-CVE-2017-14519.patch 3262 BLAKE2B d1e020e05d0a561d4915beb0ce002b57f60b0e6d48834ade0b0ece1ead5496ef75e59300beee67fd1dae46bf2462e637e7c6252a0558088a8e0f2614b281f202 SHA512 d2e7cae36be5067dd2b4a506db981f80838be027cfa06c24d94f7a756524e90e49517c851cacebf6228b8ad2f4fb81e8e46ea641b31575e6576df76badb0242c
+AUX poppler-0.57.0-CVE-2017-14520.patch 859 BLAKE2B c2e35ed1dcd77b3fb672fe5bf59cf7b4ef6b69fd7097503d2141295be766aaa85394cb1695e4653fbe9d70a7daae26f10d9e757e34e579fc69c30f398a16010f SHA512 3bd53675beac5c96a4c2abc9e098ee68387d3277f9874cd3bfb146e1a1f4a4730aa0ec8468ecdbb7f1250b5684d4249be8305a341bc8454f25f671b61b23dcc3
+AUX poppler-0.57.0-CVE-2017-14617.patch 944 BLAKE2B b6786c3d4907804d7f60efd902432e73bbc8a9d92f18d9e69dbcdbf8b172a5d59e5aac907ca3fb9012c4162e78570861a4ed9458a547c94a4fd19cba30ea2c86 SHA512 049520838ea9124265d70b7f4436060b98e1e997d0c29d3edaa740c7cb7fe477d9eeac4ac1431e68f2455ca5c23a25d96d124617cd6587d035ce09ab26eeb898
+AUX poppler-0.57.0-CVE-2017-14926.patch 1141 BLAKE2B 544bbaaa2a8362eb6be100c128792f6fc6ce02a7802e20fd7804c39089a3a5465f0fcdd7a2d1ca1a971ec52c13537f038024a9665afc745b0726917b678fa3c0 SHA512 b90d113026adaef117a6461086221296bc54bfb32c85c8cc58734c62215f1fc8f8c022742bc1d29fff40f82758b6daa8cf19d674d53992e76cec638665dd9c3c
+AUX poppler-0.57.0-CVE-2017-14927.patch 1009 BLAKE2B a0457d00b8ba7164de24ccd1e895a54496fa838b529db41c926b111c234d587c43f8ed587f47a1d89a6977d82f6897e47336f72d7a16b41bb78a399eddd16b78 SHA512 f7b36d5ce8de0f4eb449f08ae33aab50cb0f9a8a8e878705334379b64c04c0811f9826ddb8db07c44888d97267e29f9c3a65fb5a2240230050bf59cc8f5427cc
+AUX poppler-0.57.0-CVE-2017-14928.patch 2088 BLAKE2B e1a47d0a8e97bec05efb12267c6ca1303486688bde60b142beea747adf60ea042e3bd54d54a2351796dcc9472416bd3a9e8de2373cd432f14cde6e2798f6c831 SHA512 114f06bb6a392276de1c2f8e5d5d5ab843c0047a750cc8d87cff5e43f91eb6ad3aa5d09ebdcfbe6c56e055a6a34fb4209e309e54e84fa6c93f806b0643d180e4
+AUX poppler-0.57.0-CVE-2017-14929.patch 8614 BLAKE2B 673af3b4bb4d9f514a9285020701cd048662daa356cbcc1297d4ff8b44166c1f6760fa26227197d8f5776c49aecfee8fef607d4d18b8b79521f17eb03e315e5d SHA512 225fd1e169ef18ccae9968d2c5c01525dc1510d80a3548e8eeba9f0cdef5515df7d699ab1471749f34aa83fefd9680c9ec2a5cbea77b58e1cf5a4ae6da86ed5b
+AUX poppler-0.57.0-CVE-2017-15565.patch 920 BLAKE2B 4f7c67794d3f6f99b710aad06d520d3be77ec2b73009e8a3f789f2d1ee9ef1bd3936e549e0a50627c38dc6bf2aab6a7865f60bb041c249996d12b78860b43a01 SHA512 d28dffb50c38681fa32b46dac74d773709b33cc1139a7f7651f43516b75708dde4f2862ac068dc3261c9e243141ad4a33ea009f837da46ba3d34792c8414c804
+AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
+AUX poppler-0.59.0-qt5-dependencies.patch 944 BLAKE2B acc1da5a180ddd846881c3c6fbad848ca2177a647ec2f33ba4b4d0d759fa7d0a6ca3ae2dda3024bb3c58f14e58d37afd087d242c2abf1e73ae8ac98ec62c60c9 SHA512 d42d83601968f013d22018e80b2feb9ed275200f5585b2d8724486f22da24ca665a9c279c300cc1bc5b4ab69f6d945ed4044368e1ae1092e87dbe720ab35db8d
+AUX poppler-0.59.0-respect-cflags.patch 2749 BLAKE2B 130566eaa2a4c87001f7cd94c72241780d96220cbdaf2ca6b2167a3a134a126c9b70a2997ed68155ea371454de51363b1523d90ec4e0709ead96581f80d4681e SHA512 5078957d4b73a8f6bf1f9e4ccf46acabdb3b52cf58b3717dfda23518047648ad371e1aa60b371a72314a2171ec21ed4e0e2162c43876b512d8ca07eafda1702c
+AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
+AUX poppler-0.60.1-respect-cflags.patch 2956 BLAKE2B cb773887a8288a8c55022c6338afa816a34e42ad65fe9bb645e82af12ca38c7c32ded29f8bd6a8c3ca9f503978653c9974b58159e226bec369ccfd345ecbee98 SHA512 905ba703b71f637946f5adae510034a47cdc6dadb987d3c50de12e6275b53cc7d3f91456a62b4af8ef096592fd19b611888c37c7867ec44cfd82d3b252a4ac43
+AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
+DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B e4126dff2e0ee140fa4c5c30d5a57da5aff38d4c1f566e4ace22d3fe625949db3a662a8513881702cd5c5c302845998dd462048b5158abaf1d119650c997c84c SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f
+DIST poppler-0.58.0.tar.xz 1710412 BLAKE2B ac2558503f86e8f0729d9ee5e4bc6c59dc9a4abca2e94b4e94b27b139dcb237b608af70b011b6f042a06d18ce83e32593f5b3d28876ee2606d7e63bc9230e51e SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
 DIST poppler-0.61.1.tar.xz 1433696 SHA256 1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d WHIRLPOOL 9d41a9c2ae551f71a82cdae763a4d9c032977c1140fb89f619b912169f9c48c6b310bba38b0138de16c5af04cb46f0f58c57c60a15a648fefcd92cee8c8583df
-EBUILD poppler-0.45.0.ebuild 4108 SHA256 fb29a6d15775c6029bcd3d2796bb43eac7120e3ac7304ac815714b24c758c903 SHA512 d0baeb8e0db1b7e0faf183b4913457d77a742981814a06cd1f75644b7238cf9f06fceccb9cf1c40f1e56a79a215dc2aab80da099f89fd300106ed383c877253f WHIRLPOOL c82e97dc8ea77ea41d9a224d734abb2a8b1137a6a49f860a8f782c9108bb7c7257338c60734c908009ce1b9b7e64ece124307b3766a67741330e5cdafc96c2eb
-EBUILD poppler-0.57.0.ebuild 3858 SHA256 cfd1022b1f78c0249c5cc0ccd8603b73a8d60105ab0d386b2eb1927f3ea88390 SHA512 7ac898f6ae7e4535acd582966abf08ebad92d957257da548a0c330998d82a6f6e82b7e4990c6c333f2625f34b84ddc41a973af43e68da3d9d081c0243c3a21fe WHIRLPOOL b1753b898f43d012041040f312a7c50e066501456ec1fd5443a0c073ca79bff8643f0482bff346a4fe2c07103cf474945c7b7bd32d47c6c2ef541ee1616e08f1
-EBUILD poppler-0.58.0.ebuild 3866 SHA256 15b2567ab3f0406649403383c4ed72f8efa4a56a12fa8953dfc2881202782d2a SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218 WHIRLPOOL cb2c8b25c56519c3f8491084950d5f62205756078fc810e9e920bfe5f884e9abb15e4d0d1eee204699dd3701c8db3021ace8d6ddc21c2a42930d6a990056e59d
-EBUILD poppler-0.59.0.ebuild 3866 SHA256 025009ab5401a66987c0212a6db8e217ad30e0dbc71ef3a428bcee0fde6daaf7 SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70 WHIRLPOOL e4cebc30bd49442c22bd83a9c83da6911a9c6923ff42cb0b990831392ed29c33212d17ab8aabaf3a07e4458c0d1b31c9d223a0c99b75186f58a31d634255536f
-EBUILD poppler-0.60.1.ebuild 3861 SHA256 a1c0de6efb508cad5181ddf6fff049677198ec917c8d609b8cfe0ab8d554f651 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb WHIRLPOOL da25c7257a4538fbed96fc656fbae8cd1663ceacac243cb8b8974ccca625598349bcab3bf05583c57d0b01297cb12ece6128eef94d9e8cfe8ae10da6b8f71dcb
-EBUILD poppler-0.61.1.ebuild 3861 SHA256 d0f8f66c9fea0a4ca849ea7ead9e002daca4b8cc1ec832d9fc6e0c67543a442e SHA512 d7af6d662e22060b2651625f99fb0245cfb5ab5fc4f575a79319c629fb7c29926119fccbfe967a5dfd5af9ad6e9ad797771777ef18a4226f0192acde51fa2787 WHIRLPOOL 6e3443289cc94969a6a50375c9352c399a74276e93046fa47d19eadc13bb25a4e0908ae3b2894ea81192c38c951bd9ea4e22ad6cde31ca455c816608518c4bb8
-EBUILD poppler-9999.ebuild 3875 SHA256 8a4be7cd9f2377af8e68d4147d0e6909d592258cf9f80a9939e95711ae35d9cd SHA512 0605c6eef746d5851b21b4a9b6c7382bc3ddf3b0edc2725df608d34e00470dd92e7d7a79857915d4b990d2e8d11b37c2684b09ed8fa36ead918f6149b8473e59 WHIRLPOOL 2e8c4a10cfaabe911f63b5818060c0ffc64fc1da457cefe77f33a217f75b9a3722a4829fa86cbc28902ce85554532475b706031e58ae2d304c83a854b1e60ea5
-MISC ChangeLog 12583 SHA256 b10bb0674eaf3fb5709ac71f335e1d0b3010cc6465f52c43d0d9f8d80ba327f4 SHA512 92b92d9ca9d028de27ae96ac2de9f2f38b582742d0f6474315e341dc883488632a106232c4763375b93161885276cb4aa0c833712d96e569d2915881877611cf WHIRLPOOL fd51e52ac26587ade05a2548432a914936db4be111871ca8295930b47ee5e3064ad49cffc932ca6258191281b731f084b80186596e4d95d3fb63fc68587168ae
-MISC ChangeLog-2015 64326 SHA256 2d1c6158c2ddf8e667300324ead9d16a38118479df81bbfd17b754e19027b72f SHA512 beba273afefaaa7163bc58e177d7c52ac3e957037bf1616647021a174ea0cd86fc272c6cb8747b81e597e04ec2378591b37e4ca084f231c5ff20d4c9043fd961 WHIRLPOOL 9a7e71e81554411c48d7b6b60a7702c32c2a180f6dcbefc55777d9fb44f728250d08e08873dbc59653a90dc58da453e9d4789fc9a4fb8949d61971672bcf518c
-MISC metadata.xml 999 SHA256 ffe981c4c31df137ec6f6523138ab48e6d6bb60e84e8940e83211bc9415f05af SHA512 c23399b672d336acafa0e4589e44c66e57fcc71f4a4878f7f18672d9d02bae82e50f543c7462b1bb9ce3b08ee4f835997f1f571bbbb75bfbf820d9b31b60542b WHIRLPOOL a16ec5546bb6dc986e8100f316e91b738b1c97d85a0b0648901260792dd3acdd95b2f3271f46e77c0c6837285d5afdf7d65f80c3406cf9dca2d468e95082b19d
+EBUILD poppler-0.57.0-r1.ebuild 4357 BLAKE2B a18405f68e5727e80da6ba6a648eaa7654c5981c4e21d4bebdf453360595df81269602abb62e313f6c889e98cbca541aab26a548131f006a507e43ea3ea174a5 SHA512 2b75c9319a3efd67f328d76956063847551d56f86b27db9b34430a81f59ed9f079dd46ee0ab671bbf18d35e1f20d4b2fec5cdaa50332f138e048c09ba6a30b90
+EBUILD poppler-0.57.0.ebuild 3858 BLAKE2B c4e998308076d2458384d364e684e6cd73233b873e258e50ca907ddab0b63fb4baa840b6cba30efb57d32b39a3e342bf8f2f538e68320938facdfe8f12d36d74 SHA512 7ac898f6ae7e4535acd582966abf08ebad92d957257da548a0c330998d82a6f6e82b7e4990c6c333f2625f34b84ddc41a973af43e68da3d9d081c0243c3a21fe
+EBUILD poppler-0.58.0.ebuild 3866 BLAKE2B 6cc87db70c2d396a98ed240b96458be5172b8b5fdb70d5da903d89cc0611e9b9f683ddba219dc97c0c8eb4dd93ba0a1a43d81e7645348abcd6dd4e2dab5ba248 SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218
+EBUILD poppler-0.59.0.ebuild 3866 BLAKE2B ef874dc127c9802e730a6b9136029461091b0a0b44d1b2105264fe452483a39c76c9f899abadbb7489a2b3a1634898c3a26f6f527a0ff181b80c58b7469f65ce SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70
+EBUILD poppler-0.60.1.ebuild 3861 BLAKE2B fa45fb8b44eebdcfa1513923a86071766ee4e5864631e81127b87a81f3c47bb00ba88d1af4f1dcc1915b938b584d17c89544320a50d766033079a130645c18d3 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb
+EBUILD poppler-0.61.1.ebuild 3861 BLAKE2B 5c838ed916b99b742f9bf190542b65dbc66b0d28562b987c59d98aee4e11335a9b112ef02de4e6e5dd5de3da4807993d101c7b00458baf22199cea550e43f121 SHA512 d7af6d662e22060b2651625f99fb0245cfb5ab5fc4f575a79319c629fb7c29926119fccbfe967a5dfd5af9ad6e9ad797771777ef18a4226f0192acde51fa2787
+EBUILD poppler-9999.ebuild 3875 BLAKE2B 5e97bd3fdf70a68b3efde627e2789aaa0d5c2ef181722b793c330cc9579f848bd565e5097279786ce9785692123e0dd25a5f9986c63418eeb6cc7143e67913b9 SHA512 0605c6eef746d5851b21b4a9b6c7382bc3ddf3b0edc2725df608d34e00470dd92e7d7a79857915d4b990d2e8d11b37c2684b09ed8fa36ead918f6149b8473e59
+MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/files/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch b/app-text/poppler/files/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch
deleted file mode 100644
index 2246b29b1340..000000000000
--- a/app-text/poppler/files/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From e8fcbaca23878f0edd2015440eec55aaba0e8f9f Mon Sep 17 00:00:00 2001
-From: Paul Gideon Dann <pdgiddie@gmail.com>
-Date: Wed, 20 May 2009 11:42:28 +0100
-Subject: [PATCH 1/4] Cairo backend added to Qt4 wrapper
-
----
- qt4/src/CMakeLists.txt      | 15 ++++++++++
- qt4/src/poppler-document.cc |  3 ++
- qt4/src/poppler-page.cc     | 70 +++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h       |  3 +-
- qt4/tests/CMakeLists.txt    |  5 ++++
- 5 files changed, 95 insertions(+), 1 deletion(-)
-
-diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
-index 189eca2..5338b55 100644
---- a/qt4/src/CMakeLists.txt
-+++ b/qt4/src/CMakeLists.txt
-@@ -6,6 +6,11 @@ include_directories(
-   ${CMAKE_CURRENT_BINARY_DIR}
- )
- 
-+if (HAVE_CAIRO)
-+  include_directories(${CAIRO_INCLUDE_DIRS})
-+  add_definitions(${CAIRO_CFLAGS})
-+endif (HAVE_CAIRO)
-+
- set(poppler_qt4_SRCS
-   poppler-annotation.cc
-   poppler-document.cc
-@@ -28,10 +33,20 @@ set(poppler_qt4_SRCS
-   poppler-media.cc
-   ArthurOutputDev.cc
- )
-+if (HAVE_CAIRO)
-+  set(poppler_qt4_SRCS ${poppler_qt4_SRCS}
-+    ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc
-+    ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
-+    ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc
-+  )
-+endif(HAVE_CAIRO)
- qt4_automoc(${poppler_qt4_SRCS})
- add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
- set_target_properties(poppler-qt4 PROPERTIES VERSION 4.9.0 SOVERSION 4)
- target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
-+if (HAVE_CAIRO)
-+  target_link_libraries(poppler-qt4 ${CAIRO_LIBRARIES})
-+endif (HAVE_CAIRO)
- if(MSVC)
- target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
- endif(MSVC)
-diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
-index 94f997d..6decaaf 100644
---- a/qt4/src/poppler-document.cc
-+++ b/qt4/src/poppler-document.cc
-@@ -547,6 +547,9 @@ namespace Poppler {
-         ret << Document::SplashBackend;
- #endif
-         ret << Document::ArthurBackend;
-+#if defined(HAVE_CAIRO)
-+        ret << Document::CairoBackend;
-+#endif
-         return ret;
-     }
- 
-diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
-index 83bcf4a..df1d344 100644
---- a/qt4/src/poppler-page.cc
-+++ b/qt4/src/poppler-page.cc
-@@ -40,6 +40,7 @@
- #include <QtGui/QPainter>
- 
- #include <config.h>
-+#include <math.h>
- #include <PDFDoc.h>
- #include <Catalog.h>
- #include <Form.h>
-@@ -53,6 +54,9 @@
- #include <SplashOutputDev.h>
- #include <splash/SplashBitmap.h>
- #endif
-+#if defined(HAVE_CAIRO)
-+#include <CairoOutputDev.h>
-+#endif
- 
- #include "poppler-private.h"
- #include "poppler-page-transition-private.h"
-@@ -405,6 +409,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
-       img = tmpimg;
-       break;
-     }
-+    case Poppler::Document::CairoBackend:
-+    {
-+#if defined(HAVE_CAIRO)
-+      CairoOutputDev *output_dev = new CairoOutputDev();
-+      output_dev->startDoc(m_page->parentDoc->doc);
-+      int buffer_width, buffer_height, rotate;
-+      cairo_surface_t *surface;
-+      cairo_t *cairo;
-+
-+      // If w or h are -1, that indicates the whole page, so we need to
-+      // calculate how many pixels that corresponds to.  Otherwise, we can use w
-+      // or h directly for our buffer size.
-+      const QSize pageSize = this->pageSize();
-+      if (w == -1) {
-+        const double xscale = xres / 72.0;
-+        const double width = pageSize.width();;
-+        buffer_width = (int) ceil(width * xscale);
-+      } else {
-+        buffer_width = w;
-+      }
-+      if (h == -1) {
-+        const double yscale = yres / 72.0;
-+        const double height = pageSize.height();
-+        buffer_height = (int) ceil(height * yscale);
-+      } else {
-+        buffer_height = h;
-+      }
-+
-+      rotate = rotation + m_page->page->getRotate();
-+
-+      // FIXME: Okular never provides a rotation value, so I don't have any way
-+      // of testing this right now.  The result is that subpixels are ordered
-+      // incorrectly when the page is rotated.
-+
-+      //if (rotate == 90 || rotate == 270) {
-+      //  const double temp = height;
-+      //  height = width;
-+      //  width = temp;
-+      //}
-+
-+      img = QImage(buffer_width, buffer_height, QImage::Format_ARGB32);
-+      img.fill(Qt::white);  // Never transparent
-+
-+      surface = cairo_image_surface_create_for_data(
-+                  img.bits(),
-+                  CAIRO_FORMAT_ARGB32,
-+                  buffer_width, buffer_height,
-+                  img.bytesPerLine());
-+
-+      cairo = cairo_create(surface);
-+      output_dev->setCairo(cairo);
-+
-+      m_page->parentDoc->doc->displayPageSlice(
-+        output_dev, m_page->index + 1, xres, yres, rotation, false, true,
-+        false, x, y, w, h);
-+
-+      // Clean up
-+      output_dev->setCairo(NULL);
-+      cairo_destroy(cairo);
-+      cairo_surface_destroy(surface);
-+      delete output_dev;
-+#endif
-+      break;
-+    }
-   }
- 
-   return img;
-@@ -447,6 +515,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
-          painter->restore();
-       return true;
-     }
-+    case Poppler::Document::CairoBackend:
-+      return false;
-   }
-   return false;
- }
-diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
-index c0340a4..118f8ba 100644
---- a/qt4/src/poppler-qt4.h
-+++ b/qt4/src/poppler-qt4.h
-@@ -886,7 +886,8 @@ delete it;
- 	*/
- 	enum RenderBackend {
- 	    SplashBackend,   ///< Splash backend
--	    ArthurBackend   ///< Arthur (Qt4) backend
-+	    ArthurBackend,   ///< Arthur (Qt4) backend
-+	    CairoBackend     ///< Cairo backend
- 	};
- 
- 	/**
-diff --git a/qt4/tests/CMakeLists.txt b/qt4/tests/CMakeLists.txt
-index bba868f..8c40471 100644
---- a/qt4/tests/CMakeLists.txt
-+++ b/qt4/tests/CMakeLists.txt
-@@ -8,6 +8,11 @@ include_directories(
-   ${QT4_INCLUDE_DIR}
- )
- 
-+if (HAVE_CAIRO)
-+  include_directories(${CAIRO_INCLUDE_DIRS})
-+  add_definitions(${CAIRO_CFLAGS})
-+endif (HAVE_CAIRO)
-+
- macro(QT4_ADD_SIMPLETEST exe source)
-   string(REPLACE "-" "" test_name ${exe})
-   set(${test_name}_SOURCES
--- 
-2.7.3
-
diff --git a/app-text/poppler/files/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch b/app-text/poppler/files/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch
deleted file mode 100644
index 3a360394182e..000000000000
--- a/app-text/poppler/files/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7ddcf7bf4296ed58dc316b0dd6b000057740e118 Mon Sep 17 00:00:00 2001
-From: Paul Gideon Dann <pdgiddie@gmail.com>
-Date: Wed, 20 May 2009 13:17:29 +0100
-Subject: [PATCH 2/4] Setting default Qt4 backend to Cairo
-
----
- qt4/src/poppler-private.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qt4/src/poppler-private.cc b/qt4/src/poppler-private.cc
-index cbf21b1..1c7f16c 100644
---- a/qt4/src/poppler-private.cc
-+++ b/qt4/src/poppler-private.cc
-@@ -236,7 +236,7 @@ namespace Debug {
-     void DocumentData::init()
-     {
-         m_fontInfoIterator = 0;
--        m_backend = Document::SplashBackend;
-+        m_backend = Document::CairoBackend;
-         paperColor = Qt::white;
-         m_hints = 0;
-         m_optContentModel = 0;
--- 
-2.7.3
-
diff --git a/app-text/poppler/files/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch b/app-text/poppler/files/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
deleted file mode 100644
index 21547b951802..000000000000
--- a/app-text/poppler/files/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a9a6a3fcf4f2bf62e83d325a790624241084ad72 Mon Sep 17 00:00:00 2001
-From: Paul Gideon Dann <pdgiddie@gmail.com>
-Date: Wed, 20 May 2009 13:06:48 +0100
-Subject: [PATCH 3/4] Forcing subpixel rendering in Cairo backend
-
----
- poppler/CairoOutputDev.cc | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
-index d0d6cb4..50e64f9 100644
---- a/poppler/CairoOutputDev.cc
-+++ b/poppler/CairoOutputDev.cc
-@@ -203,6 +203,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
-   }
-   if (cairo != NULL) {
-     this->cairo = cairo_reference (cairo);
-+    {
-+      cairo_font_options_t *options = cairo_font_options_create ();
-+      cairo_get_font_options (cairo, options);
-+      cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_SUBPIXEL);
-+      cairo_set_font_options (cairo, options);
-+      cairo_font_options_destroy (options);
-+    }
- 	/* save the initial matrix so that we can use it for type3 fonts. */
- 	//XXX: is this sufficient? could we miss changes to the matrix somehow?
- 	cairo_get_matrix(cairo, &orig_matrix);
--- 
-2.7.3
-
diff --git a/app-text/poppler/files/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch b/app-text/poppler/files/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch
deleted file mode 100644
index 0f622323a9f0..000000000000
--- a/app-text/poppler/files/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1604ec6cb759b6f2b8aa006faa0ec990cd511b36 Mon Sep 17 00:00:00 2001
-From: Paul Gideon Dann <pdgiddie@gmail.com>
-Date: Thu, 21 May 2009 10:55:49 +0100
-Subject: [PATCH 4/4] Enabling slight hinting in Cairo Backend
-
-Originally suggested at:
-http://bugs.freedesktop.org/show_bug.cgi?id=3307#c20
----
- poppler/CairoFontEngine.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
-index 3cff917..75a1c50 100644
---- a/poppler/CairoFontEngine.cc
-+++ b/poppler/CairoFontEngine.cc
-@@ -132,7 +132,7 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
- 	cairo_matrix_t m;
- 	cairo_matrix_init_identity(&m);
- 	cairo_font_options_t *options = cairo_font_options_create();
--	cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE);
-+	cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_SLIGHT);
- 	cairo_font_options_set_hint_metrics(options, CAIRO_HINT_METRICS_OFF);
- 	cairo_scaled_font_t *scaled_font = cairo_scaled_font_create(cairo_font_face, &m, &m, options);
- 
-@@ -189,7 +189,7 @@ _ft_new_face_uncached (FT_Library lib,
-   }
- 
-   font_face = cairo_ft_font_face_create_for_ft_face (face,
--							  FT_LOAD_NO_HINTING |
-+							  FT_LOAD_TARGET_LIGHT |
- 							  FT_LOAD_NO_BITMAP);
-   if (cairo_font_face_set_user_data (font_face,
- 				     &_ft_cairo_key,
-@@ -358,7 +358,7 @@ _ft_new_face (FT_Library lib,
-   _ft_open_faces = l;
- 
-   l->font_face = cairo_ft_font_face_create_for_ft_face (tmpl.face,
--							  FT_LOAD_NO_HINTING |
-+							  FT_LOAD_TARGET_LIGHT |
- 							  FT_LOAD_NO_BITMAP);
-   if (cairo_font_face_set_user_data (l->font_face,
- 				     &_ft_cairo_key,
--- 
-2.7.3
-
diff --git a/app-text/poppler/files/poppler-0.28.1-respect-cflags.patch b/app-text/poppler/files/poppler-0.28.1-respect-cflags.patch
deleted file mode 100644
index 0b94042c8af8..000000000000
--- a/app-text/poppler/files/poppler-0.28.1-respect-cflags.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index 6cadf40..7e5e6b2 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -98,41 +98,10 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-   set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- 
--if(CMAKE_COMPILER_IS_GNUCXX)
--  # set the default compile warnings
-   set(DEFAULT_COMPILE_WARNINGS_NO)
-   set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wcast-align -fno-exceptions -fno-check-new -fno-common")
-   set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
- 
--  set(CMAKE_CXX_FLAGS                "-Wnon-virtual-dtor -Woverloaded-virtual ${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
--  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
--  set(CMAKE_C_FLAGS                  "-std=c99")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
--  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
--  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
--
--  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
--  if(GCC_HAS_AS_NEEDED)
--    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
--    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
--    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
--  endif(GCC_HAS_AS_NEEDED)
--endif (CMAKE_COMPILER_IS_GNUCXX)
--
--if(CMAKE_C_COMPILER MATCHES "icc")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
--  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign")
--endif(CMAKE_C_COMPILER MATCHES "icc")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
- 
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14517.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14517.patch
new file mode 100644
index 000000000000..6a0812cdbe81
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14517.patch
@@ -0,0 +1,27 @@
+From b524efeffa8d192c2597f4612ca961adc30286f6 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Sep 2017 22:58:14 +0200
+Subject: [PATCH 1/4] XRef::parseEntry: Fix crash in broken file
+
+Bug #102687
+---
+ poppler/XRef.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/poppler/XRef.cc b/poppler/XRef.cc
+index 6ea0fbb6..c74f2f60 100644
+--- a/poppler/XRef.cc
++++ b/poppler/XRef.cc
+@@ -1603,6 +1603,9 @@ GBool XRef::parseEntry(Goffset offset, XRefEntry *entry)
+ {
+   GBool r;
+ 
++  if (unlikely(entry == nullptr))
++    return gFalse;
++
+   Object obj;
+   obj.initNull();
+   Parser parser = Parser(NULL, new Lexer(NULL,
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14518.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14518.patch
new file mode 100644
index 000000000000..9e8f4bfe6246
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14518.patch
@@ -0,0 +1,27 @@
+From 6ba3bba6447897260bf4117e191e09d89d91ff62 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Sep 2017 23:09:45 +0200
+Subject: [PATCH 2/4] isImageInterpolationRequired: Fix divide by 0 on broken
+ documents
+
+Bug #102688
+---
+ splash/Splash.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/splash/Splash.cc b/splash/Splash.cc
+index 46b8ce29..39fc7d64 100644
+--- a/splash/Splash.cc
++++ b/splash/Splash.cc
+@@ -4134,7 +4134,7 @@ SplashError Splash::arbitraryTransformImage(SplashImageSource src, SplashICCTran
+ static GBool isImageInterpolationRequired(int srcWidth, int srcHeight,
+                                           int scaledWidth, int scaledHeight,
+                                           GBool interpolate) {
+-  if (interpolate)
++  if (interpolate || srcWidth == 0 || srcHeight == 0)
+     return gTrue;
+ 
+   /* When scale factor is >= 400% we don't interpolate. See bugs #25268, #9860 */
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14519.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14519.patch
new file mode 100644
index 000000000000..bd84e96fba3b
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14519.patch
@@ -0,0 +1,100 @@
+From 778180c0c09002f6adfc272eba6b0d0e4401c4cc Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Sep 2017 23:01:03 +0200
+Subject: [PATCH 3/4] Gfx::doShowText: Fix infinite recursion on broken files
+
+Bug #102701
+---
+ poppler/Gfx.cc     | 25 +++++++++++++++++++++++--
+ poppler/Gfx.h      |  1 +
+ poppler/GfxFont.cc |  9 +++++++++
+ poppler/GfxFont.h  |  1 +
+ 4 files changed, 34 insertions(+), 2 deletions(-)
+
+diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
+index 37220280..9feac54c 100644
+--- a/poppler/Gfx.cc
++++ b/poppler/Gfx.cc
+@@ -4031,12 +4031,33 @@ void Gfx::doShowText(GooString *s) {
+       state->transformDelta(dx, dy, &ddx, &ddy);
+       if (!out->beginType3Char(state, curX + riseX, curY + riseY, ddx, ddy,
+ 			       code, u, uLen)) {
+-	((Gfx8BitFont *)font)->getCharProc(code, &charProc);
++	((Gfx8BitFont *)font)->getCharProcNF(code, &charProc);
++	int refNum = -1;
++	if (charProc.isRef()) {
++	  refNum = charProc.getRef().num;
++	  charProc.fetch(((Gfx8BitFont *)font)->getCharProcs()->getXRef(), &charProc);
++	}
+ 	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
+ 	  pushResources(resDict);
+ 	}
+ 	if (charProc.isStream()) {
+-	  display(&charProc, gFalse);
++	  std::set<int>::iterator charProcDrawingIt;
++	  bool displayCharProc = true;
++	  if (refNum != -1) {
++	    if (charProcDrawing.find(refNum) == charProcDrawing.end()) {
++	      charProcDrawingIt = charProcDrawing.insert(refNum).first;
++	    } else {
++	      displayCharProc = false;
++	      error(errSyntaxError, -1, "CharProc wants to draw a CharProc that is already beign drawn");
++	    }
++	  }
++	  if (displayCharProc) {
++	    display(&charProc, gFalse);
++
++	    if (refNum != -1) {
++	      charProcDrawing.erase(charProcDrawingIt);
++	    }
++	  }
+ 	} else {
+ 	  error(errSyntaxError, getPos(), "Missing or bad Type3 CharProc entry");
+ 	}
+diff --git a/poppler/Gfx.h b/poppler/Gfx.h
+index a82f9f4a..44adaed5 100644
+--- a/poppler/Gfx.h
++++ b/poppler/Gfx.h
+@@ -228,6 +228,7 @@ private:
+   Parser *parser;		// parser for page content stream(s)
+   
+   std::set<int> formsDrawing;	// the forms that are being drawn
++  std::set<int> charProcDrawing;	// the charProc that are being drawn
+ 
+   GBool				// callback to check for an abort
+     (*abortCheckCbk)(void *data);
+diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
+index b59ec06c..bb87c5a0 100644
+--- a/poppler/GfxFont.cc
++++ b/poppler/GfxFont.cc
+@@ -1818,6 +1818,15 @@ Object *Gfx8BitFont::getCharProc(int code, Object *proc) {
+   return proc;
+ }
+ 
++Object *Gfx8BitFont::getCharProcNF(int code, Object *proc) {
++  if (enc[code] && charProcs.isDict()) {
++    charProcs.dictLookupNF(enc[code], proc);
++  } else {
++      proc->initNull();
++  }
++  return proc;
++}
++
+ Dict *Gfx8BitFont::getResources() {
+   return resources.isDict() ? resources.getDict() : (Dict *)NULL;
+ }
+diff --git a/poppler/GfxFont.h b/poppler/GfxFont.h
+index de7a7464..89a0ca0d 100644
+--- a/poppler/GfxFont.h
++++ b/poppler/GfxFont.h
+@@ -353,6 +353,7 @@ public:
+ 
+   // Return the Type 3 CharProc for the character associated with <code>.
+   Object *getCharProc(int code, Object *proc);
++  Object *getCharProcNF(int code, Object *proc);
+ 
+   // Return the Type 3 Resources dictionary, or NULL if none.
+   Dict *getResources();
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14520.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14520.patch
new file mode 100644
index 000000000000..f71ff53f61ac
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14520.patch
@@ -0,0 +1,24 @@
+From 504b3590182175390f474657a372e78fb1508262 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 14 Sep 2017 19:14:23 +0200
+Subject: Splash::scaleImage: Do not try to scale if srcHeight or srcWidth are
+ < 1
+
+Bug #102719
+
+diff --git a/splash/Splash.cc b/splash/Splash.cc
+index 39fc7d6..aba7814 100644
+--- a/splash/Splash.cc
++++ b/splash/Splash.cc
+@@ -4152,7 +4152,7 @@ SplashBitmap *Splash::scaleImage(SplashImageSource src, void *srcData,
+   SplashBitmap *dest;
+ 
+   dest = new SplashBitmap(scaledWidth, scaledHeight, 1, srcMode, srcAlpha, gTrue, bitmap->getSeparationList());
+-  if (dest->getDataPtr() != NULL) {
++  if (dest->getDataPtr() != NULL && srcHeight > 0 && srcWidth > 0) {
+     if (scaledHeight < srcHeight) {
+       if (scaledWidth < srcWidth) {
+ 	scaleImageYdXd(src, srcData, srcMode, nComps, srcAlpha,
+-- 
+cgit v0.10.2
+
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14617.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14617.patch
new file mode 100644
index 000000000000..279479536129
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14617.patch
@@ -0,0 +1,31 @@
+From 939465c40902d72e0c05d4f3a27ee67e4a007ed7 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Tue, 19 Sep 2017 21:19:03 +0200
+Subject: [PATCH] Fix crash in broken files
+
+Bug #102854
+---
+ poppler/Stream.cc | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/poppler/Stream.cc b/poppler/Stream.cc
+index f4eda85b..0ad602c7 100644
+--- a/poppler/Stream.cc
++++ b/poppler/Stream.cc
+@@ -454,11 +454,10 @@ ImageStream::ImageStream(Stream *strA, int widthA, int nCompsA, int nBitsA) {
+     } else {
+       imgLineSize = nVals;
+     }
+-    if (width > INT_MAX / nComps) {
+-      // force a call to gmallocn(-1,...), which will throw an exception
++    if (nComps <= 0 || width > INT_MAX / nComps) {
+       imgLineSize = -1;
+     }
+-    imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
++    imgLine = (Guchar *)gmallocn_checkoverflow(imgLineSize, sizeof(Guchar));
+   }
+   imgIdx = nVals;
+ }
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14926.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14926.patch
new file mode 100644
index 000000000000..882cf0e2b8b5
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14926.patch
@@ -0,0 +1,36 @@
+From 170fe21144d469d3f865eda6e298df440b784499 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 8 Sep 2017 18:28:15 +0200
+Subject: [PATCH 2/3] Annot: Fix crash on broken files
+
+Bug #102601
+
+(cherry picked from commit 2532df6060092e9fab7f041ae9598aff9cdd94bb)
+---
+ poppler/Annot.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/poppler/Annot.cc b/poppler/Annot.cc
+index 27b698db..643ff12c 100644
+--- a/poppler/Annot.cc
++++ b/poppler/Annot.cc
+@@ -6865,13 +6865,13 @@ AnnotRichMedia::Content::Content(Dict *dict) {
+       assets = (Asset **)gmallocn(nAssets, sizeof(Asset *));
+ 
+       int counter = 0;
+-      for (int i = 0; i < obj2.arrayGetLength(); i += 2) {
++      for (int i = 0; i < nAssets; ++i) {
+         Object objKey;
+ 
+         assets[counter] = new AnnotRichMedia::Asset;
+ 
+-        obj2.arrayGet(i, &objKey);
+-        obj2.arrayGet(i + 1, &assets[counter]->fileSpec);
++        obj2.arrayGet(i * 2, &objKey);
++        obj2.arrayGet(i * 2 + 1, &assets[counter]->fileSpec);
+ 
+         assets[counter]->name = new GooString( objKey.getString() );
+         ++counter;
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14927.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14927.patch
new file mode 100644
index 000000000000..3595345800f0
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14927.patch
@@ -0,0 +1,32 @@
+From 876e7f76159e2b12ee7d2d396f327dd2cc90bcb0 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 8 Sep 2017 18:26:05 +0200
+Subject: [PATCH 3/3] SplashOutputDev: Fix crash on broken files
+
+Bug #102604
+
+(cherry picked from commit 6472d8493f7e82cc78b41da20a2bf19fcb4e0a7d)
+---
+ poppler/SplashOutputDev.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
+index 5502be64..46b55a42 100644
+--- a/poppler/SplashOutputDev.cc
++++ b/poppler/SplashOutputDev.cc
+@@ -2714,7 +2714,11 @@ void SplashOutputDev::endType3Char(GfxState *state) {
+ }
+ 
+ void SplashOutputDev::type3D0(GfxState *state, double wx, double wy) {
+-  t3GlyphStack->haveDx = gTrue;
++  if (likely(t3GlyphStack != nullptr)) {
++    t3GlyphStack->haveDx = gTrue;
++  } else {
++    error(errSyntaxWarning, -1, "t3GlyphStack was null in SplashOutputDev::type3D0");
++  }
+ }
+ 
+ void SplashOutputDev::type3D1(GfxState *state, double wx, double wy,
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14928.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14928.patch
new file mode 100644
index 000000000000..bd2af863423b
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14928.patch
@@ -0,0 +1,69 @@
+From 6bf7212c44d0131c8f8227a4a4dadc52a3afebd9 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 8 Sep 2017 18:29:42 +0200
+Subject: [PATCH 1/3] Annot: Fix crash on broken files
+
+Bug #102607
+
+(cherry picked from commit 1316c7a41f4dd7276f404f775ebb5fef2d24ab1c)
+---
+ poppler/Annot.cc | 42 +++++++++++++++++++++++-------------------
+ 1 file changed, 23 insertions(+), 19 deletions(-)
+
+diff --git a/poppler/Annot.cc b/poppler/Annot.cc
+index 974b098b..27b698db 100644
+--- a/poppler/Annot.cc
++++ b/poppler/Annot.cc
+@@ -6982,26 +6982,30 @@ AnnotRichMedia::Configuration::Configuration(Dict *dict)
+     } else if (!strcmp(name, "Video")) {
+       type = typeVideo;
+     } else {
+-      // determine from first instance
++      // determine from first non null instance
++      type = typeFlash; // default in case all instances are null
+       if (instances && nInstances > 0) {
+-        AnnotRichMedia::Instance *instance = instances[0];
+-        switch (instance->getType()) {
+-          case AnnotRichMedia::Instance::type3D:
+-            type = type3D;
+-            break;
+-          case AnnotRichMedia::Instance::typeFlash:
+-            type = typeFlash;
+-            break;
+-          case AnnotRichMedia::Instance::typeSound:
+-            type = typeSound;
+-            break;
+-          case AnnotRichMedia::Instance::typeVideo:
+-            type = typeVideo;
+-            break;
+-          default:
+-            type = typeFlash;
+-            break;
+-        }
++	for (int i = 0; i < nInstances; ++i) {
++	  AnnotRichMedia::Instance *instance = instances[i];
++	  if (instance) {
++	    switch (instance->getType()) {
++	      case AnnotRichMedia::Instance::type3D:
++		type = type3D;
++		break;
++	      case AnnotRichMedia::Instance::typeFlash:
++		type = typeFlash;
++		break;
++	      case AnnotRichMedia::Instance::typeSound:
++		type = typeSound;
++		break;
++	      case AnnotRichMedia::Instance::typeVideo:
++		type = typeVideo;
++		break;
++	    }
++	    // break the loop since we found the first non null instance
++	    break;
++	  }
++	}
+       }
+     }
+   }
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14929.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14929.patch
new file mode 100644
index 000000000000..11745ca5436d
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14929.patch
@@ -0,0 +1,252 @@
+From accdc5be215c7ee3223e3ad21dee7708d910ef23 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 25 Sep 2017 19:33:44 +0200
+Subject: [PATCH 4/4] Fix infinite recursion on broken files
+
+Bug #102969
+---
+ poppler/Gfx.cc      | 46 ++++++++++++++++++++++++++++++++++------------
+ poppler/GfxState.cc | 33 ++++++++++++++++++---------------
+ poppler/GfxState.h  | 15 +++++++++------
+ 3 files changed, 61 insertions(+), 33 deletions(-)
+
+diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
+index 9feac54c..66d0a24c 100644
+--- a/poppler/Gfx.cc
++++ b/poppler/Gfx.cc
+@@ -468,8 +468,14 @@ GfxPattern *GfxResources::lookupPattern(char *name, OutputDev *out, GfxState *st
+ 
+   for (resPtr = this; resPtr; resPtr = resPtr->next) {
+     if (resPtr->patternDict.isDict()) {
+-      if (!resPtr->patternDict.dictLookup(name, &obj)->isNull()) {
+-	pattern = GfxPattern::parse(resPtr, &obj, out, state);
++      if (!resPtr->patternDict.dictLookupNF(name, &obj)->isNull()) {
++	Ref patternRef = { -1, -1 };
++	if (obj.isRef()) {
++	  patternRef = obj.getRef();
++	  obj.fetch(resPtr->patternDict.getDict()->getXRef(), &obj);
++	}
++
++	pattern = GfxPattern::parse(resPtr, &obj, out, state, patternRef.num);
+ 	obj.free();
+ 	return pattern;
+       }
+@@ -2298,18 +2304,34 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat,
+ 		       xi0, yi0, xi1, yi1, xstep, ystep)) {
+     goto restore;
+   } else {
+-    out->updatePatternOpacity(state);
+-    for (yi = yi0; yi < yi1; ++yi) {
+-      for (xi = xi0; xi < xi1; ++xi) {
+-        x = xi * xstep;
+-        y = yi * ystep;
+-        m1[4] = x * m[0] + y * m[2] + m[4];
+-        m1[5] = x * m[1] + y * m[3] + m[5];
+-        drawForm(tPat->getContentStream(), tPat->getResDict(),
+-        	  m1, tPat->getBBox());
++    bool shouldDrawForm = gTrue;
++    std::set<int>::iterator patternRefIt;
++    const int patternRefNum = tPat->getPatternRefNum();
++    if (patternRefNum != -1) {
++      if (formsDrawing.find(patternRefNum) == formsDrawing.end()) {
++	patternRefIt = formsDrawing.insert(patternRefNum).first;
++      } else {
++	shouldDrawForm = gFalse;
++      }
++    }
++
++    if (shouldDrawForm) {
++      out->updatePatternOpacity(state);
++      for (yi = yi0; yi < yi1; ++yi) {
++	for (xi = xi0; xi < xi1; ++xi) {
++	  x = xi * xstep;
++	  y = yi * ystep;
++	  m1[4] = x * m[0] + y * m[2] + m[4];
++	  m1[5] = x * m[1] + y * m[3] + m[5];
++	  drawForm(tPat->getContentStream(), tPat->getResDict(),
++		  m1, tPat->getBBox());
++	}
++      }
++      out->clearPatternOpacity(state);
++      if (patternRefNum != -1) {
++	formsDrawing.erase(patternRefIt);
+       }
+     }
+-    out->clearPatternOpacity(state);
+   }
+ 
+   // restore graphics state
+diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
+index f61f8124..90030b10 100644
+--- a/poppler/GfxState.cc
++++ b/poppler/GfxState.cc
+@@ -3446,14 +3446,17 @@ void GfxPatternColorSpace::getDefaultColor(GfxColor *color) {
+ // Pattern
+ //------------------------------------------------------------------------
+ 
+-GfxPattern::GfxPattern(int typeA) {
+-  type = typeA;
++GfxPattern::GfxPattern(int typeA, int patternRefNumA)
++ : type(typeA)
++ , patternRefNum(patternRefNumA)
++{
++
+ }
+ 
+ GfxPattern::~GfxPattern() {
+ }
+ 
+-GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state) {
++GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state, int patternRefNum) {
+   GfxPattern *pattern;
+   Object obj1;
+ 
+@@ -3466,9 +3469,9 @@ GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, Gf
+   }
+   pattern = NULL;
+   if (obj1.isInt() && obj1.getInt() == 1) {
+-    pattern = GfxTilingPattern::parse(obj);
++    pattern = GfxTilingPattern::parse(obj, patternRefNum);
+   } else if (obj1.isInt() && obj1.getInt() == 2) {
+-    pattern = GfxShadingPattern::parse(res, obj, out, state);
++    pattern = GfxShadingPattern::parse(res, obj, out, state, patternRefNum);
+   }
+   obj1.free();
+   return pattern;
+@@ -3478,7 +3481,7 @@ GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, Gf
+ // GfxTilingPattern
+ //------------------------------------------------------------------------
+ 
+-GfxTilingPattern *GfxTilingPattern::parse(Object *patObj) {
++GfxTilingPattern *GfxTilingPattern::parse(Object *patObj, int patternRefNum) {
+   GfxTilingPattern *pat;
+   Dict *dict;
+   int paintTypeA, tilingTypeA;
+@@ -3555,7 +3558,7 @@ GfxTilingPattern *GfxTilingPattern::parse(Object *patObj) {
+   obj1.free();
+ 
+   pat = new GfxTilingPattern(paintTypeA, tilingTypeA, bboxA, xStepA, yStepA,
+-			     &resDictA, matrixA, patObj);
++			     &resDictA, matrixA, patObj, patternRefNum);
+   resDictA.free();
+   return pat;
+ }
+@@ -3563,8 +3566,8 @@ GfxTilingPattern *GfxTilingPattern::parse(Object *patObj) {
+ GfxTilingPattern::GfxTilingPattern(int paintTypeA, int tilingTypeA,
+ 				   double *bboxA, double xStepA, double yStepA,
+ 				   Object *resDictA, double *matrixA,
+-				   Object *contentStreamA):
+-  GfxPattern(1)
++				   Object *contentStreamA, int patternRefNumA) :
++  GfxPattern(1, patternRefNumA)
+ {
+   int i;
+ 
+@@ -3589,14 +3592,14 @@ GfxTilingPattern::~GfxTilingPattern() {
+ 
+ GfxPattern *GfxTilingPattern::copy() {
+   return new GfxTilingPattern(paintType, tilingType, bbox, xStep, yStep,
+-			      &resDict, matrix, &contentStream);
++			      &resDict, matrix, &contentStream, getPatternRefNum());
+ }
+ 
+ //------------------------------------------------------------------------
+ // GfxShadingPattern
+ //------------------------------------------------------------------------
+ 
+-GfxShadingPattern *GfxShadingPattern::parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state) {
++GfxShadingPattern *GfxShadingPattern::parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state, int patternRefNum) {
+   Dict *dict;
+   GfxShading *shadingA;
+   double matrixA[6];
+@@ -3629,11 +3632,11 @@ GfxShadingPattern *GfxShadingPattern::parse(GfxResources *res, Object *patObj, O
+   }
+   obj1.free();
+ 
+-  return new GfxShadingPattern(shadingA, matrixA);
++  return new GfxShadingPattern(shadingA, matrixA, patternRefNum);
+ }
+ 
+-GfxShadingPattern::GfxShadingPattern(GfxShading *shadingA, double *matrixA):
+-  GfxPattern(2)
++GfxShadingPattern::GfxShadingPattern(GfxShading *shadingA, double *matrixA, int patternRefNumA):
++  GfxPattern(2, patternRefNumA)
+ {
+   int i;
+ 
+@@ -3648,7 +3651,7 @@ GfxShadingPattern::~GfxShadingPattern() {
+ }
+ 
+ GfxPattern *GfxShadingPattern::copy() {
+-  return new GfxShadingPattern(shading->copy(), matrix);
++  return new GfxShadingPattern(shading->copy(), matrix, getPatternRefNum());
+ }
+ 
+ //------------------------------------------------------------------------
+diff --git a/poppler/GfxState.h b/poppler/GfxState.h
+index 7bcedf2a..4b13fb2a 100644
+--- a/poppler/GfxState.h
++++ b/poppler/GfxState.h
+@@ -762,18 +762,21 @@ private:
+ class GfxPattern {
+ public:
+ 
+-  GfxPattern(int typeA);
++  GfxPattern(int typeA, int patternRefNumA);
+   virtual ~GfxPattern();
+ 
+-  static GfxPattern *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state);
++  static GfxPattern *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state, int patternRefNum);
+ 
+   virtual GfxPattern *copy() = 0;
+ 
+   int getType() { return type; }
+ 
++  int getPatternRefNum() const { return patternRefNum; }
++
+ private:
+ 
+   int type;
++  int patternRefNum;
+ };
+ 
+ //------------------------------------------------------------------------
+@@ -783,7 +786,7 @@ private:
+ class GfxTilingPattern: public GfxPattern {
+ public:
+ 
+-  static GfxTilingPattern *parse(Object *patObj);
++  static GfxTilingPattern *parse(Object *patObj, int patternRefNum);
+   ~GfxTilingPattern();
+ 
+   GfxPattern *copy() override;
+@@ -803,7 +806,7 @@ private:
+   GfxTilingPattern(int paintTypeA, int tilingTypeA,
+ 		   double *bboxA, double xStepA, double yStepA,
+ 		   Object *resDictA, double *matrixA,
+-		   Object *contentStreamA);
++		   Object *contentStreamA, int patternRefNumA);
+ 
+   int paintType;
+   int tilingType;
+@@ -821,7 +824,7 @@ private:
+ class GfxShadingPattern: public GfxPattern {
+ public:
+ 
+-  static GfxShadingPattern *parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state);
++  static GfxShadingPattern *parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state, int patternRefNum);
+   ~GfxShadingPattern();
+ 
+   GfxPattern *copy() override;
+@@ -831,7 +834,7 @@ public:
+ 
+ private:
+ 
+-  GfxShadingPattern(GfxShading *shadingA, double *matrixA);
++  GfxShadingPattern(GfxShading *shadingA, double *matrixA, int patternRefNumA);
+ 
+   GfxShading *shading;
+   double matrix[6];
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-15565.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-15565.patch
new file mode 100644
index 000000000000..7e4db3f04452
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-15565.patch
@@ -0,0 +1,28 @@
+From 19ebd40547186a8ea6da08c8d8e2a6d6b7e84f5d Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 13 Oct 2017 00:55:49 +0200
+Subject: [PATCH] CairoOutputDev: Fix crash in broken files
+
+Bug #103016
+---
+ poppler/CairoOutputDev.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
+index ffd39ef7..80f7a99e 100644
+--- a/poppler/CairoOutputDev.cc
++++ b/poppler/CairoOutputDev.cc
+@@ -2714,7 +2714,9 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *s
+   for (y = 0; y < maskHeight; y++) {
+     maskDest = (unsigned char *) (maskBuffer + y * row_stride);
+     pix = maskImgStr->getLine();
+-    maskColorMap->getGrayLine (pix, maskDest, maskWidth);
++    if (likely(pix != nullptr)) {
++        maskColorMap->getGrayLine (pix, maskDest, maskWidth);
++    }
+   }
+ 
+   maskImgStr->close();
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch
new file mode 100644
index 000000000000..faf632128ff7
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch
@@ -0,0 +1,25 @@
+Fix security issue [internal unmaintained JPX decoder] that is caused
+by building without system-jpeg libs. Fedora does not care because they
+always build with system-jpeg, however in Gentoo we allow the user to
+disable both options and poppler's buildsystem is making us believe
+there would be no JPX decoder built in that case, when in reality
+JPXStream.cc is built (even if it may not be used by the code).
+
+
+--- a/CMakeLists.txt	2017-11-24 23:12:41.953450442 +0100
++++ b/CMakeLists.txt	2017-11-24 23:16:09.441030669 +0100
+@@ -506,9 +508,11 @@
+   add_definitions(-DUSE_OPENJPEG2)
+   set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES})
+ else ()
+-  set(poppler_SRCS ${poppler_SRCS}
+-    poppler/JPXStream.cc
+-  )
++  if(NOT WITH_OPENJPEG AND HAVE_JPX_DECODER)
++    set(poppler_SRCS ${poppler_SRCS}
++      poppler/JPXStream.cc
++    )
++  endif()
+ endif()
+ if(USE_CMS)
+   if(LCMS_FOUND)
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 40c1c894b848..3f8d6be9f980 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -20,7 +20,6 @@
 <use>
 	<flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
 	<flag name="utils">Install command-line PDF converters and various utilities.</flag>
-	<flag name="cairo-qt">Enable experimental Cairo font rasterizer for Qt4 backend.</flag>
 </use>
 <slots>
 	<subslots>Reflects ABI compatibility of libpoppler.so only,
diff --git a/app-text/poppler/poppler-0.45.0.ebuild b/app-text/poppler/poppler-0.57.0-r1.ebuild
index ad745e69149c..fafef568109a 100644
--- a/app-text/poppler/poppler-0.45.0.ebuild
+++ b/app-text/poppler/poppler-0.57.0-r1.ebuild
@@ -7,21 +7,19 @@ inherit cmake-utils toolchain-funcs xdg-utils
 
 if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/62"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="https://poppler.freedesktop.org/"
 
 LICENSE="GPL-2"
-IUSE="cairo cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
-
-REQUIRED_USE="cairo-qt? ( qt4 )"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
 
 # No test data provided
 RESTRICT="test"
@@ -35,7 +33,6 @@ COMMON_DEPEND="
 		>=x11-libs/cairo-1.10.0
 		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
 	)
-	cairo-qt? ( >=x11-libs/cairo-1.10.0 )
 	curl? ( net-misc/curl )
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:2= )
@@ -65,9 +62,21 @@ DOCS=(AUTHORS NEWS README README-XPDF TODO)
 PATCHES=(
 	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.53.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
 	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
+	"${FILESDIR}/${P}-disable-internal-jpx.patch"
+	# Fedora backports from upstream
+	"${FILESDIR}/${P}-CVE-2017-14517.patch"
+	"${FILESDIR}/${P}-CVE-2017-14518.patch"
+	"${FILESDIR}/${P}-CVE-2017-14519.patch"
+	"${FILESDIR}/${P}-CVE-2017-14520.patch"
+	"${FILESDIR}/${P}-CVE-2017-14617.patch"
+	"${FILESDIR}/${P}-CVE-2017-14926.patch"
+	"${FILESDIR}/${P}-CVE-2017-14927.patch"
+	"${FILESDIR}/${P}-CVE-2017-14928.patch"
+	"${FILESDIR}/${P}-CVE-2017-14929.patch"
+	"${FILESDIR}/${P}-CVE-2017-15565.patch"
 )
 
 src_prepare() {
@@ -79,14 +88,16 @@ src_prepare() {
 		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
 	fi
 
-	# Enable experimental patchset for subpixel font rendering using cairo
-	# backend for poppler-qt4 from https://github.com/giddie/poppler-qt4-cairo-backend.
-	if use cairo-qt; then
-		ewarn "Enabling unsupported, experimental cairo-qt patchset. Please do not report bugs."
-		epatch "${FILESDIR}/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
-		epatch "${FILESDIR}/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch"
-		epatch "${FILESDIR}/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch"
-		epatch "${FILESDIR}/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch"
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+		# we need to up the C++ version, bug #622526
+		export CXX="$(tc-getCXX) -std=c++11"
 	fi
 }
 
@@ -116,10 +127,15 @@ src_configure() {
 		$(cmake-utils_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF="$(usex tiff)"
 	)
+	if use jpeg; then
+		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+	else
+		mycmakeargs+=(-DENABLE_DCTDECODER=none)
+	fi
 	if use jpeg2k; then
 		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
 	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
 	fi
 	if use lcms; then
 		mycmakeargs+=(-DENABLE_CMS=lcms2)