gentoo resync : 18.05.2019

62 files changed, 501 insertions, 1324 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6df2b36b7223..5ad3c9ac9a76 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/active-dvi/Manifest b/app-text/active-dvi/Manifest
deleted file mode 100644
index 094a3f3066d5..000000000000
--- a/app-text/active-dvi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX active-dvi-1.9-htmlcflags.patch 464 BLAKE2B d7e84e2a095f5aa5575f4dc78429106e9c695b077110965c96dab9b60b0f634c493a93f9a38996b7d282fbb4f21dca3e4115109d54ec01a0f93ee2b182fdc271 SHA512 994e7310097baececcb2f028041e66c6fb36e33a8fc6761ab2a73fb3c0d32999b92bdfdcc784366bf8f291070a5c5cc53ded072d7a562e2bdb8f559a21151d03
-DIST advi-1.10.2.tar.gz 9772060 BLAKE2B c9a96037d6101014688847bebf2c49eee94803064ef730fbc4f6729de6146672485d769cc4808cf947f8796145627dd47c4fc4cd7d406752ac77738905adcaa7 SHA512 93479e22261019b571bc331604a659e4e58200284bcdd63929b2c7ab07f8e9fabbd120f8876081a36e7e09e08286eeba9a45f3b077b545a9e404060622ec45c8
-EBUILD active-dvi-1.10.2-r1.ebuild 1602 BLAKE2B 3d3197ed45dfdaa59f029c940ea1545dffc954e4e2c681b1282c55085a749709f94965c2ad81753bd6d3b6e062943a157ebb02254be198aacc54c825b4361635 SHA512 eada2dcb6016d203db20996061e56f1466cc84d27fe9b7a17383029e9e2ab465a9b218fd7f6c5de76fa8808ee30aa272b7501cfbad7b963e73a1944bc792c5c5
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild b/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
deleted file mode 100644
index ab1bc39469ff..000000000000
--- a/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools texlive-common
-
-MY_PN=${PN/ctive-/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A DVI previewer and a presenter for slides written in LaTeX"
-SRC_URI="http://gallium.inria.fr/advi/${MY_P}.tar.gz"
-HOMEPAGE="http://gallium.inria.fr/advi/"
-LICENSE="LGPL-2.1"
-
-IUSE="+ocamlopt"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-RDEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-	>=dev-ml/camlimages-4.0.1:=[truetype,tiff,jpeg,postscript,X]
-	virtual/latex-base
-	app-text/ghostscript-gpl
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	dev-texlive/texlive-pstricks
-	dev-texlive/texlive-pictures
-	dev-texlive/texlive-latexextra
-	x11-base/xorg-proto
-	dev-ml/findlib
-	app-text/htmlc
-	dev-tex/hevea"
-
-DOCS=( "README" "TODO" )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.9-htmlcflags.patch"
-	AT_M4DIR="." eautoreconf
-}
-
-src_configure() {
-	TEXMFMAIN="${EPREFIX}"/usr/share/texmf-site econf $(use_enable ocamlopt native-program) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" --enable-dependency-tracking #486066
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	emake
-	cd doc || die
-	emake splash.dvi scratch_write_splash.dvi scratch_draw_splash.dvi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PACKAGE="${PF}" install
-
-	# now install the documentation
-	dodoc ${DOCS}
-
-	export STRIP_MASK="*/bin/advi.byt"
-
-	for i in "${ED}/usr/share/doc/${PF}/"*.dvi ; do
-		docompress -x /usr/share/doc/${PF}/$(basename $i)
-	done
-}
-
-pkg_postinst() {
-	etexmf-update
-}
-
-pkg_postrm() {
-	etexmf-update
-}
diff --git a/app-text/active-dvi/files/active-dvi-1.9-htmlcflags.patch b/app-text/active-dvi/files/active-dvi-1.9-htmlcflags.patch
deleted file mode 100644
index 59697ec4dc83..000000000000
--- a/app-text/active-dvi/files/active-dvi-1.9-htmlcflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: advi-1.9/doc/Makefile.am
-===================================================================
---- advi-1.9.orig/doc/Makefile.am
-+++ advi-1.9/doc/Makefile.am
-@@ -113,6 +113,8 @@ TEX_ENV		= TEXINPUTS=$(srcdir):$(top_src
- HEVEA_FLAGS	= -entities -I $(srcdir) -I $(top_srcdir)/tex
- HTMLC_FLAGS	= -I $(srcdir)/includes \
- 		  -D CamlVersion '$(OCAMLVERSION)' \
-+		  -D HOSTNAME "$(HOSTNAME)" \
-+		  -D USER "$(USER)" \
- 		  -D version '$(VERSION)'
- 
- MV		= mv -f
diff --git a/app-text/active-dvi/metadata.xml b/app-text/active-dvi/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/app-text/active-dvi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 3a5f2719ee9b..d8417e6d2e2d 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,3 +1,5 @@
 DIST atril-1.22.0.tar.xz 1819580 BLAKE2B 6d5ae9e42407c5c7ae716c0650eda2085bc2206f442dbbb04dbf549263cdabe6d28761deb14bb9557534f26828882cf5b9373698b5e2c29f4b70445ebfabaa5b SHA512 bf940178647c348fd78e828bcb3a55c4ff6195d4020bf198ae5ba4a96e2fe582f7e30fb9d4cde4143e82ae783358373d3a9fd68413295586da9fe1b374e2f034
+DIST atril-1.22.1.tar.xz 1766980 BLAKE2B 0b7b1a7dfff13c5d803fed4140596940b20a322fce54c9f0faecd8e80bdc1e5e498603851a10a88763b20444377bcf4e7b124ac08953ab6aa4b3b2cce021a46c SHA512 838ae397c868ac417c9266e4a06525d66214650cf8647e91c1472d83d50c8954f6dbb29411384892a98f0929e1fbac9947118bd0db10d50400fc0d5270a3619d
 EBUILD atril-1.22.0.ebuild 2114 BLAKE2B c3731b7086b91b09c2ff7eac2247caafe889286fd37ba7e43ef9cf276de60f42cc646421e3ef47cfe5540786aab12e2d746f20ff16f2f47344c35e536bed6164 SHA512 b8b9ab41fc5beeeb4463f3993d8bf7fe30c66a516aaec65f50be17932e3a3d8c44234d892678ea663c3790a4a4867af8c711607700ffd01e1f9efddf9b16107b
+EBUILD atril-1.22.1.ebuild 2140 BLAKE2B 62a297c4acb54cd3c777de938d0ec6836f887192c16a6408db41f5580f5b9879d06811935c9e262ea4fab451a413f858eafbc2e57c30606cc73a01adf1484f62 SHA512 a4abb4d9f0bed5733678c304bbfc1928542d59b38e9b8763e8a60c2c880300d3ddab28b23a71e0b9baac5c2060fd19bbab9b0e2cf0c5f36ea9c1411860749a87
 MISC metadata.xml 782 BLAKE2B f87378442b88dfae4c1b06d6bfc3f3d13770271bb0c589ad37965325bdc0ac13cdbea3dc18fb41d48339a078c2d11c0adfa78a88da9216356c79fece0f5f39d9 SHA512 d3c0b43a5957c49d606b8eafd71ec8a0ef3e428e1953a0e8172c633bede7c9e1d468cf61eecb2f6cd980ff64ab02faf16c9501351ccebbc64175af9fb9b32477
diff --git a/app-text/atril/atril-1.22.1.ebuild b/app-text/atril/atril-1.22.1.ebuild
new file mode 100644
index 000000000000..7fa4d3d8236f
--- /dev/null
+++ b/app-text/atril/atril-1.22.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+RDEPEND="
+	>=app-text/poppler-0.22[cairo]
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11
+	>=x11-libs/cairo-1.9.10
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1[introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? (
+		dev-libs/mathjax
+		>=net-libs/webkit-gtk-2.4.3:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1 )
+	!!app-text/mate-document-viewer"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian
+	app-text/yelp-tools
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 34459301428e..a83d5dc85f25 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,5 @@
 DIST cmark-0.28.3.tar.gz 229391 BLAKE2B b235d3dd8ed9b83d8fd6ec495d311bed854ad61d28e5a5087f40f7e512977892fcdff7c51e8683db87e0ee8e5e73338fe11b8829e70c6f07c59e917a8b7268cc SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29
+DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
 EBUILD cmark-0.28.3.ebuild 717 BLAKE2B 43fdae7ded885c846c49588f92d7e2825d27fef728f7c9b375f9b306255b95bb57a829818b29ac5e7778b6431fbcb27ac92134fd3311375d48115ef79a1abd75 SHA512 64f2541ff91f125b6ca0dc9639e3f7d5992876d9fd9a586530232042a11ca5d730c6e23804903648013d1a20f3e155bd5c988dcb3956b090331415c8bb131f10
+EBUILD cmark-0.29.0.ebuild 722 BLAKE2B d9cd64fe92ad61d95e01b403b52e9675cc2fd6ac85b37c17b30f9c233dbb8a3081dfed2b6e60ba234045f0e502f77e973718ac13c5fd0bcf201fa84dbbda94a1 SHA512 539b210c076133e5b262429cab9fa0af0fb227852cdd28a82811b9557f42d64bee21a30c59f3e4e4f935977e26e699e6000a53f5048e924db723144f9fc8b222
 MISC metadata.xml 577 BLAKE2B f99edfb972715ce4b1660a5e68c0261c9b8d8f2914f5bd804227bbddeae1528205bbed55c20d6d366ecfdd6a01a69bb31decd57ed40f0440de4946e86339e659 SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
new file mode 100644
index 000000000000..7400fd7331da
--- /dev/null
+++ b/app-text/cmark/cmark-0.29.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="CommonMark parsing and rendering library and program in C"
+HOMEPAGE="https://github.com/commonmark/cmark"
+SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/0.29.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMARK_LIB_FUZZER=OFF
+		-DCMARK_SHARED=ON
+		-DCMARK_STATIC=OFF
+		-DCMARK_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 6e267f3af73a..0966d8bf7d9d 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -3,6 +3,6 @@ DIST evince-3.28.5.tar.xz 2196432 BLAKE2B 992e37ad3cb82934efbdcd83afa89dc7589104
 DIST evince-3.30.2.tar.xz 2288868 BLAKE2B dd0423b7ec51daf897bfbc45afb298f9ee23b28ada3dfe5d5d2808b4515bdc7077a7e0ae46541876bb2fbfd8aa9ec44abc7aabcb3cb10b6e52912f0ac1358eeb SHA512 dfffcf15547d0720bd2379054d7b9bee02f8bea7113562162cbab62d77cf84c04f70dcc87a3e6b1ba62db38783df8f481d801854d8f0767f60e9cfabd9efc646
 DIST evince-3.32.0.tar.xz 2564236 BLAKE2B 203bc6ff6b8b2a3d30ebd30f7f9be6269ded5044521da7d2732cb759db8e8ebd2d565c2ad04908e11ec1f726ec70dd2931c58c9b31951a7b3d3165c61042c87f SHA512 565298a200d9ae2f6b4cb53c3cba0d0d0e4cfbef60e4145bfb9c82a5682947ceb2371e52c27179cd69a238cd387bcfd744d3c55df814b6347f07781aec3ea658
 EBUILD evince-3.28.5-r1.ebuild 2814 BLAKE2B 9d83603446cd2e90815f1b47fcfee1850dac5ae889567c52f05f9deb0a5242fd085392eef8ba23128ba9debb7ef9afaf32a7310a6687e4d555b8898993cb1ee6 SHA512 959d1c47891d826d3d2275d13031352f92fa17049608986cc125e1903249de98040acf2806cb23469ea6ef145afc6621cecabfa545692f15839362cf72da1f04
-EBUILD evince-3.30.2.ebuild 3126 BLAKE2B c02d5f6134de9024a82a6ef022ceca521f0a162fab63bb4997030835f0f274bafbc98f30cd08920c6a1723a77fd1592ee1ef0d422bce4ef79ab4b6871b6a4464 SHA512 53e6fa64fbe70e728c9a86ed024fda5f87b03d9d94a89b20ee625a801dae5eba6c0bbdaf6113a81a685f149a04b56bae74657bfa42cb01cb41f108ed9fd234dc
+EBUILD evince-3.30.2.ebuild 3124 BLAKE2B 18a459e407b968406bfa1220d4ee151cc2668277775ec5a6c91df53019069508e15c7213eeadf73a38c2d975be5a76eefe81e7c76da888d805c6a4b25cde736a SHA512 2eceb17e9f9251517c0b3cb5394e364bd7b2f95ead765a555730094e6686c54c256efba28adb95316a730572cc539a144dcc07607b05af7830e2e9c41c475d6e
 EBUILD evince-3.32.0.ebuild 3127 BLAKE2B 32b9d29b0e68b7a8421730f546dad584d3962ff9e5219ae68f2e5afaf943c6d52c290b3cb82fc0b9d13fdd553e19187b8f611a07218e82be6f1a86deef7b65f2 SHA512 14aab1578a9025b8bbd9d6adc1e8d00f2f54a166f373349167ad993ac524a020e5818622b9b17fd9b0be23ca1db5159077a101d6215c6cb68395849e2941e12d
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.30.2.ebuild b/app-text/evince/evince-3.30.2.ebuild
index c6623539c8a6..0d61b2bf1503 100644
--- a/app-text/evince/evince-3.30.2.ebuild
+++ b/app-text/evince/evince-3.30.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # bundles unarr
diff --git a/app-text/fblog/Manifest b/app-text/fblog/Manifest
index 40ea45b1f3f9..3c42c28a63ff 100644
--- a/app-text/fblog/Manifest
+++ b/app-text/fblog/Manifest
@@ -1,37 +1,59 @@
 DIST aho-corasick-0.6.8.crate 26786 BLAKE2B 877bac172514332ef3c607fa3c9b4708822543f69091b3151d31d9297306dbcb0b6ce9cf5ba02f3c08f5baff337e3525ada8f22477770fd6aa12cce428694a36 SHA512 1adbce716a3082c3fcd3514c49af3872d926df14044767266707862c0ad7ee22848a6ce99903003c04a3e8f8cd91b38ec8ca5d4a2c9031bfec4c93cf71c15556
+DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
+DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST fblog-1.2.0.crate 176759 BLAKE2B bba1157f78fa457ad9c091b7f7ad3db5e681e669676976c8ffec142a40f50d2feb0eef68a6e33850883715d2825561f12d842b5f8d88c42149dd5c8cd1b10e83 SHA512 bbdb8ccf29d0499e0df8b0bb187888d46e278f7c57a4a0224c4b055a74159030a50c497abd9a406b35327e9ac18114b9c24ad0d8a18fbc61e2ab9c9a02e8ca4b
+DIST fblog-1.3.1.crate 176956 BLAKE2B 71ade0f0327ba9ce97de33c83a1120c578e7dc47ee5fdfbf3ff0d10aac8cf9a0d65cc786c61152813ba4b5a1b19993a7098a5ad1a225fa3fcdc1e1f8e4cacc42 SHA512 1ed97d34d267a1f5b75086ee41687cf3ef66efdc63bb613df76b18271cd597cba4a7087237ce134f21f7a71cb9644a89032b81511d4c365aae60b7a6c07293bd
 DIST hlua-0.4.1.crate 30771 BLAKE2B b2b5b39f1a686d57fdfc54d97badd4b612913518da85cf901acf3f18cebaa7c8af8a919f659ccfa47f3eebe2827b742069f63167484f6f62274c07638a548f6e SHA512 992fa3236d19906bbb0dfa1054e89e2f78fa47e858f3cf7b2a6aeb3c6c031c49084115e18640e6fe105535a3fd124467b9f61783aedc5b9c2e670d2fe326280d
 DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
+DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
 DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
+DIST libc-0.2.54.crate 401259 BLAKE2B 6fe5f258837fb21af63b445b2679d3d33a498dd10c7676f30df4a95917358f48995461e41b1ac4c944c079ae99edbce77667e68ce963a7447bf1d35a579e3ee0 SHA512 46f0263b227b107aedbd3c4171d8b3fe60ea9c2413ba9fc4cf3f4f8b92090b7aeec630b687ff55ae4507ff44144dad393a3912c6fc81f8864e630c0f15196cb8
 DIST lua52-sys-0.1.2.crate 156154 BLAKE2B 8a6ad1d9edd6ad51febf8ed44b315f8a9578ccfb57408d8247a3f161b62c3c1403fe105963c60b8c89aa210ba03af6384e00d01b480dc16060a648360921f275 SHA512 5318ddcd1d78c40cada7cc64027684f448566257f3c4b957e9dd00b163dab16a8555782de961e500ace3b093ec1e2c9cc04fc6769d7b1e5350d8758028a3056f
 DIST maplit-1.0.1.crate 8590 BLAKE2B 6f673c6ec08df4e239558ac6df9ee5cfb5b9e9af5cd9ac9452ef9e136400d415b9b41aa4ba4b4e6f1ddadbb9d42c64e7ca7496b25415ae19bb2283fb2d148e06 SHA512 8cb6d865e4a3e73d5af5e41bd48e7f971f1a361a5ac7999f915bbd7156d5a90caa07c4ae82d428217b12a6736c362fc64dcafc757b4e7fb66f645cfddc11b175
 DIST memchr-2.1.0.crate 21479 BLAKE2B ca97d105cc780f2a22eb1eb7d6bf6755f012b1d15b5c55cffb9a63f3faaf48b5285cc7b4edbdb933c4e81565da163b325a4d570aee5cb479496d8b74c3d52d8e SHA512 6de3056b5fcdf08fcfda34be710d2f4ea326f056450a78a4fd096e5742cc40662d3003f3ef6ced26687dcee7591f5a8323d14df2cc286d732b1b22f05424c476
+DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
+DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
 DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
 DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
+DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-1.0.5.crate 245770 BLAKE2B 2bb5dcf7778ff6e6316f80a028e9e0df34d77660dc1fb21250238de250335ea2546050b0c56c077c4e64788a0fd2b27f7ea6de639feb2b99590fe9e8a2d32e1b SHA512 a4ddc78fcae0a2b3c0e041382bc8c85a216ff380212762459637934c863782445cd289f5cd60c2a923ea9161f4dad9891210fe6a86cd6bbc8db8abd98ead34ce
+DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
 DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
+DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
 DIST ryu-0.2.6.crate 39911 BLAKE2B 3dda01a1da474c106d36f63dbc762f5b7eb37e5b0c545bcc4cc992ebabaf02e0649cbbb27f81971cd4c27cc51453f4981eac869768a0cdb31ece3a68a6f8976d SHA512 fa7596d53f3a16673df016aa75a4cc7a637456db595daeb9e4a0a393c7ab7d18b669bcd2886f65a4421897c0261ac57ff85d9c452772e172a4bb6c11b61a8f1f
+DIST ryu-0.2.8.crate 42798 BLAKE2B 393eba320c417af8d2cc23f5fc2874d7813fc3cd4804f7cba1d374f073f74bda4de8208544f30a5650d21cccad28611c8ab2bbdce15ba63b88d6b17100ac5ea7 SHA512 15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4
 DIST serde-1.0.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
+DIST serde-1.0.91.crate 71696 BLAKE2B d281605205a041ee0aae9755bcdb10951fd788b57a8f415628580e520950c98cc0edf0761812ed31a818f0d3858512c88faaaca49d16bb9bd72b187544e85c98 SHA512 8a335e214cddd1e1602d6bf0c01dfc5f19276154d846bde97f5a06914e8558b75bcd7eb8cee3273ed255314bbbee6a05f1f4ccaebd45bc5cc16a18c90e8635f3
 DIST serde_json-1.0.32.crate 69507 BLAKE2B 943e59250dbafdecc4c55709105259ec2f51737290ecdd25d197329eb5c2ef618dcff155e38d19e29662ac13b9f6500fc04fdfcb0d18c8e2a87545e075f77b3c SHA512 31add4ee25db06aa61f4b94ddb57a54c38ea734de01bf91d159ecdaa0351265837336fdec7886e9d5b1056106a6d04acbecdd39f57e5f2a96642d462ce3a4c13
+DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST termion-1.5.2.crate 22076 BLAKE2B c4a49c9f8bc28f98d6b99109a6eb824b28cb58badcf3254506cd85bcc61026d900cc3fd95c29971953ba6c0979daaa5de33294e7745b816badba912c5c889d41 SHA512 573432550daf6b9edf60783a056df7f1b40ac51585194c8a6181a7b21b22a9d95d9389b3dbf90a050dbacc8988e7b1bbb189756fb5444e11cabd06b3d6c0119b
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
+DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST utf8-ranges-1.0.1.crate 9247 BLAKE2B e1a4a867c32b54b239338ba4c9a209cd5265320349a0a691f70793f1e4f1c9eddfd477cf2f11e4d4cd72e8f78e09fa32562eb0c57a3c7126a37675008b5ce7d8 SHA512 c17ca6aa679f1f974c9673fac6116c5bb48ff59ca65a968520d5e89c52a7d4409d578df4b28dd3feb4aee208d796a47641c4f1de71810de36905c6cd3439ff97
+DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD fblog-1.2.0.ebuild 1059 BLAKE2B ba2b42041973591190d1659b0f35237ef408e502e8974ceb85f9aff2ee013146c9e2bd414cd3c739e4f9482ccd4ec8416acc7fab569bf5572acfd4e717ce24cb SHA512 1081fac8de30a7c5f9ac3609df88ecf467d27a569c47c559258c3e41c6b63e71fab73ba620d84beb2a51e594b8ee1cc0b1c077e5c5b87e4f93be20c60ba7787c
+EBUILD fblog-1.3.1.ebuild 1055 BLAKE2B d3058bbea4693898ffc5cc494c7652f08cf3a5040aba00f1a0f81f8b403adbc2ef33d5bef5120cab947f427c1f7c9c8fd85c5c1a1f55ac71121992eda09bbf34 SHA512 0f497f15b0ab90f42acbf13fb944be8bc3ffedc80dcd7392da40de7047c7ecda6e77bd46663effa2013bd0a53bbb3b16a1b79874f8317aaa07fed700ca179a2d
 MISC metadata.xml 477 BLAKE2B 096b056ad3372685c163fded9f6bb7cbc2404950dac40b72e8b321c1530deba3728e1123b9fd158f799588cc3b10e3c97ff83132e313b5fc99f18049e2884a56 SHA512 94576bea6800d4aba812303abe6f6366c0fba1ecc35feed1402a383070915594e964941738a19b0b571e7577e2d06355d7204bda920f2f56904fbbf77338f7aa
diff --git a/app-text/fblog/fblog-1.3.1.ebuild b/app-text/fblog/fblog-1.3.1.ebuild
new file mode 100644
index 000000000000..f4b44651c603
--- /dev/null
+++ b/app-text/fblog/fblog-1.3.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.3
+ansi_term-0.11.0
+atty-0.2.11
+bitflags-1.0.4
+cc-1.0.37
+clap-2.33.0
+fblog-1.3.1
+hlua-0.4.1
+itoa-0.4.4
+lazy_static-1.3.0
+libc-0.2.54
+lua52-sys-0.1.2
+maplit-1.0.1
+memchr-2.2.0
+numtoa-0.1.0
+pkg-config-0.3.14
+redox_syscall-0.1.54
+redox_termios-0.1.1
+regex-1.1.6
+regex-syntax-0.6.6
+ryu-0.2.8
+serde-1.0.91
+serde_json-1.0.39
+strsim-0.8.0
+termion-1.5.2
+textwrap-0.11.0
+thread_local-0.3.6
+ucd-util-0.1.3
+unicode-width-0.1.5
+utf8-ranges-1.0.2
+vec_map-0.8.1
+winapi-0.3.7
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Small command-line JSON Log viewer"
+HOMEPAGE="https://github.com/brocode/fblog"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=">=virtual/rust-1.34.2"
+
+DOCS=( README.org sample.json.log )
+
+QA_FLAGS_IGNORED="/usr/bin/fblog"
+
+src_install() {
+	cargo_src_install --path=.
+	einstalldocs
+}
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 43eac29715cb..a16c2ccd981c 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -5,5 +5,5 @@ DIST gtranslator-3.30.1.tar.xz 3060168 BLAKE2B e2e238ffc461b99be9df679c431d7cae8
 DIST gtranslator-3.32.0.tar.xz 2767988 BLAKE2B cf05561d35adaa77e1bb15adb11faad5346a236d6bf82ccc2b474c2478ea537c89852e0c0322067de1bb24c320ad6732eff5a0f6489a97e57c980b0f1c7d56f6 SHA512 4119b64f671ccb4d8132c4b18f53b614a80c6faaecef212b23268b2a189e7b337dd63f9c0d82e139976a6d5615c4c047ad3be97397734930b5c0d07b57e13531
 EBUILD gtranslator-2.91.7-r1.ebuild 2190 BLAKE2B 51c8ed4ede8f77a97fbdcb6a0bcc8117917bc67fbaccca8a167c1cd2edddc9a73f90ef7219d5360672d5f40ae2e66969f6395c08c320276b7e79be60ff91ad0a SHA512 46651d7d50bc6de356f5df028a05350d56fa77c01b53f2e37fe0860b3b5984d53c5222ab3272f90625c4457571eb6fbe16ad61659865a01d60fa30ef8975c01b
 EBUILD gtranslator-3.30.1.ebuild 988 BLAKE2B 92f587b8e94fe6e2a8c4c176615f7bbbca241ed6366c10eaf48dca664c76673b72b9e7daa3a9f6e6cd6d5b6a152755bbd671cb62f17adb87171ee2a8e439d887 SHA512 ef41ac1dffd611ccee374fec8cb05c5a190532ae1e10cbf88877c48e0764d439fb14eed95937066c218488cd226b18deb5a713a7c441d02804a5f331e04e8dba
-EBUILD gtranslator-3.32.0.ebuild 1011 BLAKE2B 7b6aa0ab527d163c75957f3f41110da2c2658a59044eda7d3376e8c24d334d8d38c99b823dc999ce8812e4021e887e7039aa1885621d8f03291edf3421e2dbd9 SHA512 8302b1845a2532efbd1e35297458aba777ddf9e461eb5d7d5899b531922582219103756f9368ba7ec506dbc00b2ab753da04ae9af09a606a20c28f3032809e53
+EBUILD gtranslator-3.32.0.ebuild 1009 BLAKE2B 6a7af19f1b6b4656b8f74f5d1d8176009f9de0333d52d4e6dea5214c88fc4c9576eebf8b96078e2eef5d6f525972f7938f2f07f78375f624ab5ba56bbdb01b7b SHA512 b4efe029a73ba4b6f0ac9438b97860c97a87ae534fcb8e10be079863bc0cdac208c56b167446b502514983c9be9e6f99ff769d079e25ca0752ac949b62c3945f
 MISC metadata.xml 1064 BLAKE2B 7f39febe016d5aea980f3b4ec1eded4825c3fe3cd03a4314dd21cb0d3077cfebb21826c9bbf3f5c30d7581355379427923f9e2e284c7b7520c2fc5f915a746b3 SHA512 185b4b7bfb14d3ea94454b9405875b07884f19c52df2afa46de6a470b65cab521dfd19f09cbecf7168ac5722d871b085c029da7b11b533f26f6afb1f23ada6a9
diff --git a/app-text/gtranslator/gtranslator-3.32.0.ebuild b/app-text/gtranslator/gtranslator-3.32.0.ebuild
index d1525621203b..a833ec4d1aa2 100644
--- a/app-text/gtranslator/gtranslator-3.32.0.ebuild
+++ b/app-text/gtranslator/gtranslator-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 9ee77e90340e..f4adc9de65a0 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -3,7 +3,7 @@ DIST JabRef-3.8.1.jar 36739725 BLAKE2B edee679afcbcf3745a251e372608ac24fefc29bec
 DIST JabRef-3.8.2.jar 37003442 BLAKE2B 7414128603c8a3c41c0f88003b504636fa64865fbdc0ed82b23b54855750d56631f55e371382209f331579f47ac4b3d3b1ed1d389f50f168dcc2468dff3a411c SHA512 84546987ffdef106643b3aba3216041809ac42464ff37fb63dbe806e282c19c25139d8532b695a4f5ca8ad638eb23860b32bd3806e82409e2d38425d5a42e830
 DIST JabRef-3.8.jar 36714920 BLAKE2B 4a26b40168a66dd8872ff194ce687589bb5b0c679d24c1f3acb133ead2d7fde4ce305b3ef27e1cab99045657701b83054d42c17a7bc6e25e0afba13e1d6ec0e6 SHA512 15805d06c7a566b60c28035e0f9a1d525b68774395a618e43ed7fdcc053d21e61f5930c658155d2e4ff739821789f2f988ce6e9a5502bd5536ce0a672ee19854
 DIST JabRef-4.0.jar 56583311 BLAKE2B cb45bad15d507ddfa9320b7805c9c8fee4be888eb2e209a1e9447d0923e729683ebac4dc91df29172da062946c9aca816200034106238de573e7c34a31ff601b SHA512 a3e27ae895c77c6d9e6a9bd2312c7b590fe7d9c45a5d42ecc5ebb75a7be9bce27bcfb7d17e06409c05e7fe490b3ff0e6776c3f12b205acb5e95bceeef6823af2
-DIST JabRef-4.1.jar 56793908 BLAKE2B 12d046efbdd9e7d4397f889c8be2ceb495e6c2e66039705088e6459355367f9b5b776a5f3649fdcccd7f74223832cf1dd9adc2ffa6a95f9c48451857b40656df SHA512 8de74dce519d28fafffab2b57aa6d15641f0862ba562de2b0642d1836d16fe30f732707a9582dd8a98cca508f26054d585640bf992be0abc4c9368ca46c6fc7d
+DIST JabRef-4.1.jar 55587800 BLAKE2B fdbe44b672d0cab611c41a4c28fbe4e11e72ed4b0dff4b743a03ab49ad74a8472173e28c0b576a23d7a5a40c2b23bc6ce6f72aed378b3e5aca4e8b96abcaaf27 SHA512 22fae27a7eb8653e11fc5bd91f721dde49be9d1d79e1a4c05282893c25f993babe8a6df29e154bbb749e9ecc940b42b37401ab3f453401dc8eaa24e2e118d1a6
 DIST JabRef-4.3.1.jar 56868438 BLAKE2B d970599f6bfd4fef7ceda656fafeea77b5c2860ece1b5086bf895cbf212c49bb5e573f5573c483a7fc62431266899dbac7a9bd8e20308d51f5ba2d0c8814319f SHA512 6ff466e91d827254271e5728a9af9c46ac811c2e4fe01c01a2ec6ef9cc75d20978803f18e49365c8a695b0d2db7009ecf05f69f446b9e9136dad5526d5e83f19
 EBUILD jabref-bin-3.7.ebuild 864 BLAKE2B 2bb3f6d6c210c50bb737e7929283236c8771f0192b3b8a11a139ff317e375ff02d88716bacbee0be107a8038805f5acee025931eba47d21c1e4858fadcb36123 SHA512 243e44d36c417ed77c809aab63a5eb527e525874b786cd3d75ab487894e0cc27fd190f942a763aef4e3878524c7330da2dfeb43ce198cabb42ea44a73d377131
 EBUILD jabref-bin-3.8.1.ebuild 951 BLAKE2B 486b75b0dae55f9245cad51e5f5c750097adea5341e922ac0e2032e7dbbeaee56ba17a9f4c54e6e44e36bb4d189607cd752270f885893ab95c77d8a759cc48e6 SHA512 31e3af881a254bd9acc969e2ba538dc35206c360abe879827acaf80914ea557ff6e7e2c3f432a939314f37f7b3492e7beae5e2e722dc34b66fe66a7e64a90321
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 0db3fff1e0e5..31053dcc0ffe 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,3 +1,5 @@
 DIST kbibtex-0.8.2.tar.xz 4065904 BLAKE2B 5b862ef48dc3e0fb2895aa2ad0c1fa8e712c5f63d0a279b33f9d41fca0262bbde1bd00423657e2714dfbacb28657e067760192adfa033f70ac5771a7188ad4cb SHA512 f15e2d1969f79f354881ccb1e41c5d6f1628c4850b3bd177cba0b74b1aab9aa61935f65ef280d242d0ef2ac816ce45b8a2e8a4ff51720a2400ec52bd555f594e
+DIST kbibtex-0.8.91.tar.xz 4183808 BLAKE2B 7cc37909f44fb8463dbdad5260cc0805aded4fa92bd05b0e6b613da79f94217e030f5484465a19acb19e67b1c488d196901ccf285120d84ffbce9ac44816378e SHA512 10ea1285b7e174c7e0c66c1961e5a3f490e9e1afb2b62b35d31af6759dfe9b785a40a36863e0fad119017981038556386085ef7c4bd90d8745b9259550b1424a
 EBUILD kbibtex-0.8.2.ebuild 1936 BLAKE2B f6fbf95407c366b723175ba60debe6e8642041bcfda2e80da45449a9fd5bedd4b818db854ee87e09ec2625a92a7053d0acfd34ab0539312309effd0819dc1463 SHA512 a7c7fa54c5e372bb4d839477c307f8643f9eabc48c402726d286e81421951a1f1afa778e279945283b8b68054f4152fa6903217d2467790185b768bdbc38c6d6
+EBUILD kbibtex-0.8.91.ebuild 1861 BLAKE2B f02216ab0ed5cde47eb40efd88616bdc8530a954d4646a9e42217f3a3e9111e33ecfd354c2373925bfd018f3ff932eb504634ff9c43a77a9eaf391e31d624b17 SHA512 e105a0c8a28001276d0049ceb631afa53ac93bdfaef755bfab90e7921f800327802b52d368bc048eb9739b275b7a3e69b35889aafab42fc48e127723e2fe3884
 MISC metadata.xml 518 BLAKE2B e10a5e38918c43315c3804c787f80c6df00f7a37da896784a1ee932a90c7f6c15d8a1fc69313314dadaf01461b65e6be78b189226ccae9fda5422950a86edb63 SHA512 be7be6b52a067ed23384344706adaa13cd06667e768a9b5adc2d93b2edeb5feec426dc83395a226219a469bb5fbe99d378b5e1c87ea82e17a05c9751f03e12bb
diff --git a/app-text/kbibtex/kbibtex-0.8.91.ebuild b/app-text/kbibtex/kbibtex-0.8.91.ebuild
new file mode 100644
index 000000000000..0fd2876e0f29
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.8.91.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://userbase.kde.org/KBibTeX"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/unstable/KBibTeX/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE="webengine zotero"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	app-text/poppler[qt5]
+	dev-libs/icu:=
+	virtual/tex-base
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+	zotero? (
+		app-crypt/qca[qt5(+)]
+		dev-libs/qoauth:5
+	)
+"
+RDEPEND="${DEPEND}
+	!app-text/kbibtex:4
+	dev-tex/bibtex2html
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package zotero Qca-qt5)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/okular:${SLOT}" ; then
+		elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}"
+	fi
+}
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index 6fd45fe2f895..56f973a63efe 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -1,3 +1,3 @@
-DIST LanguageTool-3.5.zip 93540212 BLAKE2B 166be74df8424692d637d1f23f2044492741984feb8c863aa363aca07ca9903c1e5934e4026a4e8c7b135320053808f1735ae5800a3964e9d75381368a8c5b7b SHA512 ad49dd292ca6841e1ef439b2dbe55748f621333b418bd6a596534cd5b2cb7019170c98046c8e2c68c3d75a9e5d132cf329de6481eaaccb8f78aae2233bdb8e45
-EBUILD languagetool-3.5-r1.ebuild 1403 BLAKE2B 1fff1dbc72a71536804c645cdbf64e21ebe7ab3c160b29f93474bd32c2a5ef8ff375fe27d45252b530218f029348204696dd326109f4e1898875c577cae7ef1f SHA512 96db2123e9d72b3017fcae610aa53ac8fafff57c0f72ac5240a44890842fca9dba5cca9cfcd9cfe4a522d80311f6e3aaefe8d2c1bb9be045444a9e7b01be7e23
+DIST LanguageTool-4.5.zip 189327638 BLAKE2B b0ba0a67ee3de4ef6e452e6c47d5c03800f4e93acdaee03da37dca1a626e808bef91a167a62bd1fd7e732c86010523193d197083179cd40aa22de67bbbe5c4d5 SHA512 66bf6c99425d66ca8bc03b609f07d85f3989dbe73d7a93e81b6dc21d751fe05dd439d4753b51282d359a08ecdd92a18d9deab53d7b3a144c605d4429b2949eef
+EBUILD languagetool-4.5.ebuild 1403 BLAKE2B 768659205fb056d38477b36a3aeff2b7d1fe98120be9695fad67dbf12f86e215ee18aa1ac54206319c437340094e4a103d0b091d3a888809fc4bd0115a2d9a2e SHA512 0d9395e3e66add0c47833f0af42dba20ec4ba9484cdbfbaaa7b650afe61939350d90abb6fba2d727289ee85c655458370fd0aa3676f7afc9431c2e16a6e94deb
 MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/app-text/languagetool/languagetool-3.5-r1.ebuild b/app-text/languagetool/languagetool-4.5.ebuild
