gentoo resync : 28.12.2017

21 files changed, 53 insertions, 685 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 17252897c340..2ac118a4e3ba 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index 716aef9613c7..8eccc7d34abb 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -4,10 +4,10 @@ DIST djview-4.10.5.tar.gz 1111729 BLAKE2B 6e6607dcfd3b20c5a514ad851d404c616f2be5
 DIST djview-4.10.6.tar.gz 1113072 BLAKE2B db965ad7dc3b8191855e9c5f23af3cd963901ca649a937e6f85bad8f9f924e0636b30a9a5350c114dcfecea570f013ba395508eb6cf1d45afda674892bcd196e SHA512 c06b9c4c7addd9dededdc9d441094bca685c4d23744e3d1208eab33d9d341a85f120176bf9f1b879ac6620f591eefe05ac774870b1ba3215c43baf1eaf9d14f8
 DIST djview-4.10.tar.gz 1077198 BLAKE2B 57c9d3a8bab485929880e11aad5602a3d415fe2690abc0759b0ac4b553e8c3e8624a505cee291150df7842f02f9f1a15848daaaa843e0ed9543a42400336bd05 SHA512 b3755992df2000f088a93c0d77d4a2ea62f6495f67106142d4787b94d248c54561068a40700c18325c0977a057b26948762a7b71c392b0ccef455776dcb0aad0
 DIST djview-4.9.tar.gz 930676 BLAKE2B 384cf46d4258bb6b5fcf8e4c0b64787bdf7edd281fafdd170e6a1fe1208ea3fc207c39938e5ebd525c8857e59f0090de0d2916d2bfe9fb86f85a7bac1f081918 SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94
-EBUILD djview-4.10.3.ebuild 1976 BLAKE2B 240fe2a3524c4a4e9d3446155df69cdf86f85ba39e7fcd047b66958179c5e5b804f91feedf880bc1ec8fc2601e0bc72c4dc93e70c1f4fc364f54bd186f33d4ec SHA512 008cb8e128ad02b85ab1c5bcc8e16eb5cb07f6bd7a932bbcd049ef641e77a94d3c62acb967f07c7959037ec68b317f9b67292c38ad61037f8de790ecfdf06c12
-EBUILD djview-4.10.5.ebuild 1976 BLAKE2B 240fe2a3524c4a4e9d3446155df69cdf86f85ba39e7fcd047b66958179c5e5b804f91feedf880bc1ec8fc2601e0bc72c4dc93e70c1f4fc364f54bd186f33d4ec SHA512 008cb8e128ad02b85ab1c5bcc8e16eb5cb07f6bd7a932bbcd049ef641e77a94d3c62acb967f07c7959037ec68b317f9b67292c38ad61037f8de790ecfdf06c12
+EBUILD djview-4.10.3.ebuild 1967 BLAKE2B 28e074829e45abeb9e7cb184c827e8fb324b6cf7a1e12820ed88959c4c3911d11a8a40c25d1d00ef3a03387d505dca4a92dd88cdb65beadf320fea4a5b1ae058 SHA512 1aa0fa04b6f82e3462f8e208cd04b1125efc407ef00ed63e55c3c27a30ff13577689043df5b23796d150b68f8a4d4e77cb28b65528f55bb88da1849f270f432f
+EBUILD djview-4.10.5.ebuild 1967 BLAKE2B 28e074829e45abeb9e7cb184c827e8fb324b6cf7a1e12820ed88959c4c3911d11a8a40c25d1d00ef3a03387d505dca4a92dd88cdb65beadf320fea4a5b1ae058 SHA512 1aa0fa04b6f82e3462f8e208cd04b1125efc407ef00ed63e55c3c27a30ff13577689043df5b23796d150b68f8a4d4e77cb28b65528f55bb88da1849f270f432f
 EBUILD djview-4.10.6-r1.ebuild 2034 BLAKE2B 57fcd0e83d380eeb73f49c33448a656e55b09d680daa76c1d74784cec6a8193fbdefa5101bff2a651d2cb4b0e2fdd227694b23e0f6e033647ddf0c75564b2b81 SHA512 7ed4c8953b1326face2088ee6e8140b8cf73a13a163e16cdad1b5062459e57039410341512b272e9ce0c80955a6141f127b9d4a9791ee86e62e457e4d4c430e7
