gentoo resync : 22.05.2018

39 files changed, 722 insertions, 232 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index e9260efee7f3..173a1c1ad689 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 157cfc0330b5..d800bbc8021d 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,7 +1,3 @@
-DIST build-docbook-catalog-1.19.1.tar.xz 4552 BLAKE2B ac15bf349be35d1a5c7f4b58e5c295d3b4e7adffa000ce845060990f7c2603549f0ae696143bd4924e81f210131be3e82fb4c80190ac366303da15941f320fb3 SHA512 9c4b1a30d8b2f820046cf987296035a1418fa55f47c2adc6702cdaa3a01efc8584bdc6804889cf13a85bb1f30b129af5c62ecf8a7376d56d0738f717619ddcc3
-DIST build-docbook-catalog-1.20.tar.xz 4620 BLAKE2B d927e451e5cdc3635ec85f3d283bcd3bf1ec3a65f53b7eb21e22cc3d27bbb04a34e5ab43ba7786e76f7ca08c6a63b41ac5b1f2b6da0c9bbdb10855a8e66ac53a SHA512 65656c78709a8da01cfedc786a31da2de125eeb65bdaa3d2e49ed3a0a7ff4429280d5d384f23dca0ab540b74f7c9b2ed4b80e970905a7d2838a841c81925b3f6
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.19.1.ebuild 761 BLAKE2B 56ddbfc1f8cdd9d6531452671b1bc92b3a81eb9ab4af31980af6a82207b23c260c09ea26f4f2f9d535e78159f7868838b10d69b96207ff067e55582d0ab659b5 SHA512 32814eae6c8dd46b00d1567922631e38d000930bbd4b7aecd7c97c9d404439938e70f27dfbfbfbf0d138d119026b9eb239ce0877f24f37fbc179beca71cd718b
-EBUILD build-docbook-catalog-1.20.ebuild 1140 BLAKE2B b7c3f81d3a899d34ff27dad7e726f288fdbe781e8d359918abf726eafdcfc67f9565df9a7f0ef92c7a226036c42069f5c6c1cf56de6a571770759968f7c97626 SHA512 0330a064028c41aa8d2386118e7eb27a7a0c5e24f76cb3f619bd704244a058315692a7452694f8f3d4dc942f1be86bc65e3901654b7a7073d4b9116d081cd5a0
-EBUILD build-docbook-catalog-1.21.ebuild 1094 BLAKE2B f373349d788a83417374c2c461b9c04ed57f0054e907ef7afe66663cfe6f3746255ee6578ba8db4db1f22e267e960d0859f61e7463010cfde615c467a2f2cfc3 SHA512 ec083b7344a4557a202ea322ac18c8861268bc065404ede142f35228265d85f15b3fc004cfc6a0481bab48b3b9f69b9267630473ebd72a306d03bcca97d20df4
+EBUILD build-docbook-catalog-1.21.ebuild 1090 BLAKE2B 353dde30a03468cae9cda862842a51a2a6033f49af44ae071676a218cf95ed3f9fdd805c782ee39225c858ea989d91b2de939ae95a6bf2986ee27a6635e2a22e SHA512 a0e597a8b6cb90257d2820ffa21c42df559fb40270d82be3c1f7b0653692c5cebb9a54bdebd47ddc8e7aa8c2b743812a53f9f8a3d837166e0561af76c13783ed
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild
deleted file mode 100644
index 2708edbc650b..000000000000
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="DocBook XML catalog auto-updater"
-HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~floppym/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="userland_BSD"
-
-RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
-	!<app-text/docbook-xsl-stylesheets-1.73.1
-	userland_BSD? ( sys-apps/flock )
-	dev-libs/libxml2"
-DEPEND=""
-
-pkg_postinst() {
-	# New version -> regen files
-	build-docbook-catalog
-}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
deleted file mode 100644
index 8b81fcfc967a..000000000000
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="DocBook XML catalog auto-updater"
-HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~floppym/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
-	!<app-text/docbook-xsl-stylesheets-1.73.1
-	dev-libs/libxml2"
-DEPEND=""
-
-pkg_setup() {
-	# export for bug #490754
-	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
-}
-
-src_prepare() {
-	sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
-	has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
-}
-
-pkg_postinst() {
-	# New version -> regen files
-	build-docbook-catalog
-}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index 97c8ea14cf59..68f0e171cef7 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index ac6da68b86b8..a34d596ede0a 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,12 +14,12 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r3.ebuild 998 BLAKE2B fc8be7bd4259b96824f2384eaa2d54d3422737db2780d0a933e6919cdca4ad43e34f5c0f61cc9205ccd5a49d7fac69724df94de412c068fa797f8da2a7823760 SHA512 de1cf8959986887ce10333bf599a7f6af2c075550ebc935ca9013af9500c3ed3a18e86f7eb4b3f5b82f094e6905cc0ebaa0198f6a25b2efb318576348538a0fd
-EBUILD docbook-sgml-dtd-3.1-r3.ebuild 998 BLAKE2B 42b3769142f9892f769a4e777b4f4030b2dced088d2006d45d9fd77c3c463ed68d6a2f4b341eaa677d7ec7a339c8cd83d30297cec023d1ca0ac904bca1448fc1 SHA512 f3b626d5576e137bbe58f169ca11d237194e94c0eaf3d4e45c8e398493dad0e1c5a861d414c836af749d102ff899465977e705528675967ea9ce4cbc8a7d6eea
-EBUILD docbook-sgml-dtd-4.0-r3.ebuild 998 BLAKE2B 46ed9d8b063dabdfaad0f7165add39a1df5ef6c20be2bad899b760f013bcedd86b70d08b3fed04a7ee175ed2e558a3fdd11f82bcf941470c78e8ddeb471e65b3 SHA512 8a395cc78213ec47b3e18a5ed0edbfb617cfbd1c8d3bacb2bbae868b79ea192834acf7c53a9d2712b0a938c15ca55d8550241995b38b2e53147f11d014aa7f96
-EBUILD docbook-sgml-dtd-4.1-r3.ebuild 998 BLAKE2B 400ca316284254730bddafc254b2b05f74a92a85090d5e1f148dbc765eb7b4fc33544002cae0bb97e7797872340231862574d92f6555e75b45ebbe35427c6482 SHA512 560c60e3d575f6d8ee8992687394b1b9b417462f60f7cc0f4d2bc223b03fb5fe09c372d3bcae15b5ed69eabf408453e2a0d0941c08b556c3b3d0dff292589dcf
-EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1013 BLAKE2B cac364ca6db8c7a338e7aa246e50d11dbeaa7e1eae0fa90548e5e9696d739b9680927c2555c1b14387191cbd819017bd78b0485cb70634ffc618c8d09a88073b SHA512 0aa4acca46286a4c6af9c89ebbc959a2660c23c2ddbe576aa338548b4f101a1697cb3745151cb96d2b28c60dc1a584cbfce69af748284b8893743dd405c5089c
-EBUILD docbook-sgml-dtd-4.3-r2.ebuild 994 BLAKE2B 8563c3b0104fc86e7084ecf3bf6346eefbc843d9ade51b9646cffe1d560bd81df399fc92aa6a33d4e8d7ef9ea62f9f026aa41e0703631eec4837819135f10e18 SHA512 5428471de628c6821879af606f8a620f8ecd03a55457bd38b6b1915cb89b373e8989b3b55d4d00e9b4ba125abc6649559d1b5806c69abaca02fc1bb73e18bdc4
-EBUILD docbook-sgml-dtd-4.4.ebuild 1004 BLAKE2B c9e63807397bdad3b387f43f23663f58578db0d6b102c45a6ac98cfb2f1bc770e8fb208379f02ce6cbb4f9495bae8b8b1c80767d3d2ac2f6287311524c93e947 SHA512 ba8a6e5ae3d8edfa185bbf334326fae1a8b9a3fb57114a4b6b117de0053ccc9a09ae7c086c1b94ec0e527bd73526dfe99b0a5caecb3ea5c3d9c9339d41e30397
-EBUILD docbook-sgml-dtd-4.5.ebuild 1013 BLAKE2B d73fbbdde2122516b8aeb56e4b4593097886f09b5a088a7607c968d52a6d26c212a4d97f5bb1baa4e15b3c9e1f39ddd4142913862d0cb2b9437b94103681edd9 SHA512 415f0b59959430d3babb1bf62e29b0cb93e58751c591993e61752d5240b3a263e14be8728fa51129a5eb378a8c0859dc4ef7172f01b2ef4098799ebf2eac2199
+EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1000 BLAKE2B ab544f870b642843cac5852c3bd1a13144bac23f757b35d4eeb9294fa20bf33b457dd262a2c9a99493f916ca52c9003fd1997fd612b94a6f0fa53046c6f5031d SHA512 4800ab46cd04af41a618a979b8890e235c83aeb6079f6644539bcaf703c776774e69a231137fda037257882e2de2eb7ca673ffeb0083c4f8dc364f4dd98cf57b
+EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1000 BLAKE2B d8130fc975e1acf1d569960b3b74b6dcc3c4fb68624d9ea56834bd9f3c94ca3876ca8359ee090fca5049f4eb502a22c3632746a6441e35b1946944b416563cbf SHA512 6af8de74f63b01e446fd43a1be7c37494a773a6b4a62a23b020732071c06870e0631206964f911d6a15a4031a9158848b57362eae1a1d44937a6c11e70c02b28
+EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1000 BLAKE2B bae479fa462beef6bc0ad59b46ee470ed71677356ff1e25f87777daa5d4fd1c2e98dde26b65e32ad5333d0be81c281f16cf94e335759ddf137ff36476f3d7f23 SHA512 f4b8f6b23055c21d3f36f059666413c8d488f314756b23fd411e0d5471409c458d7bc1012aac29b02b3c82eadee8f9c2c12c758a1c498e40cb09ff0fe519e5f2
+EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1000 BLAKE2B dbb46cff1a33f8f0770588c18cf087fa75074a3ed26e7e56a2f569635cbda0b37ce2be28fbcfb4e989030b153862d05470d8c0b408e56389d0cc7c92b0bcff31 SHA512 4aafa37378a6315835af91a37aac7842b1d04745ef8f4f6c8543e21d1c4aae51593b391b71a624a5014deadac058eb619e1eca6c5f9179ae0fafe249b6402c8a
+EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1015 BLAKE2B 1dd036ea95d19b8bdbc825c4bf60b30dbd26ddcb97c4cecd020ccbdbb57294d5841882ef39dca414bab1e33533d390dd8ba0aee4f663c0bf35e0c5e7b9048c32 SHA512 8ddd813944172d0f8a858029292d7b22318e6795b1338f07057472e7042912c0c642d18876caabdf0d83aceb60c1852256bd36249741616510fbbb9abe69eaec
+EBUILD docbook-sgml-dtd-4.3-r2.ebuild 996 BLAKE2B 0368e87e3debadf66d48791a0e5044dbf6b047aa7461ac2ef190e7df56e619ecaddf16942d34570fff853b358ad030d67ba195793e79c061016e2834bab2185c SHA512 a1b777d1620c54fc30fa1d8ba1bfbded15eeebdc6a5289b8c15b7bf91577e4809db10bedc5929d1ea134a94d398929d9241b989e146012ad12b8564d84b10217
+EBUILD docbook-sgml-dtd-4.4.ebuild 1006 BLAKE2B 895942f94fb5e43c0cec90080720378b675751ea55657c759a372642f960c9e58d8427d4d8270aa8624b25847cd7556320bf0f754b81b6e3501d6ee6746607b9 SHA512 bb0b2a4b95c8b9ef77bdafb2e9129415de1be53fcbff278811049964eb9e5ab6674fd7083edd1dd502ffac560b27ee4a4d0238cfac8901c04e3f0b34a5c8894f
+EBUILD docbook-sgml-dtd-4.5.ebuild 1015 BLAKE2B cb1a8ae6963b180b5b9a1a8d2a3307efa174fd56b52137bfc9a1a0546d98305fd202d49a8d74ef7a0a028370bde42c7133893db2f7d05184d81e6ec7cb397a56 SHA512 940f6d483b380ae709dc671d3615daa956a8923fde34493a4727b5997286271cc3a9f699d3afdca6071dfb0d3f3734446c3d205fbd6a1e8ef62c553adb2969e4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
index e53da8b333fd..ba9da057ae5a 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -6,8 +6,8 @@ inherit sgml-catalog eutils
 
 MY_P="docbk30"
 DESCRIPTION="Docbook SGML DTD 3.0"
