gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /app-text
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
137 files changed, 1261 insertions, 882 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 86c888cf6e41..a33fe8a99852 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index f65194d28bdb..9409a00ac4d9 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,6 +1,8 @@
 DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9b0126ce86695c6b5840b69f94d0e5befbbfc355006a10d13d34e8ed3582f0bfb678744654a7d2040555016b1681 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
+DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
 DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab1503bd8d5d6bb6b7d66c442cf8bcd47ee4325dbb572bdcfd01168ef1bccc3430ee7c545e7b3a6715b8ebf09516ad9 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
-EBUILD asciidoc-8.6.10.ebuild 2417 BLAKE2B 05f2b65bc56930aa35a7b65162cacd357e609fe210f3433e42d63e2916a022dbd70961277a176a6ba33bd73e3a1d4a4f9d2b4e572a9f69d4bd9e7ca46e857316 SHA512 58b8bf69bfbac965e5ae33fd6e45da0680c68df64debc8940f7453b100481804778bc61b186cc09d85a2fd0b7a16933d6ab7b02652e590c1a3e5e9a0fcca7a48
+EBUILD asciidoc-8.6.10.ebuild 2412 BLAKE2B f86913608e5f13ea9509ba5432b0d1f9ec49c334fad7de9ba74989e01253d005c779a4cbc86f9887461f85b574a22f37002664cec814fed506890070870bca2a SHA512 67215f01089a47910b681de8f90fa99bd02514c0de6c98834a445b0cc39c3866b6f6cfebd0af933d96d96d2e80f32a6b2705cf1aea44a4ac6eca7c8624ab9190
+EBUILD asciidoc-8.6.10_p20181016.ebuild 2584 BLAKE2B 3d6b1a45cafe3bff679e08ab3527c80e0cf9b6765a3bf58b82153c653f0bef90911cb07eac6d389b04e8c022133db47268ab49d8ba28e6363236444f51e6b2bb SHA512 4d881457521fa12086124df79aa835210bbee9d6d7791489ddf83ac7a2032c8a1bf3ee21643a0a4be5b1ef836e8fb59f1e70bb53197ccf5bc0ad95b20c825617
 EBUILD asciidoc-8.6.9-r2.ebuild 2171 BLAKE2B 76606035ddef0bd31709a24a1b9896dda55ee1c299a043b46724da1a3d21565eddbd484ec0fd80db320c6db7aaaba1b340d6e1aac4bed7416724b9cd421791a8 SHA512 5a5bb301dab871ca93c282892c0e7a9421dad343dd529670385231397cfb96bdc01a483ce23fe86348c4af7ff2f00185006cb498e65b0eb5718e34c2fa7a3883
 EBUILD asciidoc-8.6.9-r6.ebuild 2370 BLAKE2B ffa3b9a29ff82b63eeb56d4af3c527ec62d19034086a40569116c8949fbb8bde289273f006f6f707cfed75d3f5302a8da7d09b01e998b58268aa83925eb39d31 SHA512 f953144beb29005d3a0027a644f3a1d68fbe54dafeeb2f22d176ef2a28fe92e7dc6b315c47d49e7d6132cefdef8f623e2b1c90f30337324fa90a418e6e29e39d
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10.ebuild b/app-text/asciidoc/asciidoc-8.6.10.ebuild
index b7b019cda57b..20e0726b1441 100644
--- a/app-text/asciidoc/asciidoc-8.6.10.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10.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
@@ -10,7 +10,7 @@ inherit autotools python-single-r1 readme.gentoo-r1
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
new file mode 100644
index 000000000000..bd7dd809d779
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit autotools python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
+MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
+SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2
+	${PYTHON_DEPS}
+	graphviz? ( media-gfx/graphviz )
+	highlight? (
+		|| (
+			dev-util/source-highlight
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/highlight
+		)
+	)"
+DEPEND="
+	test? (
+		app-text/dvipng
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
+		${PYTHON_DEPS}
+	)"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+S="${WORKDIR}/${PN}-py3-${MY_COMMIT}"
+
+src_prepare() {
+	default
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_test() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${EPYTHON}" tests/test${PN}.py update || die
+	"${EPYTHON}" tests/test${PN}.py run || die
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+	dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
+		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+	# Below results in some files being installed twice in different locations, but they are
+	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
+	if use examples; then
+		# examples/website is full of relative symlinks,
+		# deref them for copying, which dodoc doesn't do
+		cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index c7beb8d61c75..1fe335f20ff4 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,5 +4,5 @@ AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbd
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
-EBUILD aspell-0.60.7_rc1.ebuild 2716 BLAKE2B d2b20038a677038754f55728da07df623f69baf5e4221d0d435b6e9050cd0600d0a990e429091070f8ffe60f42f65fcec168c5c85a044b517c02fb6ca0c0a4e1 SHA512 19d5a12eaeae32975957bb7a7d664a7945bfb35b65b25065f64a510a679940c5d420c8cd3c3b1b23321824e9cdf7ee2b6265646a38f8ade12f1963ce82245ca6
+EBUILD aspell-0.60.7_rc1.ebuild 2715 BLAKE2B 06d035fba952118b6248e50644780a4645eb8706b65c64e55247272a9dfc8005589fe6dea4c42e3b52145f3ffa055a4d18032645b257e2cdcb9a23554b10962c SHA512 23ba2fb29445c969461a4cf00a1e4e21dc2d26cc4351f6a6f6f3784dd4f652bfcd91ecb1159fedec6dedd5ffd18b35e1c225cd7da92c6786bd3ad9fba38cda32
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
index 078e7eb71a35..5f2773604f59 100644
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ b/app-text/aspell/aspell-0.60.7_rc1.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
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 90a470674b2d..3a5f2719ee9b 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,5 +1,3 @@
-DIST atril-1.18.3.tar.xz 1695960 BLAKE2B 2479ddd46104153631d34070054e9ba72956468c7b720aa5dc3c4a458a00cc00484cdfefb01981f2e8beeb7a13f1fc3db940dcc9a728863a1378b5b896e71e57 SHA512 d57cf4386651cb871455b003482e896a2735fb023e0b11f192ed1d169e364306f9ba55ef163df02ffd236b5f86d6afe2c1068d00d3fbc309807ded729ce2355a
 DIST atril-1.22.0.tar.xz 1819580 BLAKE2B 6d5ae9e42407c5c7ae716c0650eda2085bc2206f442dbbb04dbf549263cdabe6d28761deb14bb9557534f26828882cf5b9373698b5e2c29f4b70445ebfabaa5b SHA512 bf940178647c348fd78e828bcb3a55c4ff6195d4020bf198ae5ba4a96e2fe582f7e30fb9d4cde4143e82ae783358373d3a9fd68413295586da9fe1b374e2f034
-EBUILD atril-1.18.3.ebuild 2164 BLAKE2B b846318383a8a5c62e7c48807172df259df46254d95eb64d962884c26decad08bf5023b6c07bf64c23a29ca534421daed0c2951d41b96f828a9ccd78e088974a SHA512 6c9782e6bd88b3258a54cbd4f31115f6527fd91a745c587ca872f9956afc6cb752b651aab86c18b563f935e469873efe780dc5965c6c6d3f2001cb3ca72a1a97
-EBUILD atril-1.22.0.ebuild 2137 BLAKE2B 43f5aa8fce52eab71cdee4de3c08627ee97fbdf7a5eb930bea44376a0f2965cebe8c4ea35781d31e22ba73d9a6dba7ca20826ef32a1c3ee6ab47b321b6572bb3 SHA512 53c279f7beb15f09ccb0a2aa6d3d2d999d541176997e9768deb2ed00854d7591e1c50775a8f6126407f934623d3af67f9f435ccf22c276d3befa3f313f50fcec
+EBUILD atril-1.22.0.ebuild 2114 BLAKE2B c3731b7086b91b09c2ff7eac2247caafe889286fd37ba7e43ef9cf276de60f42cc646421e3ef47cfe5540786aab12e2d746f20ff16f2f47344c35e536bed6164 SHA512 b8b9ab41fc5beeeb4463f3993d8bf7fe30c66a516aaec65f50be17932e3a3d8c44234d892678ea663c3790a4a4867af8c711607700ffd01e1f9efddf9b16107b
 MISC metadata.xml 782 BLAKE2B f87378442b88dfae4c1b06d6bfc3f3d13770271bb0c589ad37965325bdc0ac13cdbea3dc18fb41d48339a078c2d11c0adfa78a88da9216356c79fece0f5f39d9 SHA512 d3c0b43a5957c49d606b8eafd71ec8a0ef3e428e1953a0e8172c633bede7c9e1d468cf61eecb2f6cd980ff64ab02faf16c9501351ccebbc64175af9fb9b32477
diff --git a/app-text/atril/atril-1.18.3.ebuild b/app-text/atril/atril-1.18.3.ebuild
deleted file mode 100644
index 642717fb10c7..000000000000
--- a/app-text/atril/atril-1.18.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 )"
-
-COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libICE:0
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.17.1[introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base:0
-		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:0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.1:0 )
-	!!app-text/mate-document-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
-
-# 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/atril/atril-1.22.0.ebuild b/app-text/atril/atril-1.22.0.ebuild
index 6ccb2b4d54db..19cf67a3e376 100644
--- a/app-text/atril/atril-1.22.0.ebuild
+++ b/app-text/atril/atril-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
@@ -19,7 +19,8 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1l
 
 REQUIRED_USE="t1lib? ( dvi )"
 
-COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
+RDEPEND="
+	>=app-text/poppler-0.22[cairo]
 	dev-libs/atk
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libxml2-2.5:2
@@ -48,18 +49,17 @@ COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
 	xps? ( >=app-text/libgxps-0.2.1 )
 	!!app-text/mate-document-viewer"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+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/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 # Tests use dogtail which is not available on Gentoo.
 RESTRICT="test"
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index ed82ea909119..30b5dfbb927c 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
-DIST blogc-0.15.1.tar.xz 335708 BLAKE2B b8249c619a2d594895e02855cdae24e715393d4ff60d6eda4ed53c629c567e545ea78fca545a99e4bfa0f54545d8694f1ed40c001b7d1701963cf7a692351b21 SHA512 d22c67db483176d4cf873f0a4d2fd10a1413cee976e12fd49b3e35aa5edf80888dd7470e3523a08c45cf7fe700f578d9a0acc65863fd56776f91b30a13919573
-EBUILD blogc-0.15.1.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
+DIST blogc-0.16.1.tar.xz 336720 BLAKE2B 1b828ba6ba161ad74b0a880f5e84c43b8c5437e5ac6c745862b695bac0cbbdf6a313b9bacf97acedb5cff5650c71b0344f1a120090836c69441aa7feaa6c9cfa SHA512 bd408a4f9b9b10b7be324e03d70125aafff3bf59750820a8c947dc15323131a199372ffe00421f4ce949b22c65168088c0ed8ba0d55ba8dcab5f871a0dbd243b
+EBUILD blogc-0.16.1.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
 EBUILD blogc-9999.ebuild 1120 BLAKE2B 234392dc7c1e42c3bcd2c3ac4b1a648ee9e4fa6fc486cfcc60ef0af1c0cfb97ea68bc2b2ce3da820bdd88f05ef5993b7dc6589e52137d8d1e7cbce19d9c0a064 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9
 MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
diff --git a/app-text/blogc/blogc-0.15.1.ebuild b/app-text/blogc/blogc-0.16.1.ebuild
index d5c7c49e8ea5..d5c7c49e8ea5 100644
--- a/app-text/blogc/blogc-0.15.1.ebuild
+++ b/app-text/blogc/blogc-0.16.1.ebuild
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 3dbc496ebc7b..e421cef6afa6 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,6 +4,8 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 DIST calibre-3.40.1.tar.xz 38365300 BLAKE2B 5b1b8624d81d8a60d954b3871e46ae5dad8a49a7efb6e986cfef133da6da249fa8b36d1eed3840322ddec9c8144772c1e9504e114d27774096a9939f2a58a326 SHA512 1333c24e384ccae79d264055e1e84b8a13919e68d9290a277e07bb7f3b4579d15090859b50945672c155a438a2bf9e5f088f094bc30781af7c5d0d9ccd7226f4
+DIST calibre-3.41.3.tar.xz 38508848 BLAKE2B bbbe888bab285207a23a24a152b396cdc51723442e49d6e8ea6d3631cc4c6d67d421452d3d616d03dbe89f6df292dcdce5b564d6ed423dfece60a4bc59678a87 SHA512 9bed5d05fbe0a6b0e5c8d290f21ffc9b61c51767437aafb72afd3db94f755be3bd68f84cd1f73e5d15c7039dd0858a666975e860577f9ce84999aa9ed8e1a895
 EBUILD calibre-3.26.1.ebuild 9312 BLAKE2B b9e7712133717e608f2d6195fb3f4cc88a40f6628f74e7ae08294bc75bbb7ac42e29f7b07db77712028bc12b71950ffa3782a17dd028a7fa0e083cd2a58f733b SHA512 6a5297715b33057a539ddf46d195cdbef6a8fe9cc4f183dbc2dd78ec55352da288c904a969417c53b38db3500f4a2fb88df741fd1a0c54df11739b1e27471eb0
 EBUILD calibre-3.40.1.ebuild 9381 BLAKE2B dadfa37da609ea5134a8c88393c4f3a00a6136bd6b68e5e1ba46a35b3e92799328167a5292c0fc3123f83410bb06df64a15b81c80a5875685cc016cfac8186b8 SHA512 9ba128d123b602935c3426413b698ecd20f267731f84f1e373d8baf160435c57f81d71f3f967a3baf9cecb97eb0964368687f09c781ab9d684cd11c070c57dba
+EBUILD calibre-3.41.3.ebuild 9505 BLAKE2B d19763642dee91efa267c4ccf3be291274d8ab834bacf34efabf659e71de4cdcf2a18f012e34dc4067e9e569d7d4a2c127513c9b4ef56a531ed657c5d9785b50 SHA512 b08aeae0d4913842d64a4092816785024ac9ba2983baaca74e9ca6b5ffc35656b8b909819b4898be868778b29cf9dd2f582e61ce45c86b2666ba95269fb52568
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.41.3.ebuild b/app-text/calibre/calibre-3.41.3.ebuild
new file mode 100644
index 000000000000..08315bc6d741
--- /dev/null
+++ b/app-text/calibre/calibre-3.41.3.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# don't create/install uninstaller
+	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
+
+	sed -e 's:^#!/usr/bin/env python3$:#!/usr/bin/env python2:' \
+		-i src/calibre/devices/mtp/unix/upstream/update.py || die
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index b422a8f1678c..34459301428e 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,3 @@
 DIST cmark-0.28.3.tar.gz 229391 BLAKE2B b235d3dd8ed9b83d8fd6ec495d311bed854ad61d28e5a5087f40f7e512977892fcdff7c51e8683db87e0ee8e5e73338fe11b8829e70c6f07c59e917a8b7268cc SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29
-EBUILD cmark-0.28.3.ebuild 719 BLAKE2B 100296b5499dc7626cc44d81cb38aafae2757e94eb2ade386a24adfd1c41e4798fa3f7c746eeaa749d376d4dc7335519bd827fd4529c8702a3cd4ef5f29b5b20 SHA512 c7fd28032744e4807f7b4eeda7630aed8de99316a199fce886cedc6670ec1436e4695994c9b63df92ec25351e1e09ccfe69b6a0ad68ec2c1ce3d1c9efa208ca0
+EBUILD cmark-0.28.3.ebuild 717 BLAKE2B 43fdae7ded885c846c49588f92d7e2825d27fef728f7c9b375f9b306255b95bb57a829818b29ac5e7778b6431fbcb27ac92134fd3311375d48115ef79a1abd75 SHA512 64f2541ff91f125b6ca0dc9639e3f7d5992876d9fd9a586530232042a11ca5d730c6e23804903648013d1a20f3e155bd5c988dcb3956b090331415c8bb131f10
 MISC metadata.xml 577 BLAKE2B f99edfb972715ce4b1660a5e68c0261c9b8d8f2914f5bd804227bbddeae1528205bbed55c20d6d366ecfdd6a01a69bb31decd57ed40f0440de4946e86339e659 SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1
diff --git a/app-text/cmark/cmark-0.28.3.ebuild b/app-text/cmark/cmark-0.28.3.ebuild
index 215c1bf461aa..1b2f4a662904 100644
--- a/app-text/cmark/cmark-0.28.3.ebuild
+++ b/app-text/cmark/cmark-0.28.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/app-text/doconce/Manifest b/app-text/doconce/Manifest
index e0bc64fbf8d7..bb2964008c5c 100644
--- a/app-text/doconce/Manifest
+++ b/app-text/doconce/Manifest
@@ -1,5 +1,5 @@
 DIST doconce-1.3.tar.bz2 112034753 BLAKE2B 4ac826b09ca2dce93d8725868f6fa00a07b61835336a56b72f4d846cb81282cc6982ca25c7fc27d9e66aed5a22d3ef30badbc137748f7c6c3a2e078554b6715e SHA512 b59568e801f4cc5b7f01f3c3d344702ec80c65b5a065e2ece3b3ed8cb5f669739c9adf3caf96cd0b43c646ccae0f11325d5ca64ee1a325ac404ec6e5feb6148d
 DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31
-EBUILD doconce-1.3.ebuild 509 BLAKE2B f05c8416ac6cf3963229007f51b538384181c6332a73ee4ed4cac73dcc2e88b0cfe76665fc26dba0ebbe5a52b6b3244bd4d4daa738de37f54fa19da8e0b82345 SHA512 c54d6797c6f8397c7b4de5f8d5036d20481000105a85d5e4ebf06246d76d084b5370b811d8bbdc88164c7366231ccf53666f7788309f871260b161091478653c
+EBUILD doconce-1.3.ebuild 502 BLAKE2B 163499a2b033e562b584c0a2636a2004ba2adb53e08c3dc1e5816c7ac50e35bf4de1215d7a3e9f888d27d09c7d97cd0c4217e72c4f0dee71bd14d78c3ca7bc4d SHA512 f6bc20c935e48230edd0e5dd6b272ad36a573c472d75b66e2fa6e76e5bb0009ec821e99cdff7d5ac71bd9e9b67c9bac4a7448b5e1e98fe5854a13f661ad12de5
 EBUILD doconce-1.4.4.ebuild 781 BLAKE2B b0440491855d426fbb79fd529e639b3721737722ec4f27bc16fa97f5e5648890a8de411a60468efa9bf0492aa98032c449283acc4b24141830e868c28cb65741 SHA512 f144b7160e38817ef00c443f2083fe854775023db6df98f30bdb9943cde6705bb25aa04fb490084efbc1485da4d21ef4ac142d62cb85a7e8413ef2f5943eca0e
 MISC metadata.xml 886 BLAKE2B 0e17aef2ca8b68603b8d8b83d719d6224e3891594c07070acebfa25c22b7860e92dcc0cd856227626299c1d5f12d04f7e279afea75b7bb508854ea9ea15ecdf6 SHA512 51fd63b9e6ebef041891046676a22e11eb4addefa5730632f48843509fdfb7cb16d612b55941222d690a305ee50cf2d66557bdde64f6db35c71efe39019ca55b
diff --git a/app-text/doconce/doconce-1.3.ebuild b/app-text/doconce/doconce-1.3.ebuild
index 065c118dc878..b1f3108e9d7b 100644
--- a/app-text/doconce/doconce-1.3.ebuild
+++ b/app-text/doconce/doconce-1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 36c77d9531d8..94d8ba82e52d 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,4 +1,4 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
-EBUILD dvipng-1.15-r1.ebuild 1294 BLAKE2B c4bdfb2b64d8c81b410b03cc1044e62047f000720d00a48f5cbfc7340c39a6c6b0a5080bed826434a6b8d146e765dd7b9a2985ce5ed45ddf895fb94b350fdd46 SHA512 74ee4cd8c6b6e1e85dedf0d70e70280233d76032167c4788a2e4dbabf70d40d675c89f3b906ad88d0527fc93f9fa1a6484d4960391ccda672a2d575f57ddb86f
+EBUILD dvipng-1.15-r1.ebuild 1293 BLAKE2B 533b4e979f3487682f99944f6343ba78a76b91614b27a7fd0b11dc4bfeb05cc545cae551a1edeb1e4df2d288aca8e57c636116c35bec9fc499e00c566e476c5a SHA512 e6174f4489b7f0266d7a9d794edb5696d4b5770504f3d2294ec96be9f688554c94321a090366a753db964ccea3e9073430f8682d29586f56d49ac0d662f085dc
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index ce06c6f999cb..af72b049c50d 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 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 ~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 ~x86-solaris"
 IUSE="truetype test"
 
 RDEPEND="
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 6777adf6220a..d458a8286277 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,21 +1,7 @@
-DIST dvisvgm-1.10.tar.gz 831654 BLAKE2B 7da1032f2450cec4c166b622f488859069052a5792ead77bbadc425b24640f6c969887b22d07ec682f90b19e849668e89a3b2f8edd63ce39f0d80edcd32495e1 SHA512 2d3cb2e6b36d6a3b996347b6031f67bb89bc76d2bf0244347e512e66333536638caf855d9856771b10245387abae99a06d4c6fe33def814cae639810b4cfe906
 DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
