gentoo resync : 06.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
commit: f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree: a38046712bbc3a3844d77452d16c84e716caa3d4 /app-text
parent: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)
69 files changed, 1141 insertions, 364 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 73e2ca5ce704..c9fef5ceb5ce 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest
index 7350dc2001ed..22161f9b3c7c 100644
--- a/app-text/XML-Schema-learner/Manifest
+++ b/app-text/XML-Schema-learner/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Schema-learner-1.0.1.tar.gz 51057 BLAKE2B db9e5c6176484278fcc050c201f4ee3c560536fd1439cadf1f7c2be29e967ef9d84a488ec01045cc3887f527a0cbaf53649bdb4a505f11df17c5697b344a6fd3 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d
-EBUILD XML-Schema-learner-1.0.1.ebuild 990 BLAKE2B 5a23ea8a6271d76a86cff4494a542d12bed7542d6efea439899638ccaddf49a65549322b5816264db2100a0fefcb4b5a5ba1ba43ebef7d126413617d2beb9bfc SHA512 578bb825228e78d83617ec19bd72def2443b3c39b00da1982aec26c0cdcd19e89e1bd792c406854044394cd4f2405ce7815960a63871f611ed4fe99f9fb4c621
+EBUILD XML-Schema-learner-1.0.1.ebuild 1031 BLAKE2B 73c8a5380ba8d61b8e0f91b6d1dce2267aa1ba589dade647bf3fb064b166608afc8d0e9fce6d89b2abfe2c48b040524b9d7c1f69ebc11d69c902c07d4c8296bd SHA512 24aadcfe0f5418b49ceeee240c6c770bd1c97d60c690ea263e9d422c7235d30888bede59c1a0c99daa9079dd55b500c41a2248ad25934da8a4c777ad09208aaf
 MISC metadata.xml 942 BLAKE2B 99cfdc01afc572294b15a21d4a14a3e272c4e465e276d83990e01c6e03273730348265d3615da5fd3c5c1dc73e4c688d20ba161c9f4021f719357f1109f6c1c1 SHA512 48e0d860bbede84a76773ad1a77620cdee393eb0894f63461371ae7cb12a43fa0b640bb2dee17eb3eeb22fbe24899c90da704a74f70075e722e83f5d0be86bb2
diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
index b4d56e1a79ba..0b0e2413742a 100644
--- a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
+++ b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Algorithmic inferencing of XML schema definitions and DTDs"
-HOMEPAGE="https://github.com/kore/${PN}"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/kore/XML-Schema-learner"
+SRC_URI="https://github.com/kore/XML-Schema-learner/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 5e52a0e40537..c2909fd8ca89 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -2,7 +2,7 @@ DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9
 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 2411 BLAKE2B 18435c6f4749a661ae93d613991599fffde505210c132cfe1807035efb1323eb3bfe563a5fe53a14f4b7c7a6885c27889428db70b3c4e605f4dde37fa61d0620 SHA512 c202341942125b482e8e4cb6ef6ddf11e6806826667cd53f94e032971819b70cbdf4c2a16dc4a14b1b31df096d5bed673f1e76362af13e8761f15a6271b1d5b6
-EBUILD asciidoc-8.6.10_p20181016.ebuild 2578 BLAKE2B 11ea14032a5cb9f5338a1359e0da2d408efbc80dd959a0484dd86e6a9ce1884ef8057cf423ccfd5e21d4334db71bf49f3bd384cee6ef340aed1aac4b69d39b0b SHA512 922eea93dc09b64ea0023725732804752a2680dd37149707af571f7936265902950098c2bb307aaa4ff361fd8272c17a674b30d2412826e210069bf685b045cb
+EBUILD asciidoc-8.6.10_p20181016.ebuild 2576 BLAKE2B 16cd4a41ff09070752296ba3d3aaa573b4d13c29388035db99c945e6085f2b1816eb76c3310d325a0e499f1eefb5c09f4e920d5ad5347cee6d3c5e7932534c3d SHA512 6a940592d66cf3dd654391e718c4827a590dd0f814f4694d4337f0f4d3f450135991d9359f3c83477969ac7613ac1a973989b5cd2753d97b0a492677c79390cd
 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_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
index 5474f073229d..a395cd9f17ea 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
@@ -82,7 +82,7 @@ src_install() {
 	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
+		cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 102bb3371367..b7c7080727d7 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,7 +5,11 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 DIST calibre-3.44.0.tar.xz 38643008 BLAKE2B 7eb1412aa5de6ba2f48ea13e922dffff7ace0f4f475832ebe122db967c71df05b6bbb45092bdd53ddfe35d7a0c2af566ed83dde9aac64200d41ea2adc4cb1886 SHA512 a97f45f5f788357f62b4088c4d8190cd3e3b790685871d5a024342d5d21ca978d46fa4e47f85eef4b9fbc0774923732938a812dd188cd4a315445cf25b187d28
 DIST calibre-3.46.0.tar.xz 38750284 BLAKE2B 5590ba422d0323ea7c0cea67d88d448f00f5a470e7a8fdf9851b488c0856c88175bd107715a856706e95b2e1a45604713d061f4a7a3603ecaa01dfc018c1ed58 SHA512 d8eb014ba4d943e1c2ed05104d9b0c13f45a8b0085fa240248210cd43ab3739036936324183ae8a63dc636f7f8603484e3ddf50a260308ce1127745a8d3c6763
+DIST calibre-3.47.0.tar.xz 38720656 BLAKE2B 4626eac9f0940c1cd6ebab69c16b69eba3c01f62594bc7c60fb9bd097e513f0767a8b5706d07429f7529ed29ed5a7c47621ec6e62a9db82dc99accaaed028524 SHA512 b34d69f31e37ff528b22b6fab43836d53cabfaa4d4c03af42a8c2b73301bd737927f03eb256da765262f73dbb0631484ed164d46230f730e4b742b837c2dfce6
+DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
 EBUILD calibre-3.26.1-r1.ebuild 9203 BLAKE2B 9e3bc1630f915a8548e1480f0b00d6acb4001dee3be5a5119dd9b2eb8b984c4eecaa0a0742e550a36eca359e8806d2444d21f8bf344321c11ffeca59e7e10877 SHA512 98407a3605b58125ca783dadbe7dfed5f3bb526f816d79a167fb0358202cc56870601d16b7eae46d2464a0f64761168d9f0a00d69a5a184e17d705eb540afb97
 EBUILD calibre-3.44.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 EBUILD calibre-3.46.0-r1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+EBUILD calibre-3.47.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+EBUILD calibre-3.47.1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.47.0.ebuild b/app-text/calibre/calibre-3.47.0.ebuild
new file mode 100644
index 000000000000..9b8c29fcc23b
--- /dev/null
+++ b/app-text/calibre/calibre-3.47.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop 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/dnspython[${PYTHON_USEDEP}]
+	>=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=
+	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"
+}
+
+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 LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# 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
+
+	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
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	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 --force "${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() {
+	# 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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/calibre/calibre-3.47.1.ebuild b/app-text/calibre/calibre-3.47.1.ebuild
new file mode 100644
index 000000000000..9b8c29fcc23b
--- /dev/null
+++ b/app-text/calibre/calibre-3.47.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop 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/dnspython[${PYTHON_USEDEP}]
+	>=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=
+	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"
+}
+
+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 LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# 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
+
+	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
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	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 --force "${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() {
+	# 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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 0aa7ba15cbd4..bf17920d3dd2 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 599 BLAKE2B e6fe35f2b564b09af11bdaca9b7fb7293da711779f9add794c7a3c541707d1b53811845b869f86e98e338eae3c0358fe9ccc139d48f2717a6bd369d3a251f470 SHA512 5152e68c9c5b650d982b8d48e67f46df2434dd6864181c8721ae14dfdf593b23543967cbd0ff912d63fa143a8a786dfa4f08a59221a0677d48772f285b4253cd
+EBUILD grip-4.2.0.ebuild 623 BLAKE2B b4e93a1fedf58c990da6a9bb087014009338bc14e96cdc5df7185a5ff621747a14c6a149ba4c3d163f7672a30f6b064f9a13b70dec9fbb44463707aec8a75fc8 SHA512 a472818e9877fa23f9e18bd13b30a9fecc0ef2df6f366d40d0c99702ed6b2a1f7b143911c2658a3925bc1c187a0522cb0461b841f5de12ffb3f5973371726eb8
 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 2a8b144c5550..8c88d409de93 100644
--- a/app-text/grip/grip-4.2.0.ebuild
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -16,6 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 KEYWORDS="~amd64"
 