-HOMEPAGE="http://docbook.org/sgml/"
-SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="3.0"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
index 25ee2b14ca9a..88708e01acf1 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -6,8 +6,8 @@ inherit sgml-catalog eutils
 
 MY_P="docbk31"
 DESCRIPTION="Docbook SGML DTD 3.1"
-HOMEPAGE="http://docbook.org/sgml/"
-SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="3.1"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
index b0841961d098..feda5792a75b 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@@ -6,8 +6,8 @@ inherit sgml-catalog eutils
 
 MY_P="docbk40"
 DESCRIPTION="Docbook SGML DTD 4.0"
-HOMEPAGE="http://docbook.org/sgml/"
-SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.0"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
index 465f9932818c..f0777f778ab8 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@@ -6,8 +6,8 @@ inherit sgml-catalog eutils
 
 MY_P="docbk41"
 DESCRIPTION="Docbook SGML DTD 4.1"
-HOMEPAGE="http://docbook.org/sgml/"
-SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.1"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
index 3148720a2ac7..b4cacf0c675c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -6,8 +6,8 @@ inherit sgml-catalog eutils
 
 MY_P="docbook-4.2"
 DESCRIPTION="Docbook SGML DTD 4.2"
-HOMEPAGE="http://docbook.org/sgml/"
-SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.2"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
index 7f5046ce6090..75e8deae2c4c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
@@ -6,8 +6,8 @@ inherit sgml-catalog eutils
 
 MY_P="docbook-${PV}"
 DESCRIPTION="Docbook SGML DTD 4.3"