-DIST dvisvgm-2.3.3.tar.gz 2805568 BLAKE2B 9823d2a8d3b736dfbbfbe0e5d51fb20bf61b4a8d236cc24fadd6e8a918f8f8305dedc23f6d7146574f9302a006a50e33621d350425e1b3c65d780d1354e7b239 SHA512 1b170b5979049f30aaaa5a85d8b5555e87a7af987298980d25c77aebd95b6be56a8518986b8a6eb2215b6dbd32dfbdfdcecb0c81f9d5ffa856370da1b324ed18
-DIST dvisvgm-2.3.4.tar.gz 2896641 BLAKE2B af434a418b5ebbb9acaccc4626b6278f3d0c76e4434b9ccec8a0454a109481527bc0a7ac3b242a64a68ca1d71233778d3a90b4c03946db9f1e94c625109f598c SHA512 53c1820dee70f8a017a950400538aa2fe111b762d2f7d3bdb6b8be17de6603395d6e083b73292e688241e6e3adccaaaa2f9d82d5fec7818c2f5779ff28914dd9
-DIST dvisvgm-2.3.5.tar.gz 2897194 BLAKE2B 7661d6f5ac097a6dc62cf873dee84ec47b55e4a87ec07597170d309ac4d8d06fa19e0e14dab3a6273f022c71112a00af4c0bf167e37687037f0c23d1ea74f20b SHA512 fcfbb8e53233383a61c0662951dc914d157eb64c89eb30f54afc36069d3ca6a347dae7e64febafee1ba9ea8d90b278da9cbe36b70169df48f12c42c077cd1038
-DIST dvisvgm-2.4.2.tar.gz 2918538 BLAKE2B 373e2e6a017189dc130cc40f9abfd4601a1764400858860104e764757e93758a7d12c6b8125d684ba7a9d4bb21fe2820007852ea2e46f57cd3fe7d61d2a4d63b SHA512 9c2dbf088244898ce86a177d81cbf67bbae2df8703dce686016e2b455f6eea516751e84521f8097b82bd6a9e5b294043e3ee38cd470ff6ac1633a976828b99fc
-DIST dvisvgm-2.4.tar.gz 2850942 BLAKE2B c1cdb4aed954bcb5704b83deba087403f366f0139b053b599029d103bd85306e58c7bffb1228d3ace02fd3be91eff002e6d1e45105bb8ccaa85945ba7bbf5210 SHA512 84f51fa8cbf0a32efe667321102b1705c613cc697d86d00df2e044cd97b1f390e1552af7da2891792ccef634507bbc6922f92f194f5acb7d05a48e268e708396
-DIST dvisvgm-2.5.tar.gz 2911331 BLAKE2B b9ee90f5e34784d690f6a9a80dd1cdc4ce516f1e50722a93a0ea6e03da4f60f1bb983fa8abd8e670b2719afbf3197e6483a5c401fa1d668f79569d6a21701be2 SHA512 a722abb94c93ed8f7a6a91730639b7471b37c8c215297efe2ee071ff31829911c49253f17ccbb01dcea578ff55f2b179d85a0d9d32f65ed34ab18455e844578e
 DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
-DIST dvisvgm-2.6.tar.gz 2978741 BLAKE2B 342da9c26d05cf319053206d84e8c12ec3f3984b515f8fa6483a1ce5bf1748477f1119e8e03847a28c6458ba25229fd735a63122257450612fcc226a2e871441 SHA512 02fc3a92fe80d7146a1bc84eaa28fac714f533d9bcc3847993da978a66f533400c2c03019bb5efb3c16fcbf6774c565b1f6149cd15f4e04ae05304f879392b05
-EBUILD dvisvgm-1.10.ebuild 1090 BLAKE2B b4c79de3986a2fba7881da8c2434f1678d7b367f8b13dea7bf7421dcf68f6250681562754100a081b42c9b7d9d3d02cbadc8e7658faf26b29b6c9d2c2a317843 SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc
-EBUILD dvisvgm-2.1.3.ebuild 1144 BLAKE2B 905c8dd91653845c82e4ab1065eb69961b5a3fb4d0e0cd61f0174f9185d5cc376ede38becab539a8a60182a1f94fcfa871b1598ce269144fe133ec23a498b9b9 SHA512 d6e0f9fba9b8636e126ebf30c7eca4c14a9e31cb3e5e7bbc220a2f49c91e293e5cdaf23321be066dd38204e8abfa06d45a08577a78da589b28f1fccaf8fd8bea
-EBUILD dvisvgm-2.3.3.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
-EBUILD dvisvgm-2.3.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
-EBUILD dvisvgm-2.3.5.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
-EBUILD dvisvgm-2.4.2.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
-EBUILD dvisvgm-2.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
-EBUILD dvisvgm-2.5.ebuild 1220 BLAKE2B e5b91caafe503225573fde1ee223a87e011d7a7a7dcf22bbd057582384ed5acda31f9397d6423ef246049c830fca5a4c812d1dd9e6ae53b1225879e8a063c86d SHA512 2ff610011845f72035ae13c22fa306cc3bc9eb1f5a6d78def02729b9e1e8528c7bb5882af056b7f0798527b09fa47c2e04353b95e0ee0e121a72002ea93337ca
-EBUILD dvisvgm-2.6.1.ebuild 1220 BLAKE2B e5b91caafe503225573fde1ee223a87e011d7a7a7dcf22bbd057582384ed5acda31f9397d6423ef246049c830fca5a4c812d1dd9e6ae53b1225879e8a063c86d SHA512 2ff610011845f72035ae13c22fa306cc3bc9eb1f5a6d78def02729b9e1e8528c7bb5882af056b7f0798527b09fa47c2e04353b95e0ee0e121a72002ea93337ca
-EBUILD dvisvgm-2.6.ebuild 1220 BLAKE2B e5b91caafe503225573fde1ee223a87e011d7a7a7dcf22bbd057582384ed5acda31f9397d6423ef246049c830fca5a4c812d1dd9e6ae53b1225879e8a063c86d SHA512 2ff610011845f72035ae13c22fa306cc3bc9eb1f5a6d78def02729b9e1e8528c7bb5882af056b7f0798527b09fa47c2e04353b95e0ee0e121a72002ea93337ca
+DIST dvisvgm-2.7.tar.gz 3037242 BLAKE2B f93bcc4220adf4b2c0d7e06deb11416f22c623f07c96ca9aa9093054e18ec72f8da1d93aa4ee467f82f9478bb0c1b8acebbb56de020f47563056dd0dbea5936e SHA512 b706085015d1ab4c9b88997cf6c1c93f6c0ee60c9d1429d3fba7bed7b5acb3392958f64b4207ae27e6eb52abb19ff9640e2b7459e4b19ae21986b82d4b65b182
+EBUILD dvisvgm-2.1.3.ebuild 1133 BLAKE2B 539dbf877da7971b3a3b3f7134ceb4e0a8a901789df432d62c445c1fed973daaa7e3fe72e133b384f7676d697b68a5d9909a9e0e3c4af476ef6263082643e38f SHA512 964c71feda01cf0ba7ee6f72773a1b735cc0e96440b455966f5e0fbb29abb6b93c318e1252ebea8cabaed98976b93c0eefd05ce2a25476b685b5208f69235652
+EBUILD dvisvgm-2.6.1.ebuild 1224 BLAKE2B 79a4356389afa033c41625b3c78146d86d04cd89ddd86411fdfa2309a40fc9f38f78d31b8a497d76dda045d756927158eaa56faeaf3b1ea0385b610531fff340 SHA512 361f3a1ec530a0f5866c10d94dc54daba96773f93c1a7a591786181d315ee3f72422e55c40a1681e00d572e628b1ac60d356b681f71d045e9d275fddcb518bae
+EBUILD dvisvgm-2.7.ebuild 1224 BLAKE2B d3a3b5e0f5960fd7d86c5c04a771c939f61845109bcaff875ef7995b713dee085213b0e2ef32fd3eb029e341ee26cd12db6978d76279b012ca350aefb3921f05 SHA512 e0d0aa37a413f60cde5c03052f8fb192246e1dfc3823bfa788e3b4d41755c491fb0d804fa6d95234229f6477cdcdac19dc24d805bf8ce0543c052ec71e2d4887
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-1.10.ebuild b/app-text/dvisvgm/dvisvgm-1.10.ebuild
deleted file mode 100644
index 4440b796de58..000000000000
--- a/app-text/dvisvgm/dvisvgm-1.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	default
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
index 1352f686af2b..3e4152d3cf92 100644
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
+HOMEPAGE="https://dvisvgm.de/"
 SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/app-text/dvisvgm/dvisvgm-2.3.3.ebuild b/app-text/dvisvgm/dvisvgm-2.3.3.ebuild
deleted file mode 100644
index e2eec8fc99a8..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.3.3.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 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	dev-libs/kpathsea:=
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local myargs=(
-		--without-ttfautohint
-	)
-	econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.3.5.ebuild b/app-text/dvisvgm/dvisvgm-2.3.5.ebuild
deleted file mode 100644
index e2eec8fc99a8..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.3.5.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 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	dev-libs/kpathsea:=
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local myargs=(
-		--without-ttfautohint
-	)
-	econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.4.2.ebuild b/app-text/dvisvgm/dvisvgm-2.4.2.ebuild
deleted file mode 100644
index e2eec8fc99a8..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.4.2.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 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	dev-libs/kpathsea:=
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local myargs=(
-		--without-ttfautohint
-	)
-	econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.4.ebuild b/app-text/dvisvgm/dvisvgm-2.4.ebuild
deleted file mode 100644
index e2eec8fc99a8..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.4.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 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	dev-libs/kpathsea:=
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local myargs=(
-		--without-ttfautohint
-	)
-	econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.5.ebuild b/app-text/dvisvgm/dvisvgm-2.5.ebuild
deleted file mode 100644
index 86e6574e6539..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
-	>=app-arch/brotli-1.0.5
-	app-text/ghostscript-gpl
-	dev-libs/kpathsea:=
-	>=dev-libs/xxhash-0.6.5
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	>=media-libs/woff2-1.0.2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local myargs=(
-		--without-ttfautohint
-	)
-	econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
index 86e6574e6539..59fb93309c6f 100644
--- a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.6.1.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
@@ -6,12 +6,12 @@ EAPI=6
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
+HOMEPAGE="https://dvisvgm.de/"
 SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/dvisvgm/dvisvgm-2.6.ebuild b/app-text/dvisvgm/dvisvgm-2.6.ebuild
deleted file mode 100644
index 86e6574e6539..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
-	>=app-arch/brotli-1.0.5
-	app-text/ghostscript-gpl
-	dev-libs/kpathsea:=
-	>=dev-libs/xxhash-0.6.5
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	>=media-libs/woff2-1.0.2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local myargs=(
-		--without-ttfautohint
-	)
-	econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.3.4.ebuild b/app-text/dvisvgm/dvisvgm-2.7.ebuild
index e2eec8fc99a8..ace7733c8139 100644
--- a/app-text/dvisvgm/dvisvgm-2.3.4.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.7.ebuild
@@ -1,12 +1,12 @@
-# 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 toolchain-funcs flag-o-matic
 
 DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
+HOMEPAGE="https://dvisvgm.de/"
 SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -21,10 +21,13 @@ RESTRICT="test"
 
 # TODO unbundle app-arch/brotli
 RDEPEND="virtual/tex-base
+	>=app-arch/brotli-1.0.5
 	app-text/ghostscript-gpl
 	dev-libs/kpathsea:=
+	>=dev-libs/xxhash-0.6.5
 	>=media-gfx/potrace-1.10-r1
 	media-libs/freetype:2
+	>=media-libs/woff2-1.0.2
 	dev-libs/kpathsea
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index f90f4b58de0f..fcb266da5b29 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -5,7 +5,7 @@ DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e81
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
 DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
-EBUILD enchant-1.6.1-r1.ebuild 1632 BLAKE2B cac99741474e96a94f3a42a78d0ebd89ab65257ada3f68c71abf398d985aead724b535203e6a37bd30794a852db9249e29bc796f79fc8796a7e28681b963101b SHA512 842446d8c9925aab2465c5d72b13afff36c0afc0b49312e89706fc3099f1da2ff6e6c9e6d38fa23a93a5817d249aed7ccbe94111e175e3c89dce3ea513f7c29f
+EBUILD enchant-1.6.1-r1.ebuild 1631 BLAKE2B c63e661b7c8afa6930d173ba39dc3b1367fab36ccf840bedd3120452e83454c3284996ffcf11b0cda94d4630db0558dbe7a6098343bdf948edb79d9eb906b2da SHA512 122bae15ad3c503634e08990e1f533ad4d978a156040b72391dc8485f81c214de7a346679bcce1afe1f1790f03658fc899ca2715c131efe70b1b9b1b990a85e5
 EBUILD enchant-1.6.1.ebuild 1497 BLAKE2B 0a9aefe2919ec376d33ac79e271014c065a26cfa4dd70e760efbbd3b76e6723127fb588f4365aec905215236ed407eccb25a9943067bd198ce67f6b7b41adc3c SHA512 ca846dd37eb5e9fabcb512dfb2c77dcecacf22018a3ba5e61528180c2c879f0a849236ad7799121f9f0839bd250078480c2c80f792756d301518e06bd3c7b01a
 EBUILD enchant-2.1.0.ebuild 1315 BLAKE2B 099906e37a942d542e7bf55a4f86e2def554890f131ebb2a717a270a1b7e1582200468f403eaeeb669d8e253ec437beaa8117f5ac8c05d757983caaa7158ba61 SHA512 6c6261e70abe20d1a4ad83b3b3d0cf68fa29543d3f676301ad16fbbd4d8477b3add24accdf94b9c14bcd970a27385c88bf1c8b516a4cdfa720e81bf9c6204515
 EBUILD enchant-2.1.1.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 0d2a19a27b5c..fd728013364b 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 34f271493e55..6e267f3af73a 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,8 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
 DIST evince-3.28.5.tar.xz 2196432 BLAKE2B 992e37ad3cb82934efbdcd83afa89dc7589104045e828c6516650ee0a3fc89b99dff3fe0a723691e95adba9a5cf767a95ec18690697df15310437c7980ccbf55 SHA512 42fcf1396546f62910966b31bc657e5d3532a6bf32e87590b057efded1597de5765ed5c17ae98208a5dafca54da9c8e81f451e4133df656aaf4a9966da457bc3
 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.32.0.ebuild 3127 BLAKE2B 32b9d29b0e68b7a8421730f546dad584d3962ff9e5219ae68f2e5afaf943c6d52c290b3cb82fc0b9d13fdd553e19187b8f611a07218e82be6f1a86deef7b65f2 SHA512 14aab1578a9025b8bbd9d6adc1e8d00f2f54a166f373349167ad993ac524a020e5818622b9b17fd9b0be23ca1db5159077a101d6215c6cb68395849e2941e12d
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.32.0.ebuild b/app-text/evince/evince-3.32.0.ebuild
new file mode 100644
index 000000000000..b1965cc88ea6
--- /dev/null
+++ b/app-text/evince/evince-3.32.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+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"
+
+# atk used in libview
+# bundles unarr
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.36:2[dbus]
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.33[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.4 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	app-text/yelp-tools
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+PATCHES=(
+	"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
+)
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_with spell gspell) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/app-text/fblog/Manifest b/app-text/fblog/Manifest
new file mode 100644
index 000000000000..40ea45b1f3f9
--- /dev/null
+++ b/app-text/fblog/Manifest
@@ -0,0 +1,37 @@
+DIST aho-corasick-0.6.8.crate 26786 BLAKE2B 877bac172514332ef3c607fa3c9b4708822543f69091b3151d31d9297306dbcb0b6ce9cf5ba02f3c08f5baff337e3525ada8f22477770fd6aa12cce428694a36 SHA512 1adbce716a3082c3fcd3514c49af3872d926df14044767266707862c0ad7ee22848a6ce99903003c04a3e8f8cd91b38ec8ca5d4a2c9031bfec4c93cf71c15556
+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 cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST fblog-1.2.0.crate 176759 BLAKE2B bba1157f78fa457ad9c091b7f7ad3db5e681e669676976c8ffec142a40f50d2feb0eef68a6e33850883715d2825561f12d842b5f8d88c42149dd5c8cd1b10e83 SHA512 bbdb8ccf29d0499e0df8b0bb187888d46e278f7c57a4a0224c4b055a74159030a50c497abd9a406b35327e9ac18114b9c24ad0d8a18fbc61e2ab9c9a02e8ca4b
+DIST hlua-0.4.1.crate 30771 BLAKE2B b2b5b39f1a686d57fdfc54d97badd4b612913518da85cf901acf3f18cebaa7c8af8a919f659ccfa47f3eebe2827b742069f63167484f6f62274c07638a548f6e SHA512 992fa3236d19906bbb0dfa1054e89e2f78fa47e858f3cf7b2a6aeb3c6c031c49084115e18640e6fe105535a3fd124467b9f61783aedc5b9c2e670d2fe326280d
+DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
+DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
+DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
+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 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_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-1.0.5.crate 245770 BLAKE2B 2bb5dcf7778ff6e6316f80a028e9e0df34d77660dc1fb21250238de250335ea2546050b0c56c077c4e64788a0fd2b27f7ea6de639feb2b99590fe9e8a2d32e1b SHA512 a4ddc78fcae0a2b3c0e041382bc8c85a216ff380212762459637934c863782445cd289f5cd60c2a923ea9161f4dad9891210fe6a86cd6bbc8db8abd98ead34ce
+DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
+DIST ryu-0.2.6.crate 39911 BLAKE2B 3dda01a1da474c106d36f63dbc762f5b7eb37e5b0c545bcc4cc992ebabaf02e0649cbbb27f81971cd4c27cc51453f4981eac869768a0cdb31ece3a68a6f8976d SHA512 fa7596d53f3a16673df016aa75a4cc7a637456db595daeb9e4a0a393c7ab7d18b669bcd2886f65a4421897c0261ac57ff85d9c452772e172a4bb6c11b61a8f1f
+DIST serde-1.0.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
+DIST serde_json-1.0.32.crate 69507 BLAKE2B 943e59250dbafdecc4c55709105259ec2f51737290ecdd25d197329eb5c2ef618dcff155e38d19e29662ac13b9f6500fc04fdfcb0d18c8e2a87545e075f77b3c SHA512 31add4ee25db06aa61f4b94ddb57a54c38ea734de01bf91d159ecdaa0351265837336fdec7886e9d5b1056106a6d04acbecdd39f57e5f2a96642d462ce3a4c13
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+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 unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST utf8-ranges-1.0.1.crate 9247 BLAKE2B e1a4a867c32b54b239338ba4c9a209cd5265320349a0a691f70793f1e4f1c9eddfd477cf2f11e4d4cd72e8f78e09fa32562eb0c57a3c7126a37675008b5ce7d8 SHA512 c17ca6aa679f1f974c9673fac6116c5bb48ff59ca65a968520d5e89c52a7d4409d578df4b28dd3feb4aee208d796a47641c4f1de71810de36905c6cd3439ff97
+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-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
+MISC metadata.xml 477 BLAKE2B 096b056ad3372685c163fded9f6bb7cbc2404950dac40b72e8b321c1530deba3728e1123b9fd158f799588cc3b10e3c97ff83132e313b5fc99f18049e2884a56 SHA512 94576bea6800d4aba812303abe6f6366c0fba1ecc35feed1402a383070915594e964941738a19b0b571e7577e2d06355d7204bda920f2f56904fbbf77338f7aa
diff --git a/app-text/fblog/fblog-1.2.0.ebuild b/app-text/fblog/fblog-1.2.0.ebuild
new file mode 100644
index 000000000000..764b6b2f1ff5
--- /dev/null
+++ b/app-text/fblog/fblog-1.2.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.8
+ansi_term-0.11.0
+atty-0.2.11
+bitflags-1.0.4
+cc-1.0.25
+cfg-if-0.1.6
+clap-2.32.0
+fblog-1.2.0
+hlua-0.4.1
+itoa-0.4.3
+lazy_static-1.1.0
+libc-0.2.43
+lua52-sys-0.1.2
+maplit-1.0.1
+memchr-2.1.0
+pkg-config-0.3.14
+redox_syscall-0.1.40
+redox_termios-0.1.1
+regex-1.0.5
+regex-syntax-0.6.2
+ryu-0.2.6
+serde-1.0.80
+serde_json-1.0.32
+strsim-0.7.0
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+ucd-util-0.1.1
+unicode-width-0.1.5
+utf8-ranges-1.0.1
+vec_map-0.8.1
+version_check-0.1.5
+winapi-0.3.6
+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.29.1"
+
+DOCS=( README.org )
+
+QA_FLAGS_IGNORED="/usr/bin/fblog"
+
+src_install() {
+	cargo_src_install --path=.
+	einstalldocs
+}
diff --git a/app-text/fblog/metadata.xml b/app-text/fblog/metadata.xml
new file mode 100644
index 000000000000..bf986398f805
--- /dev/null
+++ b/app-text/fblog/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		A small tool to view json log files
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/brocode/fblog/issues</bugs-to>
+		<remote-id type="github">brocode/fblog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index fafe06b789ab..6eb79eea0942 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,3 @@
-AUX ghostscript-gpl-9.25-no-gtk3.patch 1605 BLAKE2B 8aad19d4496ef2b43169261cc5919ad2d015940d36b86ae1828cfb2f6386cd838e89b3d51531dce36934b3aecd1d33e0c2d71c269017fcf36289606b43f76486 SHA512 6c3d6a5d9be09eedf451496c221a707f90f639261a417386331f3aa8a24c82795c891ea1bbad086e3a01f706769adb591a9ac4ae358e0b86a1a22ad06687dac7
 DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
 DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 EBUILD ghostscript-gpl-9.26.ebuild 5150 BLAKE2B 24cd87418056e9ebc8505d87ad0046d158126f3c0eb66a1895ac89ad88075fdf8820d2f9f09d6ae06f2635610131f74647c250bac9dd0de608888ea761d96376 SHA512 6bc420cff6e84d3db7fd7fc860d34c00ae1366586f458fc636539595b8d18961ce79cfce0e66198faa44590b4ca770b0ad05ea10fde497279b4ad9bd78b53c92
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch
deleted file mode 100644
index 34cc2ec88c14..000000000000
--- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a73071b87a61acf1237da5ad9da59bae9316fb8c Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Mon, 8 Oct 2018 09:24:22 +0100
-Subject: [PATCH] Bug 699907: Reinstate GTK+ 2.x.x code.
-
-The fix (from March 2018) for deprecated API calls in the GTK+ 3.x.x API
-didn't account for the new, supported methods not being available in
-GTK+ 2.x.x. Handle both cases, as we do elsewhere.
----
- psi/dxmain.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/psi/dxmain.c b/psi/dxmain.c
-index 72c060e..250269a 100644
---- a/psi/dxmain.c
-+++ b/psi/dxmain.c
-@@ -354,17 +354,23 @@ static void window_resize(IMAGE *img)
- #endif
- 
-     if (!visible) {
--        guint width, height;
-         /* We haven't yet shown the window, so set a default size
-          * which is smaller than the desktop to allow room for
-          * desktop toolbars, and if possible a little larger than
-          * the image to allow room for the scroll bars.
-          * We don't know the width of the scroll bars, so just guess. */
-+#if !GTK_CHECK_VERSION(3, 0, 0)
-+        gtk_window_set_default_size(GTK_WINDOW(img->window),
-+            min(gdk_screen_width()-96, img->width+24),
-+            min(gdk_screen_height()-96, img->height+24));
-+#else
-+        guint width, height;
-         width = gtk_widget_get_allocated_width (img->window) - 96;
-         height = gtk_widget_get_allocated_height (img->window) - 96;
-         gtk_window_set_default_size(GTK_WINDOW(img->window),
-             min(width, img->width+24),
-             min(height, img->height+24));
-+#endif
-     }
- }
- 
--- 
-2.9.1
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 5b097fa2ea44..0aa7ba15cbd4 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
-EBUILD grip-4.2.0.ebuild 604 BLAKE2B 8fe0d9f6d6c66a46207a688e4d98c666dbc3936e2709b5a1013d30ca59f29c8241ae2adbb23a17605496f80deb0c4ceb0fc95b169a853536c91a4c61a2fecc8e SHA512 1066cf711fde9c9dae1048cc60a13571de56023db83f7fb1976106f3874498f9618f05d4f65e4c4711470817890eee50a34881ca064854a8774b73bb927224a9
+EBUILD grip-4.2.0.ebuild 599 BLAKE2B e6fe35f2b564b09af11bdaca9b7fb7293da711779f9add794c7a3c541707d1b53811845b869f86e98e338eae3c0358fe9ccc139d48f2717a6bd369d3a251f470 SHA512 5152e68c9c5b650d982b8d48e67f46df2434dd6864181c8721ae14dfdf593b23543967cbd0ff912d63fa143a8a786dfa4f08a59221a0677d48772f285b4253cd
 MISC metadata.xml 287 BLAKE2B 97d6c8c5b9fa03b5b8435a9719b819a9e071d1310656d97e6a203a8cf86d2414034e8642de7f010aa8f64955bcdc849bc66ef64a1e0e80fd23e355af50c6bbc1 SHA512 047bdd78979d55e9e37b92f51b52190c6a5780d6b3475560ae8908fdc98274949372918e1ab150821f09bff97cc12f25097f4e89ee4431861b608be79bd942bc
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
index 26ce65a13626..2a8b144c5550 100644
--- a/app-text/grip/grip-4.2.0.ebuild
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy{,3} python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 pypy{,3} python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index 03caca873f1d..5947c3b27e64 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -8,4 +8,4 @@ EBUILD groonga-5.0.3.ebuild 2418 BLAKE2B 03e1f4e2e34961339ac0df2568733b5c5bbdb42
 EBUILD groonga-5.0.9.ebuild 2418 BLAKE2B 03e1f4e2e34961339ac0df2568733b5c5bbdb4243037c9b32290d24873598fc2583a7c1419d11440719f45a02b27d611de89e93ddefc18dd28f8af8d5090b17b SHA512 52c3e67423eb88c7626b9b831c2058af4eeda069589b9ff315350c57eb8e4c151bbfaff5702c6c474204a5699ef2548932d389bf75edffb94b286c7a18d7f0f1
 EBUILD groonga-6.1.2.ebuild 2447 BLAKE2B 0a21cc6f5012eeb06d3af52610a8ecd97731cae2ac7d66d81c4654af903033e37c2f5cea164db2e7224f5d8a1958a47824dcbc1e277c5f8e0bf7d8a101929300 SHA512 0770d4c27bee71d3fad3caf42b10ca0da006a1d20861c154e8f8b14edb19fb9f8e619b5f6b905a59eba8d3c17d982ec9b628b6d561b638df28da8fd3a9d48189
 EBUILD groonga-8.0.2.ebuild 2667 BLAKE2B a2f9ff65cf47440bbc8b28c7926b29cda03dc0b54acb82bb0c5492719513e1b529fb888b0ef943ac4f08c62890e5dc12da52a565304931e2fd76bcca7d2bc359 SHA512 5b298d025e26449d21877b3132f4a3886f9db42853a5ab53075b875b9fec91117e9f731519773d54a573e5e84625fdcebe7554700464e410d4f5191b6c930df4