-EBUILD djview-4.10.6.ebuild 1972 BLAKE2B 6028e7f4d2106d420a2395d4578317881a2c3e131b254cbca45c1dab52d1cf70db5b7bcf258a37a500054332b0148ecc494e3a7ce8b37b0bf6ed38f11d9cea90 SHA512 6d578c18a0206759be8cad1f3f2088728324ab21313379efdf9cb2a9db50498644c9f7ba7e9cfb67ef2cf7aab35131227d4b09187e182a3adaa7c3c001ce2e76
-EBUILD djview-4.10.ebuild 2026 BLAKE2B 6de40b276a954aec044457292b6495de4f3737b955e65dad75b990b73edc4267ed0f296f51bafb734bec01aa88aee6ef27408ee12d359e67611901dc818acb2a SHA512 cc75b12554250cd19fd62d0f0e55222ffadd4734047920385f0848b13b8657f5d19ef78bfb9482438133bb9fdd57c9a58541cf24df2bf4ce67a03f9bfaaeae14
-EBUILD djview-4.9.ebuild 1945 BLAKE2B f566da0cdc06eb299452a5640a4b6c2d1a12fc4cd3eb4f3697724a219b6eaaadbd908d9d461ed6b91f92c29b2bcad6af459d299849415588b3d9a04ffca08fd6 SHA512 08264dcd607a17f4fc79994a0ac144edc94c325768e16530d185026ba459cb976ce43fe9d36728cabfade3b75b0d4c71847e0a8464f8e9cd7d121fd095e5c04e
+EBUILD djview-4.10.6.ebuild 1963 BLAKE2B 8577e48da86a9adad751d5685482b7af6348d84976a0fb7d73b494ed34b6d62c472e7c4e5f264234e82db6e57de15331c75b75c3ff432357fcbc16be544b73a7 SHA512 87550ffeedbd259d27ee273fc00f5bad414deeb6317db1548f30b015e1016e51a29552dada185bed7ff338455cb7940bd644ef83b2292ca64d9f1ace0edbb833
+EBUILD djview-4.10.ebuild 2017 BLAKE2B 914acd9c2c4fa67a41ebad20c890f5c4a54a93ff5f58e1d29139d79f4f76f65618c27fa62a92851be94a06a4b36327b3ef2f53166e3c1ee1c666e2ce47cb5b0a SHA512 65063e5d42283786094e795e6d0935045335612a563d9994b6b0dcf566354b9a647c7f2bce8eae98092529df7ce1c063ed03ff90a23d6c2c0c9f5852e90d418d
+EBUILD djview-4.9.ebuild 1936 BLAKE2B d9fe3341de87d0edf34568239f73d721830eb58b49d21ec473c751ae54dde2ac8ef28a15f4fa00175dc28366a32ab541739506556986391828e05fbed3a5470b SHA512 b17d6698188c8e9680e829d032e1884352097a914d70292654174bf4e055473ed9f71c2b5a6561628f74ab782a056f309ee627e81bafa1e4e3cf8d06829e05f8
 MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4
diff --git a/app-text/djview/djview-4.10.3.ebuild b/app-text/djview/djview-4.10.3.ebuild
index 18ba0f5fac98..80950832b3a1 100644
--- a/app-text/djview/djview-4.10.3.ebuild
+++ b/app-text/djview/djview-4.10.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
 
 DESCRIPTION="Portable DjVu viewer using Qt"
 HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