+DEPEND="app-arch/unzip"
 RDEPEND="
 	>=dev-python/docopt-0.6.2
 	>=dev-python/flask-0.10.1
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 2ca929a1166a..789a8410a371 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,7 +1,9 @@
 AUX hunspell-1.6.2-renameexes.patch 5104 BLAKE2B 83ea0ec81fdd5e8934c954bb2f2d07e9c47f725f8b63360aca7cd611348106a1e3f13ab08609ff4877272ec6b116927c382c5b47731945656ddb7927aca22c50 SHA512 0d1871eda31b83851bf153746e0f4957599e889a536e9c0994d1cb988bc4a887788c1fafe4dccccaa94e68a69e6fa4ff1e201678fa8d1afdcb9608b83211b0ae
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
+AUX hunspell-1.7.0-tinfo.patch 1721 BLAKE2B 1278f50da7577556710a8e481f46ca03ea40147149d2419343aadd2e08afcc3e1865efb9fc13beca9d4d2d7b1e027f72931415120524458843f85c86528e82da SHA512 3161ccc03a7c1af9b3a421515385d95866d306bf7639a24e4e4fc0d762a30e7195a517315ce489472fb18edc3594cd0f621ef5c42e17847d0b76563315426864
 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-r1.ebuild 2350 BLAKE2B 549d5faa02b30a9c05f0ce88d0d25aa432ea80a0a94643c819676afbf241d4e376f483cceb97073d93396e11bbaa3d944204abb91c430b23933710b6bb5252c9 SHA512 6828c0da75f5e652df23d1d14985fd0e73e00a4bf0acd407650f5973f2fd19d1ec0d98fb3ba246d3ea7ed74f5fdf1a1eed602c260c01d0a44257feceaa68581a
 EBUILD hunspell-1.7.0.ebuild 2292 BLAKE2B ffcdf02a09d0bac21a950177962e6ee769802c3c8656d847c3c59faf21925a153bf51d7d933a06a3ec14ee88bb9178398e56b8ab1efde0992e562ab1e0540628 SHA512 aa8b250d91da765cd2e86ae0233947a5722e135f38a5f5c7ae54f1a50723b66d3aa618fda42931ea65e36d5e306de00e9983c305716d613e3d4ecf7e50a7e5b1
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
new file mode 100644
index 000000000000..1fb992b0c9d5
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
@@ -0,0 +1,61 @@
+From ce41cfc39129ee2be67667f2d9b78cc7f7d24dca Mon Sep 17 00:00:00 2001
+From: zimous <zimous@matfyz.cz>
+Date: Mon, 2 Sep 2019 12:46:53 +0200
+Subject: [PATCH] Fix build against ncurses with separate tinfo lib
+
+Gentoo-bug: https://bugs.gentoo.org/692614
+---
+ configure.ac | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9426a94..bc5e39d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,11 +52,23 @@ AC_ARG_WITH(
+ AS_IF([test "x$with_ui" != xno], [
+ 	AC_CHECK_LIB([ncursesw],[tparm],[
+ 		CURSESLIB=-lncursesw
++        AC_CHECK_LIB([tinfow],[tgetent], [
++            CURSESLIB="$CURSESLIB -ltinfow"
++        ])
+ 	],[AC_CHECK_LIB([curses],[tparm],[
+ 		CURSESLIB=-lcurses
++        AC_CHECK_LIB([tinfow],[tgetent], [
++            CURSESLIB="$CURSESLIB -ltinfo"
++        ])
+ 	],[AC_CHECK_LIB([ncurses],[tparm],[
+ 		CURSESLIB=-lncurses
+-	])])])
++        AC_CHECK_LIB([tinfow],[tgetent], [
++            CURSESLIB="$CURSESLIB -ltinfo"
++        ])
++	],
++    [-ltinfo])],
++    [-ltinfo])],
++    [-ltinfow])
+    if test "$CURSESLIB" != "" ; then
+ 	echo Compiling with curses user interface.
+ 	AC_CHECK_HEADERS([curses.h])
+@@ -78,13 +90,15 @@ AC_ARG_WITH(
+ )
+ READLINELIB=""
+ AS_IF([test "x$with_readline" != xno],
+-	[AC_CHECK_LIB([tinfo],[tgetent], [
++	[AC_CHECK_LIB([tinfow],[tgetent], [
++		TERMLIB=-ltinfow
++    ],[AC_CHECK_LIB([tinfo],[tgetent], [
+ 		TERMLIB=-ltinfo
+-        ],[AC_CHECK_LIB([curses],[tparm],[
++    ],[AC_CHECK_LIB([curses],[tparm],[
+ 		TERMLIB=-lncurses
+ 	],[AC_CHECK_LIB([termcap],[tgetent],[
+ 		TERMLIB=-ltermcap
+-	])])])
++	])])])])
+ 	LDSAVE=$LDFLAGS
+ 	LDFLAGS="$LDFLAGS $TERMLIB"
+ 	AC_CHECK_LIB([readline],[readline],[
+-- 
+2.23.0
+
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..343a7fbce81c
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+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"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
+is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
+zu"
+
+PDEPEND=""
+for lang in ${LANGS}; do
+	IUSE+=" l10n_${lang}"
+	case ${lang} in
+		de-1901) dict="de_1901" ;;
+		pt-BR)   dict="pt-br"   ;;
+		*)       dict="${lang}" ;;
+	esac
+	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	AUTHORS ChangeLog NEWS THANKS license.hunspell
+	license.myspell README.md
+)
+
+PATCHES=(
+	# Upstream package creates some executables which names are too generic
+	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+	# It modifies a Makefile.am file, hence eautoreconf.
+	"${FILESDIR}/${PN}-1.7.0-renameexes.patch"
+
+	"${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# missing somehow, and I am too lazy to fix it properly
+	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+	# I wanted to put the include files in /usr/include/hunspell.
+	# You can do that, libreoffice can find them anywhere, just
+	# ping me when you do so ; -- scarabeus
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with ncurses ui)
+		$(use_with readline readline)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	#342449
+	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
+	popd >/dev/null
+}
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index 747bdf161dd5..a1f624be0e58 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1,4 +1,4 @@
 AUX jo-1.1-version.patch 217 BLAKE2B 366b69d941f5f324de39e31de160e0a296dd65259a2051f4adcefde4b8253b514e44c0d4c52413379b33567d7a744a8beef0cc324bd098b7d017ec6318d2f5f2 SHA512 c70e5993069229143f75f2360bf7b4756a988f71d321a0f26c821d0258d523fc2c9d754692b498ece20ff452444ee817af609435160409f1ebe4033287ef89a3
 DIST jo-1.1.tar.gz 50395 BLAKE2B 753e65e5b483cee357bcfc1fb95d93fae008acc8a1eeee75e6e68da6d0ed8c9636cd489278c466ffbd179ceaec7121b4fe3f64fe2e9bf70b81febbe15144c0f2 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242
-EBUILD jo-1.1.ebuild 412 BLAKE2B a5d07980550f418a4022f3a36c74f49ee5fdf21a56ebb28e20a91c3dc4b75e1ce6898a1c36e89adb9b530741056ed04fb7e96a6fd2b256b35cda4598ef8432e6 SHA512 4914cdbb6a5f71e58da34c82f188901400c5afda7abe58ecece89e175b984f16333529a986baba15513ad6b08f6559b0f8f5d6b0276fbc14aecddae344192246
+EBUILD jo-1.1.ebuild 426 BLAKE2B 7752fa82f7f4f99ca1873eaa98f9a2f9612fe57548cc7791e81ffb15bced18061d1bf4d17367506dc6a6f860fd0fea2c314d240f9d6fbb84336d77f00d867a79 SHA512 eafeac07b4a04c94a03de806eabcf620685043815a4df4db89e06783533767e09c38aec38197c34ff86c854ce29ba6456b555b18a0df7373a35620dd3e34d893
 MISC metadata.xml 288 BLAKE2B 8b66970135ed40287f00f96188b1679d936f9f58d59d2991aa36f2641e0a5ae48bdf3f36556be0b0296190a1c8bf59c88e6900de93e32c102b3adb880e524dcf SHA512 c8e9c740f13a6d2e94d28748750b51c44d9291d4fdc8823dc11647e0ae058866c06d49656011398d48fed78192bfe89f50a5fd05d36054974e3e65bdc82c55cb
diff --git a/app-text/jo/jo-1.1.ebuild b/app-text/jo/jo-1.1.ebuild
index 704769988141..d52212e5bd0c 100644
--- a/app-text/jo/jo-1.1.ebuild
+++ b/app-text/jo/jo-1.1.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=6
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="JSON output from a shell"
 HOMEPAGE="https://github.com/jpmens/jo"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jpmens/jo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index d3bbac96c196..23265a98edf8 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,5 +1,5 @@
 DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
 EBUILD linuxdoc-tools-0.9.72.ebuild 1777 BLAKE2B b61585eaf79a55b9acc1f4711cbaec19d421db998f091a4fb5827292bb30c5720de9ba5a300ad0cf248b509a8ec4d1a0415a4ee498edb18f49279cf673ff35cb SHA512 40632a82dc9252a4bac966174c4e87f6f1adf075fb2ef125ea07ccc5796b98e74d8823d1afff11f98e042ded4eb5b7da82a8b8c5ab052e4f7d53357b84cbf649
-EBUILD linuxdoc-tools-0.9.73.ebuild 1660 BLAKE2B 1d38dfa598590a912bf7d98d58ea9e6f4acc027ce9160e26ec40bc012be8913f704863a771323e3929d81f78faed6f862eff54d4955b8c82eaa2f9985bb8dfa1 SHA512 ea743c7be253326093d6c3edaacb677aa6b74340bbf9a475b4402f0b957dd41cc9e7fecf7c7f5a7356c7f834f53fbef5c523fbcb302f72e7b10325ee1b0ceda3
+EBUILD linuxdoc-tools-0.9.73.ebuild 1667 BLAKE2B 7610425455383b2de6e6d2192b1efe2ff91f177cb7d57db0244c7a5318bff2676e52b383c973345797b4322ef6d67166ef6376d7d3d2eac14a17137b59d0ef41 SHA512 1cc1811a713b4b255daf959fb45294ce2aff9c97a6c8b8fefbe0ef4d229da09c98ea4be56087b0a185ad6fde30788ee6b578c72e3f2c82673918233581c0b726
 MISC metadata.xml 911 BLAKE2B a78b50af9faf588a872f75b94f1278ce1ef5e16edb8c6f6c953dcc29b466be53f70a63275e5df54bd46f58d726e80f07b8cd8ae051d93f7c6ee11f0c8e63b8fe SHA512 6afd802552b700006b38a5eee516e5e1f59d0af0dff294bc2807804f8a85823ca2c5a928c0cfe2d5ef74d8c34521ecdd2a54d4ff5a1d322f17d42a6e5e6ad0f4
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
index bfa36dc64cdf..1c687efe9403 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.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 is blocked by Gentoo bugs 497038, 497052.
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/mathtex/Manifest b/app-text/mathtex/Manifest
index 857c008d9281..3c19d498ead7 100644
--- a/app-text/mathtex/Manifest
+++ b/app-text/mathtex/Manifest
@@ -1,3 +1,3 @@
 DIST mathtex-1.04.zip 148443 BLAKE2B 6632d30536428f6f33fc13a2b5b38651f2ab7a938381166b79c009ab3d95788fc69e8ed824dae64dca00d32bb79ccd00a73b772f9aebc813d54fd6e0f18839f4 SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601
-EBUILD mathtex-1.04.ebuild 885 BLAKE2B 1167a1ef2a7187932ff06b98d9966284a7aa8125c66d1bfc5bffffe40a661f44ec6c4869b9aa2368a932f74484c3390ec57a732b0e42cfb39f92a5275d57a54b SHA512 1c74aaa03a53c5ce6639ab5e4e960f1556aeaf3978df76eb17a9f5d9c69cfa876ef18a68b86113c518927d5239b0fa88b6a0aa9eb3300bc0cbcf48f7b296865f
+EBUILD mathtex-1.04.ebuild 896 BLAKE2B 3006c7d7502eef0620f7d2cfca7a358c3aa777dc5bf15caf897a9dc636262af13fe9431cb3bed5fe2bbcf72d73037dbe7eb3ac5c7392114bb6ac4b30472d0ba3 SHA512 5eef081c961928e5d662ddece03623a372bb1e6e85a3624abbbfbd6218fbdd2f0e0740e208c22e600795f9ffd8229934e63ce6e6f5fddd0633e1e8ca5b6ef40e
 MISC metadata.xml 633 BLAKE2B 0b7f70957a2eacffe8148ad27186334c9f6a0bb4f2f0142a132eccdbbc6c1a4f96a7cb40f927c29109e2046c5bef23af4c64b1991f9fb2984f4e76ecf96f8264 SHA512 9086dbde5cbad1aebf2b0ffdf011db515befe5bff5c40e37726a0fce358f12875469d0afa70f410e273f3ec1f80a4980c77acb888b7aa5c83cd7ecb28afbb21a
diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.04.ebuild
index c04f8dc4dfea..597f3f4add0f 100644
--- a/app-text/mathtex/mathtex-1.04.ebuild
+++ b/app-text/mathtex/mathtex-1.04.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
@@ -16,7 +16,7 @@ IUSE="png"
 
 RDEPEND="app-text/dvipng
 	virtual/latex-base"
-DEPEND=""
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}
 
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index d728c1ed8669..442fb4527df7 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,3 +1,5 @@
 DIST paperwork-backend-1.2.4.tar.gz 59998 BLAKE2B e92bfbc311a38563fcb38511e8961c081b7c5d3a445ae9b18a80cb6848edbca2460a37b3f0c81d284a04974954cecbced0122a0bc66b3bbf10dc1bc1784b9969 SHA512 aba8cfd7abe9058e3433c64a96c1f79b451d8bdc661fa16ed7eb19f1b7e15efef024c94557082ec4d71c5adbaf268254af34f1eef8a35bad5e322409821ed5c4