-MISC metadata.xml 1292 BLAKE2B 1f51b23aa93ebc86d04c05039e2d938c2cd343f91d630ba8d3815175c905c9431d53a539eebeb9965acfb456f87be37e4500d725ac4b2eb505eaaad5ebd49214 SHA512 5f6d4480b7425d5dd9172e01dbd435a7f5645e04de2956ad20672fca8b056a5d83551b3871c1ac07c52cda6f03373ff195502392a3d5b1d2c59452cccbaeba95
+MISC metadata.xml 1205 BLAKE2B e7f1c4c5159d8739b1edce0aba0e484a9a4300e1de5fd1f211224f2a1e44c0e1b6dc6bb9cc0d7aac2740a761fa922c155b6e19a7c75cc6e0a10deb46b8e27d27 SHA512 a3206dfafcada30567bbf6762fdbd4562f72a1da607cc2928426133cbe84e29277c9605778e6a77f8cb6e2c129f1949389443caa1757c72372e7e8c546ee9c88
diff --git a/app-text/groonga/metadata.xml b/app-text/groonga/metadata.xml
index 6c69341e576b..937c8f296172 100644
--- a/app-text/groonga/metadata.xml
+++ b/app-text/groonga/metadata.xml
@@ -18,6 +18,5 @@
    <flag name="sphinx">Enable document generation by <pkg>app-misc/sphinx</pkg></flag>
    <flag name="uyield">Build for detecting race conditions</flag>
    <flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag>
-   <flag name="zstd">Utilize <pkg>app-arch/zstd</pkg> for Zstandard compression</flag>
 </use>
 </pkgmetadata>
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 9578db8569de..0642fa4a936f 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,5 @@
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
 DIST gspell-1.8.1.tar.xz 419268 BLAKE2B f32c9c518c23f8f560d65eb6fb122703561cc09e385eefa99d0761e8aa5b5bf3a8cec3cab7071043134314262979de56d08ee2929973b7968016b123e53d8f16 SHA512 ae94f46c7bdcdeefa0279cd4ac3c50e53b63092016e298ef6b502c40c2574a2135c503ab322f5a3a7b8b4422fdec291a6ed0c937683a8c0f32d7ad474cc1569b
-EBUILD gspell-1.6.1.ebuild 1029 BLAKE2B e788cc6815412d4cfd157bf37700e38fd3604ab1ca51a2f7bd51c560a126ab5de9a9b8d1303d02f8da22de4207813693771469d0d80730bd91b6386559204073 SHA512 bceaaa706a10c980c184738664a0645c6e70d13ed3fd2a10e7ebd62daf51f502dc475794eb5782beb7f7bfa2f2a8974da8e4ef0fce76ab35e2b9d532a5c65100
-EBUILD gspell-1.8.1.ebuild 1031 BLAKE2B 0c22cda83a62fdea9ffd07cd5cf2c8635d38bcfc259bbd092572745687220f949391742a7d6c8574c8bc8c70a2bc8945b41a30c1c92c688fb020e06941b0fd5c SHA512 822f18b8dc5fe96a150de0482d304263ea3ce75b21afed141dbdd242db1739eae1acc5797a3535c50e1ec710310d59e6ad0d10b11b0d3ba6c162aa278fe1136b
+EBUILD gspell-1.6.1.ebuild 1039 BLAKE2B d79904f97cf3f8d312c6a776267e189515e194b87f253357c82004f4ac4cfa12359faec8c5fd020e172f74159f1e7da356f11e4a4cac7cd76ce6c7fa688b7ad7 SHA512 6785c2c1d0fedd3c9fcdadc4d322f2272ba590ec609c4a9ee84c896489b271d9d355c7c1336e84cd052bbfc4d7d409b54c4293b5832c0b849f410ec2c80e82b8
+EBUILD gspell-1.8.1.ebuild 1031 BLAKE2B 992514f9524848dc3e3c78715b7b030487152ee6b6d65c2ac8924bd9dfa8e0c2a4b5cdb104a723e35b16919307281cc7e234a1c27f11f0df9a9fa2e294559622 SHA512 4e9055dc20476b1291a108a2a779a4c94cea377be2ff7519853cae22950b6e88f468ce7ad377dee7abefd9ac021caa22a9648d83c996535f9e82c252091f800b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.6.1.ebuild
index 181912bf171e..93c3d40003f4 100644
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.6.1.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"
@@ -11,14 +11,14 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
 	app-text/iso-codes
-	>=app-text/enchant-1.6.0
+	>=app-text/enchant-1.6.0:0/0
 	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.20:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
diff --git a/app-text/gspell/gspell-1.8.1.ebuild b/app-text/gspell/gspell-1.8.1.ebuild
index 3226d1b01c67..18dcf94ede51 100644
--- a/app-text/gspell/gspell-1.8.1.ebuild
+++ b/app-text/gspell/gspell-1.8.1.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"
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 92ffa805e1c0..43eac29715cb 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -3,7 +3,7 @@ AUX gtranslator-2.91.7-gucharmap-python3.patch 1851 BLAKE2B dd54f2cd05501e0cdaae
 DIST gtranslator-2.91.7.tar.xz 2835836 BLAKE2B e6e1f7b512705152a520a47bdddd01336ddcecb9ca20409546d64caa124f1bca2985fd2a9cd7564983a8411c6a7227d37b55ce8b3e452ee7a0d5beba3460bd59 SHA512 8d2a582e06ab0fecb9c18bde372ca0cd02d426155d4b30b876bd8f2e177c88c79d410adb0297ab85f18a952eeef32c17352cde18eda3c4c4fe33833db25022b5
 DIST gtranslator-3.30.1.tar.xz 3060168 BLAKE2B e2e238ffc461b99be9df679c431d7cae85c70ca9db7aea4e7c51d9bd12aa417fab0d53d6c512555992dfb2d40f55d6d0dba8c3aacd043ad8c2ebe690de8ac562 SHA512 5f6384bec8bb23afa9aefe5928260b7ccb408d41b8a363d85277435428ca34fe544068526b11801e534911753c95b3049892e647938bee755b37f3f5cbf94f41
 DIST gtranslator-3.32.0.tar.xz 2767988 BLAKE2B cf05561d35adaa77e1bb15adb11faad5346a236d6bf82ccc2b474c2478ea537c89852e0c0322067de1bb24c320ad6732eff5a0f6489a97e57c980b0f1c7d56f6 SHA512 4119b64f671ccb4d8132c4b18f53b614a80c6faaecef212b23268b2a189e7b337dd63f9c0d82e139976a6d5615c4c047ad3be97397734930b5c0d07b57e13531
-EBUILD gtranslator-2.91.7-r1.ebuild 2194 BLAKE2B be196129746036190b3121c0a1c0a10eb67a7c2a9d7035686e49d069cb992583a9825aee1ad7ac0b6f859eaa617dc73914c9decd04800d69b46b281d5e840466 SHA512 e7b199626794e474a932dc70ef364ba946935abca57df3161f355fa37b7e1a019509323d12e8d8d0f002b7e04d76b5a411ea112a80d2e7f68d51c6d7e76e7126
+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
 MISC metadata.xml 1064 BLAKE2B 7f39febe016d5aea980f3b4ec1eded4825c3fe3cd03a4314dd21cb0d3077cfebb21826c9bbf3f5c30d7581355379427923f9e2e284c7b7520c2fc5f915a746b3 SHA512 185b4b7bfb14d3ea94454b9405875b07884f19c52df2afa46de6a470b65cab521dfd19f09cbecf7168ac5722d871b085c029da7b11b533f26f6afb1f23ada6a9
diff --git a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
index 3c0c5abed813..f545af711723 100644
--- a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
+++ b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit gnome2 python-single-r1
 
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 491eab004d2b..f71d17489d9e 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -3,7 +3,5 @@ AUX html2text-1.3.2a-urlistream-get.patch 186 BLAKE2B 600aac564090a318cd60085836
 DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
 DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
 DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
-EBUILD html2text-1.3.2a-r1.ebuild 994 BLAKE2B a6ecf556040564c64bba93dc0dd4d9fcf5060df5a6b9a487ea91f4b2b1fac6da4f4783910a86a98cc2e2c02c9f2ee19bc7ab9f7e40d0441f56c07f28b2979a45 SHA512 94ad8a3df67dc20c080bab7a5eabe3ed2f38c39df6f454f6425b0033774b5aa0f393afe16d69e01f499ee69c2f31316a979cc0326e19737550d5bfa57603e0fb
 EBUILD html2text-1.3.2a-r2.ebuild 966 BLAKE2B bed2bb01d9737b583602897df6a3f282bc43576ded681bf3777b8a245261e31e6b25fdf744aa6be48be5e6a49cc47d570e5bd10ad6cddf4997d5ba89bfdd9595 SHA512 c2fefe8343609b24840bb89bb43fbd30a4d5ea8d48fa85238f05d5b7df1f8ec2ac7141eb48a323791e425bf1fa95e75ebfa3967d9246b7d654fe527ff59d25e7
-EBUILD html2text-1.3.2a.ebuild 933 BLAKE2B 79617efc95c443681009563030126da8aadc589ae081b7162a700622367647112fae06271797923f0de4ed462aa4b89d17f2ab36084dae3edfbf67784cdb0797 SHA512 ab234c98f3998db61cb17dad4fc72dbfa184a93511d7a4482bee1dd0f1a350ef59645b5ffbd427fb0d4107135d19a95cb3cf8e36760377309e63076a56158e4a
 MISC metadata.xml 373 BLAKE2B a4ea5de91e4a5f5a7653f4c9d86262c999e72c69863f0185700bd4fab6c27cf87d3e392aa013dd4b60a84b1ea0ddc42d811c4131c8db3ba427df86df7fa4abb8 SHA512 ae24dd6abb85c0abb4085f15c9c140d2dc3bb0c201ee22f1762e1eadc37899e8b5aa5cb794f9cd12bc26857195c9b9ba8cfa46d05628cdf765ddfc0639dd6bd4
diff --git a/app-text/html2text/html2text-1.3.2a-r1.ebuild b/app-text/html2text/html2text-1.3.2a-r1.ebuild
deleted file mode 100644
index 8b1dad0a9b36..000000000000
--- a/app-text/html2text/html2text-1.3.2a-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A HTML to text converter"
-HOMEPAGE="http://www.mbayer.de/html2text/"
-SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
-	http://www.mbayer.de/html2text/downloads/patch-utf8-${P}.diff
-	http://www.mbayer.de/html2text/downloads/patch-amd64-${P}.diff
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	tc-export CXX
-	epatch \
-		"${FILESDIR}/${P}-compiler.patch" \
-		"${FILESDIR}/${P}-urlistream-get.patch" \
-		"${DISTDIR}/patch-utf8-${P}.diff" \
-		"${DISTDIR}/patch-amd64-${P}.diff"
-	epatch_user
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin html2text
-	doman html2text.1.gz html2textrc.5.gz
-	dodoc CHANGES CREDITS KNOWN_BUGS README TODO
-}
diff --git a/app-text/html2text/html2text-1.3.2a.ebuild b/app-text/html2text/html2text-1.3.2a.ebuild
deleted file mode 100644
index f3ffc7c1a0a7..000000000000
--- a/app-text/html2text/html2text-1.3.2a.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A HTML to text converter"
-HOMEPAGE="http://www.mbayer.de/html2text/"
-SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
-	http://www.mbayer.de/html2text/downloads/patch-utf8-${P}.diff"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-compiler.patch
-	epatch "${FILESDIR}"/${P}-urlistream-get.patch
-	epatch "${DISTDIR}"/patch-utf8-${P}.diff
-}
-
-src_configure() {
-	tc-export CXX
-	default
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin html2text
-	doman html2text.1.gz html2textrc.5.gz
-	dodoc CHANGES CREDITS KNOWN_BUGS README TODO
-}
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 3d4987d3b593..5c270349282b 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,5 +1,5 @@
 DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 BLAKE2B 7cc22370afa045ac13bf05082d396534e08a454f13f6bf321bc45c4743c33813bc32c31b655c21d731f091f11d13aeef405bc82c8e2b0ed0d0a12a25e4e7f3ad SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec
 DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
-EBUILD htmlmin-0.1.11_pre20170909.ebuild 634 BLAKE2B 9a55a43ee6ffaa3e5a363df3f776164e9671ff0c43d121bf575ef43a5e8d6de35368cc187e8af782f14a993966f8f141dc93df7eaf89d72422d757a6f881e0ab SHA512 c39a88b40626f7e8e943d8ef05fc355d523d13b65577c6e535139e8fa958489a83490bbff47a9cef2595f1e3c871512e4083bc3b115864f2d6644662e7a2b608
-EBUILD htmlmin-0.1.12.ebuild 508 BLAKE2B 57fa9adb75cea920eb9ef209a31f8c329315f22c269c75f714a149d8e1c07b4fba41b6a6c8fd9e170058555c1e455b05ab5d718c8a7d027e46b2792efb4ee34c SHA512 97feee6c9be7a7d96cf9a0acf2b70b2580c6e240d9de77c5487e1df260fa4327c1a365bd1d182a50fffde330b82411673514d40c9da546476fb648af13037593
+EBUILD htmlmin-0.1.11_pre20170909.ebuild 629 BLAKE2B 414fca47272870b7183c3fd712947fc9585a66ffff99b027c54e672d983b119920b188206ae10c02c85eb657611185764196173cc7687f0ff2af2a73970f0664 SHA512 ceb7d128615fe00d0e9fa138891b89d525d25228b0de24423f38ece20725158d4f69935d0b34cc66c7ba562acd2ab68420e56b276a27dd344bc37563cc4a5476
+EBUILD htmlmin-0.1.12.ebuild 503 BLAKE2B e53e77c4617928cd9db2974d243dd2ac19ed45a17e6d0c37a223447c900e1ac413a1a3c2c847fbe2a6434e26bfbf0bf758c4d0dbaea760890a8f4b2e037e7a5b SHA512 d6f6284cf1d6a2435e08667c8d2feff26ed0677c316e6b829e219322aa0b8f5accfa3525079f0b67ad2b7861d71901d0d4a41671ed4e8c65b7a823bda966e01b
 MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild b/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
index 162bd42974d4..824eee774c21 100644
--- a/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index cdddc86d92a3..95105e76d782 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index bd30655f7282..f4d7eaaa3fd2 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,5 +3,5 @@ AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
 EBUILD hunspell-1.6.2-r1.ebuild 2383 BLAKE2B 7ef52fd2c661ce65496350ebf7f33e550b9e2645183cea6a3801e7bea81045da4b9846dbedc6b933cb30a3876df87d434785ee4a39292aa2fb3093310b565b59 SHA512 41e296e4a093edc5ef757cec31fd93fcd9a6b08ea18e5b5086477f4f4b351a93fa9ff03a7cb6884da17236985c0d3e5ece154da8aba8557f56cff37c73efc3b7