@@ -71,11 +71,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/djview/djview-4.10.5.ebuild b/app-text/djview/djview-4.10.5.ebuild
index 18ba0f5fac98..80950832b3a1 100644
--- a/app-text/djview/djview-4.10.5.ebuild
+++ b/app-text/djview/djview-4.10.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
 
 DESCRIPTION="Portable DjVu viewer using Qt"
 HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
@@ -71,11 +71,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/djview/djview-4.10.6.ebuild b/app-text/djview/djview-4.10.6.ebuild
index 4c7b748345cc..64fde7ca4ee9 100644
--- a/app-text/djview/djview-4.10.6.ebuild
+++ b/app-text/djview/djview-4.10.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
 
 DESCRIPTION="Portable DjVu viewer using Qt"
 HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
@@ -71,11 +71,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/djview/djview-4.10.ebuild b/app-text/djview/djview-4.10.ebuild
index 685793424f79..07ba16e577ac 100644
--- a/app-text/djview/djview-4.10.ebuild
+++ b/app-text/djview/djview-4.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
 
 MY_P=${PN}-$(replace_version_separator 2 '-')
 
@@ -73,11 +73,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/djview/djview-4.9.ebuild b/app-text/djview/djview-4.9.ebuild
index ba3ac87ae10d..ea9ddc4ccb9f 100644
--- a/app-text/djview/djview-4.9.ebuild
+++ b/app-text/djview/djview-4.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
 
 MY_P=${PN}-$(replace_version_separator 2 '-')
 
@@ -73,11 +73,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 71cf86860edc..8dec1d538981 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -6,7 +6,7 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7
 DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 EBUILD enchant-1.6.0.ebuild 1560 BLAKE2B 0162350ad36f2da271759e69c9acc0bbd8f793ef00069406a35320673991a644ed4171a32b73e01e2c243054fe9c38768f008e8bd30c6c0fdaf5aecd5cf46420 SHA512 e800eb39c1df85310236f1a760a218539622dc6670856482009efd2d7609b748e79f2a0aeb4fa565a17420226ebc7c7c87a4860e6e749b2b6d677ae308fa695f
-EBUILD enchant-1.6.1.ebuild 1618 BLAKE2B 563c08ab9ce792d5b5206318187efb09e39bea6c220d8b50765ca5beef7c278d46009be9ad7e856c2070159cbcf0c286da8ff0ada85a71decda3a2e8f2a41447 SHA512 778aefb7b3e026d5212a3cd5d26b2c98769c663a50bcd8a87d126bbb26aa76a6bbe319c968966d8e0b4b247c239c3fdb67de5a6bb425ba704cf6facefcacbdd1
+EBUILD enchant-1.6.1.ebuild 1617 BLAKE2B 0e415614ffc9ef2409e3af37139d526a4aea13ab6bcfcbf2ef72895d48702848ba4f5127a5fcc83352ff54aed1ad2581c62d3f92c12d13028a394416a1c2f90f SHA512 488c7f69923514abdd294544710f69abc3bcef748a700b88209946e406ee61db7e26d1569a273a199d0d8d89a811199931af24f1f98a4f2a4a10956e80c0a58a
 EBUILD enchant-2.1.0.ebuild 1432 BLAKE2B b8b7276367b64a99e7010f7f4fcde09a050b3dc9a153349621df459dc5aefda583ab6a91898c247b57a5f75602970f9fa802cacb6727a788adde2b89862b3722 SHA512 4131394259cc3280717fb1f6ebd7334289c0209d21af7659ce412f4124a537d7b920e2d4b6f72e1ec6303e5e53238209ad5dfd37e5c011ffe32c9557084ceaf1
 EBUILD enchant-2.1.1.ebuild 1291 BLAKE2B 5292cda24db259c234bd3f2f7b7d30b5c64a1f36bf0031aa4a4359d061f371669e860b8879036f40af48d2fb2198576cfcfe6e2f1682667e16315499a7030c24 SHA512 f5ceb6c6114864facef4a56da39a17324a86880c680fae23acc0617e97223ab9ac36996f2aae55bfbfb5f0861263c272969f93dae17f82bfe61601b232b26266
 MISC metadata.xml 551 BLAKE2B 591faf062fb6571587dea9187322c0786caad190c7c89d490f38f8ce953d86ce9332918dc1e882830e226dbc99d20edcda5a1b35deb4f394052342f25197003f SHA512 15358f20d39014be293f87d60871f16712f4314808bdd28bd25d6cced2278fc46eaa36f1e44c970c1379488bcf0fa359686abf3fa8ff10f4d66cb2f82057a528
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
index 04033f658a56..243c1947ec61 100644
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ b/app-text/enchant/enchant-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test zemberek"
 REQUIRED_USE="|| ( hunspell aspell zemberek )"
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 47267c62c44a..b388fe46412a 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,7 +1,5 @@
-DIST iso-codes-3.74.tar.xz 3455148 BLAKE2B 2bab64ae23c6706df472e7e0150b4f5022781375d7d5932697ec4fe459b52df0628dbbb531e1fb9270533728393221edb64a9c153139a4e2d4aa2bc2c5f0e8be SHA512 b4d583a6aee331c2cdf7cdd68a0ef5e7c3b291c4afa9a9a636e9fe2aef54e784cec070f5b8fafb31e8c84b278e1a9b08d7f925187882f7382378b66778e0d9cb
 DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