-HOMEPAGE="http://docbook.org/sgml/"
-SRC_URI="http://www.docbook.org/sgml/${PV}/${MY_P}.zip"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.3"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
index 42f570ed67a4..d207163ef213 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
@@ -6,8 +6,8 @@ inherit sgml-catalog eutils
 
 MY_P="docbook-${PV}"
 DESCRIPTION="Docbook SGML DTD 4.4"
-HOMEPAGE="http://docbook.org/sgml/"
-SRC_URI="http://www.docbook.org/sgml/${PV}/${MY_P}.zip"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.4"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
index df3790d1df7b..cd0eeec3be5a 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -6,8 +6,8 @@ inherit eutils sgml-catalog
 
 MY_P="docbook-${PV}"
 DESCRIPTION="Docbook SGML DTD 4.5"
-HOMEPAGE="http://docbook.org/sgml/"
-SRC_URI="http://www.docbook.org/sgml/${PV}/${MY_P}.zip"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.5"
diff --git a/app-text/itex2mml/Manifest b/app-text/itex2mml/Manifest
index 9c58759b1806..8e5a0b7cb594 100644
--- a/app-text/itex2mml/Manifest
+++ b/app-text/itex2mml/Manifest
@@ -1,5 +1,5 @@
 DIST itexToMML-1.5.5.tar.gz 155205 BLAKE2B 46edba14bc30ee06109433f3aff1d2449a0f9ff31d3c1c8a2541e0b6ec7d6f426cd230bcd3957eea758517972515a13daf21ba229ea382966a36dccf2612784a SHA512 452436fe6f72d2c99c2bf3aec0d5d74d0bd754b6f54948428e45f50b037927a64ae3148386c387d3065d35392c3744ec6467d3e6fb8c25d46a3872d92d35ce2d
 DIST itexToMML-1.5.6.tar.gz 155394 BLAKE2B be83c2de3a7ffd0a60fa45c38bb7fb224afbbfe3e715d09813137886ab0274fad4670a6156066e2f4f15ea1e3ff63f9f5cb4a30fc64256801af45455ea3d498b SHA512 2f4ebcaccbef71ba1728909bdc60abf06606cfe267481835315fb1ecaa365641e45dfad370cffb758153379e721bde48e71ff660b0cba511f8d8db8a4aec0171
-EBUILD itex2mml-1.5.5.ebuild 603 BLAKE2B 67f01dda44e7b924ebd9db3f5efd4d9bae09deca7fe311c8865d43840bd2ed7c24daed22f779790559f2c0c901b2dc0eda052f4b39586d77da6dda7f5139981b SHA512 d587a865ba033db2e5c7243a999c9795dfadf8c63e10e6a2b284753375f1efdfc5a7bc72e1985e76653c9b0899cca52173a3b3b9f565c8e44e6e58c0f51bd752
-EBUILD itex2mml-1.5.6.ebuild 610 BLAKE2B 8d8b42784f85affd4db163784cf7de5c1eedf0cf76c3d58f5e47e1338c66d1777f46b713d6175d3ba751771da812053c83b74a9dc06699f5acab422193236a23 SHA512 c5e3768e40144a01604ab19152154955a75c7f6754822e0aecbd8361093c0905fafd22d6954574a0776e15a58a02ae2af6d402c962c6d6cd31d0c4b5da8cc26d
+EBUILD itex2mml-1.5.5.ebuild 605 BLAKE2B d47ae666c119872d55730afb01a57b617aca32325bd0dbc2dcd4327498e06984ab8b2bc65a3de4ec3873b5fa346f4bcc68035b8bf5d38f4a6bc704f29c82b4de SHA512 8965086d25edbb6072494f70330010c19bbb0989c958c4efe9169daf8ac3fd4842189e6eb41c9ffb5345dd927f9134b967c0fc23d78587668484d019c3568863
+EBUILD itex2mml-1.5.6.ebuild 612 BLAKE2B 689cf14ca4d3a0f1fbd5eee37a42aafd7f50b2d1564e55fe00147ab594e06c9a9bba4326527a35d805b06c5d59c6648072dcaadea0c76232d8fa354fb306051a SHA512 15492c37242bef67fd24739c8b846aab0e45f3706ce3cec8d4f3c171f1747fa31c00fb5edc215a14e54126e403b17d6e4c25c3ef99617eeaa5c7f0c08e35a430
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-text/itex2mml/itex2mml-1.5.5.ebuild b/app-text/itex2mml/itex2mml-1.5.5.ebuild
index 3ad8b505268d..205585e9b93a 100644
--- a/app-text/itex2mml/itex2mml-1.5.5.ebuild
+++ b/app-text/itex2mml/itex2mml-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="A LaTeX into XHTML/MathML converter"
-HOMEPAGE="http://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
-SRC_URI="http://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
+HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+SRC_URI="https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
 LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
 
 SLOT="0"
diff --git a/app-text/itex2mml/itex2mml-1.5.6.ebuild b/app-text/itex2mml/itex2mml-1.5.6.ebuild
index d3d28f105538..16120ff44755 100644
--- a/app-text/itex2mml/itex2mml-1.5.6.ebuild
+++ b/app-text/itex2mml/itex2mml-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="A LaTeX into XHTML/MathML converter"
-HOMEPAGE="http://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
-SRC_URI="http://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
+HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+SRC_URI="https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
 LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
 
 SLOT="0"
diff --git a/app-text/pdf2htmlEX/Manifest b/app-text/pdf2htmlEX/Manifest
index b99375c1aa4c..5dabb174a324 100644
--- a/app-text/pdf2htmlEX/Manifest
+++ b/app-text/pdf2htmlEX/Manifest
@@ -1,5 +1,4 @@
 DIST pdf2htmlEX-0.14.6.2.tgz 9066685 BLAKE2B b139f72c806e432facce5472e55a23567e74204829956d06bd9ead0426cbadad4ce36c581fb1d39c96eeef27fb416b2c6387dff7b0ca08b10479de24b8ffdc9b SHA512 03d04437386b2eb83530551ff15ce9d21b7990127fa659d204a269405f0d49912c622687eb6920cc4e88be8e94ab41024b378663effb61d1eda905eeb98093d3