-EBUILD hunspell-1.7.0.ebuild 2293 BLAKE2B 6a2053dd8f5cf3211521236ae7e027d99349b7864655b81c65a2f3614070b53818b3932c70ffa25cc09ed8c9b935c78243cfaf8923e4975d0e8ddef2621dcf64 SHA512 4dc99a1b623fbd8da6492bedea1d2d80c9c93fcae334ac1fee70769aaba17581ced12e3097a930324344d20d5a7e72f19df31364c665add74802163efe941d3d
+EBUILD hunspell-1.7.0.ebuild 2292 BLAKE2B ffcdf02a09d0bac21a950177962e6ee769802c3c8656d847c3c59faf21925a153bf51d7d933a06a3ec14ee88bb9178398e56b8ab1efde0992e562ab1e0540628 SHA512 aa8b250d91da765cd2e86ae0233947a5722e135f38a5f5c7ae54f1a50723b66d3aa618fda42931ea65e36d5e306de00e9983c305716d613e3d4ecf7e50a7e5b1
 MISC metadata.xml 274 BLAKE2B 6631c0f576279afaf4cd444df14acd118e393977058e957bd3e41103554a756c43860f75f7550346815f6d8a4320d3d86fb069c9451fbad268bedbde18ed5ec0 SHA512 09ac7c3282788aae9fe48dc86a3bec7d2a5b651b22d6ea06108f9ca5a86e96dddf9ab80433d0f16549649665d9a582d6c44217b73a000ee83995aad922f3caa8
diff --git a/app-text/hunspell/hunspell-1.7.0.ebuild b/app-text/hunspell/hunspell-1.7.0.ebuild
index f21f176c90c4..9d0357167faa 100644
--- a/app-text/hunspell/hunspell-1.7.0.ebuild
+++ b/app-text/hunspell/hunspell-1.7.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=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index c348e0d78b90..2290706e5559 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,3 @@
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
-EBUILD iso-codes-3.76.ebuild 2425 BLAKE2B 98b11381edd7aaad748b1c5bfdb0b3240340bdda78ce2e36e696d5addba33003ae670a60841d9bf8120f5d726764c84d1112e799e85a0105220e7fa77870f638 SHA512 b81faf5121b8c9253f2068a9d02b66e54660ff6514ea02c8379b01f4db16dcfb8ac8188b026d5c5a82dea941a417dcc19389b0a8fc32ab347beb7fe82466480a
+EBUILD iso-codes-3.76.ebuild 2422 BLAKE2B 6ef279103301db42206b5b03488dc74205c5edd74378ddd71ca082bdf477f694e38cb241d8d4b3e7e0c62050427306659a840e596078ca8534135251f30a052f SHA512 99b946cca3dfbbdb8d5cc35b7c3742ba1ee7f96b18789d936bfdabc2c62ff9942e4e1c5288459f94115d910afc6a7cefe929e52f68ba94e9c8d777a77a41b9d1
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index df8ffd9f49b9..0b54092aefcb 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
 
 inherit eutils l10n python-any-r1
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 9d45eeebdafe..9eee5393ff04 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,4 +1,4 @@
 DIST krop-0.5.1.tar.gz 42719 BLAKE2B e0baa3c14d9ce63815615eae004a08af720868d584262901eccbc569852177e07d5df659ea560d7e9cbdc4325daef8c35acd9c200440a8dfd73c19b274d8de37 SHA512 2bfd2a5d762454ab45538707c6f333d2b0947b6b203d6e7bd2d9d0d574d79de8ee6b30d87b17d6afea604456b915f323b855c9c9af5c169c192b0a01634075ca
-EBUILD krop-0.5.1.ebuild 772 BLAKE2B 80e6d86fc95989cd3ad84525661d005aaf8f520fc38a39da867d21fc57c91a08609786ce798294d157fa3cc4638074cdc8c403bf05378002c063c243fb05d830 SHA512 fbc43fb2fb7f816767d54b57de28e80256fdcd5dbf41f62d8defb0967830c5ed3a8b0f7a30b7afec14acdec86f90dd18fe9580f9d0c07ad901bd9248c1bf0ed3
-EBUILD krop-9999.ebuild 887 BLAKE2B 8965e42d04b7502d24240957ea43c9705b71a3e7d414a2455e45f71b84848a1d5409083f08490656e8d0a4a26e459ebd5e02cf802f5bcf15300ba8e89a7e2faa SHA512 0d1138ce375ce0c0994738591a07596681efdb848da20a45588ec8758028df68f456f714a7f9d958b6aca790832e7a64cdd74f444f072547249273a18a2e5d65
+EBUILD krop-0.5.1.ebuild 768 BLAKE2B b9b60e0d517172ba7c9051659a033939092137b3cedac9e6fa477e3cdbdf910c480877195c19a6f211e51937b777a282fa864809752ccb3228403c23e406f125 SHA512 3a58fde7bfca116675bf198a69a799e07ced00bf16eb006379af265e7b792ab08f7b710545b85eec403f2e2410829bbada2907ce84320e398dfa7c9be0cc9eda
+EBUILD krop-9999.ebuild 883 BLAKE2B 8b72bf4c959560ff3e44e7332cd5bea2c1543a6e0027cf23793795bcaeef99b69a7d0ff730ebd84f5062287a0dea8cdc07d34a04b106c8eabd2200459a00f5b0 SHA512 32c6bb471442164f8f0d720d72869ef5b1b03d167c2c3084fd9569ecdc19f708a57228ec447241fc3ce061759439b5280ac6f81dda73df5cafdd03461ef3d3f3
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.5.1.ebuild b/app-text/krop/krop-0.5.1.ebuild
index 21e6ff172169..a4be44a8bdc3 100644
--- a/app-text/krop/krop-0.5.1.ebuild
+++ b/app-text/krop/krop-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit eutils distutils-r1 xdg-utils
 
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index 442ae81d8fdf..bd6bb00454f4 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit desktop distutils-r1 xdg-utils
 
diff --git a/app-text/landslide/Manifest b/app-text/landslide/Manifest
index 741e25f52065..5aaae6726f90 100644
--- a/app-text/landslide/Manifest
+++ b/app-text/landslide/Manifest
@@ -1,3 +1,3 @@
 DIST landslide-1.1.3.tar.gz 151003 BLAKE2B 471cc83cbfc1c7ddc437b88514fb48632016e0915fc27c65d502a71b94f83a1184de8a7dbfaf2af8b75963e687c1af903add48e5ac8893308d9cfa07fdcc4c61 SHA512 2b29c416f8af04c0bf048060e0fe67b0b6a5e293485c5e3f68b9d1ce9d63ef66ca3bc58a96f65705c6918542932ef0a2fa6072b17c4c01cfc1975d283b417152
-EBUILD landslide-1.1.3.ebuild 819 BLAKE2B ce8070f581d056ca6a7e2b58dd3eaf2681f789b8bfb230594ad3ae4a4334580253d275512a66297ebeb2c62148bc7eaaedeaa2568ab927011db6cc3f90d6bbb9 SHA512 0821de505a6fd2b0e68ae3ac30faff81e71293af4097bc2c952e91a0f9e52dd02b93cbfcb68d116027436c4769422b2fcb5d4d395566f94a2c98973825f8dddb
+EBUILD landslide-1.1.3.ebuild 814 BLAKE2B faa789fbfdb7fd6a4e99a0323f54a3cf7d0c6b9f0e09c726eeb210ff3ce7be7de9e2ac0e0f4457a5a9d39afd62e7ca799492e95e9c1a95b8bc03547c029f09fd SHA512 31358e64b4604c2c53e755f8233c7a66075ec704ab4edd28843a4182d8d1e7d0604b21b079de3e377a73abfd329a4df8a862f6581cfc38ed2030aa532dea1cff
 MISC metadata.xml 298 BLAKE2B 15316fb3bd0eb0be967bec08510269e31406e72c3cc7623d21cc2334bfb36b8031bf304c4627b085fa64cfec15964cf9a6a486ba29bf312facf1589f36cd9819 SHA512 19a5bf1f42b94a00856b856fc0120024df40a4394a17e61fdacc817d1b355b601595a27cc0f814d3f6b436775799b44aa4f5090daa91452b55d4760e8c89b8d0
diff --git a/app-text/landslide/landslide-1.1.3.ebuild b/app-text/landslide/landslide-1.1.3.ebuild
index 9d41221f1cf3..df5e16ccb516 100644
--- a/app-text/landslide/landslide-1.1.3.ebuild
+++ b/app-text/landslide/landslide-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 8c76c289fe1b..0e12e498c850 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,7 +1,5 @@
-DIST libgepub-0.4.tar.xz 246016 BLAKE2B d51f55064d2dd0c9d6cb33884d9dae967b6a9ea971624fce333e9692abfaddf12c6ee4fb11cad97dc0fcc0b6a5d42ff71fc842eb205326ce8181af8e3ad46d2e SHA512 dd3e9837ba2c5896319918bda19eec8ea790d54f7893ddca46774f96f8e09ac1962ae6cbfc0bcd23c15059c63683ef4a6673e05f8416b024591677fddfa3ca15
 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.4.ebuild 682 BLAKE2B 5e5e637ff47ed41cc130907d61d7e5bb4cfd4711d523350f12896926abf90c56f3f5994fdc17c329d5eeb30dea4bd5f7243059642c3261d3f5011f6581bfd1b4 SHA512 636d71bf49aa273232dc555c999febb2f10c14927f4a1c160c2caf64f5d6154921bf4390220483d5967c1abba4d02000e58c59f1270d18a5c6acdee39e9e9087
-EBUILD libgepub-0.5.3.ebuild 646 BLAKE2B 2b15f05ebda230985ba74ff5d233447eed8bb4c283abccebf4d742c128e94447207d583e5ef2fcd5af660f69ca34dfcf31b752ff6640db4d8eb31a9ffc9210e2 SHA512 34fa589cb61498af1b73fbdc312171e6491a52c362fbefac83973b25b7de024355d25e2bc1126ce08a88a7086e745b618a34e48d2c6b5510c951c59d0a58cd97
+EBUILD libgepub-0.5.3.ebuild 644 BLAKE2B df2cf465d0d68cd90e2f8bedc84c38b9ebc88891bf1f2194fc1e68b2ba3eb9c23a2a0b8b8c5acf4842959d4f70ee7f5bbc0f8d884a1ffc20f5f95a706be50ef4 SHA512 324a75f046affb0911b7a95a5b3aba11c5aeb65cb969e87f5028028be1868901ea612f597a82796c73a13f7031ed584a63c0d11302704b13f7be3a189bf3610f
 EBUILD libgepub-0.6.0.ebuild 646 BLAKE2B 2b15f05ebda230985ba74ff5d233447eed8bb4c283abccebf4d742c128e94447207d583e5ef2fcd5af660f69ca34dfcf31b752ff6640db4d8eb31a9ffc9210e2 SHA512 34fa589cb61498af1b73fbdc312171e6491a52c362fbefac83973b25b7de024355d25e2bc1126ce08a88a7086e745b618a34e48d2c6b5510c951c59d0a58cd97
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.4.ebuild b/app-text/libgepub/libgepub-0.4.ebuild
deleted file mode 100644
index 101e914610a2..000000000000
--- a/app-text/libgepub/libgepub-0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="GObject based library for handling and rendering epub documents"
-HOMEPAGE="https://git.gnome.org/browse/libgepub"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection"
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib:2
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
diff --git a/app-text/libgepub/libgepub-0.5.3.ebuild b/app-text/libgepub/libgepub-0.5.3.ebuild
index 5d6e53a2c0a0..9685b374db7e 100644
--- a/app-text/libgepub/libgepub-0.5.3.ebuild
+++ b/app-text/libgepub/libgepub-0.5.3.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/libmwaw/Manifest b/app-text/libmwaw/Manifest
index cbf6be38a29a..a835bc33d7f6 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,4 +1,6 @@
 DIST libmwaw-0.3.14.tar.xz 1276240 BLAKE2B 34a5b118064dcac37834c83b2b5a61303f3e2eb70e41322845ff7661a5494c0b85db0bb07c6bf1f357c2027cab1c515eade58bb6b4fdf845a81d4d079a414b98 SHA512 6893a7a8a72765a66973a94bc7de8b3b6061aa85fd9cca5e73cb2a4024cbe81f0c030df0b6383f24835643259c361efda5527813bb84a1b08d0089d509215888
+DIST libmwaw-0.3.15.tar.xz 1289744 BLAKE2B 9aed923542e795904761e4969299785906aa65c735541788d91eb41e80420ac6c6df4df5e0cfa156c71d4e100c601e5e984de10c6a5f66eebe6ffb5f0374cc1d SHA512 0b2443fc6bc9da9247f7585743424df440f89317af989018d8b972864bf91e3c5cd78c39094a45d9de8114906b2b2a93f68ddb967af8565e4b499f643d86e682
 EBUILD libmwaw-0.3.14.ebuild 1015 BLAKE2B eb9a228a21d0bf53be7af47baf26458f1cea0c6a2e4f4bbff499533c9b7a9c226fe401bc112e4009972232ca2cf96846085cb2d9af0d37b62277b5c8e5478cf1 SHA512 58f7477e5af9f99a2248ec8f233cc5c1ec9d679c1f0a6dc4a278beb718140eb762c3c3a16cd43357c779b16b1341c2e843002a2559378022aabf7f92053caf75