-EBUILD iso-codes-3.74.ebuild 2414 BLAKE2B bb7a2128daf4b2c6c1ce1e93c323df45301604d51d9b135a1f4f932dc9c06eb9f74175c1f765a801ff83cd7450aa8981f8acc9b8c52471488ee6480a66425f6c SHA512 0080d32cb19f1b72d007f1738997c22eac368a8182c2e07f6cffedcc006cdfdd97c8c6ab80ff8a48d5355831ba5e0fefbbaffd328fc660ab583b31ba9dfebfca
-EBUILD iso-codes-3.75.ebuild 2415 BLAKE2B 438eeb0eb56156ebc9de4871eb71cd6eb30351a3e6e5dc524bc93b60f1c6cee008d352ad6f28811f3b98aba32c80da050e0d8eaca9c308dd0bda1fa4a45394d6 SHA512 a1a285a45f7810b5a5a3adeb67b68b3716f00800bcde9ff2296b616c2200f499b1703dad4e68a65b4b92aa57440f74918531afd9e27887e64779fdc99a1db999
+EBUILD iso-codes-3.75.ebuild 2414 BLAKE2B bb7a2128daf4b2c6c1ce1e93c323df45301604d51d9b135a1f4f932dc9c06eb9f74175c1f765a801ff83cd7450aa8981f8acc9b8c52471488ee6480a66425f6c SHA512 0080d32cb19f1b72d007f1738997c22eac368a8182c2e07f6cffedcc006cdfdd97c8c6ab80ff8a48d5355831ba5e0fefbbaffd328fc660ab583b31ba9dfebfca
 EBUILD iso-codes-3.76.ebuild 2423 BLAKE2B 6a115745a5a6a551971fb18a8f03f13dc7d14d3a38ff64ffee1cc8f0342f59644c6fe36e08d2bfb6f49cb33aa6fe2a5f45edbf275988a9024337fe6221b12e71 SHA512 f8dc62420ddbd98b03a8e03fe54dd13c364fefd48084a177e8f5c3982c5a74521da2993792421a94ede39d9a7f2727ed45bfcb54360d54a4c4bfc599e936a700
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.74.ebuild b/app-text/iso-codes/iso-codes-3.74.ebuild
deleted file mode 100644
index 7b19bfc4b0e9..000000000000
--- a/app-text/iso-codes/iso-codes-3.74.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n python-any-r1
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
-SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-
-# This ebuild does not install any binaries.
-RESTRICT="binchecks strip"
-
-# l10n_find_plocales_changes doesn't support multiple directories,
-# so need to do the update scan ourselves.
-check_existing_locales() {
-	local std loc all_locales=()
-
-	ebegin "Looking for new locales"
-	for std in "${all_stds[@]}"; do
-		pushd "${std}" >/dev/null || die
-		for loc in *.po; do
-			all_locales+=( "${loc%.po}" )
-		done
-		popd >/dev/null
-	done
-
-	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
-	if [[ ${PLOCALES} != "${all_locales}" ]]; then
-		eend 1
-		eerror "There are changes in locales! This ebuild should be updated to:"
-		eerror "PLOCALES=\"${all_locales}\""
-		die "Update PLOCALES in the ebuild"
-	else
-		eend 0
-	fi
-}
-
-src_prepare() {
-	default
-
-	local std loc mylinguas
-	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
-
-	check_existing_locales
-
-	# Modify the Makefiles so they only install requested locales.
-	for std in "${all_stds[@]}"; do
-		einfo "Preparing ${std} ..."
-		pushd "${std}" >/dev/null || die
-		mylinguas=()
-		for loc in *.po; do
-			if use "linguas_${loc%.po}"; then
-				mylinguas+=( "${loc}" )
-			fi
-		done
-
-		sed \
-			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
-			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
-			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
-		popd >/dev/null
-	done
-}
diff --git a/app-text/iso-codes/iso-codes-3.75.ebuild b/app-text/iso-codes/iso-codes-3.75.ebuild
index 0455731e45f5..7b19bfc4b0e9 100644
--- a/app-text/iso-codes/iso-codes-3.75.ebuild
+++ b/app-text/iso-codes/iso-codes-3.75.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 6812c9d2c582..b7b23828e0d3 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,3 +1,5 @@
+DIST krop-0.4.13.5.tar.gz 40079 BLAKE2B 9d3505f7d9cbf0eef4ec7a28928f14940e6c0a2fd4499b6c5896fde7b3f7b8a0b84ddc4f9c7735ee348f89e9924a7b8f69a3d4dbfaa4668ac770a0fe8404d469 SHA512 218eb3e256dabcacc53af62b2e704031bd21bedacf2599c4aed7ee3b3847b35741c921a08137b7b6e7295ddfc7f87f4ffbf9d3fec3fb137d1ce36e3945dc6129
 DIST krop-0.4.13.tar.gz 36654 BLAKE2B 87c6ae2435ba7f4f7d5d8ad19f4804a1e45b9bb44bef7e03b46cf6e3c1a59cdf5dfd81a7a7d8c26a0f09b75e7d3dcdfa28b4795a786f8eb06d95881eacfc7cee SHA512 2d2af25124b45108715eb90344a5683adbda4c788bd419360b641e9f47553fe143a40205a44af9b3e4db6df4148b3328547e774f24b5c7c0fd23c9206e8a14b2