-DIST pdf2htmlEX-0.14.6.tgz 8955179 BLAKE2B 68a474a0afce7e505af0331c7a05e745d0c18057c0e9dab0f57f8455b36489c399985d2f69cbebc2c3df3264ee1eef43346df49ff9ac3fae7edd3bbff884c6d2 SHA512 0bef898653755da3d731a99f2850d11a686a1db589c615216c84dcac76f3a3c41f561732fe37be262cfec3f65970b2704819c3bd4d94d87cd63d26f062dacf50
-EBUILD pdf2htmlEX-0.14.6.2.ebuild 991 BLAKE2B b020d13ec939340d673d715b8428598d1b9b6baa2015ac99afef728f2b8799d8416ca1581bfe31b183146cfdb9962ec0c534b14b20b4083f96faa242d2bcd5a8 SHA512 2a181bd3573e23a583c8251b5fbea65d1992bf9447bb6b720cd0b7cefabde02885dd4ba47144de3f3cd03b18809a82bd8c43200e02a5d1aeea314ffe3fcf6a2e
-EBUILD pdf2htmlEX-0.14.6.ebuild 559 BLAKE2B fc566297c6a7fd57a4bb36f74ceccac62dfaa3a0d3b18469420171b92cddfecccd418dd9d8a8e3a5eff35d7504f50b84cb026764c28ed3d9ca38fe0be248dfd0 SHA512 a903ef5c199c68c8eb5243dd1abcedf0bbad5d7b13132ada1affc18a635e27ca1f52b075c2221dd67e5a5a69fbc85d2ab1a1a0fcbf0398e91bb705b3343f0a60
+EBUILD pdf2htmlEX-0.14.6.2.ebuild 1017 BLAKE2B a9dda802e28273f531e35b0cea8b7f23602f48f8dd024d6367841d745edb31c39cd9d284ddae57a0cd101f694cd4fb1f2c82571386cffb5749ce9d01d828e890 SHA512 4a2003bd64ad816714b3df3065ebee4158c6ea885ac997cc2f5de19f55f79f4c10f99c97aabdb1d313a9a95f459876b40a9685a7398bba383813cb7bd2707965
+EBUILD pdf2htmlEX-9999.ebuild 1091 BLAKE2B 717cc446930f6dab311fa32f6fa6667134b283d422e6a2329006155d04e11e00c85bcfffcac1b2d8f08117c9d83184344f3ebe11feaacbc15a5eb98b000d8fc7 SHA512 b23b0dbafe433b2d1edc969d6dc6808b2244919f8e59708d92ebc5d2aa4b0bbc66d8c43ec568a84f788450d6802866ab068c6a57cb5ad10f733afde5946b6365
 MISC metadata.xml 355 BLAKE2B da386c9bf8cf6684e23a3bf7638d341b7f8872ecc7d733b946ae697e9e13096df65398f6d4b2d4594b47eba7ec1e482dc8ab14a69395ed1a32c00cdc7d91c2b5 SHA512 c416fe8d4c3edf1055170e0c4cd84fa9da19437c6eab58fde5198561048018ae6b9387d52017dfbc38db717ef370fc70a1dcc0eb37c8843b4e65cfa7e80314ff
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild
index bb1510fd1d21..823ecdd6c0f9 100644
--- a/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild
@@ -20,6 +20,7 @@ IUSE=""
 
 CDEPEND="
 	>=app-text/poppler-0.61.1:=[jpeg,png]