+DIST paperwork-backend-1.3.0.tar.gz 62119 BLAKE2B 0dcb4c4d3c96cef8ab993449da46a01168be0b1ade8bb56eada723f046a0b82eb9b8b7c15b7706ab8b6be8e22166e2e01082e57d85a68c5ca919a081ad67fade SHA512 127b71db39a54533f520bb6969a36c48b54827f5720efb40728b133d4362901cbe4a20aa84337c1e8262338ae528ed502c23fedee703898a53e08b3bd5dfd7e0
 EBUILD paperwork-backend-1.2.4.ebuild 864 BLAKE2B a7934e6c7804dc0efc99770cdee56569950445d9c6e0e82386be6f3e8b344bfc4c4cfa8a3469c4160d18b3302fa4905965414192dd0b51127393755e72ae9a09 SHA512 4714544691f7c3f9ed2777863d83246e8be06834eebd41830b4513d432ae4b19a9a6d2595803f4f213591f55ca52c99d003fd035b36e6964970da641ce375b3f
+EBUILD paperwork-backend-1.3.0.ebuild 901 BLAKE2B 9e61d6c0f1c7f390fa2f3d8ee8da5a8a1d87e3df434cfbe52363de6a6c4d4beaeea6e69a6032c6e547d48621e97b77cc686dc1f6acc631b7ee844fdefd785083 SHA512 bece3bc2cfc96b05bac14236b8b19276e4e72a47d5e06e43411ebeba52da4307e3977ea477fe1b0d89ff260f6fcc628469eddf2a56fac0d3c49f65c128592111
 MISC metadata.xml 415 BLAKE2B 3d7bb0d432b982a1c482119ffedbff65e938944bb771729e1c56cb801fd5c26286eba701eb7dbf54d682b2fc975bb8bcad32f38b27f93d8ed3dd403469a416c5 SHA512 aeff8f2d4565711d077d1d2a5105f6c87cb99fd37eb1daf7dd1e919e51b5a1309c974a9e7459b35c3334041ad9776b1ae291fc08b7f2fc0bffe8bb360e2f74c6
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
new file mode 100644
index 000000000000..05cf31677eb0
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 080de98da352..52038f3c5b39 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,3 +1,5 @@
 DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
+DIST paperwork-1.3.0.tar.gz 4625505 BLAKE2B 866a043216dd603fa4700ac09b998c55735e6a5fe09fc3ab02aeb6b68cc62f239e86f8116d84ae1571235e7d9230cbe25bb878909e3f7e542164d5f76440f367 SHA512 6f0b7b88d62520dd69fe8ee6a033a8cde9e48ba093ce7ec77df26549df29e7a0d8eb2bfef9f74e41a722cbd1d2d7693efbffa5327838708c9af54c76634b967e
 EBUILD paperwork-1.2.4-r2.ebuild 968 BLAKE2B 6962a17308bf22f9b4d18a6e662191f66b19b05c7533063c510365cd7952aaaf3c639777a22948d6d30748b06764d176ad4c4cbfbbfb2124dce38a70ebedf0b8 SHA512 cf90898f2916cb980e310c9d65dd67ac80f92e8b358bae52944768c5979c020801601b956c1dd7c571a9bec60519fafc10afa11c1e0863c475136c14df7cad7d
+EBUILD paperwork-1.3.0.ebuild 949 BLAKE2B 18cc69d417d02fc58b7d0bdd16410f09aa9eb1f863814ba821885ce39f4e1e7f0b1da56625a424e0f29876e860f40918c53eeeacb1f3eaa57c87f3feb600ae38 SHA512 60d7f4cd8a0336f6ea5ecac0d419b7ed09f3b37e5abad3523875efa6bd2109a7e7c5312017068130d3a34e776ed99c0cba75fbae55727639d44144a6a373c00b
 MISC metadata.xml 784 BLAKE2B 3da20318f2e16ddb08ca7d5920ef57112986fdd0e0c4bfd4acdecb2aedc35123746533b391be47629985d38b2eeef75dae4eb08874526254316bd240ccee5117 SHA512 dad2a904fa5374ae34f4364bc1140d2b550783bdad137269748f614c20803f938ff51cf2cd3154f1bcd6247c3b38a54afda985811881b17515768095987c7950
diff --git a/app-text/paperwork/paperwork-1.3.0.ebuild b/app-text/paperwork/paperwork-1.3.0.ebuild
new file mode 100644
index 000000000000..bff55ca7a05e
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	media-libs/libinsane
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 00906d373b7e..6fad7d692e88 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -14,6 +14,6 @@ DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d
 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-r7.ebuild 1440 BLAKE2B 1a52c7a2f04d51b7788233a0b0e4f4ff3367a798abdfe2c1c949655431652e1fffccc0b8c582143f596e44d4753a1e67d9b19a3b2f4ed5442260556015260990 SHA512 001351b50d182fea1772686449629ceb9946625f0d13d1f13219938ef0a3dfaaeb142d3fa7d8dd3dd1f28cb359da3a526d76654875cc6c62bf39451f1b6ca431
-EBUILD pinfo-0.6.13.ebuild 972 BLAKE2B 66a20d7f06c652930ecbce6862cd35ee5899ba45bd7d01fa6ed3d9719b5a54ad83b1d9a9bb7d98cce34139b951c10055c9f2849097ba6470ed11d4881054100d SHA512 0de182fe6b431a8346a9f8a8bc21e339c2d233e725f4202482bdb5e42ada6a11438540746b0e49190eab25898fe3238228e1dc0443a2d23f943aee1ec31012f7
-EBUILD pinfo-99999.ebuild 886 BLAKE2B 52c3d54f248446df82c34f49a4ed73ea3cd6dfebac907a7624a9eab847234b997ee1b24d3367ba1e0426ed6e2ac7173a95b35d4aca18f7d2b597bdee45197c83 SHA512 87561fef7173dfd86f36edd55ce92d1afb70d995d589b25dc889e0bee9a48116a1eda7f4673e3d47dbb466052b45e1252af255e43d7551417ffcf00feef0e91c
+EBUILD pinfo-0.6.13.ebuild 998 BLAKE2B ca950e33769cbcd5652c11cd4fe64f2aa0de98d0fe5dbec38e8fab04f4f5af0d6154188788d99f9dc4a05c1613c4c0e7ffca014043fd9a789c590f0c3490aa11 SHA512 70b4b076dbe03634a6b2745e117bf3969bfb12978ac30e54ae0c040aa74dadb3ac4cb30b910f50928ea5bf8f3787e967c4cec8ab4fa9ee1f9d3e0e24fea56f48
+EBUILD pinfo-99999.ebuild 916 BLAKE2B 665e86f2f287e61ef58076845d75955ae149a518fe40d3b39dd9795f13ea3f7295ab937d07e919843006603aed86ee8708d2f599a0ed8dcdb508ecbd4b7b7431 SHA512 93259861bcdaa1aee6c71ea59b2fce4913ec5dc61ecc6ed08e21e6d30994ef6a1dfffebb876cefeb583bcbb79123f0e89b6321f6e7aab8edb5e1b1878c7e19ca
 MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 70e4f9f8e0c8..07dccc853773 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -6,7 +6,7 @@ inherit autotools flag-o-matic
 
 DESCRIPTION="Hypertext info and man viewer based on (n)curses"
 HOMEPAGE="https://github.com/baszoetekouw/pinfo"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/pinfo/pinfo-99999.ebuild b/app-text/pinfo/pinfo-99999.ebuild
index 961b78a24b48..c6cc673a9633 100644
--- a/app-text/pinfo/pinfo-99999.ebuild
+++ b/app-text/pinfo/pinfo-99999.ebuild
@@ -6,7 +6,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}"
+EGIT_REPO_URI="https://github.com/baszoetekouw/pinfo.git"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 0c5d61bb13ef..754f98b73367 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,11 +2,10 @@ AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
-AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
 AUX poppler-0.78.0-respect-cflags.patch 1140 BLAKE2B 59e87b6957a5aff35cf6ebc8092c0552b8ece31e2fc73765789ac73dc5ac01ba69928f9308de9660ba3cf6b38b921ca341dcf6c5bce1d360b1bcf1a4005e4115 SHA512 713f7a3e3e2ae950fd6406ed076d4e6d2079619e40f00de7ec7d7df587df520373b923d343494902da454423adf29174f1ced11cb874a12851febfc1860988f4
-DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040
 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
-EBUILD poppler-0.77.0.ebuild 3515 BLAKE2B 6891a220705d7abde2096ff11b8f66dfee40dff5bb19fa4581ed72473a7476c6356d7c608760565a93c538f41e2447a65d520c2f4487f7a2651e4d700aab5f15 SHA512 70a9b2b6930071532d224eb93560555f4ee47409fa58d2a6282dff648763603575367ce5b80e2402d1a3bba015349936925ae78ef092773251b8c531a777de50
-EBUILD poppler-0.79.0-r1.ebuild 3519 BLAKE2B 5f0d5955e574546abbb15eeb73c3d28325b67bce90b819d2ae114b79d15cc40d544f4c6a73285752b7fcf684c2a4dc9f7a74e5a1ac3514f8cf254abc15d112cf SHA512 485faa57f4a2fb01ce4c792d8ece62cf9cee4355ecdab2b02aa1d067ebe4784d2fe5e33fad8cd8057518107cfefdc8b3748850fef2888a68bb88c17e4a074d9f
-EBUILD poppler-9999.ebuild 3529 BLAKE2B a443f6eea15d1e41eca59f5c9f5433cb6def0b4ebbae5fcfb881157bd4dbbe0d31bfbf6c10e8ccc78553e2a825f5d0615a7bef1b2ca9ca6783d0f019aa2eef87 SHA512 3904299dead5c2666709277469161c4795057b9651c685619cf56ee70d48230a684ded4528a288dffa4df1f4e6145d07c5066808ddc59de2d4e4458b0da0697b
+DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f
+EBUILD poppler-0.79.0-r1.ebuild 3518 BLAKE2B b1788df48fbc4300fc64ba2ab94bec0f1fd6fcce577ed5180fe2508043834c1894fef44096bb5d30697df5215999ec871798df1d7e936a82f604bbfe46fedece SHA512 9e04527cbacec01d734b737f9ebaa729300c987198a53c69079c198d9ace244f81eb1b6e516ad81e8afaca1ff6d44d8de3df92afc22a684fc6f389de37e5f0de
+EBUILD poppler-0.80.0.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
+EBUILD poppler-9999.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
deleted file mode 100644
index e54f7c6390a9..000000000000
--- a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/cmake/modules/PopplerMacros.cmake	2018-10-21 18:47:56.000000000 +0200
-+++ b/cmake/modules/PopplerMacros.cmake	2018-11-01 10:43:10.898347039 +0100
-@@ -147,28 +147,6 @@
-   endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
- 
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
--  set(_warn "-Wall -Wextra -Wpedantic")
--  set(_warn "${_warn} -Wno-unused-parameter")
--  set(_warn "${_warn} -Wcast-align")
--  set(_warn "${_warn} -Wformat-security")
--  set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wmissing-format-attribute")
--  set(_warn "${_warn} -Wnon-virtual-dtor")
--  set(_warn "${_warn} -Woverloaded-virtual")
--  set(_warn "${_warn} -Wmissing-declarations")
--  set(_warn "${_warn} -Wundef")
--  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
--
--  # set extra warnings
--  set(_warnx "${_warnx} -Wconversion")
--  set(_warnx "${_warnx} -Wshadow")
--
--  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
--  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--endif()
--
- if(CMAKE_C_COMPILER MATCHES "icc")
-   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
diff --git a/app-text/poppler/poppler-0.79.0-r1.ebuild b/app-text/poppler/poppler-0.79.0-r1.ebuild
index e13bc99957e5..caa27e2a577d 100644
--- a/app-text/poppler/poppler-0.79.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.79.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	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"
+	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/89"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.77.0.ebuild b/app-text/poppler/poppler-0.80.0.ebuild
index 4052e96324c6..e11942716aad 100644
--- a/app-text/poppler/poppler-0.77.0.ebuild
+++ b/app-text/poppler/poppler-0.80.0.ebuild
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then
 	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/88"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/90"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -54,12 +54,12 @@ RDEPEND="${DEPEND}
 	cjk? ( app-text/poppler-data )
 "
 