-EBUILD libmwaw-9999.ebuild 1010 BLAKE2B caf4e52dadd33b6348da5ae194d1d9364fb972dfbd4ed05b97a639f835958857b023c3a0afa658288e616e7500d3ae62fa6ee7de213b656b3084cb96633dd4d7 SHA512 313ac932f39b04df8668fddc72004ab421bb6415ca90569cde318345c40512cea7fca01f546ff044e92d373b11f5441a90be178ca6e1bac12be6743a0e6faf46
+EBUILD libmwaw-0.3.15.ebuild 1027 BLAKE2B e51984196fe26cf9e7ba8ebe2e6de35c58443d3db82a65ee5d0358ac05f7905227670e05106e89d52ecb264f1e3833fe38917fce36a1fb6a2449228d90409d82 SHA512 9b530edcb03829b26715e09c5b99dc5f08bda876317813bf4589a7366a4bf20c5e2f0604792d103d6f50f2f7c4439a19dc60e362bef8627026508910eabf7837
+EBUILD libmwaw-9999.ebuild 1027 BLAKE2B e51984196fe26cf9e7ba8ebe2e6de35c58443d3db82a65ee5d0358ac05f7905227670e05106e89d52ecb264f1e3833fe38917fce36a1fb6a2449228d90409d82 SHA512 9b530edcb03829b26715e09c5b99dc5f08bda876317813bf4589a7366a4bf20c5e2f0604792d103d6f50f2f7c4439a19dc60e362bef8627026508910eabf7837
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.15.ebuild b/app-text/libmwaw/libmwaw-0.3.15.ebuild
new file mode 100644
index 000000000000..cc207bd575ba
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.15.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc static-libs tools"
+
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	local myeconfargs=(
+		--enable-zip
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild
index 7dde090fa754..cc207bd575ba 100644
--- a/app-text/libmwaw/libmwaw-9999.ebuild
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -1,32 +1,33 @@
-# 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
 
-EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
 HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
 IUSE="doc static-libs tools"
 
-RDEPEND="
-	dev-libs/librevenge
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
+BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
+DEPEND="
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
@@ -35,12 +36,14 @@ src_prepare() {
 
 src_configure() {
 	# zip is hard enabled as the zlib is dep on the rdeps anyway
-	econf \
-		--enable-zip \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--enable-zip
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
 		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 6e736a15a0f2..f0bef048645e 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,7 +1,9 @@
 DIST master-pdf-editor-5.2.20_qt5.amd64.tar.gz 16261577 BLAKE2B 112c8d308875d36e3a71d28ae407eb78a0f714383fc005dc020cdb911a5596548274a55466133d8e03cbf47df29c062973f243f88ad0b1e9caa8410fbdfe2b8d SHA512 85b095603da1114cd4749ddbcf7bdd513c868ee17434df47037f7e0b914546fd13a6911949579ee981b5c33dcb13eb0ffa9585d4cbedd9bff4dc56e32bdcf4cb
 DIST master-pdf-editor-5.3.02_qt5.amd64.tar.gz 16333023 BLAKE2B 99c1291cd5d354e304e873dd2528806898109f0a9a79c87eb89394ec8300ab692294c5b04fa7fb712df82fa683cd3ed549b9842417d2b13f6a3f5f41fcfa334e SHA512 bf1118f1eefe3f46addacba832eee757112a91154de5929c825845983e7b6bc681bff84501082e696bb14acf6652ea180912ae48a0dfea270053fc42a3200448
 DIST master-pdf-editor-5.3.12_qt5.amd64.tar.gz 16350912 BLAKE2B a633af3f9a99542b5c61c27b237c5788468d163ea3297d17134e6f4404cbf6bfd579bb9b1febbb27892e40b369405c05c827b0b01433039cb9d9b2f062a785bd SHA512 526ff0998734eb24406907b3ffbf8801fc04cd49aa620ea57e20cb885d7d3e94e279592bd937e306151f91f82c459cf6810c80e51d438fde0db9dbeef46edbbe
+DIST master-pdf-editor-5.3.22_qt5.amd64.tar.gz 16410658 BLAKE2B fc9cb09e58625534d12b8fe4ff657917f76a14578341c678d6be909a5f2e7a75b4587c2f1abfac66741c088b43943a30874f6ae1414ae735ee01254f019c02b3 SHA512 033914e94c9ae4114243e79be445f523a6bbc6c39527db786613ef7220bedb2412ea75c83210ed8b6096d045afce73bc8f6141b55995f2f9c464ef4a7fd69d16
 EBUILD master-pdf-editor-5.2.20.ebuild 1174 BLAKE2B d5522b2277cdae788777071681ad00edab0c32897cdb204ade78167a42004e90119000e1dfcf11bd9f7059616fbb0f93bb231dcba236817082b5e00c25d20941 SHA512 1e462a4d9a8d30fc831cd70411ed028581d6c4d44038f9541f900a81763c122079c301056a230630d812aaac3db92ebd9e0889c7b1fb192a0ad34043697ef4ff
 EBUILD master-pdf-editor-5.3.02.ebuild 1174 BLAKE2B 296a73e127a2ffc90a85762bbe3724922f7af76ae972c0295f9103a68d573d67963bc14e251abb62e4cfcdbe0d99a3c2939978cefd05dd22cbf7fa5953997155 SHA512 227d9cf8bb100f905eb1cc5262d362ec71b4a70b801fc8eaab97029a8188d8dbf2c33d6af0250c9754845e79cacc90a2aa1b47946698a939030795333ee0db23
 EBUILD master-pdf-editor-5.3.12.ebuild 1174 BLAKE2B 9c347747f3b2692d4fa368b3f7b0bcf2baa4b461aeb530bb09345db7a1145f67870a6bca8c154c13c4cb29799ede5c80af298c915992484d34df3524f157ffb0 SHA512 82a6fa658e4678239662a28225b21383ebecc2c0af17882cfb83a436ef0bfb09d75de123b45851411800d7d6565687aa373157c8496ed10e60b6170641de484c
+EBUILD master-pdf-editor-5.3.22.ebuild 1174 BLAKE2B 9c347747f3b2692d4fa368b3f7b0bcf2baa4b461aeb530bb09345db7a1145f67870a6bca8c154c13c4cb29799ede5c80af298c915992484d34df3524f157ffb0 SHA512 82a6fa658e4678239662a28225b21383ebecc2c0af17882cfb83a436ef0bfb09d75de123b45851411800d7d6565687aa373157c8496ed10e60b6170641de484c
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild
new file mode 100644
index 000000000000..7b474ad5521c
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.4.1:5
+	>=dev-qt/qtgui-5.4.1:5
+	>=dev-qt/qtnetwork-5.4.1:5
+	>=dev-qt/qtprintsupport-5.4.1:5
+	>=dev-qt/qtsvg-5.4.1:5
+	>=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index 9e4434fca83a..1f8699551862 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
-EBUILD mecab-0.996-r1.ebuild 1178 BLAKE2B 46becd51f6b1f5b5810b1c8cb7ac8672284906fc6a2b1580f3c5de4f72dccca0f252f1d034e61b2c2cf6cf08332d6af32656b87ca54ed8b595bbc7a4ab3f15dc SHA512 206b5e25c34612da0354c69b843783bd1ce774a23eaf435ed72af237c2cd5c8d6e27262b4a1901d54a1a1b4859a9a7521ce4b46c0b061d05ae069eb3868810d0
+EBUILD mecab-0.996-r1.ebuild 1184 BLAKE2B df8f8d801186c3346f5f231c51de9d6e13779dbb78b31f209c9da653484e771abd77e0e10858e60a1b7fae15a223fc12b026469c326a38a0b7aae8a0ee40e1e7 SHA512 932596d0bc8cac787b1ab3512b704234a0354daafcf1558cfbd8a54a66a52578a21d7ef183baf77667572d15e841da959a5b53f7f8b7144faf011eabcbc9e838
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index 282eb9f459f8..f4e881708c9e 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://taku910.github.io/mecab/"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="static-libs unicode"
 
diff --git a/app-text/msort/Manifest b/app-text/msort/Manifest
index dcd5a42c4054..d75864859eb8 100644
--- a/app-text/msort/Manifest
+++ b/app-text/msort/Manifest
@@ -4,5 +4,5 @@ AUX msort-8.53-fix-missing-limits-header.patch 559 BLAKE2B cb158b619540aa9679d84
 AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010b04a8fbb24c2043f5436dc866c2dc5b76de4c2639103ecf75bd12ec6d63fa9e2922ac79c8e97a6939c74fe5f37d026af8325c1b161b0f42 SHA512 6d7e1ddf68240f27055a43cddf9e99594ca2ff20c0d666b8e3e09f74c319b38432d15c0b608f76aa5732b6145f1d3120f618cca398c8a68bef4a394949df55dc
 AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e
 DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573
-EBUILD msort-8.53.ebuild 1027 BLAKE2B 571a85f6b89dd74991d9923496313e5070a574141141211ac1211d7f841395cfd875fa55dbb3a9523d7952d3dc862377ad2f950264adec65c1c744c41230d8e3 SHA512 3fd422e2bbccc815c7adf26a8540e7cedab74d9855de19cfdfc9c36c461a0055fa2f73c46c8a5bcb3a2543ad5ac41403c4ed99fde0bd8cd1704008987a0636d3
+EBUILD msort-8.53.ebuild 1026 BLAKE2B cc609f657b525ec99048db658b96d1f1ffef60b1bd0fc8e9fafc621b4990dfb57aca7af6abc55996b26f3e427f0046fa82f4a7afc664502471148afd700ef617 SHA512 99882c80414eb9f817d00276e14d3032cd91415293bff5aa227a4e26de760c8069acf99c548ee6a47b0976cd277d1eb8be5030cb034672519b7e72a9839614b8
 MISC metadata.xml 1119 BLAKE2B dc935ff36b3a965f890dda09b161d321cad04d3b8f427c8ef611bf6ba728ec97bb0622d012a837fbd8bf2ae1a4bd79b4bfd8314039a515c4b36375b71b69548e SHA512 4185e0b60575cb60fb14392f24286fa8d94a15ce81c6fdbfb5d5031d7dccb170861bfa6b78a2851ad3347fcdd1bd6b9b05973e9b243561a172a69921ccf2fbbc
diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53.ebuild
index d401053463c1..260beb77ff32 100644
--- a/app-text/msort/msort-8.53.ebuild
+++ b/app-text/msort/msort-8.53.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=7
@@ -9,7 +9,7 @@ DESCRIPTION="A program for sorting files in sophisticated ways"
 HOMEPAGE="https://billposer.org/Software/msort.html"
 SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 IUSE="heap +icu +libuninum"
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a6c9fb604e7c..29bd120ac70a 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -7,6 +7,6 @@ AUX mupdf-1.14-openssl-curl-x11.patch 1799 BLAKE2B 62ae64baad844a13379f8dd1e1a1f
 AUX mupdf-1.14-r3-openssl-curl-x11.patch 1256 BLAKE2B 49bfda1f434fbfcf85c7b38b714b3c471d8d4ce02d625a6716582e0a9b3d1d0f623d401a0e9f4fc8ce4a1a6109925199c9c2b188be8739f274804217fb829efb SHA512 387f282fdd2e450585743de7fa297c24685d12c199c801f930da37795c6406aa9ee0bee335c54ca6ccef46726ebf6b49b389753f061542cf7e5381c979e0786d
 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
-EBUILD mupdf-1.14.0-r2.ebuild 3111 BLAKE2B 0431380b280fd111a1599aa1cc165a54c077d6881ac67dc99b76a2923ac001e5bfb3da3318f01178c708e0468f8940ee322b35956e51a76949771ca7c8eb3e4f SHA512 322240be76b53cf7f7f81dc04ada3463f6ba3ea00b7396d031b34d7343e7920b908c8eeb6e04f6192bd5187ffa211ac318efa5d01ce8df71c4fcbd57e215ee91
-EBUILD mupdf-1.14.0-r3.ebuild 3333 BLAKE2B edad471b5ec05e9932bf734b352bf4a7d99115fcc214f843b452f71e9c39dfb27b6b631fae9316a1bf2e4a6020d7424998666d2c433ade867182b303a4643afe SHA512 9e15ca3d84f0a04999127a8a4327de7dd55498aa0d59e3e8a0ca70bc09fbe222ea498894736e6fb9acf2e6c8a8523c419fe1f443f0bdf10344a0e8ca996d795a
-MISC metadata.xml 325 BLAKE2B b1481395199609bf3f4f01f21946866005eeb2a5df124c1ded940702808cfba176494e7b801ad5fef4ea61c93ce47e7415548a3e86d0d41b28c16ea1d064a152 SHA512 8b7c565857b47f585fa4059e99087efdbf1a88cc61fc2370a489ebf6c46e3a1271eb23b2173354054c82317ce7305d9372f6d05afd4749b0467635030cd5ea1e
+EBUILD mupdf-1.14.0-r2.ebuild 3116 BLAKE2B 1700ed8f0eacc1c986393b597df20d4b45a2158ddedbe472281e900d8dc79ce4a76aafc5be0e3f35977afd6cecb643b7a382c6a7e0a422987d23b20bf2697343 SHA512 442a258938c868062ddd3de127da51c475c89908f466aa12d8baf44b4c29fa961c99f3e1eb3649672e1855cc447eb1b30f2aa31ed80ff1c2c751716b743ee6d8
+EBUILD mupdf-1.14.0-r3.ebuild 3238 BLAKE2B 8abeb9aed58d3222403f305c51b2ac04c2b2e03ae933e2fdf4bfd7f12abf32ff09ef1b1e0204c28a25eedbf17397b02037dfc60cc6bbe29404fe5d34b4bca0d7 SHA512 a2cacbc18f138ec601bb09b2760d949af8aeb78486f54f8c6a9dd069dca563e175c80d587f75622038e94f096d345258bd9738da4ae37ef86df285f0dcad76e9
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 5866930fdf0c..88de5fc462b1 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -5,7 +5,4 @@
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
-<use>
-	<flag name="openssl">Use dev-libs/openssl crypto backend</flag>
-</use>
 </pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 0200aa416b3c..8e081a7e46aa 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -12,7 +12,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"
-IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
+IUSE="X curl +javascript libressl opengl +ssl static-libs +vanilla"
 
 RDEPEND="
 	>=dev-lang/mujs-1.0.4
@@ -23,9 +23,11 @@ RDEPEND="
 	>=media-libs/openjpeg-2.1:2=[static-libs?]
 	virtual/jpeg[static-libs?]
 	curl? ( net-misc/curl[static-libs?] )
-	!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	libressl? ( dev-libs/libressl:0=[static-libs?] )
 	opengl? ( >=media-libs/freeglut-3.0.0:= )
+	ssl? (
+		libressl? ( dev-libs/libressl:0=[static-libs?] )
+		!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	)
 	X? (
 		x11-libs/libX11[static-libs?]
 		x11-libs/libXext[static-libs?]
@@ -78,7 +80,7 @@ _emake() {
 		GENTOO_PV=${PV} \
 		HAVE_GLUT=$(usex opengl yes no) \
 		WANT_CURL=$(usex curl) \
-		WANT_OPENSSL=$(usex openssl) \
+		WANT_OPENSSL=$(usex ssl) \
 		WANT_X11=$(usex X) \
 		USE_SYSTEM_LIBS=yes \
 		USE_SYSTEM_MUJS=yes \
diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index 1b153620923f..34e7a6e9d187 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -12,7 +12,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"
-IUSE="X curl +javascript libressl opengl openssl static-libs +vanilla"
+IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="
 	>=dev-lang/mujs-1.0.4
@@ -23,9 +23,11 @@ RDEPEND="
 	>=media-libs/openjpeg-2.1:2=[static-libs?]
 	virtual/jpeg[static-libs?]
 	curl? ( net-misc/curl[static-libs?] )
-	libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
 	opengl? ( >=media-libs/freeglut-3.0.0:= )
-	openssl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
+	ssl? (
+		libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
+		!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
+	)
 	X? (
 		x11-libs/libX11[static-libs?]
 		x11-libs/libXext[static-libs?]
@@ -34,7 +36,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 REQUIRED_USE="
-	libressl? ( !openssl )
 	opengl? ( !static-libs )
 	curl? ( X )"
 
@@ -62,7 +63,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
 
 	# See bug #670832
-	use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
+	use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
 
 	sed -e "1iOS = Linux" \
 		-e "1iCC = $(tc-getCC)" \
@@ -78,15 +79,11 @@ src_prepare() {
 
 _emake() {
 	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-	local have_libcrypto=no
-	if use openssl || use libressl ; then
-		have_libcrypto=yes
-	fi
 	emake \
 		GENTOO_PV=${PV} \
 		HAVE_GLUT=$(usex opengl) \
 		HAVE_CURL=$(usex curl) \
-		HAVE_LIBCRYPTO=$have_libcrypto \
+		HAVE_LIBCRYPTO=$(usex ssl) \
 		HAVE_X11=$(usex X) \
 		USE_SYSTEM_LIBS=yes \
 		USE_SYSTEM_MUJS=yes \
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index ea432332da83..4bdc3fb78b4d 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,8 +1,8 @@
 DIST nfoview-1.23.tar.gz 83337 BLAKE2B d73cd6987bf7929c57e8acf0a24278272ea199bf980756ddb5da9a5eddf7760a8c05f0e48a287ee760d4bf4d2594fb08b43a77cef46d371a746629bf76955e91 SHA512 b94724e130cdf58b911634496c52361d008ebfafab3ac40a76612c4891737d4145596a6badc15fe4228c90c1cd7261e5a892e3e462070ebb55f71332b36345d7
 DIST nfoview-1.24.tar.gz 86037 BLAKE2B 5d565680864f1a73a64d9557e69eda0771dc164f12018ac8964fb1c2225005c1bb881c7b9035c7baed2021838e3a291e52fb5af84cf9c271c046cfddd684270c SHA512 91ad1f9f972b7681655b429c0910475012bd2231e51c6db5659b19fb869779d1de10dadc1d6461fa7d577c051af9b74f1d463543a429e1dca438a4ff17ac2293
 DIST nfoview-1.26.tar.gz 117468 BLAKE2B 7fec761774ee66f1f5845d2d49cf99644d522c6fe402bdfd578e12371b58b3ac5a80b77959c92531ff54362c2234d043fa219b50730158c91310ba67b491f729 SHA512 2e697e3a49aa85fe0865ad9f281ea830e692335682658061f2aaaa1c5ed6ccb3dbd822dab244190ae0521ce237fbc3d91480da4c1229548f0fd5a74df712e336
-EBUILD nfoview-1.23.ebuild 819 BLAKE2B d1b74841775b655e954defe1c11c2f7ba13b1f6c20c9af2b8738426f477adab8f516a3b1052ce9c9200ae14fff77e6e8486b67e94b6b31ec93b1e312e91bb587 SHA512 aab862f1d97248ce88aafa7871c0b4f4d488cd2d04b1b5dd7e94cc43a3bab39a9a6f667438df5d8e1a364a3f3bcda5240d1f00900bd856a76620eec15d6a9825
-EBUILD nfoview-1.24.ebuild 819 BLAKE2B d1b74841775b655e954defe1c11c2f7ba13b1f6c20c9af2b8738426f477adab8f516a3b1052ce9c9200ae14fff77e6e8486b67e94b6b31ec93b1e312e91bb587 SHA512 aab862f1d97248ce88aafa7871c0b4f4d488cd2d04b1b5dd7e94cc43a3bab39a9a6f667438df5d8e1a364a3f3bcda5240d1f00900bd856a76620eec15d6a9825
-EBUILD nfoview-1.26.ebuild 821 BLAKE2B ad858c4db3193a44b2924bbf4384720a89db244b8afad8296e4735def9a54d5d1ceca27c9a2e87d616a661140ac7cf7ad338acfd38e9efe6c2c4afa5127ac719 SHA512 183e2cf0e3f817a054a2fb886e1f11827a25be5271aa31221380a05ecb56e67d06104f66757c673c49dcb5282508fb5d872ab69a80c4553d25e48cf0e0e3e1a3
-EBUILD nfoview-9999.ebuild 821 BLAKE2B ad858c4db3193a44b2924bbf4384720a89db244b8afad8296e4735def9a54d5d1ceca27c9a2e87d616a661140ac7cf7ad338acfd38e9efe6c2c4afa5127ac719 SHA512 183e2cf0e3f817a054a2fb886e1f11827a25be5271aa31221380a05ecb56e67d06104f66757c673c49dcb5282508fb5d872ab69a80c4553d25e48cf0e0e3e1a3
+EBUILD nfoview-1.23.ebuild 817 BLAKE2B 0b3131d2b370724dccc96cb32972780cf3d43b2bb32ceb3f5f2c4e14d2f49560d4dc98f82fb7200963cbf17fc2bb53320b0eb91f1fe690e9aa8c76c350db75ae SHA512 00c6e69051ecada167297b006c0b53302027a67c4f1ca911d854336dcd291b79e6d591c833df8fe09e56ca852dde10b6400f56c8abb9194ae254aa8444f708bc
+EBUILD nfoview-1.24.ebuild 817 BLAKE2B 0b3131d2b370724dccc96cb32972780cf3d43b2bb32ceb3f5f2c4e14d2f49560d4dc98f82fb7200963cbf17fc2bb53320b0eb91f1fe690e9aa8c76c350db75ae SHA512 00c6e69051ecada167297b006c0b53302027a67c4f1ca911d854336dcd291b79e6d591c833df8fe09e56ca852dde10b6400f56c8abb9194ae254aa8444f708bc
+EBUILD nfoview-1.26.ebuild 819 BLAKE2B 98129245e6681ae0455454018d2468d6d424a03b4e150f70dd067ad56c1adbb70d3e60a6a81f5c15e3b79384e3253abe50033131b434c4b445c24e787bc3a8ad SHA512 05b5dcbccb4141c959a32c3f45c4b2bf71aa859acf2f036770b169d577c94d604c05ed2d6b0fd36a4d79debac31cb978746a70712524b21ba24ac6ccb9131802
+EBUILD nfoview-9999.ebuild 819 BLAKE2B 98129245e6681ae0455454018d2468d6d424a03b4e150f70dd067ad56c1adbb70d3e60a6a81f5c15e3b79384e3253abe50033131b434c4b445c24e787bc3a8ad SHA512 05b5dcbccb4141c959a32c3f45c4b2bf71aa859acf2f036770b169d577c94d604c05ed2d6b0fd36a4d79debac31cb978746a70712524b21ba24ac6ccb9131802
 MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.23.ebuild b/app-text/nfoview/nfoview-1.23.ebuild
index 9eb90a2288e3..b7aa96c2ddb9 100644
--- a/app-text/nfoview/nfoview-1.23.ebuild
+++ b/app-text/nfoview/nfoview-1.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/app-text/nfoview/nfoview-1.24.ebuild b/app-text/nfoview/nfoview-1.24.ebuild
index 9eb90a2288e3..b7aa96c2ddb9 100644
--- a/app-text/nfoview/nfoview-1.24.ebuild
+++ b/app-text/nfoview/nfoview-1.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/app-text/nfoview/nfoview-1.26.ebuild b/app-text/nfoview/nfoview-1.26.ebuild
index fd688874d731..147b225c7db3 100644
--- a/app-text/nfoview/nfoview-1.26.ebuild
+++ b/app-text/nfoview/nfoview-1.26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
index fd688874d731..147b225c7db3 100644
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/app-text/openlp/Manifest b/app-text/openlp/Manifest
index 1c8a4f6bc5cd..a4034ecd6b9c 100644
--- a/app-text/openlp/Manifest
+++ b/app-text/openlp/Manifest
@@ -1,4 +1,4 @@
 AUX OpenLP-2.4.2-disable-tests.patch 795 BLAKE2B 0741116f289c1ec368e401d66a798f87124971c069921813f71518155e78f04b6fa097686899c809f8cab84084ab1fde2141d30ba74e4f940c2bd2647069c939 SHA512 ac67c675a4793be0194ccdc522737de0fd2b7b008707c19cfb5dd4fd1c17e88a59c0d38cdfebb02272774da81dbf06ca8b897504abe3d37b5eeaf40b8d0c63f9
 DIST OpenLP-2.4.6.tar.gz 7303683 BLAKE2B 4e5b1a60c8eb8772cdecf453e8277a69cfb1cdd51ab6478425332b58c52319713dd411027a108113485ee7fdc4c770cb6f94a626b23c6cca82231311a62df08a SHA512 071ca83c6969c5281213dea5efe6dfc60a3d22b56534b93e2fd1f8e43760ba5cab851b6f4dca485a31254d2090e26ce640359cb9f9797d84b9509426061dfb7a
-EBUILD openlp-2.4.6.ebuild 1194 BLAKE2B 424025d14382ea8d10ef848ef18a50742a32e61c8d0c73a5535833693a984b7c7ef0318c59cf9c860c232e79e7ab4a23f12ae00ae9188a54945c479b43baac2e SHA512 e2ecde641044717dfa88c142385999cca20ab24faa888f8703fbd2583170f340545041bd359eb57aeca8f659e62986e486e74e9daada2547b3fc27144b47362b
+EBUILD openlp-2.4.6.ebuild 1189 BLAKE2B c41779cce8f02f881eb73353e7a4f98807a96afbc0ca584be7487215b922fb811ea6020a65878c775b15062e560246cb0b40c081dd7c360cccaa071f07853a6a SHA512 7893daf5777bbb06809597d456e2fb7bee142072380d0460df3134e923a895a61eec8fc9c3f8f95574ada1e5ddcaadc041bde9f960b56e93ccd82457b7e21e5b
 MISC metadata.xml 294 BLAKE2B f31b24e7a16fb99a7d3952c69a2d4f4a75afc12fb5e91954b20b07d9e1a43acf08bba842e5e08c73272be9db317bc2e52c5bc5c5e4e8e2d4c95acc787ef3387c SHA512 c8a3971d0143dec3196e52b3bf877b4b3e29041ec6c3c78cc20415cc9fb9640bd0762a651c3f7fd8c12b27b60d0fcf99eb8f0761c10337a9cbcf84e7e78c37e6
diff --git a/app-text/openlp/openlp-2.4.6.ebuild b/app-text/openlp/openlp-2.4.6.ebuild
index 2e89fb61736a..bd2519a0933b 100644
--- a/app-text/openlp/openlp-2.4.6.ebuild
+++ b/app-text/openlp/openlp-2.4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index d03c5e64a64c..9dd1e98befba 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1,3 +1,3 @@
 DIST pastebinit-1.5.tar.bz2 42941 BLAKE2B 678df7f2e77cc832fc9e152fb451538284033d181d9165b1a1194b254ad08ca1ac3e4612dddf7db6c62c1c3c59265ad94a78cc6df9457565264864ab06bff00b SHA512 cc4b7c46ab7932be3a1064ce7a1d91da3ebf4b132ad44b0090c8d431bfc68e945357344e59ac1239e37b3178de124930c5c8dc552b42f16c39c0452ac9ab8099
-EBUILD pastebinit-1.5.ebuild 1340 BLAKE2B f179103c378e9ce18a2d015864780200f4822fd890d4f0b260089932f2a6a99061b07a2c58385fa0017d452bae2996d74c4fc0fa09dd7f62743922e82d22c862 SHA512 7f2cab15367a685f65881271f6860d5569d6d021fe18d66f190dbb9005bd0fb288fa68932586052443ab5457121b7759040d1ee390d52b7616e828c0bdd673e5
+EBUILD pastebinit-1.5.ebuild 1333 BLAKE2B b827bdcc95526640f4437c77f09bc046b856a71f4f5c8f790bedf16d96799e50ffde20489ad745ea9198cfdebc5de5d8db3eadfa52cd3881b96749f1e0b1d509 SHA512 0f3fbb06a7a5ab6a92e31c79a0eed6e0566d53f86646b68a5b2786c81a3279faa7d5064b2fd8e83cce15bb7a85064b7768f24657c8829c7311130484389ece37
 MISC metadata.xml 300 BLAKE2B 57c8bc28049b8b085b6e522604afabd2b2c8d35fd60bbdafff35b0c4a577c283c8b5491e44f8bea37cbf7b0431b57b058cbbba840caf7b665b5e865b192df6d0 SHA512 7dc26c0febbda314bdcba49514f0222c0cca81d0fc20a0576061b406c1ba388a0d190888b98f61291b4b3e251115c0417ea6a6e2aebae1d32678d182741fb39f
diff --git a/app-text/pastebinit/pastebinit-1.5.ebuild b/app-text/pastebinit/pastebinit-1.5.ebuild
index 9e79db0da019..c78123910daf 100644
--- a/app-text/pastebinit/pastebinit-1.5.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit python-single-r1
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 92ad807bff84..806206f8bc50 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,6 +1,6 @@
 DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c96660c2a34137a425f879688822ddc8bbc19805444bf2b49369c3dccf8a5303748ff9e7cbde3910d6ba501652 SHA512 9e04e6a2009cc134f74410d8c8349831467192e7524287e23cad0b68232f2b5dd04f5d98505222d71eb3441e466bccec1cafc7f6e3c6bfcb4c5e57e4ab0fadda
 DIST pelican-4.0.0.tar.gz 1314626 BLAKE2B 18924209949b43063416f2e2c6e22a5524a36bab79a801f7cc6953c0822beb1bd5b05e715f5bcdb7c4877aba8d7a62cf4276e8abc43406f3c6fd7af8ef0c7c2f SHA512 5d98f5e13e6dde6b27cc299f9fb166edec79efb3fc53b29567218e0d0ba164989ce51830029ec8359697bc039661f6b0ced8d4155105e29098c038840c97d253
-EBUILD pelican-3.7.1.ebuild 1475 BLAKE2B 9d2de4c9d95c66c4f58fec74ef8b8ed5d804539edf66684c53c00a2b668316fb0752ff612eea3dca024f7192a91d6d99a4ffa4b99b2dd00f532e7bab133d898c SHA512 4df5e139aec385af52f994e83ea8250eb73625b24fcf17a7dc344c0a57f87733d15cd0e5ae53fd1c8ce62e28e84c1e2c0960537cd524780382e17d9b5179f268
-EBUILD pelican-4.0.0.ebuild 1490 BLAKE2B 3fc5dabb6d210511ea296a2090b5a6b4b51fd8568296e77aa6f523e5f6fcaa38d3c0dcab7a5a413096fbd9de430df9ca45491d7d175031382e5adde61a3bd0c6 SHA512 9c266a6e0bfba42de95ab268a9cea7397f088b92001063a5591cb1680876317664c0eb3028abbb26c61fd8991eefe5db6841f7156b2495f161c042cc0d2e364a
-EBUILD pelican-9999.ebuild 1552 BLAKE2B e2ef90c3d6eb63e1e7e11f62b0605ed4d93a4d654a1ba3c0fe7a8a07134dac21e60f11059802346512419188e013cd141d887f08150166d55f6e4132270d5e42 SHA512 666fad2f7b97bbb8ec69b1b56cc1d5d1da1113af11588696e9ef35b1a375341c7bf89e49c1a01ca640d3ffd54fcaf60040c2372b4eb7f6f4346680b9eca7d7db
+EBUILD pelican-3.7.1.ebuild 1468 BLAKE2B 0fe9e784ad7514b9d92e35c2e6f07bd5d8b5a9fc68e83c7e1367968c809b0f90566f7109789b142cb56c7090e6d4060ea0b754bed7614894848ce18829ef6678 SHA512 f6e81e8e93d6de41516b6e0b018974e8bd8174f10b0bca7047859644a1fbac3b0a199da331cce29a0e205362a0f935000178f4212bc27692a34f592fc8a9cc8d
+EBUILD pelican-4.0.0.ebuild 1486 BLAKE2B f4359af3f68b0e9e05d7238d3b3cf4efe58bd494b059f13d8e0af92d65f55bbb924b9cb672fcc4651e7dca101051bca43073353895cd6a2501f3d91e3c80a20a SHA512 b87631cf9a40de695173e114cf3fc347a8d7ea876174476b997c7ae9e49d2c7d5906ad90e25c72af401d236e62ee3d653bf88029ca3ab333e743bd3ef82f7a0a
+EBUILD pelican-9999.ebuild 1545 BLAKE2B 7571deb70118ea2764b71544a3adcbf863be67713a68f5a71dd336397c69fcc9bb0c285dc7ea7a533f72547be398fc5dc43c7440348b1a386e55a583c4d55d6f SHA512 f7f9c00e6905be764bd93a2612460a9db99d5e57c2bbb8d3df5f4164085ce1455a41ff42541e24ad6cd5c1afcc3bb5d38761e3362ac7f4f9d4fdd3287ec3670e
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
index 2ef91da11647..af10a1759f36 100644
--- a/app-text/pelican/pelican-3.7.1.ebuild
+++ b/app-text/pelican/pelican-3.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-4.0.0.ebuild b/app-text/pelican/pelican-4.0.0.ebuild
index 568df33717e0..fe8645d7688c 100644
--- a/app-text/pelican/pelican-4.0.0.ebuild
+++ b/app-text/pelican/pelican-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
index e2ca3d7b95b5..7b7d57344621 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index b7d626b1bc71..06d50996d1a8 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -11,7 +11,9 @@ AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 BLAKE2B a49a7addbf822436bc5cb8cf2da9964ec
 AUX pinfo-0.6.9-as-needed.patch 457 BLAKE2B 5e104b202a66c377cad570d3427043fe8273e6c907738283ed596185852cfb5713d430250d2ae83b11d7708139fa7f2dd962add064c3e3c96fe6112359faee26 SHA512 c4b23c4f273b35d2594af81ee4bf9aca60cd5208f1c3ab4a084805a63fdecc8bb7f2a7ee6118130ba691e3fa17e79f2671a90b7bc0af7e3cccaf12d2baecfe7f
 AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc66f6af2444e8b9dee2c0e6edb5afad1d467725507c9618947463cdd2f221024c7feb387282ebafcb6bc62741c89 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4
 DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d78518bb4d5399c100bf0aec291c869576b18313e00f8572610cb967c3acb5f8d643c48f1295fd2efa8e16e3e6 SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e
+DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
 EBUILD pinfo-0.6.10-r5.ebuild 1327 BLAKE2B fa65a2d59989d50982921aaf64b2f7e98fb3c4ea82e2c1537656d30159d44a29df0ffb0c8034dbabcfb4b82386bf15b7f4ccf86f5fcfb577eaa667cab7ee22b2 SHA512 f5132c2d41aba6c9cc41076571d70266db613f28ce63c1c3d3b3902c011d3860004cd910280527090b72c97a7735928ae2c3e8f85f96139134bf847d6ec624ba
-EBUILD pinfo-0.6.10-r6.ebuild 1435 BLAKE2B 59de9ee6051e3f30ae317dceaf6a2b630656086c1f25b143e5a3bdf4753bac68f8bbf71d1f0e9007a51b09bcc15705454c6fb37e06c180616e4f16ebeb39757a SHA512 6be7bf185352819df93a606b38bf73629c7c1a332667dcb89ca5148dfc2ae503310302f9d35560af1862e3651a62befecb2a58b7822b8e64bfa90528c9e60d3c
 EBUILD pinfo-0.6.10-r7.ebuild 1440 BLAKE2B 1a52c7a2f04d51b7788233a0b0e4f4ff3367a798abdfe2c1c949655431652e1fffccc0b8c582143f596e44d4753a1e67d9b19a3b2f4ed5442260556015260990 SHA512 001351b50d182fea1772686449629ceb9946625f0d13d1f13219938ef0a3dfaaeb142d3fa7d8dd3dd1f28cb359da3a526d76654875cc6c62bf39451f1b6ca431
+EBUILD pinfo-0.6.13.ebuild 975 BLAKE2B 22338c9bfd712b43760ff67e1a987a5266175fc8d6656941acef4d16f9029502f02157cd69a3f476fbc434b0cc6c89f466b6a15ee94271c63cc6835e1d428aa3 SHA512 ec1b0bd68a7ff1506e00ca1c26be1233bf71b3200ffb3d1c3c4a60701517cd9b08dc22e857e2a8447aae58c8044dc5a6033eb45f7c77424711db5e7f84a448b4
+EBUILD pinfo-99999.ebuild 886 BLAKE2B 52c3d54f248446df82c34f49a4ed73ea3cd6dfebac907a7624a9eab847234b997ee1b24d3367ba1e0426ed6e2ac7173a95b35d4aca18f7d2b597bdee45197c83 SHA512 87561fef7173dfd86f36edd55ce92d1afb70d995d589b25dc889e0bee9a48116a1eda7f4673e3d47dbb466052b45e1252af255e43d7551417ffcf00feef0e91c
 MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
diff --git a/app-text/pinfo/pinfo-0.6.10-r6.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 244a97c87c72..7ea70501a526 100644
--- a/app-text/pinfo/pinfo-0.6.10-r6.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils flag-o-matic
+EAPI=7
+inherit autotools flag-o-matic
 
 DESCRIPTION="Hypertext info and man viewer based on (n)curses"
-HOMEPAGE="http://pinfo.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
+HOMEPAGE="https://github.com/baszoetekouw/pinfo"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,34 +27,23 @@ DEPEND="
 	nls? ( sys-devel/gettext )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.9-as-needed.patch
 	"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
 	"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
-	"${FILESDIR}"/${PN}-0.6.10-version.patch
-	"${FILESDIR}"/${PN}-0.6.10-info-suffix.patch
-	"${FILESDIR}"/${PN}-0.6.10-dir-file.patch
-	"${FILESDIR}"/${PN}-0.6.10-tinfo.patch
-	"${FILESDIR}"/${PN}-0.6.10-gettext-0.19.patch
-	"${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch
-	"${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
-	"${FILESDIR}"/${PN}-0.6.10-clearfilenameprefix.patch
-	"${FILESDIR}"/${PN}-0.6.10-gcc-7-inline.patch
 )
 
 src_prepare() {
 	default
-
 	eautoreconf
-
-	append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
 }
 
 src_configure() {
+	append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
+
 	econf \
 		$(use_with readline) \
 		$(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" sysconfdir=/etc install
+	emake DESTDIR="${D}" sysconfdir="${EPREFIX}/etc" install
 }
diff --git a/app-text/pinfo/pinfo-99999.ebuild b/app-text/pinfo/pinfo-99999.ebuild
new file mode 100644
index 000000000000..961b78a24b48
--- /dev/null
+++ b/app-text/pinfo/pinfo-99999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic git-r3
+
+DESCRIPTION="Hypertext info and man viewer based on (n)curses"
+HOMEPAGE="https://github.com/baszoetekouw/pinfo"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls readline"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	nls? ( virtual/libintl )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+	sys-devel/bison
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
+	"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
+
+	econf \
+		$(use_with readline) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysconfdir="${EPREFIX}/etc" install
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 164d20f6d399..a889e7b6962f 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,7 +5,9 @@ AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27
 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
 EBUILD poppler-0.74.0.ebuild 3515 BLAKE2B ece68c444171e98859d712870d0611b9f2c49d4fc46b181d383253fe62aa64e4a1f4bef87c7940f103e878c722d4b29dd5f137d2a199da2cd0f86459cd313a62 SHA512 9ae8a8e2860129702bc3f03b0e934c7f3484c57d3e41fa2a2defa7e97c58d885cfc195289d5e2fd5ffdee809433452d4c9f7d40856d66366ca3bb9318ae038e0
 EBUILD poppler-0.75.0.ebuild 3526 BLAKE2B 519a0db97078b67ab704ed6bd9e1e264f877949b67fe014bfcf84ecc239d4f92b7060592bb44f31f519406b31031a8f00a53829da8609d8f833cfcc0cb9ba75e SHA512 d688ba1d78aeca0c0f6d5c406d0cc714911ad9cb57544544757675fb5b3771b8b4bb2a9cfe6571d601ad2b85fade836bdc14d7518b3ecd883f023fd225c9ab3c
-EBUILD poppler-9999.ebuild 3526 BLAKE2B 519a0db97078b67ab704ed6bd9e1e264f877949b67fe014bfcf84ecc239d4f92b7060592bb44f31f519406b31031a8f00a53829da8609d8f833cfcc0cb9ba75e SHA512 d688ba1d78aeca0c0f6d5c406d0cc714911ad9cb57544544757675fb5b3771b8b4bb2a9cfe6571d601ad2b85fade836bdc14d7518b3ecd883f023fd225c9ab3c
+EBUILD poppler-0.76.0.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.76.0.ebuild b/app-text/poppler/poppler-0.76.0.ebuild
new file mode 100644
index 000000000000..61a50816fcf1
--- /dev/null
+++ b/app-text/poppler/poppler-0.76.0.ebuild
@@ -0,0 +1,127 @@
+# 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/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 4c97add33be3..61a50816fcf1 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/86"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	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"
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 51fe12d678bd..0371c1547e84 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,5 +1,5 @@
 DIST pytextile-2.3.3.tar.gz 42277 BLAKE2B a6e6e1d96695f3ada03f5da9bd8bd19b99da345d83c62b1d4f2e765303dfbbbee072da4611f1b29b46d28ed334373c809117940ff0c1238dea3b12fb9076656c SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60
 DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
-EBUILD pytextile-2.3.3.ebuild 1022 BLAKE2B 37b4074eb8fe9107d61b1c26a8f24f41efd69646eaa52cdcba0feac1f74b1255bb5d7953ebffdb6456033b4ba3600fb73dea3b1200d1616396decaeaf542e811 SHA512 555e58af6e404fecbc93372a064c208d27303f78c7607baded5bcb7267ec38bea4bfac24bf3a0b10909c6edd5de557b662d5d144673e190ede513d942f6cb941
-EBUILD pytextile-3.0.3.ebuild 1020 BLAKE2B 0891ae2944fa0a4338bcc67ae47cddcf5578e5e9f1b0ac3959753168aee4c480598354a0c90b38102573572a1f71af32e34b7d5f6b9d3aaa36c775bd8d69515a SHA512 58b533104b2efdb6a2fc07c6a546c2fd303781ac1efde727cc4302e8e0bdaa02fb4a8c9a881e79d452796f8b9073a5b2027c7c44628686393a075b76e36791c6
+EBUILD pytextile-2.3.3.ebuild 1018 BLAKE2B 141e7e718091d3c64e77a1e7145ac0f0dcfc9b41de64378d7a903a5b6194c73d388b40b8bc10b6b9927edcd632341b29afa2a125b6c633763eb3514bc370d3f7 SHA512 f57a8474877268a42665b4c36042dec0c876afd5b0d986bcf23a4bfe856dc34d9158804654ef9d3cd0f119c0d5e3954cda7cb01ebda27f7d850fd65ab5b5728e
+EBUILD pytextile-3.0.3.ebuild 1016 BLAKE2B 0d0078c4870eeba7cdf970dd1ca55ff3620d3308864447310d8929f690e65982623c2b72913ae598e4668b77a7d5ef5c568861e80ff00aa5155ee5e9dc9f5528 SHA512 db2ae7f208ab478868d858b72bd67583d897fafaed51f00a1ffc74b7670cc22e68fadd2704892063b5d7e5135519c4bb0e8357a8a36f6881ac521199e701047b
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/pytextile-2.3.3.ebuild b/app-text/pytextile/pytextile-2.3.3.ebuild
index 0cf0146b654e..222e6d2ff4a2 100644
--- a/app-text/pytextile/pytextile-2.3.3.ebuild
+++ b/app-text/pytextile/pytextile-2.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/app-text/pytextile/pytextile-3.0.3.ebuild b/app-text/pytextile/pytextile-3.0.3.ebuild
index ffe603741631..d06e62c366e2 100644
--- a/app-text/pytextile/pytextile-3.0.3.ebuild
+++ b/app-text/pytextile/pytextile-3.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
index 809e30bfdda1..5c0a5601ce4b 100644
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@@ -1,7 +1,7 @@
 DIST restview-2.7.0.tar.gz 29448 BLAKE2B 0cf90599fb9b5c98e674f690ce3082f61f6ab83c46ae90934bafe5d9b62eff70f943a18aef91cfb61e234e04a4fb12d39c2e3a01faec688574ecf6c2d0b22f89 SHA512 fccfed505832b85bd4fad964f78b0de371ea0a42ac5cc700a8604e413743a236b70f0160edc115d1e9cdef03f2aa7fc461893f40e01203a048756887f655f65c
 DIST restview-2.8.0.tar.gz 44577 BLAKE2B 03fb6d6200b9b9c82abd2fc5f81cf7afd2ade0067b0e657b7d19a3abd12d72046633217ef57143f3f45c8360721acc65d499cc8c9bd31a461318699368ff7d7f SHA512 99bee763493d2a5fdf17b228c62eb9fe6adfbb6e0f3e09c758ceaeabc6dece892dbd750d043d722c6df456b27bdeeecfe1cf4187a53c2a0333a05b1e147e71b5
 DIST restview-2.8.1.tar.gz 46103 BLAKE2B 3f5b8852b1d174736333461181e9cad06c16ea8ac40e5041c5bf8246360e161609d99ac26a7a32f1dec518c017a30ecf1ac46eea80569b0d213ae62bee8ecc5d SHA512 cbc6057df06a108ced9bfbc7442730c8bbe3bbe334eb6f708dd54e899ed6630bfb05e532c403a9a1a36b170dbe933a5829ada3b014147a3834c492456ca65363
-EBUILD restview-2.7.0.ebuild 722 BLAKE2B 20d65f181d143b3ca98c733e81546ca82cc92536e31c8380ccd74ac6ec9deb4c33fbbb7e845308314fc10e683d3404c30bdd7bf8031c1bf47a126d70f64f2530 SHA512 5d6dfc20a515bc4be4df12ac7ed8a670dbea571762c170f7723604141b82d160b0a41a6e352ada16f61f0f73f24921241d080bb771c1e7aac09ee08b1e4b0b49
-EBUILD restview-2.8.0.ebuild 722 BLAKE2B 20d65f181d143b3ca98c733e81546ca82cc92536e31c8380ccd74ac6ec9deb4c33fbbb7e845308314fc10e683d3404c30bdd7bf8031c1bf47a126d70f64f2530 SHA512 5d6dfc20a515bc4be4df12ac7ed8a670dbea571762c170f7723604141b82d160b0a41a6e352ada16f61f0f73f24921241d080bb771c1e7aac09ee08b1e4b0b49
-EBUILD restview-2.8.1.ebuild 722 BLAKE2B d3e5a2c8c0c1f0e18df5b66c75475c93a79942b3185e67ad9da0347098e53367c20be7d6261a1bb4fa51acfa09de69cca6a0a9d679bff9f80125a6293657227b SHA512 30b04b0bd3ec1f495f4d8e09740b654dc777732fa579468a72ee36d17e057f9d0691ce6f65a39fd912ab2497ce1ffd169c007322a4798fec237b9c37d36e645f
+EBUILD restview-2.7.0.ebuild 715 BLAKE2B b1050004fc5b21c395fe9376cf82e21fbe399350778b82f41a10381645199f50814e02b3de6d1711753e672b70a6ecbb3bbd4097323308c1055c1b1b8997a029 SHA512 ce89ae3d297d7cc6dc53b7ade6462c195cda6eff14c96f512d6c265d1bd168d907cab3311e1193aad212214f589086f026f5248f0d163affcc6dc06b44b270e1
+EBUILD restview-2.8.0.ebuild 715 BLAKE2B b1050004fc5b21c395fe9376cf82e21fbe399350778b82f41a10381645199f50814e02b3de6d1711753e672b70a6ecbb3bbd4097323308c1055c1b1b8997a029 SHA512 ce89ae3d297d7cc6dc53b7ade6462c195cda6eff14c96f512d6c265d1bd168d907cab3311e1193aad212214f589086f026f5248f0d163affcc6dc06b44b270e1
+EBUILD restview-2.8.1.ebuild 715 BLAKE2B b1050004fc5b21c395fe9376cf82e21fbe399350778b82f41a10381645199f50814e02b3de6d1711753e672b70a6ecbb3bbd4097323308c1055c1b1b8997a029 SHA512 ce89ae3d297d7cc6dc53b7ade6462c195cda6eff14c96f512d6c265d1bd168d907cab3311e1193aad212214f589086f026f5248f0d163affcc6dc06b44b270e1
 MISC metadata.xml 327 BLAKE2B c839b763e0975489978f878c5ae32c89e3596cf5cdb2061cbada9a698b7985779abf6645b50f772d5924fcca664766cc31b186c9bf4fba9e76cd099c6559e78e SHA512 f4fcd47d4f411bbae5e9a29055a34a0e4a0367750ac10ce57bec7d4c32dbce43679e041b444eab258e616b571936de251fa22fd06aa8e3258cc2c882f913d3b9
diff --git a/app-text/restview/restview-2.7.0.ebuild b/app-text/restview/restview-2.7.0.ebuild
index 72050adfa23f..b7a7637a5e31 100644
--- a/app-text/restview/restview-2.7.0.ebuild
+++ b/app-text/restview/restview-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/app-text/restview/restview-2.8.0.ebuild b/app-text/restview/restview-2.8.0.ebuild
index 72050adfa23f..b7a7637a5e31 100644
--- a/app-text/restview/restview-2.8.0.ebuild
+++ b/app-text/restview/restview-2.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/app-text/restview/restview-2.8.1.ebuild b/app-text/restview/restview-2.8.1.ebuild
index 4a48d1c8d80c..b7a7637a5e31 100644
--- a/app-text/restview/restview-2.8.1.ebuild
+++ b/app-text/restview/restview-2.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/app-text/rfcutil/Manifest b/app-text/rfcutil/Manifest
deleted file mode 100644
index 1b2fc35136f4..000000000000
--- a/app-text/rfcutil/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX rfc-3.2.3-index.patch 998 BLAKE2B 03681e23c38abb48d31f1b163ac4086b90a535ec1e27ea7a9dd8d9ed7fe3d6dfeb215a0199525677b0e648aac7ab5abf269c9bda2c8631b580d14c97e2123b68 SHA512 cbf0dd87e6879e2510da0cbb43a62ac1e772afda178d8c9d6a8817c93b8edfa2dda98bda0b57c6bd3abdc06e558b8656ef9dd7467cd4efdba391a01a1f47180a
-AUX rfc-3.2.3-paths.patch 839 BLAKE2B 64a0dcd84fe6405e6f1f03c5be3bf4de7dc4d1f1fc9fbf393d7ddded35b20bbc2669a1e5c35fa1ae75d8950f89ce10ef4ebda4e1ded729c6a00da039ee9ed85a SHA512 be0897633ed1a56ccd5f44b018af030a9eeb6c02cd792dfe5cc0f3280f9a9319f5c48a2f71a6928b64c6ec7360c3f7c18ec74d9cea4039cfd68e35147eea1d79
-DIST rfc-3.2.3.tar.gz 10469 BLAKE2B 8158a707c216a88b0ed41b60146f1ef53bdd060ed88cef18e38c9fe69c638fec38df1c83d4bce281d85446f11e2035086c7d2f19b8bd60c8fa4349f0e9f35bfa SHA512 b16ff2ee0c7a1213369dd4d5d1033c6daf95f283b170ffc46c02b65cd125d4bf2b5dd8b25e8b6a9153330f8fc624454589ecb6d77f2d47e9e34ae18ccbdaf095
-EBUILD rfcutil-3.2.3-r2.ebuild 951 BLAKE2B bc581f684a5cb4d812606152295e7dcecdde81c33f468226f0adbdefb568f3f338886964e2818095415e2d33ae49a74028039f0427e8a3d15b1402bd958ad27f SHA512 5d86444d8656d6c1aa725868a8aac33b040da5e5c6b5aefac542cc40b186e3d05ac17b99d936bec1077bcbbbac17f2194fde08528493d91d3a725734842f4788
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/rfcutil/files/rfc-3.2.3-index.patch b/app-text/rfcutil/files/rfc-3.2.3-index.patch
deleted file mode 100644
index 6b4deb607d6a..000000000000
--- a/app-text/rfcutil/files/rfc-3.2.3-index.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/rfc-3.2.3/rfc-3.2.3
-+++ b/rfc-3.2.3/rfc-3.2.3
-@@ -103,11 +103,12 @@
-     ."It may be desirable to change the\n\$indexpath to a location you can write to.";
-     close (INDEXPATH);
-     $indexlength=numlines($indexpath);
--    print "Modem users one moment, it's about 400k \(doesn't need to be updated often\)\n";
-+    print "Modem users one moment, it's about 1024k \(doesn't need to be updated often\)\n";
-     print "original lines \t= $indexlength\t$indexpath\n";
-     #system ("$viewer -dump http://www.faqs.org/rfc/rfc-index.txt > $indexpath");
-     #system ("$viewer -dump http://www.dewn.com/rfc/rfc-index.txt > $indexpath");
--    system ("$viewer -dump http://ftp.isi.edu/in-notes/rfc-index.txt > $indexpath");
-+    #system ("$viewer -dump http://ftp.isi.edu/in-notes/rfc-index.txt > $indexpath");
-+    system ("$viewer -dump http://www.ietf.org/rfc/rfc-index.txt > $indexpath");
-     $indexlength=numlines($indexpath); print "new lines \t= $indexlength\t$indexpath\n";
-     exit }
- 
diff --git a/app-text/rfcutil/files/rfc-3.2.3-paths.patch b/app-text/rfcutil/files/rfc-3.2.3-paths.patch
deleted file mode 100644
index 8d61bdbf3889..000000000000
--- a/app-text/rfcutil/files/rfc-3.2.3-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/rfc-3.2.3/rfc-3.2.3
-+++ b/rfc-3.2.3/rfc-3.2.3
-@@ -36,8 +36,8 @@
- 
- # These make it avail for all users if you can't 
- # run it as root. (full path, not ~/ )
--$indexpath="/usr/local/etc/rfc-index";
--$servpath="/usr/local/etc/nmap-services";
-+$indexpath="@GENTOO_PORTAGE_EPREFIX@/var/cache/rfc/rfc-index";
-+$servpath="@GENTOO_PORTAGE_EPREFIX@/etc/nmap-services";
- 
- ####################################
- ## add as many urls as you please ##
-@@ -46,7 +46,7 @@
- 	    !http://www.faqs.org/rfcs/
- 	    http://www.isi.edu/in-notes/
- 	    http://www.cis.ohio-state.edu/htbin/rfc/
--	    /local/path/to/rfcs/);   #MAKE SURE you have the trailing slashes
-+	    @GENTOO_PORTAGE_EPREFIX@/var/cache/rfc/rfcs/);   #MAKE SURE you have the trailing slashes
- 	    # URLs beginning with an ! are treated as HTML and not text
- 
- #######################
diff --git a/app-text/rfcutil/metadata.xml b/app-text/rfcutil/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/rfcutil/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild b/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild
deleted file mode 100644
index 2706c02ec2ab..000000000000
--- a/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils prefix
-
-MY_PN="rfc"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="return all related RFCs based upon a number or a search string"
-HOMEPAGE="http://www.dewn.com/rfc/"
-SRC_URI="http://www.dewn.com/rfc/${MY_P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	|| ( www-client/lynx virtual/w3m )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${MY_P}-paths.patch \
-		"${FILESDIR}"/${MY_P}-index.patch
-	eprefixify ${MY_P}
-}
-
-src_install() {
-	newbin ${MY_P} ${MY_PN}
-	doman ${MY_PN}.1
-	dodoc CHANGELOG KNOWN_BUGS README
-	keepdir /var/cache/rfc
-}
-
-pkg_postinst() {
-	elog "Gaarde suggests you make a cron.monthly to run the following:"
-	elog "   ${EPREFIX}/usr/bin/rfc -i"
-}
-
-pkg_prerm() {
-	rm -f "${EROOT}"/var/cache/rfc/*
-}
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index 16c2a43e11c4..78cb2a10d744 100644
--- a/app-text/ronn/Manifest
+++ b/app-text/ronn/Manifest
@@ -1,3 +1,3 @@
 DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
-EBUILD ronn-0.7.3-r3.ebuild 1160 BLAKE2B 053326be2920dc763a40dafc44b08b0d16d9a2514cd6d8f8dfe162a15e8e2db11cd546c68256f49306e1296047dbee17c6e9f482207fdd9e064062522ff3981d SHA512 1703411a04758b835f05c124a03c6cbdaf8cf914151682daf01bd1231cb39dcb649e419331dc7348d06ca41aa0e113bdce3f87d09f57d3a03e4e84dd1559ac0b
+EBUILD ronn-0.7.3-r3.ebuild 1159 BLAKE2B c64497c8ef575ce0eaa64118014e4086d19a0dfabcd3a8aa6ca373d6b6c1b09e57f0a55291e89363f14a39dd813d94659818f34f4c69992c4cd56f9f44e9c05b SHA512 e6efe09def342f7810ff221db168cb333ec5bb31f6afb7d88bd88e9021752678c8dc703cc36be25f4ebb7da0618d44e6de3d54d0fe8c9627ffba9360ec2081b5
 MISC metadata.xml 339 BLAKE2B 2a1722a0531a1ccaba0d29a1ace114b95789ba4b0c692e8efcf38605f81de4dd1210671331fcdb5baa6536cf38fbf63f11b85fb13bd6a067be56f22a372fc5b6 SHA512 0be4072cf3514eba60569138ed409362b318616ad4514e319d9b4add120e74fd7655e2fc5c3ab8d7b5d813cfcf8e1054fb98395a1a89d9fb90e447a825ee9439
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index 95b4f9bd2f1c..491c5abab355 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"
 
 IUSE=""
 
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 1710a1d4033c..5b940cb777a2 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -5,7 +5,7 @@ DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47
 EBUILD scdoc-1.3.1.ebuild 1031 BLAKE2B 3da18d09700584dc4c3365ea66c06bdcc5e8363e5dd3ca44a0c36a2237abe6ec444a760ed0ee288e522d6c4ea1994f8c9dc0db09a6b3bb07005f8cc9c379915d SHA512 2a943adf9b0ecac43499c55f74ab56fb0f5cc59d74bb43862726ff4da4aa9a765c09cc8b4ff1de28cae3de0d7856634de65027c83577a61c91c2b222fa6f14cc
 EBUILD scdoc-1.5.2.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 EBUILD scdoc-1.8.1.ebuild 1109 BLAKE2B 9e0265584e2e9dca427d2ecd419a0ab72e723f88d4cb88be78e0ad5266a48534930d848c35a7542d8de89a12c91b7d279002c5d2b6a9550358666737fe191838 SHA512 5fbf573577f5e489e8361c8fc03594a1a4a0c38371e2df40af7178e0bbcc5b4bc78ce01c88e35326c6c66142a491bfb40a25b6be2e6373d10bd382e048bc3e68
-EBUILD scdoc-1.9.3-r1.ebuild 1154 BLAKE2B abebdc143dcf69209b591b14a752348481cb53887a3bce20c9e2b3c56645be2022c407e9ea7f06bcbdd3d7a3765aa0abe255a5891c903b3d259370af639eb93d SHA512 6e74ce420930fb3996d53fa105c845adc07103b8dc131b69cd09fcea9e2bafbdbd9cfaf6fbe47ce4491f05a6284198916160dc0375f4aa60846390adb5e2ac86
-EBUILD scdoc-1.9.3.ebuild 1109 BLAKE2B 9e0265584e2e9dca427d2ecd419a0ab72e723f88d4cb88be78e0ad5266a48534930d848c35a7542d8de89a12c91b7d279002c5d2b6a9550358666737fe191838 SHA512 5fbf573577f5e489e8361c8fc03594a1a4a0c38371e2df40af7178e0bbcc5b4bc78ce01c88e35326c6c66142a491bfb40a25b6be2e6373d10bd382e048bc3e68
+EBUILD scdoc-1.9.3-r1.ebuild 1159 BLAKE2B 2d641f93754cdcb59473165a212b127b21d4ab64ee2a0756ad05d6384ca2e67c9e6f94f51b1d4398340076e92472f44b2f1767509ea7671e7128a141d3e481ac SHA512 8cca09a88f643d3e08febe334c5d4fddc4a80ec4e8b014b785ae10220f45eab3a3911e5eab8b5c36c9904cba8d42905d3c742367c4daf9fc2352147fc7351b01
+EBUILD scdoc-1.9.3.ebuild 1108 BLAKE2B 7beb9f0d42619ac83496a9e9e7d86ac1ca359f397d3b7d74162c8c4fc60dbb5bcf2cfbf5a8d83497d34919ff8b0bc4417916ab2fc237c16aa138e076a792f9b9 SHA512 17def7a7bf2e90554eb736a7d50e4450b12508430a5c3464e6f12ace019596cd640241fd2d6941ec1c0b3d8235e80d2fa9fdd2df185d7efe30a3e16bb562baca
 EBUILD scdoc-9999.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 MISC metadata.xml 444 BLAKE2B fe48dd13d534bacc09205bd073b4052e2f5afca50eedea53236f7d2d2f31f4f876fe0b4dcb57eb8a87b4090fffb5f924ed57b9a636453be7c2bb586cc4d1a142 SHA512 3a172b03f1768baf0bb940bd842f7e6c05762e79bb1d8632bdbf86276e79cda7f1b334750a3650cc86106154a8b2e2e426c7ab99d41cc5bf5119ac1e81e7b5fc
diff --git a/app-text/scdoc/scdoc-1.9.3-r1.ebuild b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
index 119be54bf057..7e318dbd570a 100644
--- a/app-text/scdoc/scdoc-1.9.3-r1.ebuild
+++ b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/scdoc/scdoc-1.9.3.ebuild b/app-text/scdoc/scdoc-1.9.3.ebuild
index 2e828db3f05e..d32ef2884483 100644
--- a/app-text/scdoc/scdoc-1.9.3.ebuild
+++ b/app-text/scdoc/scdoc-1.9.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index acac51261cfb..e432282df490 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,4 +1,4 @@
 AUX sigil-0.9.8-proper-gumbo-install.patch 1351 BLAKE2B d24d6e0be9b7c56c944aad2d97528ef38b3f96b4d81504b1169095112cc939a662101754ccc9f4d8e9303cd0e9d2ad084e8c86c32d73d43720d1a1736ec572d3 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89
 DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
-EBUILD sigil-0.9.8.ebuild 2239 BLAKE2B cdd30741e8baedcc5a3beafb84bdfdea692aa9ae149188c3142ff78b85cd694c3fc6335ba7552d4652b0fae92d4b787cee518c832fbe272aeef7854e8dc1e5eb SHA512 1363e6b342a3944559016cddfa52de131a2b7600a0f2699cbbf4e077683d48ba87ab0a0a222c9d279bf8bbbc7779327c048cd54e61fc1459f6997ec54551bf2b
+EBUILD sigil-0.9.8.ebuild 2234 BLAKE2B 81dbc8905e5e4d96f7a423a64a66fa2f5a1ad501a7f8e8ae4049bbf43cbac8366c7fe388da1a9ba9a2f4aaca92b7df9fe585443276f283f80a305eead2797db0 SHA512 834be1bffdd30059bd224d8b0ea0d4b5efa8286f934042183e305ba793b3b25bca01a807ce1c3de9c011d4c335a5362bcfd6cc20694a83f4f9142f65f91286c9
 MISC metadata.xml 389 BLAKE2B 8f9988168470e8545fa0fa47e520d7019cb9cf1ba8af0c502fa0b66a8a6a4567feea882d0ddc44864aac2193b411010eee2bd7d5905c68b34a32550ba4f6e223 SHA512 0728fc5f14cceb331ea75a6231d176ecbd22defa77b6d90a6859ec6e001feb3cd1f9c57c779bdcf83f81a4f7dca06e120964d6c93e372e39584293addacb5929
diff --git a/app-text/sigil/sigil-0.9.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
index c033f4ff46fb..fbd390f249ce 100644
--- a/app-text/sigil/sigil-0.9.8.ebuild
+++ b/app-text/sigil/sigil-0.9.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 89097e90c3c4..ca341c1a12ee 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 683 BLAKE2B 4e904c45a20fd4c4d1c3f87df6c1132b7e68717f741b55ae7caa68b9e4e7d15001bfb9ad8d5cbc6da7f3515fe836d8462ed1881563ba274ff1992d05512c4d78 SHA512 42ac389c1bd50be14220b24ae6228fa6a96d6e59564ca73894aec82a672b35ce17dff273c781c71f959af675f70b531caad6d3fca96a2b62f8bd866b37467179
+EBUILD t1utils-1.41-r2.ebuild 676 BLAKE2B 278d765bd8594319ebf24af7053b82c0eefd8bd3d833961348dc02e74bdc628af85c2c66e67b4c94ee357d2f650ad9befb968f891991bda1527120fa9ad5daac SHA512 921c5e3903f10ef8810eb2c861da3072d7c8721f5779d1413ab0563724d1817328cd74895163af38d863f6ce18dae2cf5737428f4a104d1511815244ebd32902
 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 a07fa240ca88..f74fe7aa8539 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/texi2html/Manifest b/app-text/texi2html/Manifest
index c4498e81029c..c57996c6451d 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 1321 BLAKE2B b9c038b1a7317b6b2a74acc21414f0a687fdcc7688cf7e2cd30026e3f11641a78e06acd5fd5fcd1973a90d84aa13d65cafe29a48f0a9a1313bd84b70b2f2fb17 SHA512 587ef4af50303b8a1dd1bd4f41a79a23110a88081b61686322798cd6e78a03a68f46eca409779712d453599cb830bc24258963ec00d6a88d1224e70cf3f93e54
+EBUILD texi2html-5.0-r1.ebuild 1354 BLAKE2B 6e191188a097590e44fcf66fc9943c96c3fd3cd8069651d4dc4cca27ca3acc533a226e1ff551da268365eed4b54960dbe49715b794d762f99a1d74dba7c07d1c SHA512 0402c38e6ac525be20f915f2a9659052a6f0cda99e9311a65db43d482086018086d401e9c4d6702d1860688677a02d3c27964bf2728eb30a9eedfc5791ddde35
 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 3c4b85e12fc2..89bcf9296bf7 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-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=4
@@ -9,7 +9,7 @@ DESCRIPTION="Perl script that converts Texinfo to HTML"
 HOMEPAGE="http://www.nongnu.org/texi2html/"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
-LICENSE="CC-SA-1.0 FDL-1.3 GPL-2"
+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"
 IUSE="unicode"
diff --git a/app-text/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
index 002d815dd987..2274ff384549 100644
--- a/app-text/wiki2beamer/Manifest
+++ b/app-text/wiki2beamer/Manifest
@@ -1,3 +1,3 @@
 DIST wiki2beamer-0.9.5.zip 443288 BLAKE2B a0263ba7044966ff45c892e9f0f78f6916346c051bf57cc8445f4127019cc4cd031719b1b5b61fc7d41a85b42439fa20cdf8fc35fbed43feb28d6d9797c781c7 SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7
-EBUILD wiki2beamer-0.9.5-r1.ebuild 801 BLAKE2B bc3fe07c1ed3f1a94abd81f9cb47f49c5db7fc2e998ff6bb5998d247b68a8b275549b3bf988c1a344d252efa0fd711878c012243c56f33d32e332c3f620129bb SHA512 05d00595fda2c119f3c5be98d9a15b7dc9359a7155d0f57bb120e8814a88ef16d489effc61e0c7d4db74687904dfe22ed0b64ffab1b81eac68c0a9cd117df505
+EBUILD wiki2beamer-0.9.5-r1.ebuild 794 BLAKE2B 67e2278fb1568503d485f693f710e1b01dc4f513c7fd949ac0befa799efb050af3e0658a78eec4ca8e9716af24c7f3a98c88bf327c3fbac37cec8a98dab13a47 SHA512 78a5880517ff12c5fdd349c97bdd2676f594798f1e60695367f89495ea7bf456cd86d136509578743442992600df61475accd6cbc93f89540fbae6e67faf0e16
 MISC metadata.xml 330 BLAKE2B 27059ed0cbe2bf10ad3b028d1f0e12b0617c0e2146432e375ccae5d570d8b1c1860bb9b9f36021a588ce859b7b30dfc04fb1f841890c549093687f3b6ad8addb SHA512 27c93b4ed84b734c1d8b6a7dc86a4d25f18694c0c096351afd35acf378e823dca63d692e853571e9d98e1e7dade682eb3802add4a7088f432279dbf890636cc1
diff --git a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
index 1b54b904be80..1d2c951c2453 100644
--- a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
+++ b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-single-r1
 
diff --git a/app-text/wklej/Manifest b/app-text/wklej/Manifest
index 3ca98f549b10..5adba9955476 100644
--- a/app-text/wklej/Manifest
+++ b/app-text/wklej/Manifest
@@ -1,3 +1,3 @@
 DIST wklej-0.2.1.tar.gz 4370 BLAKE2B 616126936c37f8f727167745eecca27b7f1ba844b7396bbd2c205c804c90c2632dddb1b74bd9d66cd040c7eaa9a8e179281372b96eeb6d3d8f09ae27250563c7 SHA512 3799a1570f0cc7f1005f69484ceb1c6c88c8a24933beb3e32c0acd758ce29a5a1b6599baeea2b6405ec2da1e4fcb25b2d218b8295c68fa811fa4d53ada96cf0c
-EBUILD wklej-0.2.1-r1.ebuild 778 BLAKE2B 00f596b86a6c8986a5dc6553e624a4bde56783db13803ea78712775e7972b6c03e27a3a7062819486a1411463c570e8802c4a5e8d208e228271a6217bc3f3278 SHA512 1023f7da5c6345ef41da61152fe593fa772aa8326b23738423725d02eb2c4edeca6eb2974ffc7f529091570bb781d54a04f4d6640107ab6fb5dc69639968705b
+EBUILD wklej-0.2.1-r1.ebuild 771 BLAKE2B 4846a1ad6b8774567e8690c424ece84aec67a7ee8674a4ed655ce2fb7410cef8d103ed4e3648257573c760508d61515899e72ccc24ca3241c8fa9f58285c014e SHA512 940a93f0dcaf325f8dc44cae7e62654860d5dbb8db415c9ea3f15e5d4c2b1612d162b00740abdd908e6265a89c14c186b360d2afd9463ec7157b90b5a1025006
 MISC metadata.xml 349 BLAKE2B 9abac59717642921e8f8e3c38865b6fb76d96a1a98a60f5947602d6b66719785eda7629d01f3fe5aea22e8ad3a4af8829e53861c5cff3140acd94a055adfee10 SHA512 b65a626f1a38f94be7617bd3b46819425724097af5536d5378372574ace10d96fc33f96c9ac52b480b4d9e3a33ab63b9b127737d6d0d2e9e02013fd3d0d826b0
diff --git a/app-text/wklej/wklej-0.2.1-r1.ebuild b/app-text/wklej/wklej-0.2.1-r1.ebuild
index 0196b8485f75..01df0f62ca1d 100644
--- a/app-text/wklej/wklej-0.2.1-r1.ebuild
+++ b/app-text/wklej/wklej-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
 
 inherit python-single-r1
 
diff --git a/app-text/writerperfect/Manifest b/app-text/writerperfect/Manifest
index 3ec38d46ddae..935537dd4d39 100644
--- a/app-text/writerperfect/Manifest
+++ b/app-text/writerperfect/Manifest
@@ -1,3 +1,5 @@
 DIST writerperfect-0.9.5.tar.xz 302176 BLAKE2B 4ef8fd72f01e3c208a59c520440975f38dcf1edc353134721b7f06d042752adad9c825503f5756a74bede2307f7317c28e054dbcb6c5c1000a606822e97d2c8b SHA512 7467a798da362883101780b598e9a673c10f86f29c01ece1438ea524a0413a00928274f87895f3a8ae26f6784cdcc34e0e84039ca591dc3f75b2e25c53744ccc
+DIST writerperfect-0.9.6.tar.xz 330360 BLAKE2B da566fb8e1aae3708646b49b695cf26c5b64aeda1ca1df08ced2549ca8718840744ab011cb7567d1e371ac8e7ee6cfef6a67ee9837cf38b570a3794dc4682f81 SHA512 4a86a23ae2caa133066279994255d8ca7ee16f40ad646bd8ff434c7e4e1a29cf23db7e811b8eca1823dcf9e2456b2e8dbacf03bd5bc0377638fc52fc7d4495a5
 EBUILD writerperfect-0.9.5.ebuild 1761 BLAKE2B ef4e87d22c7ab182cb1f3e9677bbfa12498f2fade4c353bf1ba0093a4c00ae4cb90d2926b99e799e2dc0304e60102f593126cb0da0f3ee2b4746ef43a6fc1e1b SHA512 95591cec04441b34a37e60460eab58ea69641c9876e7074bcdb1dcd25aa1b7fd438dc52c98f61674b151b82eacdc18cc42c6c844390c6f78ccbd299c07b04fd6
-MISC metadata.xml 1475 BLAKE2B 930b7d6e8f9204281ca5a01d55a66fa635b3ea7680405a16a55ef85dbe572fc82a6ea00dc9a0ba2b98ce2c854b738bff02dd4e99d62e923b42bce9069fce1070 SHA512 759c262d939b9d6aa57d7de21447492d3771f6af011de6a5de83dd81cc115df14a25e20b71ba5643d0089e2b62953312fcf17ca91d67f4b5c046ecd145747450
+EBUILD writerperfect-0.9.6.ebuild 1893 BLAKE2B d73f7cde6a6ab98dbee7f763bf6dd5e6b43f3b564de23c3277d2296b37e3c111284786e5f6c0ec0d9abe8ae53645dec5104c149e0f5321a3bfa1ee74f4634a4d SHA512 da1374b7b19dca0dd41c5434168d77f3559697fa4c44bb2716c3d2420410888c39e0280a9c7cbbbfd9834a4fe909328c64541bd1f466d784e4f2077b4c37ab37
+MISC metadata.xml 1792 BLAKE2B db2026455dd4d1ecb5b0e91a404dbb68556e48568394c41f6b5f928f7dd635f7607f79a8a90b8ca06524a9a0ec399f863373a94f9e1b767dff36fc63488ea7f7 SHA512 911c9be2bc46655e7452189f29ada72faab7800056c88cea3afd81d9fe11330e554bbf27d61fc23789441a80f211c706204585f08baa0f76f461438ce809e575
diff --git a/app-text/writerperfect/metadata.xml b/app-text/writerperfect/metadata.xml
index 7fa1a1d665d1..14c2a0236a37 100644
--- a/app-text/writerperfect/metadata.xml
+++ b/app-text/writerperfect/metadata.xml
@@ -8,16 +8,19 @@
 	<use>
 		<flag name="abiword">Add support for abiword format using <pkg>app-text/libabw</pkg></flag>
 		<flag name="ebook">Add support for various ebook formats using <pkg>app-text/libebook</pkg></flag>
+		<flag name="epub">Add support for conversion to ePub format using <pkg>app-text/libepubgen</pkg></flag>
 		<flag name="freehand">Add support for freehand format using <pkg>media-libs/libfreehand</pkg></flag>
 		<flag name="gsf">Add support for structured files using <pkg>gnome-extra/libgsf</pkg></flag>
 		<flag name="keynote">Add support for keynote format using <pkg>app-text/libetonyek</pkg></flag>
 		<flag name="mspub">Add support to mspub format using <pkg>app-text/libmspub</pkg></flag>
 		<flag name="mwaw">Add support to mwaw formats using <pkg>app-text/libmwaw</pkg></flag>
 		<flag name="pagemaker">Add support to pagemaker formats using <pkg>media-libs/libpagemaker</pkg></flag>
+		<flag name="qxp">Add support for QuarkXpress documents using <pkg>app-text/libqxp</pkg></flag>
 		<flag name="visio">Add support for visio format using <pkg>media-libs/libvisio</pkg></flag>
 		<flag name="wpd">Add support for wpd format using <pkg>app-text/libwpd</pkg></flag>
 		<flag name="wpg">Add support for wpg format using <pkg>app-text/libwpg</pkg></flag>
 		<flag name="wps">Add support for wps format using <pkg>app-text/libwps</pkg></flag>
+		<flag name="zmf">Add support for Zoner Callisto/Draw documents format using <pkg>media-libs/libzmf</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">libwpd</remote-id>
diff --git a/app-text/writerperfect/writerperfect-0.9.6.ebuild b/app-text/writerperfect/writerperfect-0.9.6.ebuild
new file mode 100644
index 000000000000..5630e1a0c9a5
--- /dev/null
+++ b/app-text/writerperfect/writerperfect-0.9.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Various formats to Open document format converter"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris"
+IUSE="abiword +cdr debug ebook epub freehand gsf keynote +mspub +mwaw pagemaker qxp +visio +wpd +wpg +wps zmf"
+
+# FIXME: librvngabw
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	=app-text/libodfgen-0.1*
+	>=dev-libs/librevenge-0.0.1
+	media-libs/libeot
+	abiword? ( =app-text/libabw-0.1* )
+	cdr? ( =media-libs/libcdr-0.1* )
+	ebook? ( =app-text/libebook-0.1* )
+	epub? ( app-text/libepubgen )
+	freehand? ( =media-libs/libfreehand-0.1* )
+	gsf? ( gnome-extra/libgsf )
+	keynote? ( =app-text/libetonyek-0.1* )
+	mspub? ( =app-text/libmspub-0.1* )
+	mwaw? ( =app-text/libmwaw-0.3* )
+	pagemaker? ( media-libs/libpagemaker )
+	qxp? ( app-text/libqxp )
+	visio? ( =media-libs/libvisio-0.1* )
+	wpd? ( app-text/libwpd:0.10 )
+	wpg? ( =app-text/libwpg-0.3* )
+	wps? ( =app-text/libwps-0.4* )
+	zmf? ( media-libs/libzmf )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	|| ( abiword cdr ebook freehand keynote mspub mwaw pagemaker qxp visio wpd wpg wps zmf )
+"
+# configure fails if no import library is selected...
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		$(use_with abiword libabw)
+		$(use_with cdr libcdr)
+		$(use_enable debug)
+		$(use_with ebook libebook)
+		$(use_with epub libepubgen)
+		$(use_with freehand libfreehand)
+		$(use_with gsf libgsf)
+		$(use_with keynote libetonyek)
+		$(use_with mspub libmspub)
+		$(use_with mwaw libmwaw)
+		$(use_with pagemaker libpagemaker)
+		$(use_with qxp libqxp)
+		$(use_with visio libvisio)
+		$(use_with wpd libwpd)
+		$(use_with wpg libwpg)
+		$(use_with wps libwps)
+		$(use_with zmf libzmf)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 0c73498298a4..a76dd12bbf78 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -2,9 +2,10 @@ AUX xchm-1.23-wx3.0-compat.patch 929 BLAKE2B 87f22da40033007e071ff3c1ca497247027
 AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
 DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
-DIST xchm-1.26.tar.gz 785338 BLAKE2B b5aedff3de1a3c79205f27b833e339fa24ac08710ab2c97199fdd10f5674ee7d4a4689e275d9f6df4b6eb34c60cf2d36c5938924c4c0d73e37c2a464a1c63695 SHA512 8ed0281a2b2969f83d474b89e828545096b4ad9ece451cff2bdb602079751f6f6ca2c8f3c8cd79740ab0b4e5b2c3a3f8ce4e6f4985dc158b5d76007b7bc549a3
-DIST xchm-1.27.tar.gz 957753 BLAKE2B 84df84712d092a29692d287570f35893fb38a47f571f112093b6b7529ee5bceb22c439e7842377b2181f823bd069911c4889dc6ff794654d18cee589cf78e897 SHA512 82b003569307fc76f35acea51fe3d615601f185e084a9789b9757db60547d45af84428b63efbe645f9e20161815a1801d6a96a38c004cb1280e4ede35b02c014
+DIST xchm-1.28.tar.gz 984545 BLAKE2B b91e6983823a3f08b2df296c7d651e1a3a017824034d86dc5cb51dd327fa240e098afe5c5a186d27d57f54e02e2c6546cfe8e82acfd21d89b2cbbedd2ed9a829 SHA512 5d773b097ec813d991ceba4842c5cf967d4f2d0e20c84aff636615a92d000bac36d5ebf244a18f416928bd9b24792a5baf19397694201372478cd13111080630
+DIST xchm-1.29.tar.gz 972533 BLAKE2B e114047f4c3e19bb4d4c28a74997c76c54a2dc286f1f0691f105824be693e3b51c7618717b5b5b5f3604ab3f4fa89d703e071a36be0bd05529b6f44710b0bd20 SHA512 678cea2947d58e9b173379d6df809be603ca77431a3181ee45e3c1f4a4a55a6c10a395eecb5c25feb14ad361d044355ae313d537f0abc9278c6e5ab37a8768f6
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
-EBUILD xchm-1.26.ebuild 1022 BLAKE2B cc9f00fa40103bfd9792f081b7e425d9250dbe29c6188bd428fd2ee65cceeaba6a087680476f898a4e23051abeefb210a8406d2ccb81530a4f5e2bc7a80e669e SHA512 e533a82a1be1e78a3f30882abfbb1723a0328b662f81afd36490154d29a54e82cf928a9ca4a2bc9a5a74dd478a2554b9b3ac4e9cfb274e5e14b2f66f7e0d6c63
-EBUILD xchm-1.27.ebuild 1022 BLAKE2B cc9f00fa40103bfd9792f081b7e425d9250dbe29c6188bd428fd2ee65cceeaba6a087680476f898a4e23051abeefb210a8406d2ccb81530a4f5e2bc7a80e669e SHA512 e533a82a1be1e78a3f30882abfbb1723a0328b662f81afd36490154d29a54e82cf928a9ca4a2bc9a5a74dd478a2554b9b3ac4e9cfb274e5e14b2f66f7e0d6c63
+EBUILD xchm-1.28.ebuild 1192 BLAKE2B 3224add5ca8eb50105b7d28a37b067e66cd2e59b300811a5292524649ea75762bcb3d9d65ce84c826d5aa5b61f11a133bfcef1d8e34cc7718d45bdbd58a7b0ee SHA512 d891a2f14a044ac381af8a07d023f8bbb03a72203dc9982b644f5b26045ac89fd4469c83d56d6a5893fb3b704c1a0112054b0e8217d849b0471003c3f57a8134
+EBUILD xchm-1.29.ebuild 1192 BLAKE2B 3224add5ca8eb50105b7d28a37b067e66cd2e59b300811a5292524649ea75762bcb3d9d65ce84c826d5aa5b61f11a133bfcef1d8e34cc7718d45bdbd58a7b0ee SHA512 d891a2f14a044ac381af8a07d023f8bbb03a72203dc9982b644f5b26045ac89fd4469c83d56d6a5893fb3b704c1a0112054b0e8217d849b0471003c3f57a8134
+EBUILD xchm-9999.ebuild 1118 BLAKE2B 9c76ae3a49f85f51f83aedce892c8a0725e751bad5a7db5e90a938b91de3170702b77054f0b4f8418f97b0f0603a64da81f79314f63b891b0758be6d570be8b0 SHA512 11ca7a580fd5f37319ed5e6b0adf2b13f8a02ecfe1101ab0cb74fe8a581e5702fcc03d2337cb287d71f90a39f1bfc789aaa75cc43e1d1d20e7551947a144dbc9
 MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
diff --git a/app-text/xchm/xchm-1.26.ebuild b/app-text/xchm/xchm-1.28.ebuild
index a2c546cdaf3c..8a1516c32201 100644
--- a/app-text/xchm/xchm-1.26.ebuild
+++ b/app-text/xchm/xchm-1.28.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 WX_GTK_VER="3.0-gtk3"
-
-inherit wxwidgets xdg-utils
+inherit autotools wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
@@ -13,18 +12,26 @@ SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
 
-DEPEND="
+RDEPEND="
 	>=dev-libs/chmlib-0.36
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	nls? ( virtual/libintl )
 "
-RDEPEND="
-	${DEPEND}
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
 "
 
 src_prepare() {
 	setup-wxwidgets
 	default
+	eautoreconf # Still needed on the next release?
+}
+
+src_configure() {
+	econf $(use_enable nls)
 }
 
 src_install() {
diff --git a/app-text/xchm/xchm-1.27.ebuild b/app-text/xchm/xchm-1.29.ebuild
index a2c546cdaf3c..8a1516c32201 100644
--- a/app-text/xchm/xchm-1.27.ebuild
+++ b/app-text/xchm/xchm-1.29.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 WX_GTK_VER="3.0-gtk3"
-
-inherit wxwidgets xdg-utils
+inherit autotools wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
@@ -13,18 +12,26 @@ SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
 
-DEPEND="
+RDEPEND="
 	>=dev-libs/chmlib-0.36
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	nls? ( virtual/libintl )
 "
-RDEPEND="
-	${DEPEND}
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
 "
 
 src_prepare() {
 	setup-wxwidgets
 	default
+	eautoreconf # Still needed on the next release?
+}
+
+src_configure() {
+	econf $(use_enable nls)
 }
 
 src_install() {
diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild
new file mode 100644
index 000000000000..bff0e4a4ffac
--- /dev/null
+++ b/app-text/xchm/xchm-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0-gtk3"
+inherit autotools git-r3 wxwidgets xdg-utils
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="https://github.com/rzvncj/xCHM/"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls"
+
+RDEPEND="
+	>=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index 0e23b7d6f792..72ccd1656d4b 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,5 +1,5 @@
 DIST xlsx2csv-0.7.3.tar.gz 201482 BLAKE2B a2268e584097777d28f2565a19d0f271cb694066e1abffffd7578ecf0271efd420af63932eaea4389c062e050da257fa2f7164c9de7cdfa4ab3fd416692e7968 SHA512 855fcce9ae6ec51c46673e085a456d2862912d0da5130fdac34d88e5612c64d2bc0674c13b3bfb6cd6b7017e513fe0924dbb594db543020842705a82b6006e8e
 DIST xlsx2csv-0.7.4.tar.gz 212472 BLAKE2B de77f4d199bd5fbb43fb4aa775aed9b36aea4c956846be42e9387b79bf76727ba457a0c54db3b4803376b82af12923f21786aa34d21542e2d6ab354be33ad3f3 SHA512 771af30dce63b64272fc8d4dccbcab2106f60a2c9d33370b4d4034a21606e5726c84d963d59e88e2aa124c60f62fd57831ca5fb442d7540474ff1d688da9aaf6
-EBUILD xlsx2csv-0.7.3.ebuild 544 BLAKE2B d6380cc49b1f277049c6730e5c058849ef4995a3c8589d73f2d6ef442ebee072a300fb018ca6bb35cbbd95cc64737342dac73758a53b624c0fc85ae91f022963 SHA512 c58752c07e4aec3963b50e2d47d44d8e608d5144b2205bd30e7c13be4b5097fe029d39275fecf2183e58ea348f8d4ae80e91a5ba155080d3a348728c920f6313
-EBUILD xlsx2csv-0.7.4.ebuild 545 BLAKE2B 1d2b7ec41d494a5e022277f6bc09487ce4989d60e461322b59f546cb2ae8b6d7ca0b28b67fbc83d3b76a28f5f18c47dbcd7468dd942edc49863bd3aa0e6381ac SHA512 1b926a1733593ba9a115879b5a9286c3459f4f8bf60283356bd79d4aaaffaad02eaaabee11884ebe3d0c59f06215b1a4260c99822107cbfe952faf4b0072b98a
+EBUILD xlsx2csv-0.7.3.ebuild 537 BLAKE2B 67658251bb02b53b8e8d3b10f88e005da228c7f918c4b5fb2ac1a468603b49fea5d7b4bda97613d4ce81ee8869965f2cc43634cd3f564129959579d93ed71e03 SHA512 5597dc43ac4440b0d281cbcc0ed9451f356d2ba8853a2b66de3c9beab0cef65f8311eb2eeb4a396534a80f76cb0cf18886a6e6e14246c1fefa4375b0a86bdce5
+EBUILD xlsx2csv-0.7.4.ebuild 541 BLAKE2B 08d860d1c47c8115ba9b5cf265d875d18d71c47c184fe76f868cec57dbb3c67a9027310aa99be4c387417613a3120f9e52854f5f60820eac669f70a40a689d42 SHA512 97fbf3ff6333cd179acc7d1e5028708a1b5727ee6fb1f853f740d9ae40e5788e26dbbb1faecb9c125fcae0bffe2d1c3ee37cbe96f824986baffeab0d63a888e3
 MISC metadata.xml 385 BLAKE2B 6392216bb79b39e6121a2b6e48f838c04acc0682e1cff0c4c39c68cc7439edb2ff924b817e6bef0e94af24c64b19e68c897d5ef620bee4c171004a7420f7e151 SHA512 e608a317791c590b9dc226f44cc9ddfc2c2d4ebf39cad1b41d230d14549d2718ad09a8cdd79afc2c2e75f4929907ea14d4944923013e00001e9ab0e87c58619b
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild
index 213c2d7ff6be..59143bd10f79 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild
index 42b5982077fc..cb66033d17d4 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index e37614b713e4..4df8fe2af070 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,5 @@
 DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
 DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
 EBUILD xmldiff-0.6.10-r2.ebuild 522 BLAKE2B 6d012cfec8f200441be4e5e27e9cbd4ca927843b46a5b8d24108440663d619c36b1f4bf11f256bd7c8478e88a9b01805d12c112cbba2a82fb96887aec40d9265 SHA512 b16ceed0a37b133b1f61b9e47529bd61469bc933ad99218f5d3a345baa6bfb2d4908754bcce5691be68085ace23f3049bc1ae12b855073f33bddce20620fc879
-EBUILD xmldiff-1.1.1.ebuild 635 BLAKE2B 95d793609115d7bd924496d50c70fc22d14a9c5ee3668f7c147b88834d793119e532b81a908d6972f8b44f786e24a747d1e2a41c66e0d921996493166e10396c SHA512 feafc245d98fc9def49d31e38d4ed80d431e9a3daca68eefbaf0d8f63ae29e0f9b8fccb6b03653fccd11885ace9c65bdb8fc351dbfabd0e2283f3496427e0624
+EBUILD xmldiff-1.1.1.ebuild 633 BLAKE2B 1c6ddd088e2349de2a0582df42f6fc476ef315986ccf58c04b489092fef47f27634121ee2553461f41db772e1542f1f54d79f76cd8ce0ae0df9243269b9b1800 SHA512 8b03007cbd3bea34505104a77484245a24126010f1ff4da859d58ca43eeb234607b2a82b39c058dc4631e1dbd92a71b73b0a8d795ec7ba27d232bf25d24ec6ce
 MISC metadata.xml 578 BLAKE2B ae500988e52962a46d0c79c948a163f7d3414c230d14ae344d33b09979085cf400ec38e911fe54f71da6035f40a795cdb9b70ed2c3299b9e37d0e6e3a77fcb7d SHA512 09529a22484d9b660b11b70137cf7e113ee07af4de0c58247d9f6dd7c9e85e222111b209b71dcdb342e734897fa0243b5f9a83688fdbd649584fa226a36acefb
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
index 3407e9f0a3e6..d18c3bb32aa0 100644
--- a/app-text/xmldiff/xmldiff-1.1.1.ebuild
+++ b/app-text/xmldiff/xmldiff-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /app-text
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)