index bcf5c6bfd5d4..c50594e3392d 100644
--- a/app-text/languagetool/languagetool-3.5-r1.ebuild
+++ b/app-text/languagetool/languagetool-4.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit java-pkg-2
 
 MY_PN=LanguageTool
@@ -23,8 +23,6 @@ CP_DEPEND="
 	dev-java/commons-logging:0
 	dev-java/guava:20
 	dev-java/hamcrest-core:1.3
-	dev-java/jackson:2
-	dev-java/jackson-databind:2
 	dev-java/jcommander:0
 	dev-java/jna:4
 	dev-java/slf4j-api:0
@@ -40,7 +38,8 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	default
-	rm -v libs/{commons,hamcrest,guava,jackson,jcommander,jna,junit,slf4j}*.jar || die
+	rm libs/commons-{cli,collections4,io,lang,logging}.jar || die
+	rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.jar || die
 
 	# Loads of bundled stuff :(
 	#java-pkg-2_src_prepare
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 0e12e498c850..4cc7fd823319 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,5 +1,5 @@
 DIST libgepub-0.5.3.tar.xz 25576 BLAKE2B c51f6850c78185fec6f027ad5507b2402ab578b2ce6e4b91c674c3a3c6945857ce3d3ebd4560408ae8e5552ca658c40b30c73b42db1ef61f4814cde36a404df7 SHA512 8eb3370b6ca639135a1365756f3977f6daea3039bcb7ec4d5cd116d869584be2a2b1e8bb7f202d4c101f1afb0f7b9a45bd48c1b2337197ec4320d50a4c8d0183
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
 EBUILD libgepub-0.5.3.ebuild 644 BLAKE2B df2cf465d0d68cd90e2f8bedc84c38b9ebc88891bf1f2194fc1e68b2ba3eb9c23a2a0b8b8c5acf4842959d4f70ee7f5bbc0f8d884a1ffc20f5f95a706be50ef4 SHA512 324a75f046affb0911b7a95a5b3aba11c5aeb65cb969e87f5028028be1868901ea612f597a82796c73a13f7031ed584a63c0d11302704b13f7be3a189bf3610f