+	<app-text/poppler-0.64.0
 	app-text/poppler-data
 	~media-gfx/fontforge-20170731
 	media-libs/freetype
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.ebuild
deleted file mode 100644
index 965311e3a296..000000000000
--- a/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A precise PDF to HTML converter"
-HOMEPAGE="http://coolwanglu.github.io/pdf2htmlEX/"
-SRC_URI="https://github.com/coolwanglu/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-CDEPEND="
-	app-text/poppler:=[jpeg,png]
-	app-text/poppler-data
-	media-gfx/fontforge
-	media-libs/freetype
-	x11-libs/cairo[svg]
-"
-RDEPEND="${CDEPEND}
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
new file mode 100644
index 000000000000..327250408f93
--- /dev/null
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs flag-o-matic versionator
+
+DESCRIPTION="A precise PDF to HTML converter (dilfridge fork)"
+HOMEPAGE="https://github.com/akhuettel/pdf2htmlEX"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/akhuettel/pdf2htmlEX.git"
+else
+	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+CDEPEND="
+	>=app-text/poppler-0.61.1:=[jpeg,png]
+	<app-text/poppler-0.64.0
+	app-text/poppler-data
+	~media-gfx/fontforge-20170731
+	media-libs/freetype
+	x11-libs/cairo[svg]
+"
+RDEPEND="${CDEPEND}
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	local ver=6.4.0
+	local msg="${P} needs at least GCC ${ver} set to compile."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! version_is_at_least ${ver} $(gcc-fullversion); then
+			die ${msg}
+		fi
+	fi
+}
+
+src_configure() {
+	append-cflags -no-pie
+	append-cxxflags -no-pie -fpermissive
+	cmake-utils_src_configure
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 8aa7b53191d9..234b6fb6a76a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,8 +7,10 @@ AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 DIST poppler-0.63.0.tar.xz 1439552 BLAKE2B 9bf5cff7f5fec93ec7d49d1745aadb2b03a68d38216003e4bff54a5d264c9dda10265da79a755af1f31b582602d034cfefb16b807185d674a2cfe0d20e5de277 SHA512 a151d08480e9940a02191355ef5e7499d6494cff05f22f49de2bb8223512f5e5c9bb9b33651943ded30b4cd7096a2423fb7a01fa62228fbcd1d3a221b885cfe9
 DIST poppler-0.64.0.tar.xz 1449904 BLAKE2B 260bcc9c1b109b58b66057665d11c0685b525803206497ad0516998d93c132befd6b0ae28f187afd77dace6b35af6c08b8210ad05143d6d068109dc57caf5a4a SHA512 2799c3f628e63803eb11a25e54798a136aad91ea843d4bc1fb284af478f4a8cde87b7f95fc28cf23baf25975fbde6ca93f6ac91befb87af42e642c7650053f1c
+DIST poppler-0.65.0.tar.xz 1451720 BLAKE2B 8d8d785a2d2b9b501e2db0736e5256236eecd72e4cd4659d198db45b8a3f219e4949f6fe460bf2429cd5ea0a5ea26e1d5d5640d1e75b1443c38f43de9b17efc4 SHA512 4a2c31307ab703bd25e1b5ac1185a897e1c96de13daa4fc4849974f6ea6cec8066e8cd9ea061f65620c71ea56a09b2cd355c4e42e9a4eb9a674a11648e3ec977
 EBUILD poppler-0.62.0-r1.ebuild 3538 BLAKE2B 7af59ebba3ad33263ee8bfd949af496c1bd4ba2791f69a8ad02ebe22bc3e8196208ff664a7fc423862b9ada80d6d7557ace0746c791c188776dd2b7002275fd3 SHA512 597cd60e7313080c56da025e1659188b8fa13a6241ab77bcdb937796f1d59aaf34ace9be1c051adbe46951a1d24162522aa56f7bcbb080eef6a90ebb5116de06
 EBUILD poppler-0.63.0.ebuild 3517 BLAKE2B 1cde03a02078d671d3e8005ce3c38570ee118827360899bb6c4d972e242f4daad5c311580bc08db71318166f09134ce119d7bc772b0e56b31d16cefef4098b31 SHA512 050b9465a3382aff8188c9f9e30bbe3199d3b3abd5f9bb29e68cb19324a6015d66176eba4904f5b211916eb4e862a3c6ba962e176794b836981ee11776c4830a
 EBUILD poppler-0.64.0.ebuild 3517 BLAKE2B 6800d6285471d99283e8edcedcfa537eb2661403515707356fcdaa7b98835429c94d6c018ab1447c6cf6e6b571e157c5babb9f3a6203430e92893cc23082addf SHA512 0f5f33e19f6f309217992f27470eb4e93d7867dc299de6db68fa0cf4d2afb0923bdb31e160611b33458bf229194afc52483698d425184afd80034f769aa66cfe
-EBUILD poppler-9999.ebuild 3517 BLAKE2B 6800d6285471d99283e8edcedcfa537eb2661403515707356fcdaa7b98835429c94d6c018ab1447c6cf6e6b571e157c5babb9f3a6203430e92893cc23082addf SHA512 0f5f33e19f6f309217992f27470eb4e93d7867dc299de6db68fa0cf4d2afb0923bdb31e160611b33458bf229194afc52483698d425184afd80034f769aa66cfe
+EBUILD poppler-0.65.0.ebuild 3517 BLAKE2B b50f15e427e79492d6101dbc6b71704236d1330e27a5e756d0637ddfee2d0f955b1147c1525624820be7faee3a0dc09f006f1fc533e7aebd4b5f7229b09ab34c SHA512 51c8e5db741b927c8ac68618f58cf306571185d33166cc87b615bbcb852590527cc0d06f1e1c86e65026bf9d7536a0949e9118d5729f63d2f4815a1e37badc8f
+EBUILD poppler-9999.ebuild 3517 BLAKE2B b50f15e427e79492d6101dbc6b71704236d1330e27a5e756d0637ddfee2d0f955b1147c1525624820be7faee3a0dc09f006f1fc533e7aebd4b5f7229b09ab34c SHA512 51c8e5db741b927c8ac68618f58cf306571185d33166cc87b615bbcb852590527cc0d06f1e1c86e65026bf9d7536a0949e9118d5729f63d2f4815a1e37badc8f
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.65.0.ebuild b/app-text/poppler/poppler-0.65.0.ebuild
new file mode 100644
index 000000000000..b15fbe7973ae
--- /dev/null
+++ b/app-text/poppler/poppler-0.65.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/76"   # 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 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= )
+	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.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.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
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_GObjectIntrospection=$(usex introspection)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+
+	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-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 13fd0a3103db..b15fbe7973ae 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/75"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/76"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index 4282f4c4d612..9a77d46246c8 100644
--- a/app-text/ronn/Manifest
+++ b/app-text/ronn/Manifest
@@ -1,3 +1,3 @@
 DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
-EBUILD ronn-0.7.3-r3.ebuild 1163 BLAKE2B 36a7c10214f0b1d30fd1ac5ae05bf9f42d2a935d99bc5eeb6a8646348ed94dafae0cfb4ae6b3ea34f0eae868664706f3765056869e05b6967a9835116153465f SHA512 69afeb552cd61f8f251827db283ffdb01a47e89749fb5e23861073cb4a051161197da6adad04a9f335eeb266efd0bf5cf2bcc7762a32172cfd58ab28b48b6b6e
+EBUILD ronn-0.7.3-r3.ebuild 1156 BLAKE2B 191a39e5280862710e76e123412cb79f5f352405b41036e80af4a97dd7c0950a9cc3e9c9fe206926b440065cfabb4795c1700e34a3b50afa76ea796b886f7406 SHA512 a4becef0bf262b271e4357bec8378430ae7f2896375339165d4ef2a3b8fb2855bb33c2e33bd6c359cb1941fd9bb0382de2887597b1344656335410e46b4ce187
 MISC metadata.xml 339 BLAKE2B 2a1722a0531a1ccaba0d29a1ace114b95789ba4b0c692e8efcf38605f81de4dd1210671331fcdb5baa6536cf38fbf63f11b85fb13bd6a067be56f22a372fc5b6 SHA512 0be4072cf3514eba60569138ed409362b318616ad4514e319d9b4add120e74fd7655e2fc5c3ab8d7b5d813cfcf8e1054fb98395a1a89d9fb90e447a825ee9439
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index 10f4d04c44b4..abeb36ab502b 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index ad0a432c5392..8a5e70d5df70 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,5 +1,5 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r6.ebuild 2480 BLAKE2B e1a261db3012b8844b78909f728697d3eccf32da49eb470f9ae7229aa03ce27139a6485fadbcc255265c60b2977d7079a3bd4d6826ffafb0bc55ab17414d2c00 SHA512 ce7494ba0afd2103ea55abe9598fd767f5e942cf92571a04fd22b40f30cec257be720a22e183333d82af6a3ca1f049dbb82b807c6c826374d25bcadfebd1ad91
+EBUILD sgml-common-0.6.3-r6.ebuild 2481 BLAKE2B b4b4945c34f62854ef6db9c1bdaee90ad0814f44e705875a6da1b80956aeff8829d087dfc34939f5dc8edd60d184d8d6d9247a1d4754aec30ad82c7661962b98 SHA512 15d48f36f85740b8fd4c5a056b6483ced6fbe8919b43942928b32fae2c9367a5f07f29eb507918c7d50afb9e403f339e969de16fda5c447e19181a50c461809d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
index a72c045474d8..2926cea5963c 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit prefix
 
 DESCRIPTION="Base ISO character entities and utilities for SGML"
-HOMEPAGE="http://www.iso.org/standard/16387.html"
+HOMEPAGE="https://www.iso.org/standard/16387.html"
 SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 7153bf7db18e..e9db6a424fd8 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -4,8 +4,8 @@ DIST Sigil-0.9.5-Code.zip 19224845 BLAKE2B 181ed1cf18ad72df71b4d3a1e42770eb9de98
 DIST Sigil-0.9.6-Code.zip 19307454 BLAKE2B 109577f7ba65a07872b84ba4c8adfe93a647da5944b59090fbda4e504d224f12be85cfaebe0045e9106d088c87faeb824cdc27cd6872961aa410ddb1b959543a SHA512 8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417
 DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
 DIST sigil-0.8.7.tar.gz 19394061 BLAKE2B 9d93c7cacf5e3f10a416f0726c7a11b8e8cfb9b8d8c1310af742bd838ccaf44e33bd36dbd833837268d77d2d34e17ea2c79e93906781316a85b58761c59109d0 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652
-EBUILD sigil-0.8.7-r1.ebuild 1276 BLAKE2B 045538e8a54f69b6d0960bf6a0f8cc1231da702dd5244b98e06156eaf44fdf9b5eae1a67e7f91717f01114062cdc4165cb2b62a422ca15140603ee184b83f334 SHA512 99f64144328eb0e7566646a5705bc533df127da56f633c38ba85f432e63cda949f54f322419b7934ed80263fb275f897d8513d721d7b6807ce4ac1cabf0d2456
-EBUILD sigil-0.9.5-r2.ebuild 2242 BLAKE2B caaefca3e04f3e5f6cd87aee003ae1abb61f69ffebc1c08041ee9e27b7ae797705313a5186270aee678a6dfbeff25a5e230079df353b0a6980beab76ec3e7dfb SHA512 c72a5bb74e93c6722710f411b59bbaa1ea11ec67fab47c6e21c041c4c81d1f5e868f572b2f1eb1a1e251a15052a25ced0cd5f72020e6d9240a61f6a913438d04
-EBUILD sigil-0.9.6.ebuild 2242 BLAKE2B caaefca3e04f3e5f6cd87aee003ae1abb61f69ffebc1c08041ee9e27b7ae797705313a5186270aee678a6dfbeff25a5e230079df353b0a6980beab76ec3e7dfb SHA512 c72a5bb74e93c6722710f411b59bbaa1ea11ec67fab47c6e21c041c4c81d1f5e868f572b2f1eb1a1e251a15052a25ced0cd5f72020e6d9240a61f6a913438d04
-EBUILD sigil-0.9.8.ebuild 2242 BLAKE2B eb0a584cd984d3629015e14feddd8069f24f615567b8deb23b95a08d36c796c5e3b915acb2cd69b71db6855ca2aabef0accf972861e8c3b811bed3ff166d1f6b SHA512 633c3eb675dcd67890af8f46e1f9143952162b6ff3ae63228c1936f58e7bbb1d70255b73e0fc5ca2858693f6d3e61b62d0b39fc998ffa4967aa184ba220aa7fd
+EBUILD sigil-0.8.7-r1.ebuild 1277 BLAKE2B 0622505aa25df4368314ea8f179d206fcd3b595f7c0aa5e55a0259b3467963622c4e82d360b3257eb441d4e31da9619e241c18ccc6449237a5fcace2e09aa1f8 SHA512 97fb05e2a1763ea865fc34a6b4277640a43810c02b2bd10d803345ced35badc3c517afa06f50f3cf4d01548f6557681eceba4f453722e609059beefe9308a395
+EBUILD sigil-0.9.5-r2.ebuild 2243 BLAKE2B 7451df7209863e172b66b03cb7ed6c93615bae1c5ce4d1fe952df4f45a2ebee95247f340db100e25980804487186348f7fbdb585b0b3d1e5a463afd684f1dd08 SHA512 42f52a39fdb392464b74c3cfc7cf2a2452214acd6f10a2ec8ed169f191489284fc2436347e5c3df8ee71f3ac8cbd891319edf7adab7d9bfd1f4c7e040ce2a070
+EBUILD sigil-0.9.6.ebuild 2243 BLAKE2B 7451df7209863e172b66b03cb7ed6c93615bae1c5ce4d1fe952df4f45a2ebee95247f340db100e25980804487186348f7fbdb585b0b3d1e5a463afd684f1dd08 SHA512 42f52a39fdb392464b74c3cfc7cf2a2452214acd6f10a2ec8ed169f191489284fc2436347e5c3df8ee71f3ac8cbd891319edf7adab7d9bfd1f4c7e040ce2a070
+EBUILD sigil-0.9.8.ebuild 2243 BLAKE2B 15162b1409146781c53ba3270486745192d0b99173137b2725fbc4d8109ee34ec572828e3978a7104eea91228a725008fdf77e3911d97fce928bfba81a39d8c7 SHA512 602fdbcb111823fdd2f3447567d3cb02d1e3f089410c0c15453958f77775a56ca7282480b1c916a2499dca2a9665f7229f1edd471732ae7914aae50374efbbdf
 MISC metadata.xml 389 BLAKE2B 8f9988168470e8545fa0fa47e520d7019cb9cf1ba8af0c502fa0b66a8a6a4567feea882d0ddc44864aac2193b411010eee2bd7d5905c68b34a32550ba4f6e223 SHA512 0728fc5f14cceb331ea75a6231d176ecbd22defa77b6d90a6859ec6e001feb3cd1f9c57c779bdcf83f81a4f7dca06e120964d6c93e372e39584293addacb5929
diff --git a/app-text/sigil/sigil-0.8.7-r1.ebuild b/app-text/sigil/sigil-0.8.7-r1.ebuild
index 6262c14ed950..1fa96bf64425 100644
--- a/app-text/sigil/sigil-0.8.7-r1.ebuild
+++ b/app-text/sigil/sigil-0.8.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit cmake-utils
 MY_PN="Sigil"
 
 DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="http://sigil-ebook.com/"
+HOMEPAGE="https://sigil-ebook.com/"
 SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-text/sigil/sigil-0.9.5-r2.ebuild b/app-text/sigil/sigil-0.9.5-r2.ebuild
index 4fa21a160310..6418c4507528 100644
--- a/app-text/sigil/sigil-0.9.5-r2.ebuild
+++ b/app-text/sigil/sigil-0.9.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit cmake-utils python-single-r1
 my_pn="Sigil"
 
 DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="http://sigil-ebook.com/"
+HOMEPAGE="https://sigil-ebook.com/"
 SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
 
 LICENSE="GPL-3+"
diff --git a/app-text/sigil/sigil-0.9.6.ebuild b/app-text/sigil/sigil-0.9.6.ebuild
index 4fa21a160310..6418c4507528 100644
--- a/app-text/sigil/sigil-0.9.6.ebuild
+++ b/app-text/sigil/sigil-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit cmake-utils python-single-r1
 my_pn="Sigil"
 
 DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="http://sigil-ebook.com/"
+HOMEPAGE="https://sigil-ebook.com/"
 SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
 
 LICENSE="GPL-3+"
diff --git a/app-text/sigil/sigil-0.9.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
index 0bdd33c470ee..533b009579dd 100644
--- a/app-text/sigil/sigil-0.9.8.ebuild
+++ b/app-text/sigil/sigil-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit cmake-utils python-single-r1
 my_pn="Sigil"
 
 DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="http://sigil-ebook.com/"
+HOMEPAGE="https://sigil-ebook.com/"
 SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
 
 LICENSE="GPL-3+"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index b885bf983024..c3d3a97820fc 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,4 +1,6 @@
+AUX texlive-core-2017-poppler064.patch 5491 BLAKE2B 2028747fba8ecf08a47d3f4348fef40095ca1cd7127eb0f332c0bcd68f396070cbd1c8a8daa1aa52315ec7a14fbbc5e10c82d5cdbfc3ed2db31f6c43a23a7678 SHA512 d05e79ba223f22d73c2bdb83020ab61b8eb0e7d2c963635afe6badbfcd5c8654bb93eb9aba8add9e49e5866563ac8e8ee54ce231f88526423cb915eeb08c9c0d
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
+DIST texlive-20170524-source-freetype.patch.xz 625056 BLAKE2B 70bcd15da1edfe5422f6dc0e736bc842f93787d45a81f823c8ddc5a420eff65f176ccce20cb17ac1dbc3b4eef3081de7dfbe34eb390f1baaa925e17f3d55c6c1 SHA512 daa0ff9306b39e6d5058c53572fdc741adad17cec9a874785005aacd0e57b75ce59f21d0d12260f4178d47b7b0e6509e49c44e2ab524613fe962ac1199a9120b
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-core-patches-65.1.tar.xz 12080 BLAKE2B b6a51d733198e42c06bc896bb55786166b9b034ae3025c3a9a5c3e81e3aafac4732515088248c0e195bf0b9fb88e67b2a0d4a94e4173aecdaf307fedb0d269d9 SHA512 fa4de81cb694050728146ad7ca9a2a0247af7b1aef16efcfccebf9d0beac11ddcc334f333e1e1267658743b16b666a285dab902c3e75aa3b21c60946a82871f5
 DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
@@ -318,4 +320,5 @@ DIST texlive-module-web.doc-2016.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 EBUILD texlive-core-2016-r6.ebuild 11520 BLAKE2B 2899191b740ab54cc36f171bfc89e3b9084ac1c67c8c23d5cff7d9ed7c909ddc924872f026d0fc4290851146fa1c65dfc2732865f3c41c62b4a7252ca87381c4 SHA512 684240a46ac764bf5a567ea1fdce38db2e43589b8764afcb793c16f87fad5151163efcb6043ad704aef34b66beccd35afc0f8500252fc5cf70917280c6b23fd4
 EBUILD texlive-core-2017-r3.ebuild 11616 BLAKE2B f8b4714c8c31990b79fdb5af2ee82abada4053d49bbaa19260518bbc0e1f7f793e6d98090aa628bd33d87ea0382e86850f2e6a398041d9fd1e409bf87622c04d SHA512 2601aac905a30b54f49afa470b1d8d081ecf0598a7487899e24a4644a738b57730b51dcc3f5c8efc0eead4bb53a9bd0e5aaaf5e85bc199f72eb8176a4b7db824
+EBUILD texlive-core-2017-r4.ebuild 11820 BLAKE2B de1b219af28f8752c1ffd0ead9b365f463eee2833cf0b6efc573cc9b6e89ed70fea509fa721c9e00bb13f3a85d26d5670c2c8225bbfaba0befa58e7f73f84034 SHA512 2434d690a2a09e275a4ea10aa295e8d731a7be6cde8bbf7bfb557c3a0899eb2aa4254dbf42ab39791079fae022b2ad64f3b990ac6c92c1a09799019b916325db
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler064.patch b/app-text/texlive-core/files/texlive-core-2017-poppler064.patch
new file mode 100644
index 000000000000..9e4c7044975d
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2017-poppler064.patch
@@ -0,0 +1,118 @@
+Source: https://github.com/TeX-Live/texlive-source/commit/ea9e7b25c6566505fe6d994aa5263bd736593be1
+Backport: dilfridge@gentoo.org
+
+diff -ruN texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w
+--- texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w	2018-05-20 22:11:35.787633516 +0200
++++ texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w	2018-05-20 22:12:26.607265149 +0200
+@@ -472,10 +472,10 @@
+         break;
+     */
+     case objString:
+-        copyString(pdf, obj->getString());
++        copyString(pdf, (GooString *)obj->getString());
+         break;
+     case objName:
+-        copyName(pdf, obj->getName());
++        copyName(pdf, (char *)obj->getName());
+         break;
+     case objNull:
+         pdf_add_null(pdf);
+diff -ruN texlive-20170524-source.orig/texk/web2c/luatexdir/lua/lepdflib.cc texlive-20170524-source/texk/web2c/luatexdir/lua/lepdflib.cc
+--- texlive-20170524-source.orig/texk/web2c/luatexdir/lua/lepdflib.cc	2018-05-20 22:11:35.788633528 +0200
++++ texlive-20170524-source/texk/web2c/luatexdir/lua/lepdflib.cc	2018-05-20 22:12:26.608265161 +0200
+@@ -521,7 +521,7 @@
+     uin = (udstruct *) luaL_checkudata(L, 1, M_##in);          \
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)             \
+         pdfdoc_changed_error(L);                               \
+-    gs = ((in *) uin->d)->function();                          \
++    gs = (GooString *)((in *) uin->d)->function();             \
+     if (gs != NULL)                                            \
+         lua_pushlstring(L, gs->getCString(), gs->getLength()); \
+     else                                                       \
+@@ -1656,7 +1656,7 @@
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+     if (((Object *) uin->d)->isString()) {
+-        gs = ((Object *) uin->d)->getString();
++        gs = (GooString *)((Object *) uin->d)->getString();
+         lua_pushlstring(L, gs->getCString(), gs->getLength());
+     } else
+         lua_pushnil(L);
+diff -ruN texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftoepdf.cc texlive-20170524-source/texk/web2c/pdftexdir/pdftoepdf.cc
+--- texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftoepdf.cc	2018-05-20 22:11:35.788633528 +0200
++++ texlive-20170524-source/texk/web2c/pdftexdir/pdftoepdf.cc	2018-05-20 22:12:34.398361984 +0200
+@@ -284,7 +284,7 @@
+ static void copyDictEntry(Object * obj, int i)
+ {
+     Object obj1;
+-    copyName(obj->dictGetKey(i));
++    copyName((char *)obj->dictGetKey(i));
+     pdf_puts(" ");
+     obj1 = obj->dictGetValNF(i);
+     copyObject(&obj1);
+@@ -349,7 +349,7 @@
+         if (!procset.isName())
+             pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
+                         procset.getTypeName());
+-        copyName(procset.getName());
++        copyName((char *)procset.getName());
+         pdf_puts(" ");
+     }
+     pdf_puts("]\n");
+@@ -412,7 +412,7 @@
+         && fontdescRef.isRef()
+         && fontdesc.isDict()
+         && embeddableFont(&fontdesc)
+-        && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
++        && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
+         // round /StemV value, since the PDF input is a float
+         // (see Font Descriptors in PDF reference), but we only store an
+         // integer, since we don't want to change the struct.
+@@ -421,7 +421,7 @@
+         charset = fontdesc.dictLookup("CharSet");
+         if (!charset.isNull() &&
+             charset.isString() && is_subsetable(fontmap))
+-            epdf_mark_glyphs(fd, charset.getString()->getCString());
++            epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
+         else
+             embed_whole_font(fd);
+         addFontDesc(fontdescRef.getRef(), fd);
+@@ -450,7 +450,7 @@
+         if (fontRef.isRef())
+             copyFont(obj->dictGetKey(i), &fontRef);
+         else if (fontRef.isDict()) {   // some programs generate pdf with embedded font object
+-            copyName(obj->dictGetKey(i));
++            copyName((char *)obj->dictGetKey(i));
+             pdf_puts(" ");
+             copyObject(&fontRef);
+         }
+@@ -559,7 +559,7 @@
+     } else if (obj->isNum()) {
+         pdf_printf("%s", convertNumToPDF(obj->getNum()));
+     } else if (obj->isString()) {
+-        s = obj->getString();
++        s = (GooString *)obj->getString();
+         p = s->getCString();
+         l = s->getLength();
+         if (strlen(p) == (unsigned int) l) {
+@@ -583,7 +583,7 @@
+             pdf_puts(">");
+         }
+     } else if (obj->isName()) {
+-        copyName(obj->getName());
++        copyName((char *)obj->getName());
+     } else if (obj->isNull()) {
+         pdf_puts("null");
+     } else if (obj->isArray()) {
+diff -ruN texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftosrc.cc texlive-20170524-source/texk/web2c/pdftexdir/pdftosrc.cc
+--- texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftosrc.cc	2018-05-20 22:11:35.788633528 +0200
++++ texlive-20170524-source/texk/web2c/pdftexdir/pdftosrc.cc	2018-05-20 22:12:31.369324336 +0200
+@@ -104,7 +104,7 @@
+             fprintf(stderr, "No SourceName found\n");
+             exit(1);
+         }
+-        outname = srcName.getString()->getCString();
++        outname = (char *)srcName.getString()->getCString();
+         // We cannot free srcName, as objname shares its string.
+         // srcName.free();
+     } else if (objnum > 0) {
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
new file mode 100644
index 000000000000..edf3f3645c22
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="70"
+TL_SOURCE_VERSION=20170524
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${PN%-core}-${TL_SOURCE_VERSION}-source-freetype.patch.xz
+"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source
+"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk +luajittex xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libX11
+				x11-libs/libXmu
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.58.0:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	dev-libs/gmp:0
+	dev-libs/mpfr:0=
+	xetex? (
+		>=media-libs/harfbuzz-1.4.5[icu,graphite]
+		>=dev-libs/icu-50:=
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.3
+	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20170524
+	>=app-text/dvipsk-5.997
+	>=dev-tex/bibtexu-3.71_p20170524
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/Tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+
+	# bug 655052
+	epatch "${WORKDIR}/${PN%-core}-${TL_SOURCE_VERSION}-source-freetype.patch"
+
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	# bug ?
+	epatch "${FILESDIR}/${P}-poppler064.patch"
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Required for newest icu, bug #618732
+	append-cxxflags '-std=c++11'
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pk \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable luajittex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	einfo "Regenerating TeX formats"
+	fmtutil-sys --all &> /dev/null
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 4a88d3b58e2c..bd403653d478 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,7 +1,3 @@
-DIST xmlstarlet-1.4.2.tar.gz 407336 BLAKE2B d9e452666622c5419bad6e52ee0bfc2bf86f484e30cd949fbb77cb6f71a893aeb9f88c7ea821a95c651b2086b786609af00f5f01896a669a624348d6c274d6a6 SHA512 4e29825b503212d3dd436b892bdedd371af65dabbcdc1b0ff09dfe440fd3031c5c8c3a9b69903bd196c62ff944d9f91fe556354df6b90b990fbf6ad72be4ad33
-DIST xmlstarlet-1.5.0.tar.gz 414036 BLAKE2B 4cd68d0fa56e633b47a2f836bb3cab277d7843c16918cd32ad2990f2d6645c1d305397ebbcbbdefe95cfa64c9d4a165dd40e0ce46e2fb97c04e52d32d9a37e11 SHA512 7f2626ae724d943c4809d9772c39dc36c7050fa105aa607d368d74491582551798750e15ff00bde6d8bf1b459543d68375e670d7c9c9eff43a117c1410226ec3
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
-EBUILD xmlstarlet-1.4.2.ebuild 933 BLAKE2B 88cf8a6a5f420955887e648ccab5b5f37e2c8973beaa3e32f1316222a16f67c49b566fc07f105c69ff0902fef53f568106d09fbaaec1e14ec74aa8b89701acec SHA512 da3cb776e745b44a327efef4f82f3104c86fe7e5dd5f634a3a1acb6d92479eef855515dff5e5dc61eda0c407d8039d3a8884a0bd224d644ec37646b38dedc490
-EBUILD xmlstarlet-1.5.0.ebuild 933 BLAKE2B 88cf8a6a5f420955887e648ccab5b5f37e2c8973beaa3e32f1316222a16f67c49b566fc07f105c69ff0902fef53f568106d09fbaaec1e14ec74aa8b89701acec SHA512 da3cb776e745b44a327efef4f82f3104c86fe7e5dd5f634a3a1acb6d92479eef855515dff5e5dc61eda0c407d8039d3a8884a0bd224d644ec37646b38dedc490
 EBUILD xmlstarlet-1.6.1.ebuild 933 BLAKE2B bd579b52641fb927084d915a1272b1f57f198a16f5f810f780c6e36e3667e1a62f2c1ba2fe7cd62740425457b22382b3a05edd4997616489e6dcea2f7f813c17 SHA512 9907ecd56ddc3e689799ffd69078957c240bb39ad502317733d9d021605d0b26e22f67ae511b1a3ce194d58fa5ef6aa95df7536046168c18eb73d976aaeb3bf9
 MISC metadata.xml 293 BLAKE2B 1e39cff7005653b64f2f27c49262c0ae492da15d33d361e5e9b4148a3e975db2b30e26468fe5cf7f61155f53a3f76a16121b8a4c85ae5420d0ec74885d33bba9 SHA512 9fd9f809f74a272cc9abb789f3e08ab9b2ecdd1f6ca3931f43567b3b2e3423c0622bd3cc52f5dceac6989282351400fe9c1554ec2b69439986902b11f589796d
diff --git a/app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild b/app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild
deleted file mode 100644
index 83992e77afbd..000000000000
--- a/app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="http://xmlstar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.9
-	dev-libs/libgcrypt:0
-	virtual/libiconv"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-src_configure() {
-	# NOTE: Fully built documentation is already shipped with the tarball:
-	# - doc/xmlstarlet-ug.{pdf,ps,html}
-	# - doc/xmlstarlet.txt
-	# - doc/xmlstarlet.1
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-build-docs \
-		--disable-static-libs \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-
-	dosym xml /usr/bin/xmlstarlet
-}
diff --git a/app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild b/app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild
deleted file mode 100644
index 83992e77afbd..000000000000
--- a/app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="http://xmlstar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.9
-	dev-libs/libgcrypt:0
-	virtual/libiconv"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-src_configure() {
-	# NOTE: Fully built documentation is already shipped with the tarball:
-	# - doc/xmlstarlet-ug.{pdf,ps,html}
-	# - doc/xmlstarlet.txt
-	# - doc/xmlstarlet.1
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-build-docs \
-		--disable-static-libs \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-
-	dosym xml /usr/bin/xmlstarlet
-}