+EBUILD krop-0.4.13.5.ebuild 713 BLAKE2B 4b18cd8a175c62ea18e6fb7864bdc2995d54b27185ec4754538bdcb2c2176931532490d34f3a13f246c2d29f8c68c642fb23175e2328d1dfc79275342cf8c9c8 SHA512 deb6d8d593a350a026cb26ce9f425b736938ebd694686dd2b9fc954df131d6ca3921222cf500d681115c6163108448b3f049d8f8b2cefb3c971c614055c6465a
 EBUILD krop-0.4.13.ebuild 609 BLAKE2B a740a07ac30a2c7f3e2120f29eb9d54793b1b17705b0c50654f52a3e52face3cfd1d18d2acca69708bc8e2115cd31a10d708561e8d9aabc2b5adef0653966c2e SHA512 a0dd10fa9ede60ae319817da497cb5be4256e3fa2d6d98d1998f8f93fd88609ff31c80d8446d3757c501d338b48eb68008a63046667255a93583637010ec65b8
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.4.13.5.ebuild b/app-text/krop/krop-0.4.13.5.ebuild
new file mode 100644
index 000000000000..23966dc8cf43
--- /dev/null
+++ b/app-text/krop/krop-0.4.13.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A tool to crop PDF files"
+HOMEPAGE="http://arminstraub.com/software/krop"
+#SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~huettel/distfiles/${P}.tar.gz"
+# this is a snapshot of the qt5 branch
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+	dev-python/PyPDF2[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	domenu "${WORKDIR}/${P}/${PN}.desktop"
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index fa4c28a6a7ef..cdc8bf1411ad 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -14,22 +14,13 @@ AUX poppler-0.57.0-CVE-2017-14928.patch 2088 BLAKE2B e1a47d0a8e97bec05efb12267c6
 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
 AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170
 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 BLAKE2B ddffe0361097b54dccb3eb7df7cb2e879c90258ffed9d07fa8ad77fa41a5b9b0943b6a3d1da455074137d7b1b4166bf76f284c98130ec29a9b9ba8823f165ef6 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e
-DIST poppler-0.60.1.tar.xz 1432712 BLAKE2B 9c4e8645a5e5a3848ef9f65268e3cb757478c8e0fb46b0071e318e2afc35a05a0d1628d66af8f8815d1ff324a16c70ec8fa2c02cbe36621cb0252331594342b0 SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc
 DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 EBUILD poppler-0.57.0-r1.ebuild 4348 BLAKE2B 066b4f63c5347e883078bd8c7af3c345d0962dd12b824d53cb1024b4f40671141436bf4992774a0c1b6f18867c57b4bc88e007ad9d7370b3349dc2b9c8640bc0 SHA512 a93fb043158a88df8f52ef3f426dcc88645b5e9c3dacd5eef7939ab1ee0d016546c04c5508596162326765b3bad07579259bb6985cd33cd1695329dbecf69484
-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 3916 BLAKE2B db93b842e85bd4072b8402046ff9cfa90f640bc97987deec238f0cd8b84370509578595c965ef6c87612867f220e101c7ef5295ccaaa4068a10a1fd3efb9317b SHA512 e2fb1a52dbc901eb8f1410f537f0cf5cd20dc9d0aa4c466cb3b49ff8906069d21d4aba263c7878cd4d8934a89a41a3d5c04f4b4528950d5edf17d1d1f25bb8ad
 EBUILD poppler-0.62.0.ebuild 3775 BLAKE2B baba514bfdbd5af6364388d65d9a53f656582432f55adcd94a3cccba1756c0cb9f6c9b4a192b56a85a3270ac592f1846aa9c837adf7b9d39643b2b549f67d2f9 SHA512 c0ae101aa5b970b091e52c642ec7c6ac2b94ac44fa1158f4eae900c6c113b60d265d462fb625f6ef2276c8f658de439cb3e3fcd2392fca4b69cb9b22c0c628e6
 EBUILD poppler-9999.ebuild 3789 BLAKE2B 0e5f7d66a0e63c8c01ef821713fbba3aecb4761146af9a30162b2b34845fe63d698cf24d595f1a559542f0c9f31f4f0ee8d990bd6bcf810dcdc31e6152676378 SHA512 2cc819782d269284333f6e50246ba28ebe2d930dca48b5d2a6e197a03fe9d15fbdb84f7b2ea37d6bba38fb8000f0a5c7bf0adc09bfefebf0fd925eeb51707464
diff --git a/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch
deleted file mode 100644
index 2bef6945716d..000000000000
--- a/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2f7ca474ec49f805257c75cefb364e08ebd9e4d1 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Tue, 5 Sep 2017 22:58:44 +0200
-Subject: [PATCH] [Qt5] Drop unused dependencies
-
----
- CMakeLists.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a5b0a5be..787bd0d6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -133,12 +133,10 @@ macro_optional_find_package(Qt4)
- find_package(Qt5Core)
- find_package(Qt5Gui)
- find_package(Qt5Xml)
--find_package(Qt5Widgets)
--find_package(Qt5Test)
--if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)
-+if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND)
-   set(QT5_FOUND true)
- else ()
--  message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
-+  message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
-   set(QT5_FOUND false)
- endif()
- 
--- 
-2.14.1
-
diff --git a/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch
deleted file mode 100644
index ada6ddfc7d75..000000000000
--- a/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- poppler-0.59.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.59.0/cmake/modules/PopplerMacros.cmake
-@@ -98,45 +98,14 @@
-   set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- 
--if(CMAKE_COMPILER_IS_GNUCXX)
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
-       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
-    endif()
- 
--  # 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 -D_DEFAULT_SOURCE ${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.60.1-respect-cflags.patch b/app-text/poppler/files/poppler-0.60.1-respect-cflags.patch
deleted file mode 100644
index 4e1df0d62c68..000000000000
--- a/app-text/poppler/files/poppler-0.60.1-respect-cflags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- poppler-0.60.1/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.60.1/cmake/modules/PopplerMacros.cmake
-@@ -98,8 +98,6 @@
-   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(_warn "-Wall -Wextra -Wpedantic")
-   set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers")
-   set(_warn "${_warn} -Wcast-align")
-@@ -124,39 +122,6 @@
-   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
-   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
- 
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS                  "-std=c99")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
--  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(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
--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/poppler-0.58.0.ebuild b/app-text/poppler/poppler-0.58.0.ebuild
deleted file mode 100644
index 7f9c6e9e3d54..000000000000
--- a/app-text/poppler/poppler-0.58.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs xdg-utils
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	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/69"   # 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 cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.7 )
-"
-
-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.53.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	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
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_XPDF_HEADERS=ON
-		-DENABLE_LIBCURL="$(usex curl)"
-		-DENABLE_CPP="$(usex cxx)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo="$(usex cairo)"
-		-DWITH_GObjectIntrospection="$(usex introspection)"
-		-DWITH_JPEG="$(usex jpeg)"
-		-DWITH_NSS3="$(usex nss)"
-		-DWITH_PNG="$(usex png)"
-		-DWITH_Qt4="$(usex qt4)"
-		$(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=none)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.59.0.ebuild b/app-text/poppler/poppler-0.59.0.ebuild
deleted file mode 100644
index ebc378efb7dd..000000000000
--- a/app-text/poppler/poppler-0.59.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs xdg-utils
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	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/70"   # 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 cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.7 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.59.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.59.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	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
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_XPDF_HEADERS=ON
-		-DENABLE_LIBCURL="$(usex curl)"
-		-DENABLE_CPP="$(usex cxx)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo="$(usex cairo)"
-		-DWITH_GObjectIntrospection="$(usex introspection)"
-		-DWITH_JPEG="$(usex jpeg)"
-		-DWITH_NSS3="$(usex nss)"
-		-DWITH_PNG="$(usex png)"
-		-DWITH_Qt4="$(usex qt4)"
-		$(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=none)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.60.1.ebuild b/app-text/poppler/poppler-0.60.1.ebuild
deleted file mode 100644
index 7415bbf1f6c5..000000000000
--- a/app-text/poppler/poppler-0.60.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs xdg-utils
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	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/71"   # 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 cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.7 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.60.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	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
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_XPDF_HEADERS=ON
-		-DENABLE_LIBCURL="$(usex curl)"
-		-DENABLE_CPP="$(usex cxx)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo="$(usex cairo)"
-		-DWITH_GObjectIntrospection="$(usex introspection)"
-		-DWITH_JPEG="$(usex jpeg)"
-		-DWITH_NSS3="$(usex nss)"
-		-DWITH_PNG="$(usex png)"
-		-DWITH_Qt4="$(usex qt4)"
-		$(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=none)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}