-DOCS=( AUTHORS NEWS README README-XPDF )
+DOCS=( AUTHORS NEWS README.md 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.78.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
@@ -95,7 +95,6 @@ src_configure() {
 		-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)
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 44c544ebd76d..e11942716aad 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -95,7 +95,6 @@ src_configure() {
 		-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)
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index bacb2febb2fb..b9948d7a1561 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,13 +1,13 @@
 DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
 DIST qpdf-7.1.1.tar.gz 7099282 BLAKE2B 9658dd1cc6f8d0e3dd13137db147e0f954f747b5bb6b1577f70a236b1f67c5513713889dca77181a9b25f1a2054a8ec5cbfda60866e97b2d43e60b494752c9fd SHA512 a75f988c7dd7ac174bdc981cd3696ca8b539ac6c581e3afecf601dc67277014cb4fe3f0e5cb75a67412cafa4eb645b2fc2d8a0ec203834464baf0c7e80baa0b4
 DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
-DIST qpdf-8.4.0.tar.gz 16981811 BLAKE2B ac0f7b6ab0ca5b421229bf3813cba6b59cc5b7472080246b1384db468e14a4e634f00e1e9e9347e2f8ac8d7e5c15c1b1c18e954f4249298e5ee4778f996fc4ee SHA512 13225c6285311e8fe89970971b082b9613e70d474ee71dd5572f1ae268234d366c2c9c7bf427c4758a746a1a27ecc0127d31044ab501dbc08885c8aa0a514028
 DIST qpdf-8.4.1.tar.gz 16990752 BLAKE2B 6e7ccd212cf8d01aea3dc615f5924c0575392f19cdd20b35327a71bd1f97d7e515fe1a73cd2e3901964f621cafa19ab07a1314af19f40ded28d3e9f683c02ab0 SHA512 d5ac3376345650f05278f8b4d99182cd58b927537085a4a6415d3df0b80b7ddd80a7c33778ec8c3b85d9788ea081ea3266bd4a9315eda9820988e9e54a22f80d
 DIST qpdf-8.4.2.tar.gz 16988263 BLAKE2B 358836310575fd0f454d4504a70796b72d2e3120c5820e2c33e84ea79c5c115d1c84f8d58392d870b5357407d0fbed05028bd854d164be0b32b348c587845300 SHA512 9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a
+DIST qpdf-9.0.0.tar.gz 18172400 BLAKE2B 90b59d54dd87378ccc766f19bc142950f435e4314594fd78923f1c9099393a1b141bf7772f507df7553d9f4afbbe49414c75c0276296481c65017a48d3a5ff01 SHA512 bb20eaf4a12f33ad2ca6933a21123cdfd7d6031da472a881f8c60979881c19bc363db585c2be0635081c7380f0f0819921af7c3a4847de57505013c6e3959ea0
 EBUILD qpdf-7.0.0.ebuild 1234 BLAKE2B 303e3943f8429ab560cfef1d62b1c35f2dbec6c2e27fd6436fd8cba9eec5d8247bf4df27b2093f5a5936295452c171b81a7e07f3b888b98fff428ad7b566d109 SHA512 bc0f824517bf3d7837243162e11cd7a1b973fc27f984f2486cfea23047a7df185f5d4adcdbc82fa7c7b39a9aa6a31c80624e76fb5bda9d92aa2bff4dc457efb1
 EBUILD qpdf-7.1.1.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
-EBUILD qpdf-8.2.1.ebuild 1275 BLAKE2B 2bb7075e2ce800f0f51dd17e1f125f0100c4a87934acde7a03c2c15adfe95bacf591d31ac154adc08ae3443943cb810da9499755f1ebba6e9dca5675a740c69d SHA512 db1f34f130aee615acbf033c319911f8011dcfac5b653fbdd111168b32c184a2b481ff9e6bbae9934693a8370f2e77574a8b64a087ea0c0630f2b82f061681c5
-EBUILD qpdf-8.4.0.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
+EBUILD qpdf-8.2.1.ebuild 1268 BLAKE2B c62c4bdf99ebd71593689e7918d57cba7031d2c0d4d17e5eda23bdd147c7cac7b955e1ad258f6542e3522c598bd893e1334f3878401aa71c94c5aff34659e4ff SHA512 3a4f44293fd6c5e9319d198007795aef5a254cbe06f28e887c4d5efa4aa1f0854d5751c94af3250d7057d2693892930c723e6b43405d4234eaac6e3f7f525efb
 EBUILD qpdf-8.4.1.ebuild 1277 BLAKE2B a7a4b94e2fe88c4a4a10e82bcb85673b1425b56c76347e21101a0f0e94f92c4e7304d110ab003b731a8315b618dd35c071e102f486b726f30899d6081807bab6 SHA512 771c029e75a25d1d7c2ea14f9bbc364051a9419f513e070f7ba548b675d1e11dd4198d6dbd853de88b603d3183af8c65ced0c33498dd2df11c43be1229feb529
 EBUILD qpdf-8.4.2.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
+EBUILD qpdf-9.0.0.ebuild 1278 BLAKE2B 8ea12d44646d8c4835b4576c118708b15ba31e3d8296aa94ba6c3421a0e7e4c063dd597d1758f242a5e6ed9677b02089eacfac454d728d75f2ad8c2f97cb9b2e SHA512 377db56c3e509884111642b0f379a4c3d965caa50db1b242173c63970d716376931440145c6e992da3f6277ee98bf6032aa1efadfd402f47a32502f9663b1b3b
 MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
diff --git a/app-text/qpdf/qpdf-8.2.1.ebuild b/app-text/qpdf/qpdf-8.2.1.ebuild
index c65bd546a027..9745f21e963d 100644
--- a/app-text/qpdf/qpdf-8.2.1.ebuild
+++ b/app-text/qpdf/qpdf-8.2.1.ebuild
@@ -45,13 +45,13 @@ src_install() {
 	default
 
 	if ! use perl ; then
-		rm "${ED%/}"/usr/bin/fix-qdf || die
-		rm "${ED%/}"/usr/share/man/man1/fix-qdf.1 || die
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
 	fi
 
 	if use examples ; then
 		dobin examples/build/.libs/*
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/qpdf/qpdf-8.4.0.ebuild b/app-text/qpdf/qpdf-9.0.0.ebuild
index 320e39eb2a68..c4633b3c6952 100644
--- a/app-text/qpdf/qpdf-8.4.0.ebuild
+++ b/app-text/qpdf/qpdf-9.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 
 # subslot = libqpdf soname version
-SLOT="0/21"
+SLOT="0/26"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index b70016d897b9..623752853e7d 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,8 +1,8 @@
 AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
 AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
-DIST recode-3.7_pre20140303.zip 1902903 BLAKE2B fb85ef7710b6b4ad1bfe34f066d8a51252c40fbc4f958940eaaba142ad51982c8ee3d2da97d52a1e40e23617bbcf6450c9b45be99067efee7c1149735ea81cb6 SHA512 256d79d6f9de18bbf53cb322f0467411ef2ff8e4f242d073d7302fbd05e4942373023514d0a88e33701280c1cb4e0235d76efb9220729cd1f91f9ad8fd2407de
+DIST recode-3.7_pre20140303.tar.gz 1580388 BLAKE2B 8fb280368e6998c8cb4554f856dd779e70fd53958bf6da5839735e14e741f45b110ac106494703d97ac3390f41736b2d94539dfde4554b3ca70911788ce8c005 SHA512 a1821909e7ba68a315bbd5e0dcaf0a574f09ac6ef1ccf8858aeda1a0affc09cb70353b4bda005a14cff37ef41646a6f5246c5b5a0f6e89db2065eac7ace9b030
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
 EBUILD recode-3.6_p20-r1.ebuild 1666 BLAKE2B 4d47ac76ad8a1a57bf31c313b345158d7a36995a5b7478cd6a698aed49ba43a0d9e9f29c9813aee1b602cea80f5a8e3a98789a2cea930a7687fbd3ccd096764b SHA512 e934997a54c90398769ea35803a4008bfeca5ba69cf7c20b9001cd49f4f342648f66185e6fa0df3a59598408d233860f5effbe08bcc6c077d372ca32f7e1d294
-EBUILD recode-3.7_pre20140303.ebuild 1114 BLAKE2B 04c89e3e73d3cf4cd961d4e024d0e141898bd037402d563871981afb2536bdde7faff2cbe32895f145131c47c750faa741b39d8b67a1eaa653ff1513580a067f SHA512 24e1156be1209ccd38cda16c665007203afb5effe7934652d48832afcbe8319aeb88bd337cded810fe2650c38ae20468fce23983ddbe5ca50e565af51265668c
+EBUILD recode-3.7_pre20140303.ebuild 1117 BLAKE2B b745a5946e221ca9790e5521d86cc0f81096daa87e9a55dc88900bcedd058644cc2c85181b2f5cf532964edcfcc24acffa3e0b0d36f80868d7ea5d42b55041ea SHA512 c281d27e012193976989ae044744584ee5be47799542e9ee53c882550a2fec0f9bfbf8c5daef75cc212001e6e1d23be342a1b3ea4bbc4e16e55c95dfa9161ff6
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
index a6c2e5b129fe..252872bba7df 100644
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ b/app-text/recode/recode-3.7_pre20140303.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
@@ -8,7 +8,7 @@ inherit flag-o-matic libtool toolchain-funcs
 DESCRIPTION="Convert files between various character sets"
 HOMEPAGE="https://github.com/rrthomas/recode"
 REV="2d7092a9999194fc0e9449717a8048c8d8e26c18"
-SRC_URI="https://github.com/pinard/Recode/archive/${REV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/pinard/Recode/archive/${REV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
index 5c0a5601ce4b..a06b89c20670 100644
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@@ -1,7 +1,5 @@
-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 715 BLAKE2B b1050004fc5b21c395fe9376cf82e21fbe399350778b82f41a10381645199f50814e02b3de6d1711753e672b70a6ecbb3bbd4097323308c1055c1b1b8997a029 SHA512 ce89ae3d297d7cc6dc53b7ade6462c195cda6eff14c96f512d6c265d1bd168d907cab3311e1193aad212214f589086f026f5248f0d163affcc6dc06b44b270e1
-EBUILD restview-2.8.0.ebuild 715 BLAKE2B b1050004fc5b21c395fe9376cf82e21fbe399350778b82f41a10381645199f50814e02b3de6d1711753e672b70a6ecbb3bbd4097323308c1055c1b1b8997a029 SHA512 ce89ae3d297d7cc6dc53b7ade6462c195cda6eff14c96f512d6c265d1bd168d907cab3311e1193aad212214f589086f026f5248f0d163affcc6dc06b44b270e1
+DIST restview-2.9.2.tar.gz 47181 BLAKE2B 6812e39eb2f830cedacc359fe24988191fc6c7b46b4ddc7005e6e6ee3e52d6998b4b99687892842710154eb2bceb22dc161986f0c8f5f0d1910733226084b0b2 SHA512 4b8627248097368a06fba5dba8994d349b96e605ebde0965a9100c213d9c8bb9320e6ff33a93ce40d80a6b5f3150e4094e2824b5ef5b4757d1e3bd39399a8e0c
 EBUILD restview-2.8.1.ebuild 715 BLAKE2B b1050004fc5b21c395fe9376cf82e21fbe399350778b82f41a10381645199f50814e02b3de6d1711753e672b70a6ecbb3bbd4097323308c1055c1b1b8997a029 SHA512 ce89ae3d297d7cc6dc53b7ade6462c195cda6eff14c96f512d6c265d1bd168d907cab3311e1193aad212214f589086f026f5248f0d163affcc6dc06b44b270e1
+EBUILD restview-2.9.2.ebuild 748 BLAKE2B 89961f83baa7c8f1089741791f0626d258c3bd5b5aa5cc735beed8a7cbf195b17eff4c261f64f076ff1af58acdc5a3e2af66994574548b5510ae2cd64217445d SHA512 b3c15b7fe9d97177eaa3524d75881aefe41fff7cdaf912ba739b1d3f9ce3f649565ba789637f06f40356d6a1a1d8ab9846be3089b4c89d680d27aa876bc8a290
 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
deleted file mode 100644
index b7a7637a5e31..000000000000
--- a/app-text/restview/restview-2.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/readme_renderer[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGES.rst )
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-text/restview/restview-2.8.0.ebuild b/app-text/restview/restview-2.9.2.ebuild
index b7a7637a5e31..01d1f9c130b6 100644
--- a/app-text/restview/restview-2.8.0.ebuild
+++ b/app-text/restview/restview-2.9.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 
 inherit distutils-r1
 
@@ -14,6 +14,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 18c1e040165d..d31afa862d82 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,8 +1,7 @@
-AUX sigil-0.9.8-proper-gumbo-install.patch 1351 BLAKE2B d24d6e0be9b7c56c944aad2d97528ef38b3f96b4d81504b1169095112cc939a662101754ccc9f4d8e9303cd0e9d2ad084e8c86c32d73d43720d1a1736ec572d3 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89
 DIST Sigil-0.9.13.tar.gz 18235134 BLAKE2B 4afe0f0258a8c1056029534ec696372e40343b9a398b612ee32fe95a3d417594bcc6782a4e6447323d67e84db5193756ff7c8756e160c432678ebc59ddeab706 SHA512 cafc6b075827239b73e80d3efa02e4e77d5903fed1faf8b600f70b178fb0c248c38d43e115f249124859edc12ddd8caf199ef0b0d05f20852eb060b27e5a3578
-DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
 DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
+DIST sigil-0.9.18.tar.gz 21396185 BLAKE2B a20a1465032371f9d7e567fff03c859adf4bd2264e9d803efeb3bdeb3b097eca826daa36824370848aea50fffb2b2b74b28568f7dca926565dfd0948d7ade030 SHA512 a8f669ffb76554268aae8aa0f85c6861f80def71e429b44b20ac9b231f3f7584839a82e7b6991f57ca1f2d1f023e24d1f37897bd048379e30565e9bdd7ee188a
 EBUILD sigil-0.9.13.ebuild 2527 BLAKE2B f48d3ad43514ad147011b2902e9dec7d4ca35e8f58100cd6ed4e0ce640d9a3f321ccd1c996cb5e88c861ee273c09dd384c95f1136be5604361d1dc7f5044ca0e SHA512 a6b0a5e912f90617f23abdd36b6173e8cc8287f0dc0b2d8052069f656c042dc3d132c7a0b6035c8bc899c6a8defa13f8d6caf08c55793661e5d0e8ef34d0fcdf
-EBUILD sigil-0.9.16.ebuild 2877 BLAKE2B cf884cab1b1b41c4b8ca7b95c8de4db846aaab774a741d8dc51babeff1513db3fa9354f2fb162d7010afac2e93b578603bd8eca86f2811d26ece7e4cf51f518f SHA512 080f1efaf317e4b872bc153d1e78ae793a07400b726977af985c8e73917e887097235c0960be93c9ec9facb92a8c53cf193369e884f765640b70f62b256f5979
-EBUILD sigil-0.9.8.ebuild 2234 BLAKE2B 81dbc8905e5e4d96f7a423a64a66fa2f5a1ad501a7f8e8ae4049bbf43cbac8366c7fe388da1a9ba9a2f4aaca92b7df9fe585443276f283f80a305eead2797db0 SHA512 834be1bffdd30059bd224d8b0ea0d4b5efa8286f934042183e305ba793b3b25bca01a807ce1c3de9c011d4c335a5362bcfd6cc20694a83f4f9142f65f91286c9
+EBUILD sigil-0.9.16.ebuild 2875 BLAKE2B 431939484d3124f69512bebc5bfcdf40cc5c6cc3a4fb9c4456b99fe5151579928f675a7cc2c3d3026212b36b49ad6f3e0f236eac25edb4ed68e9db90d665b350 SHA512 6aceb1ac42f5b6e7f0413337c1ec4c79748f6b8654fff933bdd93b98c5c574e6ab4dba700d80ea102e834ba518f8846848aba7c1d4eedc6ecf932db39cc051ce
+EBUILD sigil-0.9.18.ebuild 2693 BLAKE2B 531b36defdc189bd33c1c3cf15c55093518894a791af9daa89acf7438e083ddca07fa09302a28de452cbd0a7e77f5080fdccd2c9ff66efb46e86b973ef66eacb SHA512 97b853181a212d9be386cc9a769a492fdb10ad7edcbd15cf1e4621ad00a77c7c491e23654c1271f91bb8ed880f8eaeb20a0bde4065167762cf35e045a959435c
 MISC metadata.xml 1073 BLAKE2B 5428bda0e56ccfc8a4f5c7df773698fa62e0309daa5cb970df9fe3381a7a45c920a854e793b92a2d7e91c66698ddd40f2cf89001e85d0bdfbf521af9fe8ea4a8 SHA512 cdfca84a4cd89a3d4d8d6d79b7eb6432d51019b3ac2c8f59f09262c7cf52c990886e299557bcf10f698ec84e8c3c4f46da19bd9dc298d7011aaf4e52b9e0b35b
diff --git a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
deleted file mode 100644
index 375f2e0ab6ca..000000000000
--- a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/CMakeLists.txt	2017-10-17 14:22:57.780297490 +0200
-+++ b/src/CMakeLists.txt	2017-10-17 14:24:21.754150453 +0200
-@@ -962,12 +962,8 @@
-     endif()
- 
-     # Standard Linux 'make install'
--    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-+    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
-     install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
--    if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
--        install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
--    endif()
--    install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-     if( BUILD_PATCHED_LIBXML2 )
-         install( PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsigilxml2.so.2.9.4 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-         install( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libxml2.so.2 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
---- a/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:02.539107666 +0200
-+++ b/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:27.985457056 +0200
-@@ -40,4 +40,5 @@
- 
- if( UNIX AND NOT APPLE )
- 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
-+	install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
- endif()
diff --git a/app-text/sigil/sigil-0.9.16.ebuild b/app-text/sigil/sigil-0.9.16.ebuild
index 2faaf3abb786..f2afdb994b88 100644
--- a/app-text/sigil/sigil-0.9.16.ebuild
+++ b/app-text/sigil/sigil-0.9.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/sigil/sigil-0.9.18.ebuild b/app-text/sigil/sigil-0.9.18.ebuild
new file mode 100644
index 000000000000..f7af56a5f6f3
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.18.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="tk"
+
+inherit cmake-utils python-single-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell:=
+	dev-libs/boost:=[threads]
+	dev-libs/libpcre:3=[pcre16]
+	dev-libs/xerces-c[icu]
+	dev-python/css-parser[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-qt/qtconcurrent-5.12:5
+	>=dev-qt/qtcore-5.12:5
+	>=dev-qt/qtgui-5.12:5
+	>=dev-qt/qtprintsupport-5.12:5
+	>=dev-qt/qtwebengine-5.12:5[widgets]
+	>=dev-qt/qtwidgets-5.12:5
+	sys-libs/zlib[minizip]
+	plugins? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/cssutils[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+	)
+	system-mathjax? ( dev-libs/mathjax )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/Sigil-${PV}"
+
+DOCS=( ChangeLog.txt README.md )
+
+DOC_CONTENTS="From Sigil's release notes:
+When you fire up Sigil for the very first time:
+navigate to the new General Preferences and select the default
+epub version you plan to work with (epub2 or epub3) so that new
+empty ebooks start with the correct code.
+if you plan to work with epub3 epubs, you should change your
+PreserveEntities setting to use ONLY NUMERIC entities.
+
+For example use & # 1 6 0 ; for non-breaking spaces and etc.
+
+We strongly recommend enabling Mend On Open in your settings
+for best performance with Sigil."
+
+src_configure() {
+	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
+	local mycmakeargs=(
+		-DINSTALL_BUNDLED_DICTS=0
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
+	)
+	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/sigil/sigil-0.9.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
deleted file mode 100644
index fbd390f249ce..000000000000
--- a/app-text/sigil/sigil-0.9.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit cmake-utils python-single-r1
-
-my_pn="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell
-	dev-libs/boost[threads]
-	dev-libs/libpcre[pcre16]
-	dev-libs/xerces-c[icu]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	"${FILESDIR}"/${PN}-0.9.8-proper-gumbo-install.patch
-)
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DLIBDIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "From Sigil's release notes:"
-	elog "When you fire up Sigil for the very first time:"
-	elog "navigate to the new General Preferences and select the default"
-	elog "epub version you plan to work with (epub 2 or epub3) so that new"
-	elog "empty ebooks start with the correct code."
-	elog "if you plan to work with epub3 epubs, you should change your"
-	elog "PreserveEntities setting to use ONLY NUMERIC entities."
-	elog ""
-	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
-	elog ""
-	elog "We strongly recommend enabling Mend On Open in your settings"
-	elog "for best performance with Sigil."
-}
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 8d42914c2c44..1f1b8bd3b098 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -145,6 +145,7 @@ DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4c
 EBUILD tesseract-3.05.01.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-3.05.02.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-4.0.0.ebuild 3658 BLAKE2B d06d2635968b2b7d68a1dbcacffffbaf941722bbad81d12e1adf37993245964d5022aacb88fb40c9c1a8a35435cd8bf0baefb0ccc482c247a542e6c532c0d16a SHA512 fdb8e1b4a4f3280d3dd808ed630f229d5af276a4e035d1f7150bb2a8d2e8f60d0c2e44839c06f8bf1c0479b1ee20c52dc997a9369493832cd565c7bff4e1484b
+EBUILD tesseract-4.1.0-r1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
 EBUILD tesseract-4.1.0.ebuild 1752 BLAKE2B 3585fbdec92bcc4ee4f8826a851b9c58cf03bbc8624c0af82528ba2f9cb900305d9816f3daf08a5343a3dd1623882ba34402b967843a84d0dc5f3f90055237bc SHA512 da8401d6628b45cf9e89c3d4703f53441b0ef789db81d841d3b657a3bc883b5622dfe651fe1827dd4530715858458d68694d2ef3fcaa241c3390c5469181d6f8
 EBUILD tesseract-9999.ebuild 3544 BLAKE2B 3747649a31c9cc8d4d83aa1c9d2f47e5ebfaea45488373a1712ced42dcefd0beca400aae8b25db9c59fb4ded3b19c5e978adc365f90c162c3361aad8cb8c9cf2 SHA512 6926f550e5d0a68af8d941c4b9d1e0e54ca8d22a1a4e60d9f5ffa3159f399f5a69bdb2180da9b0fddb1416da5ae195eb2926d772233e9c759462876eb1730366
 MISC metadata.xml 1144 BLAKE2B 1b9ecd743c9a6b016ae04ea28b8bc2f80f6192c8c52d9d7e165cb8a2f222cc08408c97b0e01cebd4840b46cf0f046b2a7511b56c8f14b1a6434fea6e1149a48f SHA512 a86b76ef0f4bdf4339df2d061d1ef4c4fa80b60bc1d748a8c8c06023a9a5bc025bd14ee2d5e06f25706fc8055d8722cef41048e39908fc3771ec5ddd314eea4e
diff --git a/app-text/tesseract/tesseract-4.1.0-r1.ebuild b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..7313d345c7a4
--- /dev/null
+++ b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl[${MULTILIB_USEDEP}]
+		media-libs/tiff:0=[${MULTILIB_USEDEP}]
+		media-libs/leptonica:=[tiff]
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=app-text/tessdata_fast-4.0.0
+		>=app-text/tessdata_best-4.0.0
+		>=app-text/tessdata_legacy-4.0.0
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# scrollview disabled for now, see bug #686944
+	local myeconfargs=(
+		--enable-shared
+		--disable-graphics
+		$(use_enable opencl)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+	if multilib_is_native_abi; then
+		use doc && emake doc
+		use training && emake training
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+		if use doc; then
+			HTML_DOCS=( doc/html/. )
+		fi
+		einstalldocs
+
+		if use training; then
+			emake DESTDIR="${D}" training-install
+		fi
+	fi
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/tokyodystopia/Manifest b/app-text/tokyodystopia/Manifest
index 1fb936baf455..aa8295177bf2 100644
--- a/app-text/tokyodystopia/Manifest
+++ b/app-text/tokyodystopia/Manifest
@@ -2,5 +2,5 @@ AUX fix_ldconfig.patch 439 BLAKE2B fa9c4b1cf06b2ea8e0a2ff6546e09040e92718558e824
 AUX fix_rpath.patch 2631 BLAKE2B abc4903f98c2399f9514322cc93e9ead3452f09fd5fc88f8ac096613ed676eec517f9eb3fd3412f438a047e9c0305535589bb8ef263f55721dc02c503cfeb87f SHA512 cc4a357c5dbdc95e0b557e2a9578b5e4c6595b19c9b8c061b9882f77f25a5f2b710c1fc83aed1bb1ec8df6ca22ab20b822f1d134743c7ccdd94f68a30bc199b1
 AUX remove_docinst.patch 456 BLAKE2B 768890c4f85a391eac2e436db6b457042a8bf6b28c1c370d19be67a85c194b5a4be06b1f5f1541ad0552228145c7e44587c9c39fa553a5866d8886220e8d2847 SHA512 cb052f09c37e0b84e9e236cf7722974b29e0a2d537bd1268cbb8de0db9ba35292836c82b1d21b35f04b753d58c908f32bb42ceeaba03ae086888aeb278dd6a29
 DIST tokyodystopia-0.9.15.tar.gz 158522 BLAKE2B 624efe5ab587b8fcb63c6365862851ec8f3e596a9d75b48a273e008fadc0919004c6163ca54600b741289ed9f16f9e6d003766a4562f3df6214d48e3ff647ada SHA512 14e956ea6d84c3e00f1af5b8fd7e7ded8e886d585d80f492119521594826e21dd556b875b9552203c9d2f9e2830b15078d635a62975162436a7c2a13387086dd
-EBUILD tokyodystopia-0.9.15.ebuild 717 BLAKE2B d2befe1f9e6d98daaa80228b7b4665dce7f1ce43abda0ade364d668d0de5a7b90ef65d31c160762826bc51a52c0f904fad0e1e8fa31b1abbed7a2660ac2316ee SHA512 b3b14c4b113052b98dac4bbffabe6a493049a3ae0f22f7f48b173c5ac8e72b889e0e2d2a9698b839bb994515a6f24dedc7a6af0ce92a4ff83ae49ce0b4e09339
+EBUILD tokyodystopia-0.9.15.ebuild 740 BLAKE2B 989306adb013c2a7a5abaec93ce37196ff3c67b98a368624275ce102aef9cce4cb37a126b626f522e09f64887f3b40f3414e95084ab4d3676e6cf10b8517eec8 SHA512 75bfd5229d27289a343159a16658c560a26f3d13d9bddbffaa8bd3108dd31e888da8ca77ba6b06365fdaf0de646211666dc8bba3c84fda22f320ad77fde034c4
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
index 6b5ad2082928..6bb8c6f44679 100644
--- a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="A fulltext search engine for Tokyo Cabinet"
 HOMEPAGE="https://fallabs.com/tokyodystopia/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="https://fallabs.com/tokyodystopia/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 6754f4adf273..a60a1934a85e 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,6 +1,7 @@
+AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de245213307b154c8c9f94a4f37b952b7509b7768df53459b1724b91e43bdde3ddb4cacf070d02c4a2dfdf33cbce7cff240c5ec7bc SHA512 70e9b77b5e4eef7a790973737be5c330443ae5eb4f54ac7a706e1404073a3568e0dc42eee1084ae5c4fdecff3384d22ff4666f2b0b24d6d28cf5d66ba3094612
 AUX wgetpaste-remove-dead.patch 1069 BLAKE2B d11664112833cf72b3f0cfd338e6a3e7b41549b60dedb61915501f45f86d72e6003415fd30badb3820453c3b4c81829b34d5bbe501e33aba735b8668487f109d SHA512 edc121802218f7c32664d76e737195b50e167b8b86e62314bc5c818822ee8dca2807d0d38c81167c9771a9a2023ef507f509abed574bc5f1906fbf39ba72ee18
 DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
 EBUILD wgetpaste-2.28-r2.ebuild 779 BLAKE2B ed1ba770ecf40257f2db99a7a84e4cbb264264244d407db4659ea82d11afd6f6a1b8960444d11165d413955ab88a3f7df45da734444940f322f0aac18101bbb5 SHA512 851fd5ea306c1f99645096671dcda51a84791863d171bd007b92c47de760db34c6eb15feca2b7d7cb21827f2d00dd74318c715e3f97e031c8e017cbaef54239d
-EBUILD wgetpaste-2.29.ebuild 738 BLAKE2B ab009023d2ca5d29af4d1657726c9e94f0825c2003807b5c41d77e2649718b37c302e3805db07d3dc9ed601bc35f37eea00c3035a6fe322327417280b0b3d505 SHA512 6a6d96d076f5533bf1e4f2e7981dd907d88e486f09b138a6812dd249f64ab708dfc9c5b929d2623abc1a84e1e1b3a1204e65807ee8f0d8b88c110d352b72e9e7
-MISC metadata.xml 355 BLAKE2B cfb82b6309e5508319685ccad6757d701ad60ca2c9b015bf04cd500348a1c43e951876917d60e118e4008088a40761cd57b0f08a220cf1e97b9f638a4efe086a SHA512 04699e3fb3122aa304bcb525a1130732c949473086ed946ae9051928e7e84edd5347cab006e6a31f0ad854c7d8f51f07c3e77f6e3a7dac450619f4decb52f2f5
+EBUILD wgetpaste-2.29-r1.ebuild 787 BLAKE2B bb4190d4de6240b39244ec2b1b1a87af2599d81494adbdfe0682bfcdf4edf8dd79f90ae79ffc04acb871a8bcad7d566ab5f6472b76e107516067c598b21b7905 SHA512 87a551c9576cf10096f80588babefcd8fcb285c4e57109c46683b1a523aee3d2b202d479337fda3c654155c5fb1f1c53a1f02cd1c090b84f86f723061dbc0d28
+MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278
diff --git a/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
new file mode 100644
index 000000000000..0af9a6f855d7
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
@@ -0,0 +1,40 @@
+From 6175f89cb618fef83882ed86ab049a7fd1035770 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bo=20=C3=98rsted=20Andresen?= <zlin@exherbo.org>
+Date: Tue, 23 Jul 2019 00:16:19 +0200
+Subject: [PATCH] Fix handling of bpaste urls.
+
+---
+ wgetpaste | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index 585fcd9..99eb7f1 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -181,7 +181,8 @@ xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb
+ xml+velocity xml xquery xslt xtend yaml"
+ EXPIRATIONS_pinnwand="1day 1week 1month never"
+ POST_pinnwand="submit=Paste! % % lexer expiry % code"
+-REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|'
++REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1"
++REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|'
+ 
+ ### errors
+ die() {
+@@ -550,11 +551,15 @@ postdata() {
+ 
+ # get url from response from server
+ geturl() {
+-	local regex
++	local regex location
+ 	regex=REGEX_URL_$ENGINE
++	location=REGEX_LOC_$ENGINE
+ 	if [[ -n ${!regex} ]]; then
+ 		[[ needstdout = $1 ]] && return 0
+ 		sed -n -e "${!regex}" <<< "$*"
++	elif [[ -n ${!location} ]]; then
++		[[ needstdout = $1 ]] && return 1
++		sed -n -e "s|^.*Location: ${!location}|p" <<< "$*"
+ 	else
+ 		[[ needstdout = $1 ]] && return 1
+ 		sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*"
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index 23d91c3c4034..1aa3c4c3cd76 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -6,7 +6,11 @@
 		<name>Maxim Koltsov</name>
 	</maintainer>
 	<maintainer type="person">
-	<email>zlogene@gentoo.org</email>
-	<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">zlin/wgetpaste</remote-id>
+		<bugs-to>https://github.com/zlin/wgetpaste/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/wgetpaste/wgetpaste-2.29.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index ff53674f0697..175617a320c6 100644
--- a/app-text/wgetpaste/wgetpaste-2.29.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -15,6 +15,8 @@ IUSE="+ssl"
 DEPEND=""
 RDEPEND="net-misc/wget[ssl?]"
 
+PATCHES=( "${FILESDIR}/${P}-fix-bpaste.patch" )
+
 src_prepare() {
 	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
 	default
diff --git a/app-text/winefish/Manifest b/app-text/winefish/Manifest
deleted file mode 100644
index f4a7546c3100..000000000000
--- a/app-text/winefish/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX winefish-1.3.3-desktop.patch 355 BLAKE2B f99870a04c8d0de075bf6c4c169e2eabcbec212817a1ab6b1dd0aaf1bc29b0fcc063c834083b7ee9fd832600245f8e3650576b5f42ea53ffbc8e95d095f643db SHA512 12606e0e49bfe9e6de7fe5f7a3b17c55653a4465fb85376929f664afb8d25acad862c8004b9fdfed56e289f7d7ba9fa0618dd551663a9361e4acc174b51e6785
-AUX winefish-1.3.3-doc.patch 518 BLAKE2B e682e07326c44708ac8ee4e8fddd4a07145288f7fcac86e21e37a1cf97cc373d5340661855d896003539ae98b84d147da649a3909f49c02c7b26076cb47b412a SHA512 3a49d0035d580ec8a3daae606a3b1c287ce64cf355de899174fddc9610520ee987823d4fe84e82a25f8bcbf7d8a7c11043b373ab4865a4f7dd654e5520a5eb3b
-AUX winefish-1.3.3-memset.patch 364 BLAKE2B 5eeb23216a11845e2e5adff2fc869aae647a97f8ee6ab2ed1b1d90eb420125fe245b56332eb5a25d510d4bcafce88f4eda3a131d3463206635ee89c851150928 SHA512 282743d8eb64035c2f21a3b037004e17d4b14f15db1877baf7524d90b3a5b8c46a279ca00e9617f79be70c503611884de5859ae910406bf027fa61f70c0404fd
-AUX winefish-1.3.3-nostrip.patch 384 BLAKE2B 3f395994f6c4d214680b6c954ffc9973f3686f0dd29361e708b4e576e6043d9ebf349873ced4f53a782fd7649b6cc27b14560b5fe13c68860b32e81c16b99ba4 SHA512 4090358771013fffed32487eff4cd74c7545b4d7dea97aac6638c9b1bf1d3add2d2f5ab4ad2cc3d0626a3fed336203221528f8efe21802e0f72dd891b65e7bb9
-AUX winefish-1.3.3-version.patch 217 BLAKE2B 4830bcd33b1acc99732dc32bcaa3dd0950dc28c139286b152ba0a250833d39a1f92674900c1cf003ebc2218796aacdda1a509034b1693f7c77342f4f748d9e92 SHA512 c3da51e0a1140fbd0c2c811e16da19af0c9d8817b7d00a1d5fb97901234d8e2c8e1ad27b20a5cc79accac9d1c96239e942fd3ce5de87f5664f3769e6393f2600
-DIST winefish-1.3.3.tar.gz 485772 BLAKE2B 344059c9bc15ec693e66d5d901d2e620ff223dd48de64d32b385cc1e06f6782dc2a2ec965ab8f5ce26bbf518df8edc60a1640b7ed7b576939bf45bbc424f7900 SHA512 216196694979093f5152eb7e3ccaa1e342b44bde4a054c2b6a72c38451d08cd03c3209f5becab8ce3f3c8aace089253a60dff8d8c2f679bb297b34d0fa1ff19c
-EBUILD winefish-1.3.3-r2.ebuild 1017 BLAKE2B 015b366f7ed84feb3e3243315fc90e8e55f6c81b84a33aa1ec962cba205b3ce74725326fe5e17835e286330705563c5a238665c06017e7bf4174eb0aadd8ee5e SHA512 4897589831fb8ff3637fa79b763122edd16a9ef59487599bb418a616939de6a3dc0dab12dde544e5faa3ed4736a6ab76e4f8d4e6190da265b1dc6e260ad52ade
-MISC metadata.xml 330 BLAKE2B 28aec1129c0c006de502806221b22ef857fd367d9fa88dd34d2a4324845cf103e0446b45cf78877df1cf8038c8a569fe456126da51a5b7e7000cb7382797fa5b SHA512 000a6237daf47d5b798b4b0845582741df60e0b9c2d2bdb87e014c96d48a7c8697c03b0de38fd11a2e243c84683bf7ececad0853fbea06e8065ed4ea055cbfb6
diff --git a/app-text/winefish/files/winefish-1.3.3-desktop.patch b/app-text/winefish/files/winefish-1.3.3-desktop.patch
deleted file mode 100644
index eaa66eca7dd0..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/data/winefish.desktop.in
-+++ b/data/winefish.desktop.in
-@@ -7,7 +7,7 @@
- Icon=ICONDIR/winefish-icon.png
- Terminal=false
- Type=Application
--Categories=GTK;GNOME;Application;Editors;Office;Development;
-+Categories=GTK;GNOME;TextEditor;Office;Development;
- Encoding=UTF-8
- StartupNotify=true
- MimeType=text/x-tex;application/winefish-project;text/xml;
diff --git a/app-text/winefish/files/winefish-1.3.3-doc.patch b/app-text/winefish/files/winefish-1.3.3-doc.patch
deleted file mode 100644
index 9e02510e35a8..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -89,8 +89,8 @@
- 	$(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)
- 	$(INSTALL_DATA) images/winefish_splash.png $(DESTDIR)$(pkgdatadir)
- 	$(INSTALL_DIR) $(DESTDIR)$(docdir)
--	$(INSTALL_DATA) doc/winefish.html $(DESTDIR)$(docdir)
--#	$(INSTALL_DATA) doc/winefish.txt $(DESTDIR)$(docdir)
-+#	$(INSTALL_DATA) doc/winefish.html $(DESTDIR)$(docdir)
-+	$(INSTALL_DATA) doc/winefish.txt $(DESTDIR)$(docdir)
- 	@cd icons/ && $(MAKE) install
- 	@cd src/ && $(MAKE) install
- 	@cd data/ && $(MAKE) install
diff --git a/app-text/winefish/files/winefish-1.3.3-memset.patch b/app-text/winefish/files/winefish-1.3.3-memset.patch
deleted file mode 100644
index 7390642bb690..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-memset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/highlight.c
-+++ b/src/highlight.c
-@@ -731,7 +731,7 @@
- 	GList *tmplist = g_list_first(level);
- 	while (tmplist) {
- 		Tpattern * pat = (Tpattern *)tmplist->data;
--		memset(pat->ovector,0,sizeof(pat->ovector));
-+		memset(pat->ovector,0,sizeof(&pat->ovector));
- 		pat->is_match = FALSE;
- 		patmatch_init_run(pat->childs);
- 		tmplist = g_list_next(tmplist);
diff --git a/app-text/winefish/files/winefish-1.3.3-nostrip.patch b/app-text/winefish/files/winefish-1.3.3-nostrip.patch
deleted file mode 100644
index 24f21e49d307..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-nostrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -37,7 +37,7 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- INSTALL = @INSTALL@
- INSTALL_DIR = $(INSTALL) -d -m 755 
--INSTALL_PROGRAM = $(INSTALL) -s -m 755
-+INSTALL_PROGRAM = $(INSTALL) -m 755
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
- -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DPKGDATADIR=\"$(pkgdatadir)\" @DEFS@
- 
diff --git a/app-text/winefish/files/winefish-1.3.3-version.patch b/app-text/winefish/files/winefish-1.3.3-version.patch
deleted file mode 100644
index a586608719d9..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@
- AC_CONFIG_HEADER(src/config.h)
- 
- PACKAGE=winefish
--VERSION=1.3.2
-+VERSION=1.3.3
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION)
- AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
diff --git a/app-text/winefish/metadata.xml b/app-text/winefish/metadata.xml
deleted file mode 100644
index bb345a547d2f..000000000000
--- a/app-text/winefish/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">viettug/winefish</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/winefish/winefish-1.3.3-r2.ebuild b/app-text/winefish/winefish-1.3.3-r2.ebuild
deleted file mode 100644
index 2c873d65af7f..000000000000
--- a/app-text/winefish/winefish-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils xdg-utils
-
-MY_PV=${PV/%[[:alpha:]]/}
-
-DESCRIPTION="LaTeX editor based on Bluefish"
-HOMEPAGE="https://github.com/viettug/winefish"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="spell"
-
-RDEPEND="
-	>=dev-libs/libpcre-6.3
-	>=x11-libs/gtk+-2.4:2
-	spell? ( app-text/aspell )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-doc.patch
-	"${FILESDIR}"/${P}-memset.patch
-	"${FILESDIR}"/${P}-nostrip.patch
-	"${FILESDIR}"/${P}-version.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-update-databases
-}
-
-src_install() {
-	emake install DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html
-	dodoc AUTHORS CHANGES README ROADMAP THANKS TODO
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index d796c7737dcc..2158cfaf26c4 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,6 +1,7 @@
 DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
 DIST xapian-omega-1.4.10.tar.xz 532952 BLAKE2B dec0ebc7b4de24d6f11ea91f090925c0a2dd088ec6468e47e1ea6e60f31acd99d8480f47275df597a508b51c3d2046ce89cd1c8f10e19ff4ad4ce5e593e25852 SHA512 53dde1705eea39fa26afd4db6a0ab39e050ecd1ffc71d2e4c2a2287930d926993c48c36d0c2ad6268188a29876bac1f0e3c29fc54afd2fb6f831899929ebb302
 DIST xapian-omega-1.4.11.tar.xz 533596 BLAKE2B 5002f809a310cfff8b7316c6d1f7fa17f93fd88381aa5ca5de14a443f2b3bfd7f00738bae7b2e3a739a170bd8f454e82f696212fc43282d342946a774b7bfaa0 SHA512 135077e26dc0b0707d1d14c64eeb25db67374b1b7909e9f3e925b10e03b1557263339d2f84c5a82046a159e58a5301834e76e99843d66342666d5694f91ed4f3
+DIST xapian-omega-1.4.12.tar.xz 539324 BLAKE2B 01a9f54dc622699fc4362c3d36a9b529f31c87b6c424f5d55d5dc7e676e8dff895df7e31fa187680afd5eb9e90d65b06d39fc06912b9ae5db8a9e13b694d980d SHA512 2d2c48646f4f06fc4b2666e0901e4f73b2c5da93c4a8e8a5ea6d32e9076a2f18c15c14c7dd2ae2d421a501119ea19b52fe324ad98f9f0bfd6b80f4286721aa2e
 DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
 DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
@@ -8,6 +9,7 @@ DIST xapian-omega-1.4.9.tar.xz 522100 BLAKE2B af1d01d918ff6b6355bd3ebdd28883d7f8
 EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B 28e33f851cccd463daf6ff3e92c980d4c3421cd5272504c6e6dafed1dc859a60d361ebb8e89a2b62b2cd86416760a1d91f9f0c83eda7396705af45c487c88a4a SHA512 769048855d948fdfcfb06cc37d1790712fda232b800b74a8b347617140d1e0ce4dcbb8f9e47d40f39342a694201a592c3446411c92989c840e0b6305e11f1169
 EBUILD xapian-omega-1.4.10.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.11.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
+EBUILD xapian-omega-1.4.12.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.5.ebuild 1152 BLAKE2B 1cdca6a87ec353a468a65a7dc5df903e452128c8df66930d3b7eb651963d211305962cf5b415dca9a56475ff782c4693aa34cd2a91e4d2a444e6a1d2f00b5144 SHA512 540c43a135aaab12509e155b188e17f768d0b9c50a4170f39a29d815532aea4c66c24c65af270c7b906321527f4795a06d325d87b0b67f51600a0da488408944
 EBUILD xapian-omega-1.4.7.ebuild 1151 BLAKE2B 60e49c563df5f5df9b3b29a4ad0aec64c56b045b3bb0f6ac4691d34d46342ae8504a2da8910562cd6dfdd5068b097a9e0d0217c517968f1db9fee114275297c3 SHA512 bd6cc0b52a785d6d205d4faebe6f8dd620623a9c4305da606238bef4026279d6e5c3490c3f398ce51e4fedbf91cb2fd65a1efca8943f8e3ad4ebba829c6e1bf6
 EBUILD xapian-omega-1.4.8.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
diff --git a/app-text/xapian-omega/xapian-omega-1.4.12.ebuild b/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
new file mode 100644
index 000000000000..4a7e3ffd806d
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 64aef6ec2659..e8cf47514490 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -5,7 +5,7 @@ DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f
 DIST xchm-1.29.tar.gz 972533 BLAKE2B e114047f4c3e19bb4d4c28a74997c76c54a2dc286f1f0691f105824be693e3b51c7618717b5b5b5f3604ab3f4fa89d703e071a36be0bd05529b6f44710b0bd20 SHA512 678cea2947d58e9b173379d6df809be603ca77431a3181ee45e3c1f4a4a55a6c10a395eecb5c25feb14ad361d044355ae313d537f0abc9278c6e5ab37a8768f6
 DIST xchm-1.30.tar.gz 981171 BLAKE2B 6b2077e9cf8fa849121cee3681bd390218de1ce83c9c49117a186ddef107b15ee8f491eb93ae41ba8a2ea07ede306883ef0f8f0c357142e9ca333bdea8ebc50a SHA512 896d94f4fa3b728e37985b1a2e918596e20bed0a43cf90711d27ebfdcbe49e4a0794c17e1f6cfefb6f272adcc7fb22464e2c25c15d0f0afcbe94b867899eb1a5
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
-EBUILD xchm-1.29.ebuild 1192 BLAKE2B 3224add5ca8eb50105b7d28a37b067e66cd2e59b300811a5292524649ea75762bcb3d9d65ce84c826d5aa5b61f11a133bfcef1d8e34cc7718d45bdbd58a7b0ee SHA512 d891a2f14a044ac381af8a07d023f8bbb03a72203dc9982b644f5b26045ac89fd4469c83d56d6a5893fb3b704c1a0112054b0e8217d849b0471003c3f57a8134
-EBUILD xchm-1.30.ebuild 994 BLAKE2B ea80c3a38ed48d1b5f5a6dd21990398b4744221fedee5edb0a6f2001e22d1d3d2081a61647936e5576a0420e2c8106fd1a73013225187ef1d98a7aed75e9f118 SHA512 cb71ac423b415418b167f4f5e5ba641436ff9ad74666658ae3371ee3bf5cfef727e52f63560092ce404bf49fd2080398280593b8ddd4dedf0278c2d409aa0a59
+EBUILD xchm-1.29.ebuild 1212 BLAKE2B a92a0015f18489465890cb9d292aa8e834a732e9d3b13b4df7fff95a42e0a3f2654c0aa59dae7327fd09e1330b5d0d8ab885a757c6fbfdb01227f2c04957c26d SHA512 ae281e0998252802f558ed91ba1ff39ec04144b9b2f6666657bc27d2ed9320a0420cc7ade9aa25cf5846fd1fbb3e4c158c2a4d3f9d164026cbf1fa9d3108399e
+EBUILD xchm-1.30.ebuild 1014 BLAKE2B b78f2480a9fb60cea85e74e185fc69b7cf34b429c53fb4d5a2b02b6287b88d156a29f2229dfa2332d080fbc8fa7b35a6c7165dcaffb60a9da12fb9739b352c75 SHA512 030b6a0e0100e1ba1ab2948eeeacb88fe42aa4d0d40be1746b2fd0a17d90178894a9034d66f8f7921160f2a4052a0e1f85f08c7cf191229f17badcc56ff0ad7c
 EBUILD xchm-9999.ebuild 979 BLAKE2B 237ba16825e09abdf152e072a2fd6db4f596483056a56961e391bb0dc519fde5c27d2eb0293ced5e14f4cda42f5575e1acc2a3c8b4838f062ad020a42f90570c SHA512 5be7614b88a6a2d1b6db510ae78fa2be1e07dd7634479a86593328966b34686d55810c2b07ac7961e13abaa955c55cf37af30587c376d04726fcde6582c38408
 MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
diff --git a/app-text/xchm/xchm-1.29.ebuild b/app-text/xchm/xchm-1.29.ebuild
index 8a1516c32201..7fc116cb157d 100644
--- a/app-text/xchm/xchm-1.29.ebuild
+++ b/app-text/xchm/xchm-1.29.ebuild
@@ -7,7 +7,7 @@ inherit autotools wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/xchm/xchm-1.30.ebuild b/app-text/xchm/xchm-1.30.ebuild
index 2784ed8aac1c..e1a21d227bbe 100644
--- a/app-text/xchm/xchm-1.30.ebuild
+++ b/app-text/xchm/xchm-1.30.ebuild
@@ -7,7 +7,7 @@ inherit wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 8813cdb082e7..24f6df0ac2c1 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d2603a93a3fc05bbbcf036f825a534f9083fda3ea536de7b47091aca63409b54a15bec057b7fb3da687507e55efa779075 SHA512 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
+DIST zathura-pdf-mupdf-0.3.5.tar.gz 8901 BLAKE2B 63595d6a4b305d8cd09eced1cfa3840a5ab3d37a61c42738603691621f1f1dbdfc31d5963b14c7af32f8c504f2470bf1cadb708fefbfd49fb25b2848b2564153 SHA512 1f7a748fee74296a008cef42c8f2e443409c77e16caa8441f74136260aaac7dee4d3c03e8a88532c45a0f9972e1b4965d4cffd488a00123d4d8cee9bcec2cf30
 EBUILD zathura-pdf-mupdf-0.3.4.ebuild 793 BLAKE2B 480774b820e6390885f0a6901fde83b5c7ee777d4921bd4e6a105e325743222c4c8793879249734e33ab2ddb6170056105454e52ed6d358870c7a1f24778d166 SHA512 f0e9fe25289a90e838062f37522255ee6256b04a0deaadc9357f996eb7b8d735903bbec10421c4e985461d4454e697004806a83c756568adca76c54a7ccbdfb4
+EBUILD zathura-pdf-mupdf-0.3.5.ebuild 809 BLAKE2B 848d3a8bd80d7b253fa42f2fa352946cc4f6d6a3da0568f230ee504c6c46c58470fb228e75142313769ddf86cbeadd674a978d70e56b713aadc9f4aa7873c9dd SHA512 b928e7582cd71e4135bc0967f3eea887e9657b41baf83c5b0995580fbac13ef4bc12583029e346b99a15b9a6de99733232f67954033cc6326c1562af9ca92766
 EBUILD zathura-pdf-mupdf-9999.ebuild 796 BLAKE2B 623e1c0f435e95826791a71c3ce66c4448ff8c47f9e13dae411d86e8c78b4e6cc630333263eb9b2fc94bb41f6d86fcb871da340fc78509e894fa13613785d934 SHA512 54e52e1405959ee3fdf0ac819dcc1941a370369291c9b480256fc2b404a16f2c839d1f29110cc2e7728de148423bf372c33c2aae413fb3d658a74777bb577fe2
 MISC metadata.xml 672 BLAKE2B 539ab88c5ef3fe3ad7ca25d9856bcf6a7755e09c479631c1cbdd835aeb398d2f6052af0980afc35771312397b6858fca2271f5aa8ee64fa8a57130f05b7594ee SHA512 288bfcdc265543b1d5d364af4fe0c6dbdeec0f30019b683ef0bf32619d87ada509cce47c141aac08cf0942f7ad74d1a453e6b5303175ea591e2f661ba044882a
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
new file mode 100644
index 000000000000..a8c73f86302b
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/mupdf
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+	default
+}
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index b222de9bdd2a..77c815011db6 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,4 +1,4 @@
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
 EBUILD zathura-0.4.3.ebuild 1333 BLAKE2B ad5146cdea9826b8d22bf95d47dc0dcfc02989ae7acd5c085cdbccb61a3b69fe2eb3aa7a44866efe71387da6d63490f37f4d19f01a4a0cdffdd680a52cd60e02 SHA512 cca06811020ead3fbc6d56aa54f1d6e5b73ab03874c5a59c885db015aeb8a9841f6f3d43562bcd0dc3a305d1faec8b7f4473f16ff7107740fc02b330869390fd
 EBUILD zathura-9999.ebuild 1374 BLAKE2B b1935313606001d9dac20406d05fde7fe1720afd0380885577fbf4ae88e78e989226f01651f59279fe863c67b552f0e4b9e6b8dcc00dbbee2b06e80622e8acc7 SHA512 a904dacf3ac21794e27aa8ebc84c2faf7cfbecde519a52936a91ec7d0d317552fd64ef95d0481ef2eb43ca19183e14075b6dc442ca2732ca6958e17cb2fde2c6
-MISC metadata.xml 827 BLAKE2B ce7ca0240a5fc4caca62988ca9d849aa2c010ff36f9ca542f45c49d47a04669e66cd6e1c891f3ef1c36b5eed690d7a6bc134d7130be7ee7e0ee987a428eaeecf SHA512 fba70c39e525376da98422f05601a327e68cb7bc904688ebb3b17854b1123e8baf066cae45d82d3c91d9ccf24b64241a6541484cfcd342fecb2a5f7ca44af02f
+MISC metadata.xml 763 BLAKE2B 1a98b02634dd4017052820cb2103b81d7bc8308c8832edb28f65127f43e9a673926b76091e2062a66c701b25e9d5866051e2268fa3fb4f53a681257132618789 SHA512 5afbabe1726a25ba2b0ae5c66533bbc247deaf1c745534487895bfafa2671ba87d9fc4333ac824176f78db64a940cc53a87d018fa4d7e5d201cfc6f41cfb50d6
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index f01011d4cef6..9e879333ac21 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -6,7 +6,6 @@
 		<email>zlogene@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="magic">Use libmagic to determine mimetypes</flag>
 		<flag name="synctex">Use libsynctex to get latex codeline from pdf</flag>
 	</use>
 	<upstream>
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
commit	f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree	a38046712bbc3a3844d77452d16c84e716caa3d4 /app-text
parent	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)