-EBUILD libgepub-0.6.0.ebuild 646 BLAKE2B 2b15f05ebda230985ba74ff5d233447eed8bb4c283abccebf4d742c128e94447207d583e5ef2fcd5af660f69ca34dfcf31b752ff6640db4d8eb31a9ffc9210e2 SHA512 34fa589cb61498af1b73fbdc312171e6491a52c362fbefac83973b25b7de024355d25e2bc1126ce08a88a7086e745b618a34e48d2c6b5510c951c59d0a58cd97
+EBUILD libgepub-0.6.0.ebuild 644 BLAKE2B df2cf465d0d68cd90e2f8bedc84c38b9ebc88891bf1f2194fc1e68b2ba3eb9c23a2a0b8b8c5acf4842959d4f70ee7f5bbc0f8d884a1ffc20f5f95a706be50ef4 SHA512 324a75f046affb0911b7a95a5b3aba11c5aeb65cb969e87f5028028be1868901ea612f597a82796c73a13f7031ed584a63c0d11302704b13f7be3a189bf3610f
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index 5d6e53a2c0a0..9685b374db7e 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index 0d6404fe5f82..30d93cd6576e 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,5 +1,5 @@
 DIST libgxps-0.3.0.tar.xz 93000 BLAKE2B 8e04ae281aa8ee637d597265992a5bf6df3592b7d251d657dae3833c8cca848f7142f926964d96586f50ce9987dee94841be15554a733816a3b4f0acef282f12 SHA512 283ce3041f0238ef1dcae30ce2adbc3f843677e00ae22f20ed3459828f3edaab6d05d87c20dddb613925ab248ed0b29855a94198b982606c3dcb2e59f800b013
 DIST libgxps-0.3.1.tar.xz 93132 BLAKE2B 63af298ef1dc345ef7c40fae4006ba73aa7529381cc6cbc8cf86f4d5b69c8c5617b902bef833ed7d3fa968d927b441e888889179f598b06e2ca13084d3b199af SHA512 80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239
 EBUILD libgxps-0.3.0.ebuild 1220 BLAKE2B 5a253905c2e9c7cfac0362a25f77e7d43bf204a07756ac12efd10b3a6b07331dca27a027aa125b4390557eba939dd8623433b06087989c78b67a0c4cb2aa1efc SHA512 a03b58d526fe52b849ffc7aaab979e18ba4af390e3a887732c7f3aab4a96f6abc01e141a6127c38fd2f8fb1bbff412abf596600a11e5c29b3e70cd220fac01bf
-EBUILD libgxps-0.3.1.ebuild 1230 BLAKE2B 414cef7dfd62e950b93a3070b5b0071b5435a604ad342a0bf8c9db59d41b6466b8573bafe0ffe349db9aff5ab0222a050f9ae49ef78bb3fdef02ba5a3329a0dd SHA512 712f459449bd07bd24c09bfafdc495ef5ded8f366a4383820848ca768f3509427132b09feae705c9caae83eb70d9417985dde47b97bcb059dd520a1c376d603e
+EBUILD libgxps-0.3.1.ebuild 1228 BLAKE2B a141417a9a7a08f896cebba41d2ebc13542033c46d898e6cdb71fed93d241cd763c45f37f3d558b45673d6821a55158fc2b2e6ec3282939e054ad7e8395632d9 SHA512 a1caa283f24e16acf79429f45374f80132b29a65166ef4019f939ded785e32077998958a59bbc8d585d04c808153a82f509efd5379963df6877cdcd1869af8fb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/libgxps/libgxps-0.3.1.ebuild b/app-text/libgxps/libgxps-0.3.1.ebuild
index bd2e88b54d1c..aa87362f6be9 100644
--- a/app-text/libgxps/libgxps-0.3.1.ebuild
+++ b/app-text/libgxps/libgxps-0.3.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection jpeg lcms tiff"
 
 RDEPEND="
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 1d75ebac4ec4..b5636b577356 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -12,6 +12,6 @@ AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a76
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
 DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
 EBUILD mupdf-1.14.0-r2.ebuild 3116 BLAKE2B 1700ed8f0eacc1c986393b597df20d4b45a2158ddedbe472281e900d8dc79ce4a76aafc5be0e3f35977afd6cecb643b7a382c6a7e0a422987d23b20bf2697343 SHA512 442a258938c868062ddd3de127da51c475c89908f466aa12d8baf44b4c29fa961c99f3e1eb3649672e1855cc447eb1b30f2aa31ed80ff1c2c751716b743ee6d8
-EBUILD mupdf-1.14.0-r3.ebuild 3238 BLAKE2B 8abeb9aed58d3222403f305c51b2ac04c2b2e03ae933e2fdf4bfd7f12abf32ff09ef1b1e0204c28a25eedbf17397b02037dfc60cc6bbe29404fe5d34b4bca0d7 SHA512 a2cacbc18f138ec601bb09b2760d949af8aeb78486f54f8c6a9dd069dca563e175c80d587f75622038e94f096d345258bd9738da4ae37ef86df285f0dcad76e9
-EBUILD mupdf-1.15.0.ebuild 3137 BLAKE2B ff4724df2f1510c9b0449e598df551c051a1c1fea623349129039e65be80f7164edb43e74288ae7f904b173633b14b7ce494159b477a75be96c20408ef04300d SHA512 f7dbb3e75e186f6d6a907349a36a78782dbdf468bc120c5c8b2a70ca81a404eb542edde585f53fa9476e0a625726ae5f828d80f6e93852cf71e47262c1255383
+EBUILD mupdf-1.14.0-r3.ebuild 3236 BLAKE2B c2f0ac79635932c9c662c176056342a1e26428390fa850da680e2682b26ae01b09e687cfdbe5426403c96e0cafe992bfb4adf157b0b095d23763818dd6ec9495 SHA512 090559082f61ccaa0e9e787de6e660b68ff8143300dbab9605e00a4d95901ab278586fd8d702a7e854678e1ec879fc1990580fee88b338b4f2126990dc64acdb
+EBUILD mupdf-1.15.0.ebuild 3505 BLAKE2B be357aae0944fda68a0e95cf12e2936ec94428d5baa645399add9f87ca5127de85898f22fb56762d7fb88d6ed3e61874723f7668fb9c4a2ac942585e3ddbde6f SHA512 41209dd40db318acaa224a031672fb9281dd674a6803b789da1cd673ab18af08c4fcdd2f5d82ccc5076026fec056986d2b67f1adc4b4cf3a7a0aca56787d7b75
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index 34e7a6e9d187..cc0d347167e7 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="
diff --git a/app-text/mupdf/mupdf-1.15.0.ebuild b/app-text/mupdf/mupdf-1.15.0.ebuild
index 258ffd768026..7d1f75d3ee14 100644
--- a/app-text/mupdf/mupdf-1.15.0.ebuild
+++ b/app-text/mupdf/mupdf-1.15.0.ebuild
@@ -14,14 +14,17 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs vanilla"
 
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
 RDEPEND="
-	>=dev-lang/mujs-1.0.4
 	media-libs/freetype:2=[static-libs?]
 	media-libs/harfbuzz:=[static-libs?,truetype]
 	media-libs/jbig2dec:=[static-libs?]
 	media-libs/libpng:0=[static-libs?]
 	>=media-libs/openjpeg-2.1:2=[static-libs?]
 	virtual/jpeg[static-libs?]
+	opengl? ( >=media-libs/freeglut-3.0.0:= )
 	ssl? (
 		libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
 		!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
@@ -73,15 +76,20 @@ src_prepare() {
 
 _emake() {
 	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+
 	# We don't use system's freeglut because upstream has a special modified
 	# version of it that gives mupdf clipboard support. See bug #653298
+
+	# As of v1.15.0, mupdf started using symbols in mujs that were not part
+	# of any release. We thus go back to using the bundled version of it.
+	# Bug #685244
 	emake \
 		GENTOO_PV=${PV} \
 		HAVE_GLUT=$(usex opengl) \
 		HAVE_LIBCRYPTO=$(usex ssl) \
 		HAVE_X11=$(usex X) \
 		USE_SYSTEM_LIBS=yes \
-		USE_SYSTEM_MUJS=yes \
+		USE_SYSTEM_MUJS=no \
 		USE_SYSTEM_GLUT=no \
 		HAVE_OBJCOPY=no \
 		"$@"
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index 55b3a7ee097c..ca4cba99a052 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -1,7 +1,10 @@
+AUX pdf2djvu-0.9.12-poppler-0.76-1.patch 1038 BLAKE2B 5867bf9bb8a9eceec872c6d366bf9acf489c2d7eaaea374115e7c308a58acf1c55ef0f85b0d8326414af2d84d489e5b7aa3c5fd42c8ab860cacad989a50e8c71 SHA512 ce2d2f486ba451e630ec2f7b4763b92f29d5546ced5600ba34205dec9f50cd26d5ed3464a6cec1431935976c3061dc21eccbe899951b5b5826264b8c3b502c5d
+AUX pdf2djvu-0.9.12-poppler-0.76-2.patch 2083 BLAKE2B 6d861148705ca78b03dead9a7e2c1e98039d0bdc5a8e70fafbd6ddb71c428c2df242e74f956ae972cccb73aeb5dbddafc95cbf9a05f5acdb34ac6af3e65d26a4 SHA512 ebe0594918f421cfa396ec0291da9da71f482dc2e869f8dd2374e8638253b150a4896b3c361f5e972dbda03994df18959c2ee9665da63225ec19a98d4ed5fca3
+AUX pdf2djvu-0.9.12-poppler-0.76-3.patch 1127 BLAKE2B 2556851d29ebe02e0e17b3e2fa733a533cbf98b61fa6a20b7fb9f9befe800d2ed0d5826b61d7aa1deade63277ef61173a6080782e0c33d5946fd1fd076c064fe SHA512 07ee2c2b8277d4c9ba90fc192885c299451b20558b3ee5c268030bf21e69e37c0e3f750b1158b9cb927d7504ee2458ced8fb662cb65ad2ecae76d14ae729ce10
 DIST pdf2djvu-0.9.11.tar.xz 291356 BLAKE2B 726d9132c43c7dabdecf1e6174a3f2627db7f6981b3ba1f280ea131272ea0fef38acdaaa0f78ab0c883dd2cd046017edac46bb10d91e10668a6e480322e465fb SHA512 7b47ff4cd3a49f3fa1fec08490a192725899307d9c2a75a65a21d36abcece2f308e56161ec4c4f77f32fbdedcc167520657cad2b06cf178335f7e2169b7ada82
 DIST pdf2djvu-0.9.12.tar.xz 295088 BLAKE2B 6dd8b04f089e464becd7923c96ac2ca35efc28412c1913270c8c85656b58a74a47777b1b5b932d29e3ee2ad4d75bc6bcb85b835e5aa7e9d9c6a0ef7b242b5c46 SHA512 2a3acd8efa682541f45a0650070c0260903dadbd49ac6d4560e2e5ee3c5a68a1310dcb9d170035ee8fec0e588171f2c402047b3d7dc4e7d4033abe95f2ebde74
 DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
 EBUILD pdf2djvu-0.9.11.ebuild 1248 BLAKE2B 2c853db54877e60077815a89a9257a0258fc6a5aa6f6a8baefa9b11b5c10f1819fdb4b93ae3cb23b1c604ee9401b3e69304838b6998bd60663637f492d3b976c SHA512 8b7525c6af445582c5710fb92c4133aecef5e1e8e6acd9764bebb0a12e61ad3981d3bfbb83c6d224f95d31cb9a0dc7bc128c9d89e4481a2ae3a57de24fe9c445
-EBUILD pdf2djvu-0.9.12.ebuild 1248 BLAKE2B 314a6564b04a6d638ce2f33f98eb5e66a1066210db47fd535430106b46253c5f064c7e03ba2d83a9b6403ccbec6c15cce8cbb0bfba60a30fd7de0faad7a2a802 SHA512 bd531152726f48d84dd71c02ceb60dd779708571fd015c1243c1b1b5b44ef9b7fb11a0ef70cf3d7af9d74a1fe2a3deb0e19fc457e3d8619ba11b71bf42fa9e0d
+EBUILD pdf2djvu-0.9.12.ebuild 1308 BLAKE2B 588df751c039d93819cdc71718fe8c6e31a33094c2e8005935786fff973cb86c2c2f45371d19220f4027e1468d474e21a5ec256bd8f270aa563dc8dce8fe1663 SHA512 4b07d93a9c82449ce81ae5e3513cfe5f9fc1a01cefdb55eb5cfc027c121d2b6558d5e9dfa54cc81392ee9c5ec2a9a658a68ac01cbd5ad9780364ff95bde07073
 EBUILD pdf2djvu-0.9.8.ebuild 1251 BLAKE2B 6a3487ef4e2195daf5c78447960874a504bcb4a2f5187b49e058df35ed7482f820058aec8d719a52aca3a558ce86cef5705c006d422ef516db9de69632767404 SHA512 b2a2ed2d2f9ebe91f15f2da833b5e5a638bc9a82b7a2562eb4548909bfca18d519f9d76f5f2e843115e73af8c7a232ad4b5f5de419ac08371114762ef2d42013
 MISC metadata.xml 351 BLAKE2B 68816123c075f603535faa42307dfc58066cc7c9db272b1f6004a9e0bba5d71d0a798b5b2fed9d4af704ed5145264b400f406c5b1185e3b759c97c0ccccc05d1 SHA512 98cfb584785e967dfd11dc82da694ccde0031609c28faca492d2384d6257020ebf8ac264dcb512129f5a681455ce3228b9f443aa2aa99197134ed7957901eb06
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
new file mode 100644
index 000000000000..06341298ff68
--- /dev/null
+++ b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
@@ -0,0 +1,35 @@
+From aa3fdae51c19ad2865f92882ec9007feeb7e477a Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk@jwilk.net>
+Date: Mon, 1 Apr 2019 08:23:51 +0200
+Subject: [PATCH] Put Ref in pdf namespace.
+
+---
+ pdf-backend.hh | 1 +
+ pdf2djvu.cc    | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pdf-backend.hh b/pdf-backend.hh
+index 43899c0..d7872c3 100644
+--- a/pdf-backend.hh
++++ b/pdf-backend.hh
+@@ -82,6 +82,7 @@ namespace pdf
+   typedef ::Catalog Catalog;
+   typedef ::GooString String;
+   typedef ::Goffset Offset;
++  typedef ::Ref Ref;
+ 
+ /* type definitions — annotations
+  * ==============================
+diff --git a/pdf2djvu.cc b/pdf2djvu.cc
+index 669eba5..d9e1532 100644
+--- a/pdf2djvu.cc
++++ b/pdf2djvu.cc
+@@ -86,7 +86,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
+     int page;
+     if (dest->isPageRef())
+     {
+-      Ref pageref = dest->getPageRef();
++      pdf::Ref pageref = dest->getPageRef();
+       page = catalog->findPage(pageref.num, pageref.gen);
+     }
+     else
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
new file mode 100644
index 000000000000..356153b5cca0
--- /dev/null
+++ b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
@@ -0,0 +1,69 @@
+From 8b0348b3d5f33494d7e637411633fbea511a78d7 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk@jwilk.net>
+Date: Mon, 1 Apr 2019 08:49:02 +0200
+Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to
+ Catalog::findPage(int, int).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+    pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’:
+    pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’
+---
+ pdf-backend.cc | 15 +++++++++++++++
+ pdf-backend.hh |  2 ++
+ pdf2djvu.cc    |  2 +-
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/pdf-backend.cc b/pdf-backend.cc
+index f1d7662..a1b9b63 100644
+--- a/pdf-backend.cc
++++ b/pdf-backend.cc
+@@ -631,4 +631,19 @@ const char * pdf::get_c_string(const pdf::String *str)
+ }
+ #endif
+ 
++template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
++{
++  return catalog->findPage(pgref.num, pgref.gen);
++}
++
++template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
++{
++  return catalog->findPage(pgref);
++}
++
++int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
++{
++  return find_page_impl<pdf::Catalog>(catalog, pgref);
++}
++
+ // vim:ts=2 sts=2 sw=2 et
+diff --git a/pdf-backend.hh b/pdf-backend.hh
+index d7872c3..d88c956 100644
+--- a/pdf-backend.hh
++++ b/pdf-backend.hh
+@@ -436,6 +436,8 @@ namespace pdf
+ 
+   const char * get_c_string(const pdf::String *str);
+ 
++  int find_page(pdf::Catalog *catalog, pdf::Ref pgref);
++
+ }
+ 
+ #endif
+diff --git a/pdf2djvu.cc b/pdf2djvu.cc
+index d9e1532..21f2d50 100644
+--- a/pdf2djvu.cc
++++ b/pdf2djvu.cc
+@@ -87,7 +87,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
+     if (dest->isPageRef())
+     {
+       pdf::Ref pageref = dest->getPageRef();
+-      page = catalog->findPage(pageref.num, pageref.gen);
++      page = pdf::find_page(catalog, pageref);
+     }
+     else
+       page = dest->getPageNum();
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
new file mode 100644
index 000000000000..b3d8cfad6df2
--- /dev/null
+++ b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
@@ -0,0 +1,38 @@
+From 8325358a9769e8aa33693fc5ea2ac771dd82716f Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk@jwilk.net>
+Date: Tue, 23 Apr 2019 08:23:46 +0200
+Subject: [PATCH] pdf-backend: simplify find_page() implementation.
+
+---
+ pdf-backend.cc | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/pdf-backend.cc b/pdf-backend.cc
+index f6f5267..a94383e 100644
+--- a/pdf-backend.cc
++++ b/pdf-backend.cc
+@@ -631,19 +631,13 @@ const char * pdf::get_c_string(const pdf::String *str)
+ }
+ #endif
+ 
+-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
+-{
+-  return catalog->findPage(pgref.num, pgref.gen);
+-}
+-
+-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
+-{
+-  return catalog->findPage(pgref);
+-}
+-
+ int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
+ {
+-  return find_page_impl<pdf::Catalog>(catalog, pgref);
++#if POPPLER_VERSION >= 7600
++  return catalog->findPage(pgref);
++#else
++  return catalog->findPage(pgref.num, pgref.gen);
++#endif
+ }
+ 
+ // vim:ts=2 sts=2 sw=2 et
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
index 069fd000f70f..ca3f9f534524 100644
--- a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
@@ -39,6 +39,10 @@ DOCS=(
 	doc/{changelog,credits,djvudigital,README}
 )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-poppler-0.76-{1,2,3}.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index a1aa9543ff4f..930c837dc96c 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,4 +1,4 @@
 DIST pdftk-v3.0.0.tar.bz2 546821 BLAKE2B 1d1935322f1468d9e2e8044e748fbb816e399599e445e078866d416d5e99866739134fb794ff42dbfcc37271d66655440f706db46f152722ab7030cba16edf38 SHA512 3b487f7532140366c9ac41222cd366d387b93e67aada845772f60ff20601e25611e34a190a65fbcec9d776a0b5683100fdd54453357bf7c43cebea7dda0c6229
-EBUILD pdftk-3.0.0.ebuild 887 BLAKE2B 90e3a8fec61768bfb426616e13e3fd1abfba8603ff92fdf3397d4c25c6f9e66745e5130384f143ce1a0eb737d8f1b50ebb28fc061e522e4188c95d28825c2b13 SHA512 568a2467ab3f98e4b69c730ca3ab62f69ece26da3e930635f83181a945a1dc7b855cb8ceec31b9404e2f1aa37bcf0fa03b6f1773826d3d77ea9b430e4da2eb07
+EBUILD pdftk-3.0.0.ebuild 904 BLAKE2B 1639a85321d6fe453d7b16c9c6bb3d4becda977a6cf624feff4abc3aa3964c05eed4ce22c8f74f54c5f1a1edc3ec14c0198d71f0f725482f518f8efc18c52357 SHA512 f0866fb18062a9e7110a7f654747be14f3ebc58a9f20a6bd32fd591851096bac0b5ee33c04b648ec412744b2dcf7e30062696c329d305109a3d1706aa8a2b57b
 EBUILD pdftk-9999.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
 MISC metadata.xml 348 BLAKE2B ef51c768c6964646b5e264d379b5c259134b37df3c9d4368b92c44855ee21fa40005fcf1514e95fba43fb683fbf49c35dc251521d1b63f91449c73ecb527a749 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572
diff --git a/app-text/pdftk/pdftk-3.0.0.ebuild b/app-text/pdftk/pdftk-3.0.0.ebuild
index 013ab53a1b0f..1f8c20acf72c 100644
--- a/app-text/pdftk/pdftk-3.0.0.ebuild
+++ b/app-text/pdftk/pdftk-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,4 +39,5 @@ DEPEND="
 src_install() {
 	java-pkg_newjar "build/jar/pdftk.jar"
 	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
+	doman "${PN}.1"
 }
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 80259a83d610..9e4aa7b8d3b7 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -2,7 +2,7 @@ AUX podofo-0.9.6_pre20171027-libressl-bug-635890.patch 840 BLAKE2B f4bca9474abac
 DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
 DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10
 DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be
-EBUILD podofo-0.9.6_p20180715.ebuild 4632 BLAKE2B 2af8ae0d6149e015883bb9c834ee094a976f5a1df4f21544f61748b1d8711db96fc6b5fd48f7895d5d1abe5faa8b333a054995475d4ab4d1d851af1e5f1a5376 SHA512 a22bb250890628388f4fc7bc3205ee9eeeec9d7d1c4476a6d6dc9ae82d0f32a7ff18d6d8609546b9de0459db66b28773709b4688da574b7a2dd2b3e26038cb2b
+EBUILD podofo-0.9.6_p20180715.ebuild 4631 BLAKE2B cb2fade5d5a237561ed7b897fca4af55c0345e4e3701c8d0e5fdf80f406ff3e3a0fae4648a857de00c12bf82904fa04df694e12d7a4318160d91674f3c4a73e6 SHA512 5b2e49129b6251921d7cd9fa9f1d3ab3e1682372f01d0743ab2e5e2ba8f4d45291de7b3d28746680b7875cd943d4a8376a4b1104c2669d4f167251f7a44c4b59
 EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4581 BLAKE2B 7ae073e6e68192232440f925b0bef5cd9a5193ab7cea1d76bf303a2f01ccc3fbba42907408904da4043da0b38532134cff9c9deef868ec8c9d94e70d1360e80d SHA512 abc3b61b00606184996b904475ad9d41d61bbf6e9c301216df47a8c93b8c42f1f03fcd8c200c06e2c9c630105c39546097dc02df153f825aeecc4638a0ae65f3
 EBUILD podofo-0.9.6_pre20171027.ebuild 4643 BLAKE2B 38214968a021b0412e5a52b5d72f3a308a4d5c8fd0d47cef955c352a0f465b3e86e56917e46022cb4aa58767e8f7f4e2c131daefe06dd534d83fa63aaeb4a53b SHA512 5d333d71840298a02ac3bb209ca93946f760e1c443b943fad95ef9fcb726e56f7547979394818061b0fe826490888f39cb7ca53d99dd5b87f4670acc9983ad92
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
index dd1f3e60f7ce..c8a06f9532b0 100644
--- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="+boost idn libressl debug test +tools"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index bda26cf2bc44..ddd9550dfe54 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -4,12 +4,8 @@ AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc2200
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
 DIST poppler-0.74.0.tar.xz 1514044 BLAKE2B af3821d5a5c68a3f2541cd9468fd7318ad0182cda66cea068dc42208fef6c2af78a401e50a6a5906cdc943de7339620937ddc6f69f0d8d1b15082aabc6cc3482 SHA512 4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66
-DIST poppler-0.75.0.tar.xz 1523872 BLAKE2B 245f574e985570a1d0923e732da8694728506fc59382c9e4532159867e1b18ad9f03f6b995891796d72a6e401d2c86ac18403c9219bf533e36c8a07a1dc85d61 SHA512 6a1b76cc5095b7c5809eaa5072aeb4ea615744ff8ffce537f40a3f73a81fc12cc18d596876ceda1c78b5312ad20535f72366e69c861b620d108616f24a98e6b8
-DIST poppler-0.76.0.tar.xz 1530264 BLAKE2B 6496b7e069c98b8ac0bdb9001abd96bf0d71129e436813f4c91832f732e9ae6e125dd1adf49c238cad095185ecdeb47f7efc70b39a03309964dc2bb8552bf4e6 SHA512 bff0dacfabcfb6d4843d3dbc526e45eca85c1e043734d4cd2adb11c025c432559a26d59427169e2172a89e1d7d2bd6cad773688d11410495c6dcda108cf5ca9c
 DIST poppler-0.76.1.tar.xz 1531548 BLAKE2B edbd9c1be99aadf4f14608a1e0dc58a2fed351b10e18aa3c006f4e54cf0f2082deaded9c67a0181bb0f012bcbc550f1208e8a632df9cbe26261b735ca44cde60 SHA512 e4af2785948ecc89c105ab00269b0072b33feea25224e5beb158d515b1de789f979084bed2d4260c9659382cf437c25c0baf2444f5b4fbbba5c58afeb707b7ac
 EBUILD poppler-0.74.0.ebuild 3515 BLAKE2B ece68c444171e98859d712870d0611b9f2c49d4fc46b181d383253fe62aa64e4a1f4bef87c7940f103e878c722d4b29dd5f137d2a199da2cd0f86459cd313a62 SHA512 9ae8a8e2860129702bc3f03b0e934c7f3484c57d3e41fa2a2defa7e97c58d885cfc195289d5e2fd5ffdee809433452d4c9f7d40856d66366ca3bb9318ae038e0
-EBUILD poppler-0.75.0.ebuild 3526 BLAKE2B 519a0db97078b67ab704ed6bd9e1e264f877949b67fe014bfcf84ecc239d4f92b7060592bb44f31f519406b31031a8f00a53829da8609d8f833cfcc0cb9ba75e SHA512 d688ba1d78aeca0c0f6d5c406d0cc714911ad9cb57544544757675fb5b3771b8b4bb2a9cfe6571d601ad2b85fade836bdc14d7518b3ecd883f023fd225c9ab3c
-EBUILD poppler-0.76.0.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
 EBUILD poppler-0.76.1.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
 EBUILD poppler-9999.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.75.0.ebuild b/app-text/poppler/poppler-0.75.0.ebuild
deleted file mode 100644
index 4c97add33be3..000000000000
--- a/app-text/poppler/poppler-0.75.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/86"   # 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"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1: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 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-
-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.71.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.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 -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^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_UNSTABLE_API_ABI_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-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)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	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.76.0.ebuild b/app-text/poppler/poppler-0.76.0.ebuild
deleted file mode 100644
index 61a50816fcf1..000000000000
--- a/app-text/poppler/poppler-0.76.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/87"   # 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"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1: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 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-
-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.71.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.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 -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^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_UNSTABLE_API_ABI_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-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)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	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/qpdf/Manifest b/app-text/qpdf/Manifest
index c1387dbeb9be..b3a83537199e 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -7,5 +7,5 @@ EBUILD qpdf-7.0.0.ebuild 1234 BLAKE2B 303e3943f8429ab560cfef1d62b1c35f2dbec6c2e2
 EBUILD qpdf-7.1.1.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
 EBUILD qpdf-8.2.1.ebuild 1275 BLAKE2B 2bb7075e2ce800f0f51dd17e1f125f0100c4a87934acde7a03c2c15adfe95bacf591d31ac154adc08ae3443943cb810da9499755f1ebba6e9dca5675a740c69d SHA512 db1f34f130aee615acbf033c319911f8011dcfac5b653fbdd111168b32c184a2b481ff9e6bbae9934693a8370f2e77574a8b64a087ea0c0630f2b82f061681c5
 EBUILD qpdf-8.4.0.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
-EBUILD qpdf-8.4.1.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
+EBUILD qpdf-8.4.1.ebuild 1277 BLAKE2B a7a4b94e2fe88c4a4a10e82bcb85673b1425b56c76347e21101a0f0e94f92c4e7304d110ab003b731a8315b618dd35c071e102f486b726f30899d6081807bab6 SHA512 771c029e75a25d1d7c2ea14f9bbc364051a9419f513e070f7ba548b675d1e11dd4198d6dbd853de88b603d3183af8c65ced0c33498dd2df11c43be1229feb529
 MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
diff --git a/app-text/qpdf/qpdf-8.4.1.ebuild b/app-text/qpdf/qpdf-8.4.1.ebuild
index 320e39eb2a68..4555441c255b 100644
--- a/app-text/qpdf/qpdf-8.4.1.ebuild
+++ b/app-text/qpdf/qpdf-8.4.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/21"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/rman/Manifest b/app-text/rman/Manifest
index 3d66d947d52b..308ba40e4260 100644
--- a/app-text/rman/Manifest
+++ b/app-text/rman/Manifest
@@ -2,5 +2,5 @@ AUX rman-3.2-format-security.patch 458 BLAKE2B 85807cbc0ffa292c56794f61f37133381
 AUX rman-3.2-gentoo.diff 560 BLAKE2B 7f63625d37971f537c44667a05ec5b65c7c2216c05b5cc447fc802be3a35df365def1c8a95aebd5ed2f462eeced80cd1c106fb2708c231568a7666d1fa7335d4 SHA512 528b2e7385882620ecaa0374a65579e0fe56803aa6991277ea1279d18d65a4331ebbfc2374a711bda2f5722a5fcc236681f9c4dfb3c0abed1e931ff986cbf74e
 AUX rman-3.2-ldflags.patch 451 BLAKE2B ee44bfca1a15b8a52a42c703ca749722257f8ded019fa3119687f0808ad85ae696096bc29d5a7b04c4527382ad1f3f9d8d2d3e3bfb72005a167be3e95693a4b3 SHA512 936c9fb92e3f018ec0006370ea61f010b61469171a22a9f52a6773f32ef3ab01764b726573aa30548b1c9ea6db3893302a45d20c06bc19f7e272b5e531bec433
 DIST rman-3.2.tar.gz 79397 BLAKE2B 2be1c60f77c3b2c4fa73a59c5a8965da1c8b1f3b569e7e4d5716a372228bacb81c5421f4bbf330781aa231835393c915ed14057c717cb1e8ed57101f7febb37d SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae
-EBUILD rman-3.2-r1.ebuild 827 BLAKE2B c8009479031369a6fcbed5b82a19754d69cb580b3a6527c055bc7c611d377bf47bed9af2b5d4a37b8b6e532240ef8fa20c76a7d8c890025edb2381d8359fed01 SHA512 4d7b4a492185ae4924efda0d98816059468af14285891f609956ed6e7cbcc5d013d4d8172e96d7f1b9892fc8991aaa4d259aa807c730435716610bd90e76efac
+EBUILD rman-3.2-r1.ebuild 823 BLAKE2B 168b622d56892faa6e41642ce973a4b4c4cc633334a7d7828abb4ea9a974f3c7fdd09c5bc0e7d83203d99fb79a186f1dda854699f22874336ad148f3366ea6ad SHA512 0a5559eda13c5f2a971e99b35020359d1e1599b9af42e9574d788f21c49742e9cd5ce2039239adea2e7a947c1259c7f6b44bd81a712915cc1bd7e598cb5191a0
 MISC metadata.xml 334 BLAKE2B f3759592bab3b3f8426acb5a0fff5d5d7efb5618c951e2c0a26dcc119f609702f45327dcc47de6132befee7064536413006e77a09ab67415c041b0697129df6c SHA512 29d5b70060964469ce308fed8bc01e09bb74b3d2ac0605760d88f7dbd19a1cdd6517cdbab76f4269188454112837e0d27b32bbf3c5b9ecd5bb4d3ea4f862188c
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index a7c1c12e39bd..d891857e3a63 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-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"
+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=""
 
 RESTRICT="test"
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index fe7b3ae08bf9..feeea53efcb2 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -3,5 +3,5 @@ DIST t1utils-1.39.tar.gz 175047 BLAKE2B 346c6a400351e3662cb7ab88183c2f3b3934d4dd
 DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
 EBUILD t1utils-1.39.ebuild 644 BLAKE2B 9c15a7a5374adb05e68cd58074357208f53aa1d8e77aefc156577442879097696f939aebf22f745917c3cda777859e35eed43f2d646dfe65d6f64ab5ba5ada9b SHA512 b3a01745789d41b50a4ae48bfc020cc8d85da4c4b72e43976b45ff8b6cd8a542cc461afedac3452d7b39f23417d59acecc886a4c87e3ee3515693f63c9230e2d
 EBUILD t1utils-1.41-r1.ebuild 582 BLAKE2B 42785ac05287fd06f1656f0f92e3b0ba85c4ef25302581b6b736b935db13a3f1bf2324a222e730c4fa5ecffd56a8302d2a335159dfe0478dc3adcd1b51f71f96 SHA512 ec09c0b28ff09f1add4d9436df2c3fe293980ade630d31e58a0831140cc2ec68268ce59e1d4c7cb81e288420e42a2620154516783b456b55f8b072365334be18
-EBUILD t1utils-1.41-r2.ebuild 675 BLAKE2B c31d08e5661e13f59de60d25a2e4b93e599c806d4e107fd17b881d72e790e56a6145fa8e25ddc5745571e7da644fab22c1a18f116433d1a6283ce12b45d3d9b4 SHA512 6a0f286465be080486486709a7734d56025104487dbfba560697fa5df9d5af35295b3b13eb927a84bb2d1e3fc8371c2cc63e5dc9a45efe0999fc9c6e5b935a41
+EBUILD t1utils-1.41-r2.ebuild 674 BLAKE2B beb41c51330046c2552922724920b1c241cbdb6be66b7d46d9cf2aa522e70e3891a7a62f7538a36f67139303056ff95c788dcb96dc1c9735de3d0a85b13113a2 SHA512 910fb29b9b44b5926ad53c6d0d9f15368534aac7f0633dc144c2e388b3730082f7291a5198fbb24c37b2d80a62f560ea96621e057eb1e3918b20334e21e2a4c7
 MISC metadata.xml 347 BLAKE2B 2f19fa13fe0a6a3f521653e00c787e1e5b61a0d53ef30e06efb6ef104d560e90417512d9e72bed79f51a81bd465494ac469f23246705876cfb91da82fe31cddb SHA512 6a4884011de9218a6c0417b64690cc76c9c5be7a525f4439fb04e70c3ed287080fdb5707004d611107dee69230bb1f892078260bd18dfe7aa824d88e23dffc16
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
index 6c27c423023f..dfc88459ba3a 100644
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-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"
+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"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 59a7b8ca590f..f9acca026084 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -141,7 +141,7 @@ DIST uzb.traineddata-4.00 12505562 BLAKE2B e0fb586d07d70e13c03e2ae0ce7a974952819
 DIST uzb_cyrl.traineddata-4.00 10390622 BLAKE2B 055ad7b767d5e919cf386f3a1b2902bdf21918b7e7604d83b4e002f248c3ae209326c1cc78541bbdf58a12c96e7e072f5d935c76053bd7b65090191f9b0956af SHA512 d2e82371312bdeb3e4db73bb74270553165df2f4d2b62ae7de474286c8c02e27f7c5401c3857c60d0d1de3d02b9106e396de7cfa167b82bb8a874101498be0e7
 DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
 DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4ce4cbd40493d9b56b13ecc42e9e2b9030fd8ad80e44e8c784f344b0eabbdec65373135bffadf36cd79b25f19bd4d SHA512 6f73647d8fc4df104eb8a8b9444bb46e0ee7560dfff3c33055a791a17a9ffb78a857dac2aa0219c628469eea636f89eb1551151fd79d7ac8c2d4a09c68765560
-EBUILD tesseract-3.05.01.ebuild 5839 BLAKE2B 60b51c0673443da142de10d6b2494a0e6e64351ab05b93294834c2c7f0dd7b49cabfaa7b6ac3524f2448edf27a42d3c064e6eafaebe325b12734b39ac5fb72cf SHA512 bd9aafd41fff04ee0c0b725c402613050ebfffa0113a74352b8819bffae7aa6d200d18f9058db22cff312befe213c0468affc5efc36b08e8b544570a9a4241f5
+EBUILD tesseract-3.05.01.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-3.05.02.ebuild 5844 BLAKE2B 498c5b5e633af1319b785c3ea40bfd3de48022710bd5edc8d381bf0dbc7d2ab29b11524be669a43cdbaae439677d606eae67ee334077961f0dbd952dd16a1745 SHA512 f8f9adc9e12ecaad1aafae82fed5ad3169b54275e43b225e91931044bc76822d4ac39dacbe0fdcc57a551eccce44ed4e5600deb1c100aca546a4467dfded99d2
 EBUILD tesseract-4.0.0_beta4.ebuild 3965 BLAKE2B c8d8b17f998368aca538ee664e6cdf12f6beba3ee0fb90c5439b84d16623b50cb75f0c81623d2fb777967d8531de583308127ec4e49c1f2c55d41e718479dc85 SHA512 0de2ba12cfb65644e126d2c4b635f6d3621d9cf4b6f0dc40e5ce606d27f55e9d4ddae567af7ee0b7691b6b57c951687ab623fcb6d6d1cf8f5fcab75e083f8715
 EBUILD tesseract-9999.ebuild 3842 BLAKE2B aef57e284d1268d22a48e832bb451999e05bf0a870d399f9e2d83ac53705ef8df3ea95973a42cfd40adaecd81595dd92a5cc5810c26128af15b922532604fd06 SHA512 a9e6935469b8b8dfef11ccfe86b0df0cacd2e7cc536517f0092fbc9242c29e7df3ef128b4057a09df5ebc57516457a11a231f7df554d3a55c8b85e1c34594ec3
diff --git a/app-text/tesseract/tesseract-3.05.01.ebuild b/app-text/tesseract/tesseract-3.05.01.ebuild
index d237409e66ae..02784759ea3c 100644
--- a/app-text/tesseract/tesseract-3.05.01.ebuild
+++ b/app-text/tesseract/tesseract-3.05.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,7 +60,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
 
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index c57996c6451d..29b46cbc0957 100644
--- a/app-text/texi2html/Manifest
+++ b/app-text/texi2html/Manifest
@@ -1,3 +1,3 @@
 DIST texi2html-5.0.tar.bz2 15397249 BLAKE2B 3e502d9424c2936a922488aab7a66140c0a8369253a5500beeebcea0942ffa7b97fb7021b23212264e110d4bdab4850f263269aacf61de23ac6e052dfcf10d67 SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d
-EBUILD texi2html-5.0-r1.ebuild 1354 BLAKE2B 6e191188a097590e44fcf66fc9943c96c3fd3cd8069651d4dc4cca27ca3acc533a226e1ff551da268365eed4b54960dbe49715b794d762f99a1d74dba7c07d1c SHA512 0402c38e6ac525be20f915f2a9659052a6f0cda99e9311a65db43d482086018086d401e9c4d6702d1860688677a02d3c27964bf2728eb30a9eedfc5791ddde35
+EBUILD texi2html-5.0-r1.ebuild 1353 BLAKE2B 14b9bbb13aa0c18c9c0ade90a323c39dd5a0e4f6cbfafa067df6b80d32bbb212fa7df67863091eab6ad6c6dc0c393f22c329d3e5dc5bc7590fe15d8cea8b59fa SHA512 9f57defaec3e5a959885c0e8eef21e33c0b7f9207a7da95d19d79b3e2e83bba37552dc8d871ef69c1a5efc3ff6761b5c24897a3eda651ac572064660a2dad4a4
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index 89bcf9296bf7..f0c768a3b544 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
 SLOT="0"
-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"
+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="unicode"
 
 RDEPEND=">=dev-lang/perl-5.10.1
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 48f1b9323bfd..8daffa826688 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,10 +1,6 @@
-AUX texlive-core-2017-poppler064.patch 5491 BLAKE2B 2028747fba8ecf08a47d3f4348fef40095ca1cd7127eb0f332c0bcd68f396070cbd1c8a8daa1aa52315ec7a14fbbc5e10c82d5cdbfc3ed2db31f6c43a23a7678 SHA512 d05e79ba223f22d73c2bdb83020ab61b8eb0e7d2c963635afe6badbfcd5c8654bb93eb9aba8add9e49e5866563ac8e8ee54ce231f88526423cb915eeb08c9c0d
-AUX texlive-core-2017-poppler069.patch 7757 BLAKE2B 4465552809e9101058562f390d90e94e768eb55dfeb4724598c5aac1677a99379ebfbddcf0be3bb3f1c0bd4e308aec22d88c7526c9f2f7107381cfa5c44c54c4 SHA512 e1a9d7488b8a5cf92f0fe4111970f73f4f1308d5dfd4e7092d67ba46a891bcf25589da0b78fec5c99b9315e9f1527eeda97223151bdef562b37306d20b575e3d
-AUX texlive-core-2017-poppler071.patch 10031 BLAKE2B c9ca6c5b6b6ec0c2e5320dbf53bd845579a0e7bffbd723fa7e5d44297e9b23eac4018c5d4da913374c09eaf9d424787a8e421ad406c299445e83abed108f8b3d SHA512 4fec9eefbf3dabdba24258e2e6e5569113c239f339d481a8edd7c49443b4788e689be462baccdb639037441e4bc9634b196d73841e5cc7b69e6888ead259fabf
-AUX texlive-core-2017-poppler072.patch 6784 BLAKE2B f0253975e7f64b39f2671e3cf2d4bf27219309e5febbcd0e9a75529a0055c4bc44b9f5295af71a9c865e84322d1caf57f9ffe68f3eb00ad8ded5ff67c95329fc SHA512 6e6d99fab8ad0b3f3782531a19519c1967470661a48d5073c308e489f2254cad30483b75d7375dbdbccf20efce550cadc4383e06d8275b27ff778a1997869228
-AUX texlive-core-2017-poppler073.patch 2603 BLAKE2B 1d79005e38f1a0f31d47bee4d23b2ebe602f1e0850b628b667fb77ff42183c30c34ffbf506e75e53d56a26782efc3ae1d9c785ff4718b6215295fc2b54a4024b SHA512 8b7e53334787a492a4a1142ea19d03f989e77a375f5455ec3e2299d72522bd99d5ca5c96c7bf28a7ca99866bea1eb813933a51cebb7cf4551c433df4aa6539e1
 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-2017-poppler076.tar.xz 9232 BLAKE2B 945e4f8e6f3230b78dc43560c664fbe4989fb32759b41c0ef83d656b43b008030cebdbf668718c4f22831d01c3fe1466f686f7f6b76183d3d1bb5e760f17140d SHA512 63fb2b426921be5f6d310b31e7fea6fc0edc0900f4790445fcaface9c931ca6c3e8f98b81a3bccfd1c877750e854c9410a59ff9a124aa2826d7b4187d54ed8ab
 DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
 DIST texlive-module-a2ping-2017.tar.xz 31136 BLAKE2B cc0d99992cb780711a2a423fa26135845fa1f2cbbac76485d64a0b3184e338e7a60cdcfeaca129e6251f72110b0069c32164f9c4904d7f7c9c2edc6306f50411 SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41
 DIST texlive-module-a2ping.doc-2017.tar.xz 17524 BLAKE2B dea1db9fb3650c56161190823e4015d3e6399be3612f7e54702264a5187e72c7be987abb2cf8465d82711c9894d604fa03d79dc770bbf93b3404f18a633fbfa0 SHA512 8cfcc3b2a5dc462895a2bbd82f3a21537ae5d3fe81217b0b664b2008d6d18259f18de10e6eb3e3ac2655f96067b0f9bc6e30f69d068d9335598eb0b075eb4cea
@@ -163,5 +159,5 @@ DIST texlive-module-typeoutfileinfo-2017.tar.xz 1596 BLAKE2B 3c20d6daebac40630f4
 DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf44728d0fc474cd1a39036997366b9f4565f6a1648a27ec904fc24100ab0109d35825b171f9d094a165cf72f7fbcf53ce766c5cd6acd336f2ac0 SHA512 277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de
 DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
-EBUILD texlive-core-2017-r4.ebuild 11952 BLAKE2B 0f35e84dd6ca4c7e7ed51eef9c3e37c128ed94a679304d48563390b3c70f7f58f5fccd3a213dcbd97024ab0df2f75feeb9f95103bd68949dd9d5872c6a48d117 SHA512 7d8e91ef2030d32815cec9e0c9325112fe355819cc8110a71c496be484a9a3ccdeeb4f461364a4637dad5d146a825de884948a552d8690e4d016ffd19bce06c3
+EBUILD texlive-core-2017-r4.ebuild 12341 BLAKE2B 97ce4f9a733fddb0bc85ba3885ac9e988b89408b71d045fa3172d643937587193f1a71c9b156f71eabe4e59f155b2694c6f5d7522d4d2f463950cd7a8ffe1b6f SHA512 bc97b917ce1da33677f58b865d551c904efbb0b971a8f2cd25cb785c2e999b1f550cf08cec2e8df40fad934176994c4865732c7cee44a53458cf92e8e8c6a249
 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
deleted file mode 100644
index 9e4c7044975d..000000000000
--- a/app-text/texlive-core/files/texlive-core-2017-poppler064.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-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/files/texlive-core-2017-poppler069.patch b/app-text/texlive-core/files/texlive-core-2017-poppler069.patch
deleted file mode 100644
index 309341705006..000000000000
--- a/app-text/texlive-core/files/texlive-core-2017-poppler069.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 29f2412e10523158f5e601f32482d3d233a934fc Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 12 Jan 2019 21:42:09 +0100
-Subject: [PATCH 1/2] Fix build with poppler-0.69.0
-
----
- texk/web2c/luatexdir/image/epdf.h          |  1 +
- texk/web2c/luatexdir/image/pdftoepdf.w     | 14 +++++++-------
- texk/web2c/luatexdir/lua/lepdflib.cc       | 18 +++++++++---------
- texk/web2c/luatexdir/lua/lpdfscannerlib.cc |  1 +
- texk/web2c/pdftexdir/pdftoepdf.cc          |  7 ++++---
- texk/web2c/pdftexdir/pdftosrc.cc           |  5 +++--
- 6 files changed, 25 insertions(+), 21 deletions(-)
-
-diff --git a/texk/web2c/luatexdir/image/epdf.h b/texk/web2c/luatexdir/image/epdf.h
-index 57bb2e39..ebc83bdb 100644
---- a/texk/web2c/luatexdir/image/epdf.h
-+++ b/texk/web2c/luatexdir/image/epdf.h
-@@ -39,6 +39,7 @@ extern "C" {
- #  include <goo/GooString.h>
- #  include <goo/gmem.h>
- #  include <goo/gfile.h>
-+#  include <goo/gdir.h>
- #  include <Object.h>
- #  include <Stream.h>
- #  include <Gfx.h>
-diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
-index 3aebf009..0a23b201 100644
---- a/texk/web2c/luatexdir/image/pdftoepdf.w
-+++ b/texk/web2c/luatexdir/image/pdftoepdf.w
-@@ -31,7 +31,7 @@
- 
- extern void md5(Guchar *msg, int msgLen, Guchar *digest);
- 
--static GBool isInit = gFalse;
-+static bool isInit = false;
- 
- /* Maintain AVL tree of all PDF files for embedding */
- 
-@@ -468,7 +468,7 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj)
-         break;
-     /*
-     case objNum:
--        GBool isNum() { return type == objInt || type == objReal; }
-+        bool isNum() { return type == objInt || type == objReal; }
-         break;
-     */
-     case objString:
-@@ -587,11 +587,11 @@ void read_pdf_info(image_dict * idict)
-     PDFRectangle *pagebox;
-     int pdf_major_version_found, pdf_minor_version_found;
-     float xsize, ysize, xorig, yorig;
--    if (isInit == gFalse) {
-+    if (isInit == false) {
-         if (!(globalParams))
-             globalParams = new GlobalParams();
--        globalParams->setErrQuiet(gFalse);
--        isInit = gTrue;
-+        globalParams->setErrQuiet(false);
-+        isInit = true;
-     }
-     if (img_type(idict) == IMG_TYPE_PDF)
-         pdf_doc = refPdfDocument(img_filepath(idict), FE_FAIL);
-@@ -960,7 +960,7 @@ void epdf_free()
-     if (PdfDocumentTree != NULL)
-         avl_destroy(PdfDocumentTree, destroyPdfDocument);
-     PdfDocumentTree = NULL;
--    if (isInit == gTrue)
-+    if (isInit == true)
-         delete globalParams;
--    isInit = gFalse;
-+    isInit = false;
- }
-diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
-index 14558510..d47ec941 100644
---- a/texk/web2c/luatexdir/lua/lepdflib.cc
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
-@@ -1374,9 +1374,9 @@ static int m_Object_initBool(lua_State * L)
-         pdfdoc_changed_error(L);
-     luaL_checktype(L, 2, LUA_TBOOLEAN);
-     if (lua_toboolean(L, 2) != 0)
--        *((Object *) uin->d) = Object(gTrue);
-+        *((Object *) uin->d) = Object(true);
-     else
--        *((Object *) uin->d) = Object(gFalse);
-+        *((Object *) uin->d) = Object(false);
-     return 0;
- }
- 
-@@ -2881,12 +2881,12 @@ m_poppler_get_BOOL(Attribute, isHidden);
- 
- static int m_Attribute_setHidden(lua_State * L)
- {
--    GBool i;
-+    bool i;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    i = (GBool) lua_toboolean(L, 2);
-+    i = (bool) lua_toboolean(L, 2);
-     ((Attribute *) uin->d)->setHidden(i);
-     return 0;
- }
-@@ -3023,7 +3023,7 @@ static int m_StructElement_getParentRef(lua_State * L)
- // Ref is false if the C++ functione return false
- static int m_StructElement_getPageRef(lua_State * L)
- {
--    GBool b;
-+    bool b;
-     Ref *r;
-     udstruct *uin, *uout;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-@@ -3069,13 +3069,13 @@ static int m_StructElement_setRevision(lua_State * L)
- 
- static int m_StructElement_getText(lua_State * L)
- {
--    GBool i;
-+    bool i;
-     GooString *gs;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    i = (GBool) lua_toboolean(L, 2);
-+    i = (bool) lua_toboolean(L, 2);
-     gs =  ((StructElement *) uin->d)->getText(i);
-     if (gs != NULL)
-         lua_pushlstring(L, gs->getCString(), gs->getLength());
-@@ -3164,7 +3164,7 @@ static int m_StructElement_findAttribute(lua_State * L)
- {
-     Attribute::Type t;
-     Attribute::Owner o;
--    GBool g;
-+    bool g;
-     udstruct *uin, *uout;
-     const Attribute *a;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-@@ -3172,7 +3172,7 @@ static int m_StructElement_findAttribute(lua_State * L)
-         pdfdoc_changed_error(L);
-     t = (Attribute::Type) luaL_checkint(L,1);
-     o = (Attribute::Owner) luaL_checkint(L,2);
--    g = (GBool) lua_toboolean(L, 3);
-+    g = (bool) lua_toboolean(L, 3);
-     a = ((StructElement *) uin->d)->findAttribute(t,g,o);
- 
-     if (a!=NULL){
-diff --git a/texk/web2c/luatexdir/lua/lpdfscannerlib.cc b/texk/web2c/luatexdir/lua/lpdfscannerlib.cc
-index eb881b63..a2d39b83 100644
---- a/texk/web2c/luatexdir/lua/lpdfscannerlib.cc
-+++ b/texk/web2c/luatexdir/lua/lpdfscannerlib.cc
-@@ -34,6 +34,7 @@ extern "C" {
- #  include <goo/GooString.h>
- #  include <goo/gmem.h>
- #  include <goo/gfile.h>
-+#  include <goo/gdir.h>
- #  include <Object.h>
- #  include <Stream.h>
- #  include <Gfx.h>
-diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc
-index 0ffc3e19..af12c74e 100644
---- a/texk/web2c/pdftexdir/pdftoepdf.cc
-+++ b/texk/web2c/pdftexdir/pdftoepdf.cc
-@@ -37,6 +37,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <goo/GooString.h>
- #include <goo/gmem.h>
- #include <goo/gfile.h>
-+#include <goo/gdir.h>
- #define GString GooString
- #else
- #include <aconf.h>
-@@ -114,7 +115,7 @@ struct UsedEncoding {
- 
- static InObj *inObjList;
- static UsedEncoding *encodingList;
--static GBool isInit = gFalse;
-+static bool isInit = false;
- 
- // --------------------------------------------------------------------
- // Maintain list of open embedded PDF files
-@@ -718,8 +719,8 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
-     // initialize
-     if (!isInit) {
-         globalParams = new GlobalParams();
--        globalParams->setErrQuiet(gFalse);
--        isInit = gTrue;
-+        globalParams->setErrQuiet(false);
-+        isInit = true;
-     }
-     // open PDF file
-     pdf_doc = find_add_document(image_name);
-diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
-index ead9f209..22ab6bdc 100644
---- a/texk/web2c/pdftexdir/pdftosrc.cc
-+++ b/texk/web2c/pdftexdir/pdftosrc.cc
-@@ -31,6 +31,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <goo/GooString.h>
- #include <goo/gmem.h>
- #include <goo/gfile.h>
-+#include <goo/gdir.h>
- #else
- #include <aconf.h>
- #include <GString.h>
-@@ -167,8 +168,8 @@ int main(int argc, char *argv[])
- 
-                 // parse the header: object numbers and offsets
-                 objStr.streamReset();
--                str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first);
--                parser = new Parser(xref, new Lexer(xref, str), gFalse);
-+                str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
-+                parser = new Parser(xref, new Lexer(xref, str), false);
-                 for (n = 0; n < nObjects; ++n) {
-                     obj1 = parser->getObj();
-                     obj2 = parser->getObj();
--- 
-2.20.1
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler071.patch b/app-text/texlive-core/files/texlive-core-2017-poppler071.patch
deleted file mode 100644
index 6238002c2e59..000000000000
--- a/app-text/texlive-core/files/texlive-core-2017-poppler071.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From 2f77decfd2340c9a241dc508ae984a93dfef2643 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 12 Jan 2019 21:43:29 +0100
-Subject: [PATCH 2/2] Fix build with poppler-0.71.0
-
-Thanks-to: maurerpe <junk4me46806@yahoo.com>
----
- texk/web2c/luatexdir/image/pdftoepdf.w | 10 +++++-----
- texk/web2c/luatexdir/lua/lepdflib.cc   | 18 +++++++++---------
- texk/web2c/pdftexdir/pdftex-common.h   |  2 +-
- texk/web2c/pdftexdir/pdftoepdf.cc      | 20 ++++++++++----------
- texk/web2c/pdftexdir/writeenc.c        |  2 +-
- texk/web2c/xetexdir/pdfimage.cpp       |  2 +-
- 6 files changed, 27 insertions(+), 27 deletions(-)
-
-diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
-index 0a23b201..aa1d7f25 100644
---- a/texk/web2c/luatexdir/image/pdftoepdf.w
-+++ b/texk/web2c/luatexdir/image/pdftoepdf.w
-@@ -363,7 +363,7 @@ void copyReal(PDF pdf, double d)
- 
- static void copyString(PDF pdf, GooString * string)
- {
--    char *p;
-+    const char *p;
-     unsigned char c;
-     size_t i, l;
-     p = string->getCString();
-@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooString * string)
-     pdf->cave = true;
- }
- 
--static void copyName(PDF pdf, char *s)
-+static void copyName(PDF pdf, const char *s)
- {
-     pdf_out(pdf, '/');
-     for (; *s != 0; s++) {
-@@ -527,7 +527,7 @@ static void writeRefs(PDF pdf, PdfDocument * pdf_doc)
- 
- /* get the pagebox coordinates according to the pagebox_spec */
- 
--static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
-+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
- {
-     switch (pagebox_spec) {
-         case PDF_BOX_SPEC_MEDIA:
-@@ -584,7 +584,7 @@ void read_pdf_info(image_dict * idict)
-     Catalog *catalog;
-     Page *page;
-     int rotate;
--    PDFRectangle *pagebox;
-+    const PDFRectangle *pagebox;
-     int pdf_major_version_found, pdf_minor_version_found;
-     float xsize, ysize, xorig, yorig;
-     if (isInit == false) {
-@@ -721,7 +721,7 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info)
-     Ref *pageref;
-     Dict *pageDict;
-     Object obj1, contents, pageobj, pagesobj1, pagesobj2, *op1, *op2, *optmp;
--    PDFRectangle *pagebox;
-+    const PDFRectangle *pagebox;
-     int i, l;
-     double bbox[4];
-     /* char s[256]; */
-diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
-index d47ec941..01f9415c 100644
---- a/texk/web2c/luatexdir/lua/lepdflib.cc
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
-@@ -238,7 +238,7 @@ static int l_new_Attribute(lua_State * L)
-        if (uobj->pd != NULL && uobj->pd->pc != uobj->pc)
-           pdfdoc_changed_error(L);
-        uout = new_Attribute_userdata(L);
--       uout->d = new Attribute(n, nlen, (Object *)uobj->d);
-+       uout->d = new Attribute(GooString(n, nlen), (Object *)uobj->d);
-        uout->atype = ALLOC_LEPDF;
-        uout->pc = uobj->pc;
-        uout->pd = uobj->pd;
-@@ -443,7 +443,7 @@ static int m_##in##_##function(lua_State * L)                  \
-     uin = (udstruct *) luaL_checkudata(L, 1, M_##in);          \
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)             \
-         pdfdoc_changed_error(L);                               \
--    o = ((in *) uin->d)->function();                           \
-+    o = (out *) ((in *) uin->d)->function();		       \
-     if (o != NULL) {                                           \
-         uout = new_##out##_userdata(L);                        \
-         uout->d = o;                                           \
-@@ -972,12 +972,12 @@ m_poppler_get_INT(Dict, getLength);
- 
- static int m_Dict_add(lua_State * L)
- {
--    char *s;
-+    const char *s;
-     udstruct *uin, *uobj;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    s = copyString(luaL_checkstring(L, 2));
-+    s = luaL_checkstring(L, 2);
-     uobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
-     ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d)));
-     return 0;
-@@ -1894,7 +1894,7 @@ static int m_Object_dictAdd(lua_State * L)
-         pdfdoc_changed_error(L);
-     if (!((Object *) uin->d)->isDict())
-         luaL_error(L, "Object is not a Dict");
--    ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d)));
-+    ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d)));
-     return 0;
- }
- 
-@@ -2308,7 +2308,7 @@ m_PDFDoc_INT(getErrorCode);
- 
- static int m_PDFDoc_getFileName(lua_State * L)
- {
--    GooString *gs;
-+    const GooString *gs;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -2396,7 +2396,7 @@ m_PDFDoc_INT(getNumPages);
- 
- static int m_PDFDoc_readMetadata(lua_State * L)
- {
--    GooString *gs;
-+    const GooString *gs;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -2414,7 +2414,7 @@ static int m_PDFDoc_readMetadata(lua_State * L)
- 
- static int m_PDFDoc_getStructTreeRoot(lua_State * L)
- {
--    StructTreeRoot *obj;
-+    const StructTreeRoot *obj;
-     udstruct *uin, *uout;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -2422,7 +2422,7 @@ static int m_PDFDoc_getStructTreeRoot(lua_State * L)
-     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
-         obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
-         uout = new_StructTreeRoot_userdata(L);
--        uout->d = obj;
-+        uout->d = (StructTreeRoot *) obj;
-         uout->pc = uin->pc;
-         uout->pd = uin->pd;
-     } else
-diff --git a/texk/web2c/pdftexdir/pdftex-common.h b/texk/web2c/pdftexdir/pdftex-common.h
-index 307ba64a..09741707 100644
---- a/texk/web2c/pdftexdir/pdftex-common.h
-+++ b/texk/web2c/pdftexdir/pdftex-common.h
-@@ -101,7 +101,7 @@ extern void tex_printf(const char *, ...);
- extern void write_epdf(void);
- 
- /* writeenc.c */
--extern void epdf_write_enc(char **, int);
-+extern void epdf_write_enc(const char **, int);
- 
- /* writeimg.c */
- extern float epdf_width;
-diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc
-index af12c74e..e353b652 100644
---- a/texk/web2c/pdftexdir/pdftoepdf.cc
-+++ b/texk/web2c/pdftexdir/pdftoepdf.cc
-@@ -270,7 +270,7 @@ static int getNewObjectNumber(Ref ref)
- 
- static void copyObject(Object *);
- 
--static void copyName(char *s)
-+static void copyName(const char *s)
- {
-     pdf_puts("/");
-     for (; *s != 0; s++) {
-@@ -305,7 +305,7 @@ static void copyDict(Object * obj)
- static void copyFontDict(Object * obj, InObj * r)
- {
-     int i, l;
--    char *key;
-+    const char *key;
-     if (!obj->isDict())
-         pdftex_fail("PDF inclusion: invalid dict type <%s>",
-                     obj->getTypeName());
-@@ -377,7 +377,7 @@ static bool embeddableFont(Object * fontdesc)
-     return false;
- }
- 
--static void copyFont(char *tag, Object * fontRef)
-+static void copyFont(const char *tag, Object * fontRef)
- {
-     Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
-         stemV;
-@@ -462,7 +462,7 @@ static void copyFontResources(Object * obj)
-     pdf_puts(">>\n");
- }
- 
--static void copyOtherResources(Object * obj, char *key)
-+static void copyOtherResources(Object * obj, const char *key)
- {
-     // copies all other resources (write_epdf handles Fonts and ProcSets),
- 
-@@ -549,7 +549,7 @@ static void copyObject(Object * obj)
-     Object obj1;
-     int i, l, c;
-     Ref ref;
--    char *p;
-+    const char *p;
-     GString *s;
-     if (obj->isBool()) {
-         pdf_printf("%s", obj->getBool()? "true" : "false");
-@@ -650,7 +650,7 @@ static void writeRefs()
- static void writeEncodings()
- {
-     UsedEncoding *r, *n;
--    char *glyphNames[256], *s;
-+    const char *glyphNames[256], *s;
-     int i;
-     for (r = encodingList; r != 0; r = r->next) {
-         for (i = 0; i < 256; i++) {
-@@ -678,7 +678,7 @@ static void writeEncodings()
- }
- 
- // get the pagebox according to the pagebox_spec
--static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
-+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
- {
-     if (pagebox_spec == pdfboxspecmedia)
-         return page->getMediaBox();
-@@ -710,7 +710,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
- {
-     PdfDocument *pdf_doc;
-     Page *page;
--    PDFRectangle *pagebox;
-+    const PDFRectangle *pagebox;
- #ifdef POPPLER_VERSION
-     int pdf_major_version_found, pdf_minor_version_found;
- #else
-@@ -829,7 +829,7 @@ void write_epdf(void)
-     Object groupDict;
-     bool writeSepGroup = false;
-     Object info;
--    char *key;
-+    const char *key;
-     char s[256];
-     int i, l;
-     int rotate;
-@@ -856,7 +856,7 @@ void write_epdf(void)
-     pageObj = xref->fetch(pageRef->num, pageRef->gen);
-     pageDict = pageObj.getDict();
-     rotate = page->getRotate();
--    PDFRectangle *pagebox;
-+    const PDFRectangle *pagebox;
-     // write the Page header
-     pdf_puts("/Type /XObject\n");
-     pdf_puts("/Subtype /Form\n");
-diff --git a/texk/web2c/pdftexdir/writeenc.c b/texk/web2c/pdftexdir/writeenc.c
-index bd55103f..08f44633 100644
---- a/texk/web2c/pdftexdir/writeenc.c
-+++ b/texk/web2c/pdftexdir/writeenc.c
-@@ -83,7 +83,7 @@ fe_entry *get_fe_entry(char *s)
- 
- /**********************************************************************/
- 
--void epdf_write_enc(char **glyph_names, int fe_objnum)
-+void epdf_write_enc(const char **glyph_names, int fe_objnum)
- {
-     int i, i_old;
-     assert(glyph_names != NULL);
-diff --git a/texk/web2c/xetexdir/pdfimage.cpp b/texk/web2c/xetexdir/pdfimage.cpp
-index 85389136..ce46cae1 100644
---- a/texk/web2c/xetexdir/pdfimage.cpp
-+++ b/texk/web2c/xetexdir/pdfimage.cpp
-@@ -78,7 +78,7 @@ pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
- 
- 	Page*		page = doc->getCatalog()->getPage(page_num);
- 
--	PDFRectangle*	r;
-+	const PDFRectangle*	r;
- 	switch (pdf_box) {
- 		default:
- 		case pdfbox_crop:
--- 
-2.20.1
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler072.patch b/app-text/texlive-core/files/texlive-core-2017-poppler072.patch
deleted file mode 100644
index 489ff25fa006..000000000000
--- a/app-text/texlive-core/files/texlive-core-2017-poppler072.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 19462cf1b5628d7251cde91031a0635e636d890a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 12 Jan 2019 21:59:07 +0100
-Subject: [PATCH] Fix build with poppler-0.72
-
----
- texk/web2c/luatexdir/image/pdftoepdf.w |  2 +-
- texk/web2c/luatexdir/lua/lepdflib.cc   | 16 ++++++++--------
- texk/web2c/pdftexdir/pdftoepdf.cc      |  4 ++--
- texk/web2c/pdftexdir/pdftosrc.cc       |  6 +++---
- 4 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
-index aa1d7f25..2f143068 100644
---- a/texk/web2c/luatexdir/image/pdftoepdf.w
-+++ b/texk/web2c/luatexdir/image/pdftoepdf.w
-@@ -366,7 +366,7 @@ static void copyString(PDF pdf, GooString * string)
-     const char *p;
-     unsigned char c;
-     size_t i, l;
--    p = string->getCString();
-+    p = string->c_str();
-     l = (size_t) string->getLength();
-     if (pdf->cave)
-         pdf_out(pdf, ' ');
-diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
-index 01f9415c..6b24a39b 100644
---- a/texk/web2c/luatexdir/lua/lepdflib.cc
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
-@@ -523,7 +523,7 @@ static int m_##in##_##function(lua_State * L)                  \
-         pdfdoc_changed_error(L);                               \
-     gs = (GooString *)((in *) uin->d)->function();             \
-     if (gs != NULL)                                            \
--        lua_pushlstring(L, gs->getCString(), gs->getLength()); \
-+        lua_pushlstring(L, gs->c_str(), gs->getLength()); \
-     else                                                       \
-         lua_pushnil(L);                                        \
-     return 1;                                                  \
-@@ -758,7 +758,7 @@ static int m_Array_getString(lua_State * L)
-     if (i > 0 && i <= len) {
-         gs = new GooString();
-         if (((Array *) uin->d)->getString(i - 1, gs))
--            lua_pushlstring(L, gs->getCString(), gs->getLength());
-+            lua_pushlstring(L, gs->c_str(), gs->getLength());
-         else
-             lua_pushnil(L);
-         delete gs;
-@@ -910,7 +910,7 @@ static int m_Catalog_getJS(lua_State * L)
-     if (i > 0 && i <= len) {
-         gs = ((Catalog *) uin->d)->getJS(i - 1);
-         if (gs != NULL)
--            lua_pushlstring(L, gs->getCString(), gs->getLength());
-+            lua_pushlstring(L, gs->c_str(), gs->getLength());
-         else
-             lua_pushnil(L);
-         delete gs;
-@@ -1225,7 +1225,7 @@ static int m_GooString__tostring(lua_State * L)
-     uin = (udstruct *) luaL_checkudata(L, 1, M_GooString);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    lua_pushlstring(L, ((GooString *) uin->d)->getCString(),
-+    lua_pushlstring(L, ((GooString *) uin->d)->c_str(),
-                     ((GooString *) uin->d)->getLength());
-     return 1;
- }
-@@ -1657,7 +1657,7 @@ static int m_Object_getString(lua_State * L)
-         pdfdoc_changed_error(L);
-     if (((Object *) uin->d)->isString()) {
-         gs = (GooString *)((Object *) uin->d)->getString();
--        lua_pushlstring(L, gs->getCString(), gs->getLength());
-+        lua_pushlstring(L, gs->c_str(), gs->getLength());
-     } else
-         lua_pushnil(L);
-     return 1;
-@@ -2315,7 +2315,7 @@ static int m_PDFDoc_getFileName(lua_State * L)
-         pdfdoc_changed_error(L);
-     gs = ((PdfDocument *) uin->d)->doc->getFileName();
-     if (gs != NULL)
--        lua_pushlstring(L, gs->getCString(), gs->getLength());
-+        lua_pushlstring(L, gs->c_str(), gs->getLength());
-     else
-         lua_pushnil(L);
-     return 1;
-@@ -2404,7 +2404,7 @@ static int m_PDFDoc_readMetadata(lua_State * L)
-     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
-         gs = ((PdfDocument *) uin->d)->doc->readMetadata();
-         if (gs != NULL)
--            lua_pushlstring(L, gs->getCString(), gs->getLength());
-+            lua_pushlstring(L, gs->c_str(), gs->getLength());
-         else
-             lua_pushnil(L);
-     } else
-@@ -3078,7 +3078,7 @@ static int m_StructElement_getText(lua_State * L)
-     i = (bool) lua_toboolean(L, 2);
-     gs =  ((StructElement *) uin->d)->getText(i);
-     if (gs != NULL)
--        lua_pushlstring(L, gs->getCString(), gs->getLength());
-+        lua_pushlstring(L, gs->c_str(), gs->getLength());
-     else
-         lua_pushnil(L);
-     return 1;
-diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc
-index e353b652..84e9f7ce 100644
---- a/texk/web2c/pdftexdir/pdftoepdf.cc
-+++ b/texk/web2c/pdftexdir/pdftoepdf.cc
-@@ -422,7 +422,7 @@ static void copyFont(const char *tag, Object * fontRef)
-         charset = fontdesc.dictLookup("CharSet");
-         if (!charset.isNull() &&
-             charset.isString() && is_subsetable(fontmap))
--            epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
-+            epdf_mark_glyphs(fd, (char *)charset.getString()->c_str());
-         else
-             embed_whole_font(fd);
-         addFontDesc(fontdescRef.getRef(), fd);
-@@ -561,7 +561,7 @@ static void copyObject(Object * obj)
-         pdf_printf("%s", convertNumToPDF(obj->getNum()));
-     } else if (obj->isString()) {
-         s = (GooString *)obj->getString();
--        p = s->getCString();
-+        p = s->c_str();
-         l = s->getLength();
-         if (strlen(p) == (unsigned int) l) {
-             pdf_puts("(");
-diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
-index 22ab6bdc..bad1b78f 100644
---- a/texk/web2c/pdftexdir/pdftosrc.cc
-+++ b/texk/web2c/pdftexdir/pdftosrc.cc
-@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
-             fprintf(stderr, "No SourceName found\n");
-             exit(1);
-         }
--        outname = (char *)srcName.getString()->getCString();
-+        outname = (char *)srcName.getString()->c_str();
-         // We cannot free srcName, as objname shares its string.
-         // srcName.free();
-     } else if (objnum > 0) {
-@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
-             fprintf(stderr, "Not a Stream object\n");
-             exit(1);
-         }
--        sprintf(buf, "%s", fileName->getCString());
-+        sprintf(buf, "%s", fileName->c_str());
-         if ((p = strrchr(buf, '.')) == 0)
-             p = strchr(buf, 0);
-         if (objgen == 0)
-@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
-         outname = buf;
-     } else {                    // objnum < 0 means we are extracting the XRef table
-         extract_xref_table = true;
--        sprintf(buf, "%s", fileName->getCString());
-+        sprintf(buf, "%s", fileName->c_str());
-         if ((p = strrchr(buf, '.')) == 0)
-             p = strchr(buf, 0);
-         sprintf(p, ".xref");
--- 
-2.20.1
-
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler073.patch b/app-text/texlive-core/files/texlive-core-2017-poppler073.patch
deleted file mode 100644
index 487ecc0129c1..000000000000
--- a/app-text/texlive-core/files/texlive-core-2017-poppler073.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From b3df00dcf7332ae9b64f019278af8708c1ced284 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 16 Jan 2019 21:10:09 +0100
-Subject: [PATCH] Fix build with poppler-0.73
-
----
- texk/web2c/luatexdir/image/pdftoepdf.w | 2 +-
- texk/web2c/luatexdir/lua/lepdflib.cc   | 8 ++++----
- texk/web2c/pdftexdir/pdftosrc.cc       | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
-index 2f143068..10ed9879 100644
---- a/texk/web2c/luatexdir/image/pdftoepdf.w
-+++ b/texk/web2c/luatexdir/image/pdftoepdf.w
-@@ -29,7 +29,7 @@
-     the functions of poppler, which happens to be written in C++.
- */
- 
--extern void md5(Guchar *msg, int msgLen, Guchar *digest);
-+extern void md5(unsigned char *msg, int msgLen, unsigned char *digest);
- 
- static bool isInit = false;
- 
-diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
-index 6b24a39b..87078fc5 100644
---- a/texk/web2c/luatexdir/lua/lepdflib.cc
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
-@@ -2867,12 +2867,12 @@ m_poppler_get_GUINT(Attribute,getRevision);
- 
- static int m_Attribute_setRevision(lua_State * L)
- {
--    Guint i;
-+    unsigned int i;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    i = (Guint) luaL_checkint(L, 2);
-+    i = (unsigned int) luaL_checkint(L, 2);
-     ((Attribute *) uin->d)->setRevision(i);
-     return 0;
- }
-@@ -3057,12 +3057,12 @@ static int m_StructElement_getTypeName(lua_State * L)
- 
- static int m_StructElement_setRevision(lua_State * L)
- {
--    Guint i;
-+    unsigned int i;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    i = (Guint) luaL_checkint(L, 2);
-+    i = (unsigned int) luaL_checkint(L, 2);
-     ((StructElement *) uin->d)->setRevision(i);
-     return 0;
- }
-diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
-index bad1b78f..295c4e66 100644
---- a/texk/web2c/pdftexdir/pdftosrc.cc
-+++ b/texk/web2c/pdftexdir/pdftosrc.cc
-@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
-                 Object objStr, obj1, obj2;
-                 int nObjects, first, n;
-                 int localOffset = 0;
--                Guint firstOffset;
-+                unsigned int firstOffset;
- 
-                 objStr = xref->fetch(e->offset, 0);
-                 assert(objStr.isStream());
--- 
-2.20.1
-
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index e0cf232cbf42..890dbd171496 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -19,8 +19,10 @@ LICENSE="GPL-2 LPPL-1.3c TeX"
 SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
 
 # Fetch patches
+POPPLERPATCHES="${P}-poppler076"
 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
+	https://dev.gentoo.org/~asturm/distfiles/${POPPLERPATCHES}.tar.xz
 "
 #	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
 
@@ -164,10 +166,15 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 
 	# bug ?
-	epatch "${FILESDIR}/${P}-poppler064.patch"
+	epatch "${WORKDIR}/${POPPLERPATCHES}/${P}-poppler064.patch"
 
 	if has_version ">=app-text/poppler-0.69.0"; then
-		epatch "${FILESDIR}"/${P}-poppler0{69,71,72,73}.patch # bugs #672854, 675448
+		epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-poppler0{69,71,72,73}.patch # bugs #672854, 675448
+	fi
+
+	if has_version ">=app-text/poppler-0.75.0"; then
+		epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-pdftexdir-poppler0{75,76}.patch # bugs #681338, 685284
+		epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-luatexdir-poppler0{75,76}.patch # bugs #681338, 685284
 	fi
 
 	sed -i \
diff --git a/app-text/xfbib/Manifest b/app-text/xfbib/Manifest
deleted file mode 100644
index 9bafc32ea749..000000000000
--- a/app-text/xfbib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xfbib-0.0.2-validate.patch 349 BLAKE2B 282c326fe8f80039a10930777a063bd556447617c74dcd7ccee8ab0572169521029246e4ac2728b8188c19dff41d5c4df0027d338f454fdf0f66f625f819d1de SHA512 fffd683dc018889793dc9371c756ec89c89d7de0a1c863aba9bac3fad8660baf16688b02831f83c07642de401c134ed86b62e34c95018c8836c714ad2fe89035
-DIST xfbib-0.0.2.tar.bz2 340703 BLAKE2B 4f15fb39fc55e06b5cde8961db27661f3f2f2e954e52e809105fb7f3326f54c63e63acb6fa21585da8a5aa340eafd4bc33df73822fe9f6ac7a04e67d95db6e0a SHA512 7f6f812bfdb6b95574f66b63e51fb1a70ce20fd795b6070b055cdc8e753656a266237be92a7e60865d9f1e5fa750be0af3404ecf219a8a5d89dde505c759aebc
-EBUILD xfbib-0.0.2-r2.ebuild 859 BLAKE2B ac797067144696fbb734d69018fdd6aafbe93c108ab7c084a4bc72166d154e2ca0ee5ba2681e4ef348ba6a179b21ba06d9ca1f4499a76004d70fbb9df14b3cfa SHA512 117d12c679e6fa9e6b1f9c730deafdcbf81d210e2d82f104f116f141016527239b7b387d45b0bcb66742a4f63a2adf916fb497e3f7a26e8226a9961813010f66
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/app-text/xfbib/files/xfbib-0.0.2-validate.patch b/app-text/xfbib/files/xfbib-0.0.2-validate.patch
deleted file mode 100644
index a072b730c3a6..000000000000
--- a/app-text/xfbib/files/xfbib-0.0.2-validate.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xfbib.desktop
-+++ xfbib.desktop
-@@ -1,13 +1,11 @@
--
- [Desktop Entry]
--Encoding=UTF-8
- Name=Xfbib
- Exec=xfbib
- Icon=xfbib
- Type=Application
- Comment=A BibTeX editor for Xfce
--Terminal=0
--MimeType=text/x-bibtex
--Categories=Application;Office;GTK;
-+Terminal=false
-+MimeType=text/x-bibtex;
-+Categories=Office;GTK;
- GenericName=
- StartupNotify=false
diff --git a/app-text/xfbib/metadata.xml b/app-text/xfbib/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/app-text/xfbib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-text/xfbib/xfbib-0.0.2-r2.ebuild b/app-text/xfbib/xfbib-0.0.2-r2.ebuild
deleted file mode 100644
index 2a24e6eae3ee..000000000000
--- a/app-text/xfbib/xfbib-0.0.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="a lightweight BibTeX editor"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfbib"
-SRC_URI="https://goodies.xfce.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.12
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfcegui4-4.2
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-validate.patch
-	default
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index f583bad7e7fd..182db31cd214 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
 DIST yelp-tools-3.28.0.tar.xz 210496 BLAKE2B 2904b0ffe50f302d7f0938fecca74b37f6d070fe42fd681dd96b3a70b73244f65e204c34bb6f6ffb2b5bcd3400334b3d85a82807793b2bd30261c616382b8be6 SHA512 0b5adcb746ffb2b9c60303ef484dac01fbb59a06abf94bb8ec8a66bd573451939299688dec088a7421eab8f69ec2d7628475e81720640f0cb5b947a8d410ed62
 EBUILD yelp-tools-3.18.0.ebuild 665 BLAKE2B cca32e98a9cbcf49457795aa608955662f8a58ab7276b24aed66b5069f1f67de5c6ea5c244c4ec8dba26670b996e3d1554d210888fe339bc1f7b299b32aca978 SHA512 265e23a9f7286e866e85c431dbab8bed4f1c6477ac55029f1e55680cee77840be72260470d6bb81590174a16a0f5affc8c54fe8d072bd834ffb666f4d685f8c6
-EBUILD yelp-tools-3.28.0.ebuild 654 BLAKE2B d93a7ea632e15f4617cdd21a1a82d619c162158797c6da115eddfd497250aab0efadbcb87515216109861830bb7b6d11200baa3d757bba006dfebf2b4160ce26 SHA512 d0af1aecc928f9c6dbdef5e6866f6f5070a56e56a619cbba650d004eee88f3e6beb0ce2de357115102e90651f4acda467e547cdce99adacf11c53ee07b81ecbe
+EBUILD yelp-tools-3.28.0.ebuild 650 BLAKE2B b771bd288c85a98fa12c8c9c2df0a68e9dace8b2b191bfa26c8e0686d2959b0d6108ccfd9b3f640e5203cba795b8fb059b71794b88beaa67316d794c76d3f506 SHA512 f67a7908bfb4c4bc1ad7d578922454094513076b65b06fc81f3d74a60f60add54845a70a095c973c0bda0e772a07f753455f372708802f59f9fd0073d498bdd5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
index a991a8a83649..721dcd0a68a6 100644
--- a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="