gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /app-text
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
104 files changed, 1140 insertions, 548 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index fd280b07ccb0..756c82029d9f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 90b47eb07a80..56f8fd59b409 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1,5 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
+DIST asciidoc-9.0.0_rc1.tar.gz 1143528 BLAKE2B 97e2ee77cf7554e2e0d53e792213377e6cb233853717487b0c0ac1c70d233a5d58a08f3aa69ae840c90f98185b595f9feb7396795b2de47ff0cfc0147920bc2a SHA512 965d65df18ff90596e5cd72bec8d0f7daf2f6ad585ec77af2a6ae9637569b613e2384cc7015c1823fcde99be8170107789505a543fe8b6d3273f2c75a6a92960
 EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2620 BLAKE2B 4ae19fa2b8362818e9b5a04226aa7c4b57dd027efab22b0c9881ee3c3ce0d6b4d5ed903f03e0a26962d93ccdb125d73b1ef9e0a22178fb54fe28ef186b42ae2e SHA512 b01efd0d8d1b03de83bd39b37fee70645812795dba6136ea0410258793f4775e41a7ec9392e4b572dfb2db6bd76582de0a605704bb0dc026025044f5e971fdf6
+EBUILD asciidoc-9.0.0_rc1.ebuild 2727 BLAKE2B 09cf677eff56b5a84cb62b36ce2baae2a132806f1fc860546058a33d49bc6d8123668d92b348fed330c33e265113056e2aa71ada291db03e0bd484f8375115f6 SHA512 6acaa452918764b6151ea17284e4b528c88a89bfc3f58796ab5e4dd81d80f39fd3eae364bd1353ae2b39a21945e13732e64019e20674a962d7c3b8b39d489298
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
new file mode 100644
index 000000000000..1b8ec0e44bfd
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
+
+inherit autotools eutils python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
+SRC_URI="https://github.com/${PN}/${PN}-py3/archive/9.0.0rc1.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2:2
+	"
+DEPEND="
+	test? (
+		${PYTHON_DEPS}
+		app-text/dvipng
+		app-text/dvisvgm
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
+	)"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
+	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
+	   filters/code/code-filter-readme.txt )
+
+S="${WORKDIR}/${PN}-py3-9.0.0rc1"
+
+src_prepare() {
+	default
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_test() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${EPYTHON}" tests/test${PN}.py run || die
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+
+	# Below results in some files being installed twice in different locations, but they are
+	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
+	if use examples; then
+		# examples/website is full of relative symlinks,
+		# deref them for copying, which dodoc doesn't do
+		cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
+	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
+	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
+	optfeature "\"graphviz\" filter support" media-gfx/graphviz
+}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 0974c986fab8..7794cef8941b 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,7 +4,11 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-4.10.1.tar.xz 37012272 BLAKE2B e5d9421ed986da8ec7d814f364702fe04bcbb76b5e08dedfadd7164c81943cdfe6f012042e82a4715e3ccda284efdf44340af0bde9d03cbc7c22cbcf10136a55 SHA512 eb6f4fd458da3e3e1121ff72da0dfb2bdc38cec98bdaf538e6761563aa176aae2439e4949424795c239a8fa8ebde507564452495ef71f3f7f19b25435e10a41a
+DIST calibre-4.11.1.tar.xz 37042376 BLAKE2B a21a6d01afce4f0a02c1fe6cfba9a77cabd88da72ddb761368ad606d6eb08e3126bd53099a075c26503e91187699d4fef5e8ab3290b7c1e9c94c8310db23af6f SHA512 b6ad65da63f1ec5665116cfc82b8bc1c462d94842d1f53034417db6aa5fbb2e4f90801cba1daa76c54a2c6689e14ae12857cf234afe90356931b8458aeb5ab5a
+DIST calibre-4.11.2.tar.xz 37045372 BLAKE2B 7d76d45afd9228d6346daefaf4ee7cbf4d3281379c96d0ae63b3073b6b5ed055bd2eca0ae728f1471460e3aa8cf9b3afa3e489c4c2f02c6849b39b94e2c2023a SHA512 64f1779ea16e2aedbc91e815b015ffbcfcc2d50035dddc9b33588007ceeeaa5cf4cca84b40fbc9c5808e9b6dab3b04047f37505815120a1e66650447363672f2
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
-EBUILD calibre-4.10.1-r2.ebuild 8600 BLAKE2B d516c9eef99658009a0166cccb1bff5d5e5a4bdd0c3aeb2c8a007842a4cf6e8b98f306cda56be533dcbd02878db0c0a9c28e04b505c00b270360fa6d554c70cf SHA512 f9fea2168fe46e1653d9af2ce4ec49291e75d08a6818bc948c71ee2f558c7cef663f78a2f35bb34cc4497e71ad6ad1b9597700040db3d324e3f85a99187b674b
-EBUILD calibre-4.9.1-r2.ebuild 8598 BLAKE2B aa11c525cf0439a82ba79a18dcdb56f90b35cdfb8b6c602fbe7a445b793b36527420f4737680ad86fd8ba62f8728fb768ab16d24b92235472595e9ceb8ac9159 SHA512 6cbd0692b4dfacf6f00bffe2158a261ad38a933a716869f8e8c2c916f2f96287965c9aedffd28b4d53bbabd58e78b623675a73910a290163e2a0f423a094f25c
+EBUILD calibre-4.10.1-r2.ebuild 8619 BLAKE2B 378dc8e78725a0b11480b9ededf2248626c215eed04f7f3e06cbe60029aa5ca73dbf72eaf718a551b6391ca826be941c9e3f3c46e4ab44e3decd728bfa82c517 SHA512 ea9465a3d1954af1a94f8427f7b3c3b1521a405f0eec15d16e6f7641238f4a1021d8b4bc10d3cb353ebc4fce502e83060296b87be08e886f5a9cc1ce9f5faea7
+EBUILD calibre-4.11.1.ebuild 8568 BLAKE2B c42797c17b08b81152ec019b8a995e83c07c9701ba2fae7f3ce876c214544de7af835f77dd9f4fe3ee5fd710969c4671a5aed178fbacaf2a465c5fc7104b279e SHA512 1a659bb78ad25a37ad4055c9ff4805181738052d2c420b81ae5d34b7c69b6ad142643f98bf31e4f084649b1036bfdf154e856ad900fb6af304f3eac3c88f29ca
+EBUILD calibre-4.11.2.ebuild 8568 BLAKE2B c42797c17b08b81152ec019b8a995e83c07c9701ba2fae7f3ce876c214544de7af835f77dd9f4fe3ee5fd710969c4671a5aed178fbacaf2a465c5fc7104b279e SHA512 1a659bb78ad25a37ad4055c9ff4805181738052d2c420b81ae5d34b7c69b6ad142643f98bf31e4f084649b1036bfdf154e856ad900fb6af304f3eac3c88f29ca
+EBUILD calibre-4.9.1-r2.ebuild 8617 BLAKE2B e8bdc3e44335fe1d559f992ba44cf987a9bdf787b68f657706712561656d8c1f440ae351a7e4834d60923c54a890aebef0d4404325378879105b57d3cb88aa4c SHA512 10e2905269e874033af8cf968e91b9c808c695a5efea5eb7b1fa5865138516f9a0cd9ef0c109738060a00f96065d9af683295346e321740592bfb1d5e6bb13c5
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.10.1-r2.ebuild b/app-text/calibre/calibre-4.10.1-r2.ebuild
index ff49270f8916..08411595122f 100644
--- a/app-text/calibre/calibre-4.10.1-r2.ebuild
+++ b/app-text/calibre/calibre-4.10.1-r2.ebuild
@@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(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."
diff --git a/app-text/calibre/calibre-4.11.1.ebuild b/app-text/calibre/calibre-4.11.1.ebuild
new file mode 100644
index 000000000000..25d08cce1987
--- /dev/null
+++ b/app-text/calibre/calibre-4.11.1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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 ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=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/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	>=dev-qt/qtwebengine-5.12
+	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}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(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"
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# 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.utf8 #709682
+
+	# 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-4.11.2.ebuild b/app-text/calibre/calibre-4.11.2.ebuild
new file mode 100644
index 000000000000..25d08cce1987
--- /dev/null
+++ b/app-text/calibre/calibre-4.11.2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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 ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=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/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	>=dev-qt/qtwebengine-5.12
+	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}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(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"
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# 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.utf8 #709682
+
+	# 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-4.9.1-r2.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild
index 9a06547f837d..799b96ca85b2 100644
--- a/app-text/calibre/calibre-4.9.1-r2.ebuild
+++ b/app-text/calibre/calibre-4.9.1-r2.ebuild
@@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(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."
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 59b35cfddc18..a0551a7a6c27 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,5 +1,5 @@
 AUX catdoc-0.95-parallel-make.patch 1568 BLAKE2B 868cad85a1882c60e1f6f37b630a233949c457afd66f59b1e07616a8403bcb4710cb7ed7d914e58ea2e5022787ad94a4c4db20572386d373b27e61257c5cb2ef SHA512 f40d7440bf19157b862226e8d956b5505e6d79db3a39a21f71f68d6943b162f62863333739f1f4777c2c38b4116b4745888ed0cf5cd4159ccc84d02979f691ea
 DIST catdoc-0.95.tar.gz 217779 BLAKE2B 37c01c485410a6eb08c5935351b00f60f1d4c418f4c1b3cca73da23f870cb5d5414ea6cf7c37effb295e6ccb12a7981367bd08ca6226ee0fc64d2dfdca2762ea SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c
-EBUILD catdoc-0.95-r1.ebuild 1349 BLAKE2B 88f333de0ded60f2f287e44206baa8c423c14a0150752335d39a0fb2892613b83841551186eaef0843c391ab9b6bd74dfc30a6a885ed1d2ddf69b04742d096e2 SHA512 e4212270c30f26d5706f3f457befef3c5c559e345d16f8f2192dd0678373d83868e6f649e3b7935aa86999a133520a845cbd12734b212029e4d183a065642dae
+EBUILD catdoc-0.95-r1.ebuild 1347 BLAKE2B 84a1a8e91f6ad67f23090505bafc683fb03d0394109fd7c35eccb7179cd3159f20354dcbfa36e067e8bfedddf409edccd41e70f5b2823d7c7409e0bf92552927 SHA512 c1935e15391efa1e64e1c4f0bececd22d15b68bd92c3dcc67a990e0446a3621b3b84363727bfd7a9c2096fa8883c3cb2550d796545282f68866b62b55a41b4f8
 EBUILD catdoc-0.95.ebuild 1194 BLAKE2B 96629971c7c69ef5a46f6b0cde1ae1fd7a803c3d203c828ba3e7dbcceac53046aad29c62f524a48b691a7ff1c201bd13a2302239b9d84fa041779356d3ddb132 SHA512 48e93c76ff30043e9fb800109cdab36bd25e7d24895aede5767641b636a62ac30477e6a5dfda5d46a3d6c61f3cdcdd1876b3ecc6c0fecf539c06d7f3766adef5
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/catdoc/catdoc-0.95-r1.ebuild b/app-text/catdoc/catdoc-0.95-r1.ebuild
index bcb0c6d36a8e..f0636d133f30 100644
--- a/app-text/catdoc/catdoc-0.95-r1.ebuild
+++ b/app-text/catdoc/catdoc-0.95-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="tk"
 
 DEPEND="tk? ( >=dev-lang/tk-8.1 )"
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 75be31578842..1df4bb9a658d 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -3,5 +3,5 @@ DIST cb2bib-1.9.9.tar.gz 1292720 BLAKE2B 7263d09ab077d1029129b81abbf7a745405d476
 DIST cb2bib-2.0.0.tar.gz 1337422 BLAKE2B 6b1137c162f69f6d875aa3ae73b5995a067b332b3a7c0a5e69b787f352810768559c227c793204ca40ec594667624d329b5202c28056bca2e13110afebe57f63 SHA512 de1f3a36b98e016c5fa7317ba3fa8c5b767bd4b37bad1318298a57999bead4cc70d18ac49bb87fde57c4379f3347988846a7aa9b88e23a381d6c193bb1354cc2
 EBUILD cb2bib-1.9.8.ebuild 1778 BLAKE2B 6d381621b9d13fdc8459c95017a7ffe1814278d86112b843b3f3bfa714a38cf9aa47050ba6ec8d3e10adc8a62f590fa42df4eaca91bab8577fc09170e8ba3c23 SHA512 afbd9c421d77e9b46cb341e41c13929dd7a7169cba634dd54c584c39f5d6757c098c931ab149746acfd3c2a9e9782345a88b4b35da975ad7a2c31585d0e8ca42
 EBUILD cb2bib-1.9.9.ebuild 1777 BLAKE2B 3f71e35f3a27fe137e17bfdb0d605fb20b397f1f3144ceb0ce6d14038ef119675cfbd8ae0e3aa54085da54548b21edaf4e8198ab09e2f6ea5354822bda3205b0 SHA512 8092905d8d12e49ae68e204d78289c8a2c6ddf007349e61883183982821248f6a0a04ea946b69e1565c12df3928b06e260a73a85f87b4d781721113fdc4b2767
-EBUILD cb2bib-2.0.0.ebuild 1883 BLAKE2B 4602ae4164f8b9aa70a65b330237e4a16da1c5b2b8f6e93559a44bf58a6c88a94a418b531c15da8d2452937c3f237d4d7ab500d626938216ee24f2181e564f7f SHA512 78fb750e11c718cb9f67838759862064209a5f3e0e8d6d12829bf46c58386e8ba22eca09886fd5316f6c64c6fd83711d36896c9b032e901c1e352ed75eadb567
+EBUILD cb2bib-2.0.0.ebuild 1882 BLAKE2B ac145533edc970e58f57da2ddad3269b3af26d780fb4c30ff5d5993fc02e87c720717143a9d7524c8e92eba6b2ec11b27fc463973a49a2d322681df545bc19e0 SHA512 f1200c6efd5b2a03e1d3b181e6b52d0258607bf71a0c09916d31fca8404fdde475f8a989738bff811d3cd72dd53e416b281b40dc7b6c23e3dc841546bcabbae8
 MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a
diff --git a/app-text/cb2bib/cb2bib-2.0.0.ebuild b/app-text/cb2bib/cb2bib-2.0.0.ebuild
index 966c0a15b77c..70c2922ef25f 100644
--- a/app-text/cb2bib/cb2bib-2.0.0.ebuild
+++ b/app-text/cb2bib/cb2bib-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+lzo webengine +webkit"
 
 REQUIRED_USE="?? ( webkit webengine )"
diff --git a/app-text/chasen/Manifest b/app-text/chasen/Manifest
index a054fde56de5..2eb05c8c70b9 100644
--- a/app-text/chasen/Manifest
+++ b/app-text/chasen/Manifest
@@ -1,4 +1,4 @@
 AUX chasen-2.4.4-cve-2011-4000.patch 559 BLAKE2B ee5085a642c1b04ab5cefeaedd09690f988e5cb600953d0ffecd479fe8ddc207e67a27980ebb3df2fbf31dab1f9cc55d597ea09d25dd0c0b29b8fe1d0eddc6c6 SHA512 308a82dfcba13fc33733df853f0abf9979f2d8ff18e1c3f552ac7cd3b6c844dd40e125790fa62844a326ef7e546d0b24fc01c801f3e6cee0aa8b7b2a08474623
 DIST chasen-2.4.4.tar.gz 845720 BLAKE2B ae18e71d78588c108f747abc6f28835f90d0a2c84616a01d87acea2ae5e0e54ef6ff296ebb9dbdce9047a223bd34203cf2763e9b3d4fb28522a4add7bc823860 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075
-EBUILD chasen-2.4.4-r3.ebuild 1089 BLAKE2B b7aa4401d6e8304ede1f4a348d70337a9633a5dd0cc12de47d5523c9da4f150d502b757e91a275d2cf5c54183d8c39bab398a02cd011509c13720de77141ab7f SHA512 6f66db0a4dc2466147be8992edf710640c9125c508a10b930c263f36c83647a47bbb42548e1e2b7f2d026fdd231428b143018eb241a414be498e8ac38291d179
+EBUILD chasen-2.4.4-r3.ebuild 1088 BLAKE2B c38191a89acb2d7525698ae899703a02e11bee43b421a2a043c6f7b90802a1081108aa98752a26b5558ed89d4bc5da5a8092646e55458cf9d5b1134bd9bfa280 SHA512 48c130de04beb906397e6dfac10b07f197e64ff5748e933ab77e1e0e4aa958639aeb748dc467b2cf3dcd9a397fde5398e26166aaf8aebd0ce19356275c31b7a5
 MISC metadata.xml 320 BLAKE2B a218844660f8614413b8afeec00615885e71d7ba7fc1784496ca28fe8c2d689eedb160dfe56080f24cfa369c0652de87597c14b63ab4879cba1970761c8d2ac8 SHA512 1bf81a4a404bd57dd50b071ec19fa00e17b2a733d3988251d195406a8229d0fb3500498ebbb634f863df5d1d56445ceb1605a470421c54697a130769f0f4263c
diff --git a/app-text/chasen/chasen-2.4.4-r3.ebuild b/app-text/chasen/chasen-2.4.4-r3.ebuild
index 102f7e147888..913b177defb5 100644
--- a/app-text/chasen/chasen-2.4.4-r3.ebuild
+++ b/app-text/chasen/chasen-2.4.4-r3.ebuild
@@ -47,7 +47,7 @@ src_test() {
 	fi
 }
 
-src_install () {
+src_install() {
 	default
 
 	if use perl ; then
diff --git a/app-text/cuneiform/Manifest b/app-text/cuneiform/Manifest
index d965cc181a64..cc4e358511e2 100644
--- a/app-text/cuneiform/Manifest
+++ b/app-text/cuneiform/Manifest
@@ -8,5 +8,5 @@ AUX cuneiform.1 2844 BLAKE2B ed7d68de70ebd50caf35bb22ebd23ef7ecf00633be22f237e19
 AUX graphicsmagick.diff 1547 BLAKE2B 5dad602a467a2b3f8c0a55f8a873e9d46cde7857b078009888cf965440ad9a863a5cf3cdb5a3df8c42cf4cc33a4ada7d029c4a80e741083fe54f9948ff837832 SHA512 1aec9b28b1fdde076a4eb3b9d03c448ed28dfdfe102d0fcb7dd9c75c3dd735854ca69d0334c0b1067fa897cfd96044cc49cdf7c8b90e464fa653b702a946fad6
 AUX libm.diff 634 BLAKE2B a1f3eaba778b5cb1a8322a3b3c048293af61eebfe1c3e43c880242a100b732d3f2252ea9bac3469218e0f6e97424fd13ba52655adaf1a43b8c8abf8d67652e16 SHA512 7b1f00e9644ef0762adb10d64835bd9f2e5b2d64729a75cd1afde62f6560afe4fb632e666a4f971686aabbc8a6d5d6364ab641787a01152667e25904fedfff62
 DIST cuneiform-linux-1.1.0.tar.bz2 26388511 BLAKE2B 9a9406d42b96d814b7342c48b384b7d46b529116e37f9946da6b1158bd223d2e4be0158bd0101f0b9821b7d63374758190e60232483779bdb6a4164d1b06034e SHA512 82395f43aae9f4b1301fb47b8d46613affb0ccb09c92d64ac3d77a593618cd56824225b0306176e4d8b90eb468abf6b9f534e97f28dabd4bba81cb7977b79b56
-EBUILD cuneiform-1.1.0-r3.ebuild 1527 BLAKE2B 7a7ef252fddf498e555c9ff879b85045934cced8f27e490e64e5f077d81c232bdf852123b98dfcb3c7d245db70cf1ca5c8959bad93981101865d7166153b5952 SHA512 d2f35a031873e1b24d63131a429982c8dfd7bfc9a01277e1f8219e0144e4f8bca4d06a040f8757c9c957426a481466f8c896b65d9d177a95f017a5509b5f1cc2
+EBUILD cuneiform-1.1.0-r3.ebuild 1528 BLAKE2B 40cb06b092624ded0880885fa36e0a5737bf10b59727be792c2852d6e4ab07f66860425b3a337735ed9822c8e90bfbf8d4fc995bce828044e77e71a1da5b5e1c SHA512 a2a4106a360b2b888aea93df82ae3f134b7ed4df6eeb98fcaf35fde5ba6f288c4267cd2fb31dca2bf0ecd50026996ba28be439bbdfd2d6916f665ac950a3a23c
 MISC metadata.xml 344 BLAKE2B a004a26b6f3707acc98c356f79b3d9451b5fb596fb5ee3e2291ceda662539e2b90e82cfcc3f0c5f17febd315f5f8d921a39cfa212fab2253efa67edb87914e41 SHA512 7c8e545246470ac8e3928f698434403dfd4ccfacce041d623a1fbfdc26bf2a032b4df5604425292d5fc63570237c576630d61884f1ab03e7d2052b9d167a385e
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
index b3da9fad0540..53d1efd18b7b 100644
--- a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
+++ b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-typos.patch"
 )
 
-src_prepare(){
+src_prepare() {
 	use graphicsmagick && PATCHES+=( "${FILESDIR}/graphicsmagick.diff" )
 	cmake-utils_src_prepare
 
diff --git a/app-text/doconce/Manifest b/app-text/doconce/Manifest
index c64302bc1b24..e6e347751a10 100644
--- a/app-text/doconce/Manifest
+++ b/app-text/doconce/Manifest
@@ -1,3 +1,3 @@
 DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31
 EBUILD doconce-1.4.4.ebuild 764 BLAKE2B 1ed038fd47721164bce9260b9a0ea1b0e7e7404ef1c779543875ee258057b1d4a6475804492cfae07488ba044177c98cf91d053be50c6a2948589cc639684909 SHA512 0a13380d62f41ebf420dcd3a097f2844319b8470f38c0614c1e5d6ea70d8bf8430eb172dc4e0712740922c676f3331fc0483cc62ab75e812d18c6be666904912
-MISC metadata.xml 886 BLAKE2B 0e17aef2ca8b68603b8d8b83d719d6224e3891594c07070acebfa25c22b7860e92dcc0cd856227626299c1d5f12d04f7e279afea75b7bb508854ea9ea15ecdf6 SHA512 51fd63b9e6ebef041891046676a22e11eb4addefa5730632f48843509fdfb7cb16d612b55941222d690a305ee50cf2d66557bdde64f6db35c71efe39019ca55b
+MISC metadata.xml 802 BLAKE2B 1b8df627a632e8b2e6ee6f038aef692b611fad270ae96d7d3ae44ad74d9259006e9aa636ffd14aa92fa286bc76d48a6e4a9ec85268e54173c3dc02a066ae18c0 SHA512 8223b8bb4e3b4da93110afb748946ad976ab275a76de8e998933fb7fe258e0be6ea205c4097ceae32760e5f8e8e16566ecc2889ced920d09dad06d0b9386a8bf
diff --git a/app-text/doconce/metadata.xml b/app-text/doconce/metadata.xml
index b9c4307747b0..2e6a499d5337 100644
--- a/app-text/doconce/metadata.xml
+++ b/app-text/doconce/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     DocOnce is a modestly tagged (Markdown-like) markup language targeting scientific reports,
     software documentation, books, blog posts, and slides involving much math and code in the text.
diff --git a/app-text/fblog/Manifest b/app-text/fblog/Manifest
index c6f4c88fae6f..04a4efa5c5f3 100644
--- a/app-text/fblog/Manifest
+++ b/app-text/fblog/Manifest
@@ -33,4 +33,4 @@ DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD fblog-1.3.1.ebuild 1088 BLAKE2B 53f55738f98edd20e4eb559459359b7cb3ae324679b6969945ac35b5d945cf4b895fb9bcab2686ec72c8dce157ca3092e9f656bdd0f40817ffbe7e6ba74f2d87 SHA512 ad075994c1e144e39b770807c46d20fda50c13d566f8b9242b151d9acad2c2a31e1391f9309c1b4fa270ed081444b765447e064d61cde9aab6ea03e1f8507742
-MISC metadata.xml 477 BLAKE2B 096b056ad3372685c163fded9f6bb7cbc2404950dac40b72e8b321c1530deba3728e1123b9fd158f799588cc3b10e3c97ff83132e313b5fc99f18049e2884a56 SHA512 94576bea6800d4aba812303abe6f6366c0fba1ecc35feed1402a383070915594e964941738a19b0b571e7577e2d06355d7204bda920f2f56904fbbf77338f7aa
+MISC metadata.xml 390 BLAKE2B 75706201540fe87b91200fca22103f06fcb7e392ccac62461b7bc1f77a9187b24e2e7fa6ea9723749fc048d6c334098b267530f0212e3554a9969876f109ac6c SHA512 bdb6e4e2464c6669e864ad909c317720516eb6aada0317df8140763a5dd8dc8a6b3653a08884850d8cc30306226f958bdd42879c4d0a232bbd7f21869ed1064d
diff --git a/app-text/fblog/metadata.xml b/app-text/fblog/metadata.xml
index bf986398f805..1950ef12155f 100644
--- a/app-text/fblog/metadata.xml
+++ b/app-text/fblog/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
-		A small tool to view json log files
-	</longdescription>
 	<upstream>
 		<bugs-to>https://github.com/brocode/fblog/issues</bugs-to>
 		<remote-id type="github">brocode/fblog</remote-id>
diff --git a/app-text/fictionup/Manifest b/app-text/fictionup/Manifest
index 7bc77732f2ad..1a4d166d86b2 100644
--- a/app-text/fictionup/Manifest
+++ b/app-text/fictionup/Manifest
@@ -1,3 +1,5 @@
 DIST fictionup-0.1.tar.gz 322407 BLAKE2B 73b464b73f58d725a1973450c2ecb79e140d2a2a4f6a563ea9d5fc1c25ff417a98f487fd26f1c578234007ccb52902390e6292fd3f1b3ec0331a31d00e25e9c3 SHA512 375dbfb27cab05693197b0774875ebbafdb5c4a1bc67db318e00712b821d37fc647b5047fbca083ad145847aa61b81486e4f5192524c233d3facdec3447beb6e
+DIST fictionup-0.2.1.tar.gz 375892 BLAKE2B 1aa80517116e2154227fbc374efe6f051c665c7a2cbc0b2f7c71373a1f535ea41189db4528134b0031f754507d214e6f787df3b571443b6dc5d17f60535069c6 SHA512 c6fadac5bfbd88356dd90b4d2673d2d3dd4d7b5cc26d0b0e1141862143d79b8cfbb71cbbe1c82fe52e4777aed43a677efba1479d14ac64d3931d6bcf31dbc127
 EBUILD fictionup-0.1.ebuild 514 BLAKE2B 80f508bdee2c8308d840fca9ec476e0252c32c25d2a64bb6e19b8430e1ff580ae632c26ee1fbbd1a9a2f69195aea0e0a11caf5edc5ee6da8edf9af692f18751e SHA512 ca95b1d8b0553d899c3c86d77c7f5175888d74d5b734ad6b66f90d3cf6eb916c851897cdad07706adb3ed83c2398a468257197ffc9344a641ee5ae8346f724dc
+EBUILD fictionup-0.2.1.ebuild 388 BLAKE2B ccbc1036f9dce129e3c88092852822b53f0b969094e7a837472e53192258c6a3131b2e34213cd091900aecced115e69eb272ae1b204f4cdc4a367e00859af780 SHA512 eb848b5bb9d9e36940ea980b866240c22b1b5fe890332cda30f6ca0bfb1ec9038c434131509df708105a4ab323ad25ab982ab35dd1baad394443f8fc7828b8b8
 MISC metadata.xml 466 BLAKE2B 49d2b46c6b3bdc4d25b6373c363d22eba40437fc09f4302fb6f627fdd856802d1d9a5143f9129326516ed7ff4d1bc3fa8f2d2583bb070d71c6a8ba817a5e3a6f SHA512 bf13006956e97c9e3fbf1f0fe52acbc42e321b2fe39ac988cfc70f7e9b5ae4de83da1bc131dce9b69882c05c6205fc8630d6776a47e665231544c34a1bcba8dd
diff --git a/app-text/fictionup/fictionup-0.2.1.ebuild b/app-text/fictionup/fictionup-0.2.1.ebuild
new file mode 100644
index 000000000000..fde9cbdf0fb8
--- /dev/null
+++ b/app-text/fictionup/fictionup-0.2.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils
+
+DESCRIPTION="A command-line markdown to fb2 convertor"
+HOMEPAGE="http://cdslow.org.ru/fictionup/"
+SRC_URI="http://cdslow.org.ru/files/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-libs/libyaml"
+RDEPEND="${DEPEND}"
diff --git a/app-text/getxbook/Manifest b/app-text/getxbook/Manifest
index 2fff325e4660..9e0ae0091bf7 100644
--- a/app-text/getxbook/Manifest
+++ b/app-text/getxbook/Manifest
@@ -1,7 +1,4 @@
-AUX getxbook-1.0.patch 863 BLAKE2B 1ffbd7f11a195620ebda24e9da1aa4ea183efb0438797f0cbacce87dbbae2691f2fc0f8c61e965e86f4ed3066f2aa58c7dfef2d4828747839e773b6d8e51ecdd SHA512 3b953cafff23f01918eb910d06cc6bc81d8420fbbe18cfa3cab59458977c7a843ac62ef8789ce0883c225200593f657efce593afcd5bc9a8d87a8f30784ed0cc
 AUX getxbook-1.2.patch 853 BLAKE2B 03778bceed27f4582ffdf3fb2ac9de1fd2f6101d78e697126d86a829e5a13bf97f9ad2948feb274c10dd05ce611d7142bd9f624da19020ce891073402cbbf0d8 SHA512 04699a133cfba3d2a7d0f4eb9cb420abb93eec9b890f23130c23ea7b9e07b7a0da1b69f34aff0482acc79fe07c8abeb7de9de1163ae04d9c581d7a3f5af084a0
-DIST getxbook-1.0.tar.bz2 22314 BLAKE2B cc3b652d4c580c8a5f41a0fc58c2d7cfc9e783fe2c159fb871c0a89d8246f65f9601265e8a7b51c593ef27a726b07faa84a9d2333f2d448b1661d1dad2e48e0f SHA512 df912e67ddd823e4b1ce1539522ef0804f74758aa27baa0c568790859fac97d40dbc8f574be936fdf3ba8a1135bcc3d9af1bedf0205353d7a12f8993393fe941
 DIST getxbook-1.2.tar.xz 23776 BLAKE2B 327a35a73a5e29eefcf3f87cd8ba1237da5d045e3ef009d3ae708797fa78e6d844baa4cba2e8ff021d71951ca100e087d69a98dac3ddce953afa549b63e7e1f8 SHA512 fec397d4fd979421658f7ef9535f3c25369c8bd4ea2f9adcd719f760fd01265ed789f9eca34374b245c24acd485b951c91fa92a36d5b6401a0e0bf4db746788d
-EBUILD getxbook-1.0-r1.ebuild 935 BLAKE2B e9f6642fcda1362867dd44202c58eb0ee812bc9567d1fb97057bf8805d19e56c70e751150569b0c9cfeae0983671041c88eb9e76a137ca0d262155a947f77541 SHA512 bc0d6f4a98efbd087552ede80bef2c81645e559f2d18df1b606cf7de6379a6cf36acb7ff04ad708fdb4d01b54e65dbdf9198684289179f79a19ecbeb1c8d6bdb
 EBUILD getxbook-1.2.ebuild 936 BLAKE2B a4f057509fb8195718b53aa5491a57279eb5feeed587a3b896e7608b06db5c28ff2d15fc8f26841fd7675b211fb468741391545a8447c821a09cd04dcbd80e05 SHA512 33818a0e2e930c48d1a330691d60cabb3552b5a97d2ef692e0d1a39bf463a454e90703e0675ce7ca0e75ac59a171155425b07be3fe0b9a2cf867a62912fcb1d1
-MISC metadata.xml 635 BLAKE2B 73ed8df477413c663fd0821b3aa61301dcfeef8b3ccded5465d4903782572cde1ccef3da28f5804be740ae230a836139359f9c80cb97b70fca383a5bac8fe9a5 SHA512 297c1e817da165662e84bda74934d4493edf3cca336d48ac6e1cd7bf5bb599d9967e0fe38f0fffbafc526185b0bdbcd6244cf7c5b61fb303791e64dcfd80e504
+MISC metadata.xml 551 BLAKE2B dd6bac7ee3b0ec2bcd017b9d9ba62c859a2b31af629b4e5c5f021f3cea713c4b08927447dbdab46f069a8b50d1f4899c9cefc0d127b0df0a7e4080f398136fb4 SHA512 38858ab4ba3a4ca457e115e7638d01d720c735fe2c9112ec2f005bcf73a29848b74f4018e89f405ad260adc188a1bc4afbb0aaf0371643d24ca0461a21bec82a
diff --git a/app-text/getxbook/files/getxbook-1.0.patch b/app-text/getxbook/files/getxbook-1.0.patch
deleted file mode 100644
index 50da6328bf8a..000000000000
--- a/app-text/getxbook/files/getxbook-1.0.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- Makefile | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f6507b5..d080f2b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,12 @@
- # See COPYING file for copyright and license details.
--include config.mk
-+VERSION = 1.0
-+RELDATE = 2012-08-19
-+PREFIX = /usr
-+MANPREFIX = $(PREFIX)/share/man
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra \
-+          -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
-+CC ?= cc
-+LD = $(CC)
- 
- NAME = getxbook
- 
-@@ -20,16 +27,16 @@ $(BIN): util.a
- 
- .o:
- 	@echo LD $@
--	@$(LD) -o $@ $< util.a $(LDFLAGS)
-+	$(LD) $(LDFLAGS) -o $@ $< util.a
- 
- .c.o:
- 	@echo CC $<
--	@$(CC) -c $(CFLAGS) $<
-+	$(CC) -c $(CFLAGS) $<
- 
- util.a: $(LIB)
- 	@echo AR $@
--	@$(AR) -r -c $@ $(LIB)
--	@ranlib $@
-+	$(AR) -r -c $@ $(LIB)
-+	$(RANLIB) $@
- 
- install: all
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/app-text/getxbook/getxbook-1.0-r1.ebuild b/app-text/getxbook/getxbook-1.0-r1.ebuild
deleted file mode 100644
index 575f7242613f..000000000000
--- a/app-text/getxbook/getxbook-1.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Download books from google, amazon, barnes and noble"
-HOMEPAGE="http://njw.me.uk/software/getxbook/"
-SRC_URI="http://njw.me.uk/software/getxbook/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pdf djvu ocr tk"
-
-DEPEND=""
-RDEPEND="
-	djvu? ( app-text/djvu )
-	pdf? ( media-gfx/imagemagick )
-	ocr? (
-		app-text/tesseract
-		pdf? ( media-gfx/exact-image app-text/pdftk )
-		)
-	tk? ( dev-lang/tk:0= )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-	tc-export CC AR RANLIB
-}
-
-src_install() {
-	DOCS=( README LEGAL )
-	default
-
-	use pdf  && dobin extras/mkpdf.sh
-	use djvu && dobin extras/mkdjvu.sh
-
-	if use ocr; then
-		dobin extras/mkocrtxt.sh
-		use pdf  && dobin extras/mkocrpdf.sh
-		use djvu && dobin extras/mkocrdjvu.sh
-	fi
-	use tk && dobin getxbookgui.tcl
-}
diff --git a/app-text/getxbook/metadata.xml b/app-text/getxbook/metadata.xml
index 3b5c78cf814d..b214e7e03b4e 100644
--- a/app-text/getxbook/metadata.xml
+++ b/app-text/getxbook/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     A collection of tools to download books from
     google books' "book preview",
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index 07b5548e5ac8..f0725434c42d 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -5,5 +5,5 @@ DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 BLAKE2B c2f06ffa4aaf52266dabf1
 EBUILD groonga-normalizer-mysql-1.0.6.ebuild 712 BLAKE2B ffa3e31c542b4399826c879ac879f8a23c96e1301e110c174a4f26175cf169947b7ad19db6d7520226903115035028045a71edee6984157b24c3916dc7d9f047 SHA512 3d52475e2844caaa1e1cc208962308d70eb0d4812f7bc3525b2e57de91a6b0e3257c8c3609d4449fd63d51f1e8d2c2dcc63a8072afaf1baa397feb4dd9cd4803
 EBUILD groonga-normalizer-mysql-1.0.9.ebuild 700 BLAKE2B 0b0f4a33a55d932244250f1294fb8e9794c3e078032263348a87039da4c7cf58596d7985472c905ee1b4ed614a9b10704f1379ca8d8f097ee5dad9a8ef0fe77e SHA512 022e5ba51320af015149061407f11f21b2be35ebf5ad799c7634b42199dbf5c8a873b98c7299ed29d3dc84defd17ea4a235431716d0b1828243fceee3ddf1824
 EBUILD groonga-normalizer-mysql-1.1.0.ebuild 700 BLAKE2B 0b0f4a33a55d932244250f1294fb8e9794c3e078032263348a87039da4c7cf58596d7985472c905ee1b4ed614a9b10704f1379ca8d8f097ee5dad9a8ef0fe77e SHA512 022e5ba51320af015149061407f11f21b2be35ebf5ad799c7634b42199dbf5c8a873b98c7299ed29d3dc84defd17ea4a235431716d0b1828243fceee3ddf1824
-EBUILD groonga-normalizer-mysql-1.1.1.ebuild 721 BLAKE2B 418473161e837142a0e065c9f4eebf6655ae557957c593cbd2bb017660d67fbebb0e0e07e48babd2f5ea459ba81eb3898cee46f0d4d105d20f6f679c221d1d1d SHA512 488d36fd2c2f4267a56bd2e8f4f681dd2c377f48419506923ce60628f8a7946a151ce5771289d950105ad0c6240ed5b29e3796d2413006dfb5c3f4faa86da2d9
+EBUILD groonga-normalizer-mysql-1.1.1.ebuild 675 BLAKE2B f5615a7f0f2d92bc6e07e01a1dc8f01c5f56a6eb380608ee392e46c2d3e844f8719b0921dfb63b61db2e8fa6984e867874a72f45fe0916878e7c518e7c7d52a0 SHA512 199d4275ba2f39aa3eeef1b9231204a107a49483cef584ceb2adcbb7bb225dd2c918a74964909fed0aca000a78e294df3943152ffc0dfb25dc014e39eb3d9a95
 MISC metadata.xml 215 BLAKE2B 4eba5c3c44bf788b64d8084a6276754dc99a606036638e96522f3680ce8e5c6f6e1075b2f975d31cf93faea7c5e9a1ad37b58ec4e29e3eacc6a064d035ad8d52 SHA512 b9dfac6d012a908a88f80298c5df82f8b093bcb8f6b523ac7d1897289d0e72d4a62baca343c1b784b1e3f37a94efe000d353b7ea74cbd9b4584698c890d5a7f0
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
index 5bdce94124c0..d61e4f8126b6 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
@@ -25,9 +25,7 @@ src_prepare() {
 
 src_configure() {
 	# ruby is only uses for tests
-	econf \
-		--without-ruby \
-		--docdir="${EROOT}usr/share/doc/${P}"
+	econf --without-ruby
 }
 
 src_install() {
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index f4a861f7c1dd..dcb24303e77d 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -6,6 +6,6 @@ DIST groonga-6.1.2.tar.gz 14028916 BLAKE2B c05a1a5a73bce63655eb588b3021570d22a00
 DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1
 EBUILD groonga-5.0.3.ebuild 2423 BLAKE2B 68844a8cd8c52e45eeba804d8d44659a32b723182a7584c6acea02bdb165334ebad517901eccfcbdf0249f1c8772d60cb9fc75ff7d7c72a604574cdad31acc59 SHA512 25cd58568c1947f1d42e441b297542c7856c0b8033dcea73791aaac720bf74bfa6df47f55776f37e5b4869f76d13b31b423c0893163480b7208804090c81da07
 EBUILD groonga-5.0.9.ebuild 2423 BLAKE2B 68844a8cd8c52e45eeba804d8d44659a32b723182a7584c6acea02bdb165334ebad517901eccfcbdf0249f1c8772d60cb9fc75ff7d7c72a604574cdad31acc59 SHA512 25cd58568c1947f1d42e441b297542c7856c0b8033dcea73791aaac720bf74bfa6df47f55776f37e5b4869f76d13b31b423c0893163480b7208804090c81da07
-EBUILD groonga-6.1.2.ebuild 2452 BLAKE2B 4bf3ae9d039dec9532b70d4f3b8daad45e38efb6502a42fd67c7afb7316e32f61aed1a128b874ee603336354989f92fcdd35d1882016d64d444b84e36a1bb04f SHA512 ff9b183597368af761ef869d441cb100396ac9e387081b42cac21e3e96d2b7d442457dd3bfbc6ff3a898568e8b9ed09401eb90ed6dc1277769f6b278849dc2cd
-EBUILD groonga-8.0.2.ebuild 2667 BLAKE2B a2f9ff65cf47440bbc8b28c7926b29cda03dc0b54acb82bb0c5492719513e1b529fb888b0ef943ac4f08c62890e5dc12da52a565304931e2fd76bcca7d2bc359 SHA512 5b298d025e26449d21877b3132f4a3886f9db42853a5ab53075b875b9fec91117e9f731519773d54a573e5e84625fdcebe7554700464e410d4f5191b6c930df4
+EBUILD groonga-6.1.2.ebuild 2413 BLAKE2B 0d9472484b1d0bfd0949c968e52f6b80737d5398d9304a35826984a30db9555610fc2e8512b8eeba6bd0fd33b9f337d70ceceb425ebe9180530fdcff75390327 SHA512 d6832fac842eab906b5c9df2cbc9e9158b1336c39775a42eea818e8e8fb3ea40917ad02b6b89517bf6a75e6477e92bc0cb290343fe5fb8bf685cff79c3c6fdbe
+EBUILD groonga-8.0.2.ebuild 2621 BLAKE2B efcfa60f6d05c88d765973434c2fa53f25d28de79ac627cd1d5ba7a3f7313e214c88ecff5b70f16b1fac046f7b8ad919311c6d5abef3ce762f413a0de4fe2627 SHA512 875ffc1cd44664637e860ffd5ac91ae1e5b8b6858ca6413fa0076090e04a0bf78fa89e03e3e8f52941adf1d8a748bdbd4d0c46a8aa3bcf6ec00914b219b03aea
 MISC metadata.xml 1205 BLAKE2B e7f1c4c5159d8739b1edce0aba0e484a9a4300e1de5fd1f211224f2a1e44c0e1b6dc6bb9cc0d7aac2740a761fa922c155b6e19a7c75cc6e0a10deb46b8e27d27 SHA512 a3206dfafcada30567bbf6762fdbd4562f72a1da607cc2928426133cbe84e29277c9605778e6a77f8cb6e2c129f1949389443caa1757c72372e7e8c546ee9c88
diff --git a/app-text/groonga/groonga-6.1.2.ebuild b/app-text/groonga/groonga-6.1.2.ebuild
index 8e0f8d564420..144873b934c1 100644
--- a/app-text/groonga/groonga-6.1.2.ebuild
+++ b/app-text/groonga/groonga-6.1.2.ebuild
@@ -49,8 +49,7 @@ src_configure() {
 		--without-pcre \
 		--without-kytea \
 		--without-libstemmer \
-		--with-log-path="${EROOT}var/log/${PN}.log" \
-		--docdir="${EROOT}usr/share/doc/${P}" \
+		--with-log-path="${EPREFIX}"/var/log/${PN}.log \
 		--without-ruby \
 		$(use_enable abort) \
 		$(use_enable benchmark) \
diff --git a/app-text/groonga/groonga-8.0.2.ebuild b/app-text/groonga/groonga-8.0.2.ebuild
index c628d1b0675e..c429f681ca08 100644
--- a/app-text/groonga/groonga-8.0.2.ebuild
+++ b/app-text/groonga/groonga-8.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,8 +53,7 @@ src_configure() {
 		--without-kytea
 		--without-libstemmer
 		--disable-arrow
-		--with-log-path="${EROOT%/}/var/log/${PN}.log"
-		--docdir="${EROOT%/}/usr/share/doc/${P}"
+		--with-log-path="${EPREFIX}"/var/log/${PN}.log
 		--without-ruby
 		--with-shared-onigmo
 		--with-onigmo=system
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 5f323b2ceb81..76f3b85fb8f3 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,4 +1,4 @@
 DIST krop-0.5.1.tar.gz 42719 BLAKE2B e0baa3c14d9ce63815615eae004a08af720868d584262901eccbc569852177e07d5df659ea560d7e9cbdc4325daef8c35acd9c200440a8dfd73c19b274d8de37 SHA512 2bfd2a5d762454ab45538707c6f333d2b0947b6b203d6e7bd2d9d0d574d79de8ee6b30d87b17d6afea604456b915f323b855c9c9af5c169c192b0a01634075ca
-EBUILD krop-0.5.1.ebuild 757 BLAKE2B 43c6ef4fce3592305e59c1006f1d736a7777c0858c3baa2c0922a006988f92a65b20c2e4d73058f47a41e7bac3998140822b30a47a6c370373062a4999665674 SHA512 ee1865af35eda2f6971661aa32f0694d9cda57f857df380827085c5046370a321db38fd2b49d4afab0b46aed870ebd981400aa8665d4b19862e39c96104d6607
-EBUILD krop-9999.ebuild 873 BLAKE2B 8354d4d11794afdf167a4a584d48a3b4e7471dd0411bd636ba4323a67d1d7b5b7b7dad5e564445027bb5d231780d0e20a6fb140bc9df2ed725bf4140e10e879c SHA512 6fe66c73bc35914f113e8a66db53b514d42445df2df646580ac448f30ffeef8f078e2a081c7538e8fc6aaf14f1c78944c91a1cc22b29122c830159e3eed9d2dc
+EBUILD krop-0.5.1-r1.ebuild 884 BLAKE2B 7d294532b03e2a7bb2a6e706cca576d4848163cac83db252b972929d654300cdccff72d2efc20eb25f37c932261a0ae65c3b8eadb5a218071e06b32748997bd6 SHA512 9a24a2fb6ec464685bd8e712a0b94ba8fc188760be32fa37f31cdf50e416224a68793176b3da89c879976cca22b07467d2e27f0d7b150dc947d919207d6f1e78
+EBUILD krop-9999.ebuild 885 BLAKE2B f58eccf02d0f3a08afca3245a6d3695842e4d50df44c7137d72f6e28bf71bd1c1a7acfb3b7756911237f700eb2fb253608587c4a0d57ba90b5d47223c0725cf0 SHA512 9c7aca04b83d8acbb68d691d01cb155d0c55eb9c9cfa916dd0549bb3fcd9f12b50f5d1f3c21d8bf9a494b30a57e8cd460c89648ab02a41e1e6ffd7cc2fc022c3
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.5.1.ebuild b/app-text/krop/krop-0.5.1-r1.ebuild
index 8dc3d8371c93..3a3c251466e4 100644
--- a/app-text/krop/krop-0.5.1.ebuild
+++ b/app-text/krop/krop-0.5.1-r1.ebuild
@@ -1,23 +1,29 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_6 )
 
-inherit eutils distutils-r1 xdg-utils
+inherit desktop distutils-r1 xdg-utils
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
+else
+	SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~x86"
+fi
 
 DESCRIPTION="A tool to crop PDF files"
 HOMEPAGE="http://arminstraub.com/software/krop"
-SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
 	dev-python/PyPDF2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP}]"
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]"
 
 src_install() {
 	distutils-r1_src_install
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index b7f325ef3b86..67c084e81c67 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 
 RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
 	dev-python/PyPDF2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP}]"
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]"
 
 src_install() {
 	distutils-r1_src_install
diff --git a/app-text/mftrace/Manifest b/app-text/mftrace/Manifest
index faeacd1e9875..c279b603778b 100644
--- a/app-text/mftrace/Manifest
+++ b/app-text/mftrace/Manifest
@@ -1,5 +1,5 @@
 DIST mftrace-1.2.18.tar.gz 79112 BLAKE2B 8c3be27985766690782338dec33955cbac80e7d8f4334ed7b62d3c52d7ea5784c14b12c87afd13099cdae226033ca3324b9e7c6e876badb75a8fb634f68a75f6 SHA512 db26a643a92cfcbb150c5f80af65b1ce6030a266023b4433ea760c3601092c42602617f52a49ce467cd3a4804aa6779e72ee38dc557dc03e1e1c86a36dbd54db
 DIST mftrace-1.2.19.tar.gz 78907 BLAKE2B 894ec3c428020cad8f2e408e141b58d7f1e0969c59e65ccb5379e346d735845f8922be4e046ca8fbd18cfd7c3b8e2179ed7af4756ddb4416b6ad42bdbff27f09 SHA512 410739ced17c5e5bb82c286b6b935c9d8d46299f9c04f0ba4c97df9ada5d7e9c778c720fb8a2377eb6df3c629a6e7264836fe7675733cf60197a817477dc49ee
-EBUILD mftrace-1.2.18-r3.ebuild 894 BLAKE2B f87da179f946ccd6232b05c94ad992311673379dc4283d6eca3c69cd007c31537526a58f9dbb50e278fa0560b9863ea653f86d4e31b921fa858aa01627fd7fea SHA512 ea8495b29c08d633a7a7b062f7c37c0dd7f85a0b616e771c70d6f745ceae260dfbc7c52d1c24d3ac6c4c09f40ddcbcc8f1ba58bc6d3130b24d43bfc26f7f23be
-EBUILD mftrace-1.2.19-r1.ebuild 897 BLAKE2B a260e65974332c44744b3c9f1ee5b6c1f6bc709de97e0a1557920b1215912e476918d02f5b08a533cea4fc80f80fbec5d5356196f37b67a5075c8b61dee231c9 SHA512 676613ea2d2b9146c7f0e31ddfa8a6fdbc08dcb27b083997f88476a749d2d55c05480bd7bbfa7172801521f5e5e010a98a33cfcbed02cca3e2587e1ed8c6a443
+EBUILD mftrace-1.2.18-r3.ebuild 893 BLAKE2B 313aa235ff20995f1ae82ed72e74921bb7e13af3c08641026eeeadaa88ef68992a03f5f95c777e46f70e252f6797ded27d829d6cb152bd9a8c1009c0b37f8232 SHA512 3afd8d942567db44841c674875ad3c6a464b0c7ff7106a51c468df89d986be6ac55a9c41aad9d6907fbc08d926fb6bb54d662c8fa7c96c74dd4d214d7452093b
+EBUILD mftrace-1.2.19-r1.ebuild 896 BLAKE2B f5e9b9017ac2fb34ee78830db58965cc45c3aeb6b389fcddb253722a8f4cf8d5a078d0791f172ebf2c91d893c419596e0a9a48668d0f3314457c178f5fc2030a SHA512 d269a62b586f0bff5f31c6b40d9ccb5868f594c5ae8ccc6a86e6df6a50359b253a5b8253ffdae92dc20a8f34c95d2e313d3276c82c2621dcca6a6651f0fc45c9
 MISC metadata.xml 340 BLAKE2B c05678e707d8559ee9e192a80e8911ed8caf3279f8b240e2554bf2e60a6f10c0c1597d12ee3d236fdcf4e9b10aea677972c1a443eabf507d37f6adf9cc7fbcff SHA512 f8317a47d8515f79517a74e966aa31a05c9900a5a4aa52d9aac86b92d15553d03e6d82051312eb689d62381be05ab0f2fe9234bd520e86faf8226aba0cc9ba21
diff --git a/app-text/mftrace/mftrace-1.2.18-r3.ebuild b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
index 043340c9e9ab..eb25b659a5f2 100644
--- a/app-text/mftrace/mftrace-1.2.18-r3.ebuild
+++ b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ src_compile() {
 	emake CFLAGS="-Wall ${CFLAGS}"
 }
 
-src_install () {
+src_install() {
 	default
 	python_optimize
 }
diff --git a/app-text/mftrace/mftrace-1.2.19-r1.ebuild b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
index ec0f31be3231..2ad587595348 100644
--- a/app-text/mftrace/mftrace-1.2.19-r1.ebuild
+++ b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ src_compile() {
 	emake CFLAGS="-Wall ${CFLAGS}"
 }
 
-src_install () {
+src_install() {
 	default
 	python_optimize
 }
diff --git a/app-text/mpage/Manifest b/app-text/mpage/Manifest
index bac5f72f3af7..69866cef9276 100644
--- a/app-text/mpage/Manifest
+++ b/app-text/mpage/Manifest
@@ -1,5 +1,5 @@
 AUX mpage-2.5.6-fix-buildsystem.patch 1014 BLAKE2B ef8b13e878060eda2ff5d0de8984bbf0b6bc1f6888e435aead416e2e8eb8eb6c68982fa16f9ec863ce129d8b15697d60f1b9c901ebc962811e285ee1d7965e13 SHA512 d7b9df3250bfe763d72241e83c64b8c220099b9859ce88534162090d8fe18d7583b8f884d31ecff22e2d9da9e6489f6a87802022c8a5d00f2085adbfbdb9e608
 DIST mpage-2.5.6-gentoo-patchset.tar.bz2 12853 BLAKE2B 69adf941b43fdd7c4e43f3c793063f8d4c1d7f5eeed4b4e01cee7c7a7f5b70554cf1d2e4f73278231d5d95b99de7925ca6f355b8933bb5b7ea2d850d802b567c SHA512 2bfbe4689e02fb76af58a6db3415227df38e71b45fcc3d563a12f505fab8ea78de0415c9ac6d7c9b873f23a9f65e1c8f708f902965ab10e18b2a217b67cc5f0d
 DIST mpage-2.5.6.tgz 86748 BLAKE2B 44558be1272c90a83de37bf9854c96dd1f5b9b38d8588bae66adcfdaa938da351f606424f4d9049231bddae2d03ebc632570a7c80a0037ba1536147aa33df872 SHA512 79a51d0fa08848b22f758e8bc3f57680d33492d261a0061c6cce002c3cb5f129a78221d2af1749c79d4e46385136d9996294499531e60e8fc501f9fd61f8077d
-EBUILD mpage-2.5.6-r1.ebuild 1003 BLAKE2B 974fa91cf7211af2d930e7e0d6226fa604252c48f4d06a19b5c1c079adffa8aca4f215ac959815f211806c3c2be0534d98c3aa6ec4a23e4497cbbad64d245426 SHA512 6f282bd32d9c45bd087e3e92481a7060401f48cb2f7194c417ec17097eef7e9d2b91a3ffd4ff5f3a8b08a5d58e9fa7b8a255446ee85143df15bd75902d72c4ef
+EBUILD mpage-2.5.6-r1.ebuild 1002 BLAKE2B d1c7a194423966c7cf8d4783ba6ee6475d3c6f3c98f16b0ebc8cd048ee6ea030eea09d08857351df50807f7482c0ae53dfedbf20bea5b581183da99841ded626 SHA512 6227e362202f94c66c4e71f4b97640e65359e222639017e27809b26a81ef6f201c4dd7c7f3744d69b379239e37a78a117b500198295b8e7eb8e6892fa2296139
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/mpage/mpage-2.5.6-r1.ebuild b/app-text/mpage/mpage-2.5.6-r1.ebuild
index 6ab60421dd8f..f5e91377a3b5 100644
--- a/app-text/mpage/mpage-2.5.6-r1.ebuild
+++ b/app-text/mpage/mpage-2.5.6-r1.ebuild
@@ -33,7 +33,7 @@ src_compile() {
 		MANDIR="${EPREFIX}"/usr/share/man/man1
 }
 
-src_install () {
+src_install() {
 	emake \
 		PREFIX="${ED}"/usr \
 		MANDIR="${ED}"/usr/share/man/man1 install
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 073dea29c67f..101f28a46fa7 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,6 +1,6 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
 DIST multitail-6.4.1.tgz 155717 BLAKE2B 621e511c74f774681de95c7ad85bac12d528ffac1808ff22b5824c3b97c64397db2d084697a2d4f11a87eab3d4ff29715632d51afa7f7338178a9e89ccdf6e1c SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
-EBUILD multitail-6.4.1.ebuild 1282 BLAKE2B 40ee08c9d5083ee80fd15f23fded9ca0dc18041f217c50bd160194467b241e0a5715ad0ed38329aebe9c0ecc7c0058267d4715fd0b04b0c6ba55c4a3e13080c9 SHA512 4f74993f6fa90cdec97da72db2ec18f680095d479211233eaa619eed64db54247a3a763c8980858f9177d72a543b273d75304529c2ceca013414140d6ba6f633
-EBUILD multitail-6.4.2.ebuild 1288 BLAKE2B d09fdcf2461d1886539a19fefb88e5315d23248cb58d9499df77fad1e0ede7f4d7234d1f66d7d51da21ff434541030077dd8efc7fe7330cf83def7cee98f57b2 SHA512 4beadf5564ff8827c0360236bfc882a5522ce926281b7633110a24c81beeb1a6fd102c2ab0b51b73e9713b66a5b1d2f6f3e63cb0f23297b7dc9dca148c0a1429
+EBUILD multitail-6.4.1.ebuild 1278 BLAKE2B abe03651f6098d9374f33299de56e25749e5865bd9408f8dcebdbc50ae4f5d81f7ed046241c5c4818ffd082b2ce6c88cd4f721f80400f02e8f5af2736b7c5db6 SHA512 3816da3c15569425b5aed28e15bffacd196469b90d1e40cda37471023c95187de85fb9d24308b65676deb61780e3b80289338fb85a2f17d41d09729670fc67ba
+EBUILD multitail-6.4.2.ebuild 1284 BLAKE2B c336442cad722e0aee03c97e43b3e9b4c51146afa4b704387f417c27cfd43459fea7ce5edad9058f319d4544c30af36c5b8ac973cab4990a19794708cea1d9bf SHA512 aacfeb85b96ff2a6b321019edf6427f61634bee087fa79103d2224424ef6f87bf1cd5a0181c886abca2f63eeade937d87feca9709b484dbe870b9c6cd60296d7
 MISC metadata.xml 272 BLAKE2B 609c633a45e8ff00773488f8866b7db5928c91bb7d81172a893fee6ac47f1125ddad1c15a59e3c337d57612112ab6c4731669e31ea4690c8097e6a4602019d5b SHA512 d36a244fa048a320eecd4da6ab2b4a65287a32ef24a253e028b5f95d4abeb7fd935b466cbe02f29a8e83d4c0cd3d1109de7c8d9b0799fa45273b0fb695bc37f7
diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild
index 38b011b1d39f..2c67a1735992 100644
--- a/app-text/multitail/multitail-6.4.1.ebuild
+++ b/app-text/multitail/multitail-6.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -43,7 +43,7 @@ src_compile() {
 	emake UTF8_SUPPORT=$(usex unicode)
 }
 
-src_install () {
+src_install() {
 	dobin multitail
 
 	insinto /etc
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild
index dbb81bb22436..819fc4d3e724 100644
--- a/app-text/multitail/multitail-6.4.2.ebuild
+++ b/app-text/multitail/multitail-6.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -43,7 +43,7 @@ src_compile() {
 	emake UTF8_SUPPORT=$(usex unicode)
 }
 
-src_install () {
+src_install() {
 	dobin multitail
 
 	insinto /etc
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index cd955bb7e71a..d9385e8350ea 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -5,6 +5,6 @@ AUX namazu-perl-5.18.patch 1761 BLAKE2B 38941d15556c229de19592ba2660b9a79782588a
 AUX namazu-perl-5.26.patch 632 BLAKE2B f6b4a0838d6ca529adb9330f7221ebb014e50f289be144920a24a6656fb3abc604a0dc39f6f618a02b25c1cbf2065331f57f80d4120fba69042692a3dcb8a673 SHA512 78c655dfb0bfee51e339a142e71685b0599a58786899a151279834b7e9523dcff8359df8addb2a1e40a162f2a412cbd10e178a8215f3a178527392c2a8fa7be7
 DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
 DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76 SHA512 e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989
-EBUILD namazu-2.0.21.ebuild 1702 BLAKE2B f84a3d893c5bdc471845d288e86defb43adec287b7792fcf7ce7cf22a431cecfeae41cb2fce24da3afc4850bc0adb636f0b6d8ba18d7a6ae5d4d9542638048d2 SHA512 d6c3bb404bd37106af1e7d8788fe1ec04e55d07b98b0050cdc592ba8793aea20c83fc39930e29077353993e9845640440492a7fe94ad4b04d56aeae82a896a36
-EBUILD namazu-2.0.22_pre7.ebuild 1618 BLAKE2B 370b2534f42f2853aa3408ce69ea5b164869be095d72c6226a17e6f13cc0c85390f3ec0dee60a68526239cc495fbdce4d35e2e8d239509eaed80ba8c126be599 SHA512 d99c03d2bbe1c272878b1fd1b78cfee6680b1b79a78dfbd6d9f690047867e4e8b11478329d6ee85534559127cf296c6930a923c4e11f311065060b6f646fe6c4
+EBUILD namazu-2.0.21.ebuild 1701 BLAKE2B da0cf2173235fe7efd2aa5b44ad1c79a7e32e204816e64e01e9480bff2082753d157bb1fbf5fc7be0993b185073eec5c176344dd46c91b57001fa6fb6ba876c6 SHA512 af0cf876363779efa6dd32b948bcc717bed8693f6365768c6d66cbf09663aadbf8a2f7fbd4181b76c7d2d7e6fa460b8959dd0293a51911645f37ce6dd38c4282
+EBUILD namazu-2.0.22_pre7.ebuild 1617 BLAKE2B f0eac6cbfc2842de4934c14aee296942a49b8f305a1c5ae408a5a07f6588814f2f6c1c6e589e5e409af3a3619035ca95aeaf6577de263742968f34ce3963588b SHA512 59be3e7022df5db40f6517915aed1ef9f1e4347d0e88fa86bb23fdce8dd224b4f0b532cd1c2ddc631c5faab113b6b64084fc69e65d5f929e3b412c2c2efc65f5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index 54ecb12f321d..5d0b4d0d14e3 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -77,7 +77,7 @@ src_test() {
 	emake -j1 check
 }
 
-src_install () {
+src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
 
diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild b/app-text/namazu/namazu-2.0.22_pre7.ebuild
index 8bb626158323..8517c8554367 100644
--- a/app-text/namazu/namazu-2.0.22_pre7.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -75,7 +75,7 @@ src_test() {
 	emake -j1 check
 }
 
-src_install () {
+src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
 
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index d8375ec3e84e..8e4f04ff0060 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1,3 +1,3 @@
 DIST pdfarranger-1.3.1.tar.gz 120834 BLAKE2B 5f429d479d130ec06e795c6cedc2aefa75f89b971b556901fc0bfba02038e36c4fd7b4233b5ce6d0dfb6252862176dc7b07192ab43e458090970a25648bb946e SHA512 6ac13447410477e9125da26adbf7123f7f5ffa25814a4c254247a5ff2d07eba6af0557eafb60b4c68ac5987c8e9e7888da21296fb6a74d31a3d0d763b1077918
-EBUILD pdfarranger-1.3.1.ebuild 726 BLAKE2B 06b0263c241444325fb2d82cd1dd1a920b3e3a2a05989204bba58fb6659c117d4cf47c9ab916e565a4a614b63c80fffaca8d588dca8bee78f5eef12b27934d03 SHA512 feffb8b4f27db6df8efe8c58b21a4c728673e6f119f80d9e038d9cbc56e44f8ad9de4fcd2dca542393a8d578759c7d80985526b2b74d7b35d0cc3dd5ee436115
+EBUILD pdfarranger-1.3.1.ebuild 732 BLAKE2B d2f04362a6461b10b875fdc00e86e1f71534eefc87c5cea5f9b6ae7e3ea877ec07dd4debb1aaf39c13dd00f553cf09782b35d2a8d07e2159ce0cbd2d8424b6a6 SHA512 97d65731e892b00f5c3e22756c9ca02548982a7a88e5434d7abf76018deba2671d2b378cf9b5c0e0d5179516f6e88c8f8c7e5aa7428ad8c648e13f97f8a10074
 MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/pdfarranger-1.3.1.ebuild b/app-text/pdfarranger/pdfarranger-1.3.1.ebuild
index 5b8bc956ae5d..d42ba6dcc63b 100644
--- a/app-text/pdfarranger/pdfarranger-1.3.1.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.3.1.ebuild
@@ -17,6 +17,6 @@ RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]
-	app-text/poppler[introspection]"
+	app-text/poppler[introspection,cairo]"
 DEPEND="${RDEPEND}
 	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 8aedf7fd836a..9acb69ef1f90 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,6 +1,6 @@
 DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
 DIST pdfminer-20191020.tar.gz 4168016 BLAKE2B 53658853f1c6948a3249b56769c4d9e28cfe8e977b8702c3802f2c3d64f5c9f1d228024a3cbc9a5f288f60c991b2738a7aa131021bdb47c1492c83f9682abb15 SHA512 6ba663440f0ac370742f3a300a55d5f810202d960253931dfdb109a30ce3f71cf3e3dd30af9d0f6257365972452813b4ebc2dbee8031e988b7efb9dac15075d4
-EBUILD pdfminer-20140328-r1.ebuild 710 BLAKE2B 62103b84cfba56ea6e3cf3b7d38c01f708e7d6df1c5df827bd81bf95924e3caba496d4eb8f1f466e678b66033f3ac9e8c7414949c8d0090a188de6ce67eded8c SHA512 d6b4c398ac6d565c866621f87c4b2b5a1de86a0137ad6dd68e460dfe28a2ca0f97cb5ce31c0e05a31db1e008e563700a29dd90688408bc962c298d61ba1f0c26
-EBUILD pdfminer-20140328.ebuild 645 BLAKE2B 7bee82ab92d12c4bf096549db1a9ec3284564a87b672d5255867737097b8f08e32e3e80f4c90f82d24d1a3df294959585fa86961ae3c72d3384e543bc0f86d6a SHA512 f1dabd40276a5b04f7410bdb3a26d9abb606c927b57a304f96169fe1647633aedd27b42b35fe4948ff915f295c8ce50d5483d2bf72f58d64aeff3b4d89aa6787
+EBUILD pdfminer-20140328-r1.ebuild 711 BLAKE2B 4293a17a8ff55054f70ba706b6891900c01fc2dd372fef392112272f2d0a7a355d4fb1ae34c3429faff6dfbff9427d7036e57895a44e1a15b0bb33c40df41cef SHA512 801fd0b59a9d197e407ebc764239a739886c6a8b5f51efb8d9c8bd96a88008a2beab6f90b834859164c6a89cc8d5a284d21ba882a688b96dd24ef343c843ea40
+EBUILD pdfminer-20140328.ebuild 646 BLAKE2B 4d134bd1415669c0e0b4b43540ac11537074da4a729af7a4b39e21700cdc114749971e8e843ee0b43a854331d1795ae020b821c3842a7abea83248f6cbed7cc4 SHA512 b4b943e9680beb80e7935fd5b6b683221f163972ca97f84d9344950473f476b4fa307590b3198b73536888a87be25914f8452030f591ef2bf9094cb599ee47b1
 EBUILD pdfminer-20191020.ebuild 793 BLAKE2B 3ebbc5cb905bb2ca09d9c2b78ee67e99bd0c8ad41ee8d8faac18bb3f12a5990761a04ac3e02f451581506df9ee44a91b69d2d020d7de817ac18030874b67e07f SHA512 b1f1a8364afcecc11a76e058f0a193cd8be4d251fe51da36604c945614186a2531a4d876fd706c76fe2060fb6b1b35e356df752fce4920815d7303dd9eedc390
 MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/pdfminer-20140328-r1.ebuild b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
index 91cf73768b9e..342b4f9f88f3 100644
--- a/app-text/pdfminer/pdfminer-20140328-r1.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
-python_compile_all(){
+python_compile_all() {
 	use examples && emake -C samples all
 }
 
diff --git a/app-text/pdfminer/pdfminer-20140328.ebuild b/app-text/pdfminer/pdfminer-20140328.ebuild
index eea303083e1b..97c356bcfc39 100644
--- a/app-text/pdfminer/pdfminer-20140328.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
-python_compile_all(){
+python_compile_all() {
 	use examples && emake -C samples all
 }
 
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index eab51f449084..0b8ed6d010d3 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -2,7 +2,7 @@ AUX podofo-0.9.6_pre20171027-libressl-bug-635890.patch 840 BLAKE2B f4bca9474abac
 DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
 DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10
 DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be
-EBUILD podofo-0.9.6_p20180715.ebuild 4654 BLAKE2B 624e6bf3feaeaafa5a0f54e56ffcc9063b14d36d365156eccd0e22bd2b89515b040eddeb3615096b6365942955ec35abba6d1598ee46362d13427ee773e5fc5f SHA512 b5ebe48d81468eafa266e7813a15241f0afc29a62992bd4363921bad8a0ffb010b74e84b7732fc4194d5db606c046f866e78a56a153e494ee0ee4bf1ba83ffcf
+EBUILD podofo-0.9.6_p20180715.ebuild 4661 BLAKE2B c5e6616218c01a583ef3bcd8e93a80edd060b9fe010cf9f91372a5ce3e9f34d592d69fe20cc8e9ba02dceefa6ac70679c5d66783580fd7d70b40cc2f74c5a85d SHA512 b6b6a274d5ee92d13d4b573844cd0d1629f13b552f5d8257e884a0c555ba1d14425abe3fab1be9e01d27c5c1da9eae07519ad0916862569a0495808d2719449f
 EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4605 BLAKE2B b1af6d6e60638220fa4ef3d4d6019fd56fdc186911d9fee02fb4cf1e3dad7d9d75d95e2a2860395d7257ce6f7ac6f4bcda391fdab113795c6351d03130bad326 SHA512 64a66ab34e3b7cb2d01bd8214429f3c880d589a7ca469686e37b1ca1f8c3fb2d780bd3da489a8386b8f6d84f994c596791e88f869a1b063cd2d7f01431f02d53
 EBUILD podofo-0.9.6_pre20171027.ebuild 4667 BLAKE2B fe2ee3f4bbfadc0b25f9c30dc94bc01ad041dc4006251748d9c1e9b5cb6307ab5705e71b716cd7b068452b7063d3c189cf9872f35a0b20ead7397633840d17ab SHA512 8fb15f004cc08cdb63d8ed455c53e425def5c67b388c8de6fd06110d0524b510b71bfa056575fd99541e126bd0cfbeffc0b66f288faad57e4c50f98f0b910483
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
index 667a02839159..e53db8b61f42 100644
--- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9eed6b1873ac..651c2a4e223e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -4,12 +4,10 @@ AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc2200
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
 DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
-DIST poppler-0.83.0.tar.xz 1555456 BLAKE2B 4ab24a85e879d0ddbf24cf7bab5b1da7c15fc026e88b4076dc2b8cd34d69a5bcc0113df20fabda6915afea880480613ba34be6e23b5b0d79a3c6197c92af7853 SHA512 bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713
-DIST poppler-0.84.0.tar.xz 1561236 BLAKE2B eb85b2d0aac2d736ffa74a11df4fbdf28841ded8fec3d32aa92d22f0d1c51aae9d3deacc8cbdd7dbf95906cf46b01f1bca7aa8af99c7fe209e4169478a778e72 SHA512 e00aca76b4909621b79ec68374529396ddba756af5d60d86750095dfebbabe5b576aa7c873c3fcfabaff28c89e3e37e826d4a0fac356d76ef966500514a772e7
 DIST poppler-0.85.0.tar.xz 1588616 BLAKE2B d30c16ff214d2b64fade28bb4099567150e99df6ab967702f48e18ed2191e444728f51d4c1ce1772567c31f9b87a8cf64993ebc383184e06f8b3707436c89143 SHA512 2311bde5ae52e065c12a6129f500469860f5ebefafc3f7be581393f08c2121f3eae57394ff54c1f83ee1b926f28c61530bcd8149d42de10a16b9ba7345f2604e
+DIST poppler-0.86.0.tar.xz 1593992 BLAKE2B 7b09d3d173db31a3dc2965e7eb5dc80fe1e714a7f1319b5fce0719ea345f496313536da023da8f7793d7365210159b26ea23ae95bdef709efbe665abeb13fdb9 SHA512 58a8ee7bc0bae1dfbbd1bd8d2f66bbb77bd4b93637f500b7d69f4b57d20f7f14b2b23b74f2e34a3f00c7b7887c366379ed6d95f5e1e610eafb9cf7847ea7583a
 EBUILD poppler-0.82.0.ebuild 3327 BLAKE2B d86c37fc03b547298324a6f950c9ebf99450ac7e5b14648c3f8c234d187781e8d5e42d6a405d56dad9016445a85d2556470944767d89e6c83a0525d302f173c8 SHA512 722eb340a4bb71ae810629afb4ac2d73a19a07d2a2a3dde90a84244c4eeb35a2c711dedad6b6c0a24da2c63bd12e90a0aef2790611e723b7a0917a018871a748
-EBUILD poppler-0.83.0.ebuild 3337 BLAKE2B c71dbea37c103190528ba3e6f2cf0fdfb4ce53c566335b86b3585f28e31b17ffe801155f55a8be29e044e1bb86ddcd3efd669c6caaef6631ee411128a94f26e5 SHA512 4fbfb1bff3c4711c2c748eaa5f82982bf9a7686ac4ebb1ad41abd41867072816c3c858ae55b1ac8e1a555b53867b6cd3784762074bd33a5ddded56afc1ab1251
-EBUILD poppler-0.84.0.ebuild 3337 BLAKE2B 1bbd89a894f18c11bbf6a8f6c3cd7e66b8ba844af8109861f88618a0787b71919710bb5e5cea754d0424788c89e2411a19838201bc521a6f0bf956c00af358b4 SHA512 567e761c4a7b73edf02cc574fa2866f0ae0f461ac232d00fbebebe7f9a04650f1f7aeaa84584e1617fcb416bfde623f99314ebb207eeeaec1087d053e9b94849
 EBUILD poppler-0.85.0.ebuild 3366 BLAKE2B 9584abfe5136196387ca4b565aa0da160ee089b93750ee43f032efc0d588cd97fc1e64e1fabe736c4076a6ed0563abdaa0ef0f5fb0c44281195b5480df21385f SHA512 e08ea49d45b58d256f3a0ecfff5891b70bc46b27e8d0230f437eaafe55a168095304a35101d8ddc47a3b9a43c83ed2ef0f6f54b343ee3513bca2155965823b04
-EBUILD poppler-9999.ebuild 3366 BLAKE2B 9584abfe5136196387ca4b565aa0da160ee089b93750ee43f032efc0d588cd97fc1e64e1fabe736c4076a6ed0563abdaa0ef0f5fb0c44281195b5480df21385f SHA512 e08ea49d45b58d256f3a0ecfff5891b70bc46b27e8d0230f437eaafe55a168095304a35101d8ddc47a3b9a43c83ed2ef0f6f54b343ee3513bca2155965823b04
+EBUILD poppler-0.86.0.ebuild 3366 BLAKE2B 24034c6c2839a55ccd179a78d38f38de6ea727f71461d226a52699d451c6b46136fdd09f4efc0b7f1a1d1d91e1ebbd06c401cef7acd086e57129ba1b07695e00 SHA512 58b9930d61652d7db5ee3915c7b57a5470b2871a37ce5ea7067f11bfc1b744e6781d6fd5365adc6f870b034e6631d0c0fbfc5c6a3f4f4514779eec3fd5023f0a
+EBUILD poppler-9999.ebuild 3366 BLAKE2B 24034c6c2839a55ccd179a78d38f38de6ea727f71461d226a52699d451c6b46136fdd09f4efc0b7f1a1d1d91e1ebbd06c401cef7acd086e57129ba1b07695e00 SHA512 58b9930d61652d7db5ee3915c7b57a5470b2871a37ce5ea7067f11bfc1b744e6781d6fd5365adc6f870b034e6631d0c0fbfc5c6a3f4f4514779eec3fd5023f0a
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-0.83.0.ebuild b/app-text/poppler/poppler-0.83.0.ebuild
deleted file mode 100644
index 4e79ad3d70dc..000000000000
--- a/app-text/poppler/poppler-0.83.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2005-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/93"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.84.0.ebuild b/app-text/poppler/poppler-0.86.0.ebuild
index dc4ab8ebb00d..f81798f9ce05 100644
--- a/app-text/poppler/poppler-0.84.0.ebuild
+++ b/app-text/poppler/poppler-0.86.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2019 Gentoo Authors
+# Copyright 2005-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/94"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/96"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -87,6 +87,7 @@ src_configure() {
 		-DBUILD_GTK_TESTS=OFF
 		-DBUILD_QT5_TESTS=OFF
 		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
 		-DENABLE_SPLASH=ON
 		-DENABLE_ZLIB=ON
 		-DENABLE_ZLIB_UNCOMPRESS=OFF
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index cdb9a9313740..f81798f9ce05 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/95"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/96"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/psiconv/Manifest b/app-text/psiconv/Manifest
index dc6d3a193f5f..44b0e9ca320d 100644
--- a/app-text/psiconv/Manifest
+++ b/app-text/psiconv/Manifest
@@ -1,3 +1,5 @@
+AUX psiconv-0.8.3-Wimplicit-function-declaration.patch 1753 BLAKE2B 94c3effba9da16e3baa58d09e7f93be3a1658c6b77a31aaff13f60e9c752823cb2deaa32836f208c597f2948fb66c89e2c9e4c15b286863106c38a101dffaef5 SHA512 ed9c06ba1e53b2ba84e5fb585976398514599eec8974b071e5d44f395cc059477e59dd33230ded7fb4255bd6f6052e643a74a13ba68e075c0d7f8c6ceefdd0f1
+AUX psiconv-0.8.3-gcc10-fno-common.patch 563 BLAKE2B cf6ff5a05283739bcaf8fbc4177927c6d396af4fa517a838727b668f4b2118d433022d1f66e2e4f25b01f576cbfe54555bf74482c48a184a86242cdf058b349b SHA512 25133db789feb733a358847c1f5be7d13995dfc81533a9761df6d2eb18c2c4b6af86e13003b4f0c35dcd3313220ce7a559bc0bf869d89bdedfce13a29890dae9
 DIST psiconv-0.8.3.tar.gz 326460 BLAKE2B add1a863c706dfe00ddace65e7083924cd37766a7e17339d1626c6a65ba00bb72e6687a6e1409febf81efd5fb1f7937b60f83e8afcca67f3a47c40611118c82c SHA512 a48814f64fd2c3dda0dfa13c331d2d60ff8674ab7a56f51efcad29d3dd6874f4b94dc0a21ef3066b0fa605b18635ee151fbb4e3eeb06dab3854a329ed70348a9
-EBUILD psiconv-0.8.3-r1.ebuild 579 BLAKE2B 3975ca13de7d3483b84bda156d4af4e882d9e9027331ac2f5efc375ae5922b40809ce0e54077aae030d21ad9dedfa50201fb94265c5fad5fabea041eb1369d14 SHA512 9a03f74797245f144f8a1b81c463bca6a151132c349699bd95527524190eaaa0256fa8b105bec8914d0c2fb80cee8e2652b0c8971447678e78133f0f4a141b92
+EBUILD psiconv-0.8.3-r1.ebuild 645 BLAKE2B 8045280a6048cc3686598e0667125c163f41d3d4abbaf7c0a31dc4fef797105eedb669f4926e21e7ac565bced84f0ee2af2da153e9a0d76616ce3771602c7b19 SHA512 d6ff83339ea40e0126f3b11a5f8fc0b990232ed20140402ea87befb2ce12661a4d7b5524079e22289d1338a630726ec8671ffd3349ed33c3583e13f3942dbf05
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/psiconv/files/psiconv-0.8.3-Wimplicit-function-declaration.patch b/app-text/psiconv/files/psiconv-0.8.3-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..9d01c2d87de3
--- /dev/null
+++ b/app-text/psiconv/files/psiconv-0.8.3-Wimplicit-function-declaration.patch
@@ -0,0 +1,92 @@
+--- a/extra/checkuid.c
++++ b/extra/checkuid.c
+@@ -19,6 +19,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ unsigned long uid1[32] = { /* bit 0  */  0x000045A0,
+                            /* bit 1  */  0x00008B40,
+--- a/extra/empty.c
++++ b/extra/empty.c
+@@ -20,6 +20,7 @@
+ #include <psiconv/generate.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ void help(void)
+ {
+--- a/extra/rewrite.c
++++ b/extra/rewrite.c
+@@ -21,6 +21,7 @@
+ #include <psiconv/generate.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ int main(int argc, char *argv[])
+ {
+--- a/lib/psiconv/error.c
++++ b/lib/psiconv/error.c
+@@ -22,6 +22,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "error.h"
+ 
+--- a/lib/psiconv/generate_layout.c
++++ b/lib/psiconv/generate_layout.c
+@@ -23,6 +23,8 @@
+ #include "generate_routines.h"
+ #include "error.h"
+ 
++#include <string.h>
++
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+ #endif
+--- a/lib/psiconv/generate_simple.c
++++ b/lib/psiconv/generate_simple.c
+@@ -23,6 +23,8 @@
+ #include "generate_routines.h"
+ #include "error.h"
+ 
++#include <string.h>
++
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+ #endif
+--- a/lib/psiconv/list.c
++++ b/lib/psiconv/list.c
+@@ -23,6 +23,7 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "general.h"
+ #include "list.h"
+ #include "error.h"
+--- a/lib/psiconv/misc.c
++++ b/lib/psiconv/misc.c
+@@ -22,6 +22,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "common.h"
+ 
+ #ifdef DMALLOC
+--- a/lib/psiconv/parse_driver.c
++++ b/lib/psiconv/parse_driver.c
+@@ -21,6 +21,7 @@
+ #include "compat.h"
+ 
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "parse.h"
+ #include "parse_routines.h"
diff --git a/app-text/psiconv/files/psiconv-0.8.3-gcc10-fno-common.patch b/app-text/psiconv/files/psiconv-0.8.3-gcc10-fno-common.patch
new file mode 100644
index 000000000000..4c21a6ed3d4a
--- /dev/null
+++ b/app-text/psiconv/files/psiconv-0.8.3-gcc10-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/program/psiconv/psiconv.c
++++ b/program/psiconv/psiconv.c
+@@ -41,6 +41,8 @@
+ #include "gen.h"
+ #include "psiconv.h"
+ 
++psiconv_list fileformat_list;
++
+ static void print_help(void);
+ static void print_version(void);
+ static void strtoupper(char *str);
+--- a/program/psiconv/psiconv.h
++++ b/program/psiconv/psiconv.h
+@@ -31,6 +31,6 @@
+   output_function *output;
+ } *psiconv_fileformat;
+ 
+-psiconv_list fileformat_list; /* of struct psiconv_fileformat */
++extern psiconv_list fileformat_list; /* of struct psiconv_fileformat */
+ 
+ #endif /* PSICONV_GEN_H */
diff --git a/app-text/psiconv/psiconv-0.8.3-r1.ebuild b/app-text/psiconv/psiconv-0.8.3-r1.ebuild
index 004004aee641..84ee5132d4f5 100644
--- a/app-text/psiconv/psiconv-0.8.3-r1.ebuild
+++ b/app-text/psiconv/psiconv-0.8.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -9,20 +9,23 @@ DESCRIPTION="An interpreter for Psion 5(MX) file formats"
 HOMEPAGE="http://huizen.dds.nl/~frodol/psiconv"
 SRC_URI="http://huizen.dds.nl/~frodol/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-IUSE="static-libs"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 
-src_prepare() {
-	tc-export AR
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc10-fno-common.patch
+	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	tc-export AR
+	econf --disable-static
 }
 
 src_install() {
 	default
-	use static-libs || rm -fr "${D}"usr/lib*/lib${PN}.la
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/pstotext/Manifest b/app-text/pstotext/Manifest
index 81162f9b85bd..e7d1d5bf463d 100644
--- a/app-text/pstotext/Manifest
+++ b/app-text/pstotext/Manifest
@@ -1,5 +1,5 @@
 AUX 1.9-flags.patch 775 BLAKE2B 32634da1338504c985a71dd58a6c5a09e03f07063c4540647e155a3d9f4b17fdc2a2d2a6db39f698c9bb7442b525ba876e7a951ad95e908e6a457699847f583f SHA512 4933522482e76eb9a220da6baf74722318e1b3c818515560f58a2d448b66a5236450c96171e89c8fa899c4e4904fcbde8457e87accbde0b6275c7154e1e9e462
 AUX pstotext-1.9-quote-chars-fix.patch 3491 BLAKE2B 81f284386683222fb8c95f0b2677d05134e578486932b09511ba9fd685ade1b02db1a6c1e60dd90502e558f5ff5bc3a8eefa577c8cc620a89f5a97215e9aaea2 SHA512 c6ffabaf5b5f7261e79e43d0083543b0428cde0d62c1b9e9513905d03dd5174a1ee1a537dfa8d906b7422cc6c9e5606fc7dc6f177d11441fd028355e99c2c4a6
 DIST pstotext-1.9.tar.gz 37461 BLAKE2B ff0c816ff0f57882e6fb36df9a2ba02049526cc0d5a0996e47c32f98a3d3208ca35f59c84605e75c787b80b3a0d8db498afbd4d28e2095be8abd979ecaa6bc22 SHA512 a8148e94d635544a7dfa8c96ff6071717388e4dc6c3db36f2c50939dce96c1f824ee423b1622af9111fffc60cb298215a6ee85d956c81873d71ceac804ee48ca
-EBUILD pstotext-1.9-r4.ebuild 659 BLAKE2B 0d75710e224caeb41c97a6a3fcd43c1c11e768a801f152b83742f3e80097e2eb37ce3007afba5938775c8a8e95d174c34d94d93f0f446fed9400d55f8e3b91c2 SHA512 a4654692a85c847ae918547e22ea2837b8ca78a156528fdf485ade26c9d8ce84c7a04a07fac1b4b018955126f3dc514a4590ad00d5d897bb62708ff1002234db
+EBUILD pstotext-1.9-r4.ebuild 655 BLAKE2B c947cffb60d9211e645e3a42b1b1a2d32bca1d20f70516c6aec48ca39e833634a2bdc69bf52b41fc0eb262425c6007b010c9b7e815a02c38ef5f439597125641 SHA512 7a53a08ab11421a7af8c7a23551dbfd23649f4c209cec592aa28854fef4e420c85e52db89d5204e5f9934f7251d41567f33eb57b9fd8976a82b0695f616f42d2
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pstotext/pstotext-1.9-r4.ebuild b/app-text/pstotext/pstotext-1.9-r4.ebuild
index f08483acb74d..e514f3c9a379 100644
--- a/app-text/pstotext/pstotext-1.9-r4.ebuild
+++ b/app-text/pstotext/pstotext-1.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ src_prepare() {
 	tc-export CC
 }
 
-src_install () {
+src_install() {
 	dobin pstotext
 	doman pstotext.1
 }
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index 56a61724f998..ac845c6d4f31 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,5 +1,5 @@
 AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r3.ebuild 975 BLAKE2B b5fd538295eabd917f86043426eabbd51b5803bb603640106650624eb33a26297cef035964472a1de95ad5f1efea925be9111bb01e53dbadabcf1657b891947b SHA512 119a9717be41349c6c273b1932d8858fb02d019acd4a8cde4062c0a8a22e5a357b057f522cd85b6a91e770442f629e97b24ad3517a90c8eda24b2d0a377d0aaf
+EBUILD psutils-1.17-r3.ebuild 974 BLAKE2B 509f10864f4ac1ee612033397a5845dc026c4f67705a408d5b4a96d256d509fb026047ad92e27c47895c561082d0c7c4bb8fa3d502c7b5e07930c850bbeb4247 SHA512 f4b02a32a55dc4c050388e048b446979d74c4a7bbc88b1f30dc97cac6bb933409c973f61b2823bb7751aae2796a82fed31f5a6b83f683c2fd3a0cf2552da8263
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index 0b41f05b4edb..8aca2e46858c 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -33,7 +33,7 @@ src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
-src_install () {
+src_install() {
 	dodir /usr/{bin,share/man}
 	emake DESTDIR="${D}" install
 	dodoc README
diff --git a/app-text/refbase/Manifest b/app-text/refbase/Manifest
index 928f34bafd5a..2ccc3398d222 100644
--- a/app-text/refbase/Manifest
+++ b/app-text/refbase/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 837 BLAKE2B 306f387521e1a4004434e5eba01b1254d6c893515ab0164f96f1bf26c07dbb9d8216d0a2a59173096637f9279d23128d123ae21fe1c8c86c07d7f3dd8d069a30 SHA512 fab28207a5d3bff1c8cb499ced404d5ecf2dfcd27493c0ba8b4cedd14518a0d2fdee16e61c28c6d14daa486de80ef33725cc66b48f4fe1ec9e150e5b037f9f3b
 DIST refbase-0.9.6_p20180223.zip 1725517 BLAKE2B bc92ba3bd7e317100e9390157e7b9cef5450aafa4fa78925cd7ac11f8933bca24a978fa44719e4a62e4e914c6949cc57a663a3ceca44ba0f07a7dae96b82d594 SHA512 65960052b99037653d0cf6f0c02f133f47e359ed67da095b03e10519ba48ecaa3cedf29eb1f2d56115b21cd479dcea77a26bf1f90baa8f4037876ca9c61a4aa3
-EBUILD refbase-0.9.6_p20180223.ebuild 961 BLAKE2B 793699579c4e117c08db24364884fdbef472e3279a3a83968781c0fdaafb8980feaec4ac4e369fcd56a7e238ba99de8838de1ed5939c21d8d2d5c31c3ee446e6 SHA512 bfe12d28ef996fa4ff4eb4be16f8dcd09f81a8509b2a8b3cae1e166096fec90e39211015f321421e279cc9ae15e6cfa39539c87a1de4aebcf8d01d2832ae3569
+EBUILD refbase-0.9.6_p20180223.ebuild 960 BLAKE2B 2691af2ceade102c0ddfa464e7d5fcef295d69eab8d57631b0fdf32d194b3f91ac9c1e10d9734992ca5dd5e67ecc6f7ae9ce7c584508b7823828a5ddb02da829 SHA512 7e8f90e92b32e430e1bc9e76714d3ae6f650c19d7aaa7430e7b2d78b4d85c382845f8d472699c1ddbed459220870386b8521c7865b5537530b6455429cb905f9
 MISC metadata.xml 330 BLAKE2B 9e35fe6ced389ecb38ec836735c1d1482efcc1c606f438f433a34543a726d317d903beb94e3fc4c24b6297f4e209e7f8a02bbf046d34fbf3b4fa2813b4c12e89 SHA512 0fbcf620763f7e60e102335842267a1b934695c96b50055e5d338b5504592990c8817afe416cc3b48f9da72aa3365b83ec448165d07446c20fcd4bdd6e5ddb77
diff --git a/app-text/refbase/refbase-0.9.6_p20180223.ebuild b/app-text/refbase/refbase-0.9.6_p20180223.ebuild
index 425caca6082e..a36d4ed7ff86 100644
--- a/app-text/refbase/refbase-0.9.6_p20180223.ebuild
+++ b/app-text/refbase/refbase-0.9.6_p20180223.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${PN}-code-r1422-branches-bleeding-edge"
 
-src_install () {
+src_install() {
 	webapp_src_preinst
 
 	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO UPDATE"
diff --git a/app-text/referencer/Manifest b/app-text/referencer/Manifest
index 9d69499a55f2..d46f1944db3f 100644
--- a/app-text/referencer/Manifest
+++ b/app-text/referencer/Manifest
@@ -1,4 +1,4 @@
 AUX referencer-1.2.2-lib_path.patch 809 BLAKE2B 2cb37ce577ab7b877353489dcaedf32fb135b7970ed70c031de843e0db50d619c8b83d451945dfe9c5d88f60fd21e5243c026c6cf10b0f113fc375bae7f766e0 SHA512 4857eaf468aaba555e7a74b23f91049c68746a6bc1a80d4df287a3363f92871ccb879bdf7f0f8dfb6f18a6f0443fc61f743cbe23b164de4fa0f8a076f59a839b
 DIST referencer-1.2.2.tar.gz 694421 BLAKE2B 2b48b71610d0cb79feaaeae7af203dedd1dc53d194b1b93306c5f022954a5e50f5db1dd693da76b7d4f33045d3174ed82a0764a9dfee6b6bfe98f352575cf59b SHA512 de8d759890f283e7863e6174334bcb051edf70f87a6fb06f724ffa1699be60c83d0191bde0324b571fab0801752a5b92fb507a3cd337fa9adb5ea7d22b280907
-EBUILD referencer-1.2.2-r1.ebuild 1176 BLAKE2B 95b621885a80ec83e9413c4fa0393132d1a4483836772af7ad78b369d01efd8c7d8c4b954639d9794a8c0c5d2e4f2239dffb1dcc51dcc72fa3beb384f2cfa92e SHA512 2ee802541e873f388af523cf0f8aa2c9e1442d62db3a00e0a4e036a1dac5f2c6d83ea3d15c075958a91308b2ffa47c9bd6814ced63c94c0a951362183657ea2c
+EBUILD referencer-1.2.2-r1.ebuild 1175 BLAKE2B f96a5be8c8845efde3c7c62ea6c455ed643940ddc5f29d00a06539ac3c370eac1206d4d242adf9614405c3ae332b837e81bb6ed0f3339b8238af6468cde3dadb SHA512 353a7164345f5fcb0d709669d65497dd2c5bd620c8b869f80f822a5437038cad6110d028d95676dbf6a470b3cd2b255128d2609dda24ebb0f42897b9d68a7cc4
 MISC metadata.xml 453 BLAKE2B 8422bf3441f4a64d469ed5d1f3935f93d6ef0a9b04dda823d3ab6cd03f53de8794fcc30732d9c5ba7414f925a346d96ba70fbfe52c628b1ba473b4c4c3180cdd SHA512 966bf89a47f9afee99af80214048a21d332e810ec1013ca8c9d7edb9e7038575c7a86fd1603dd9cf34ffe90f2a93ff55f7f1d1c229d66055872123f7b6f20649
diff --git a/app-text/referencer/referencer-1.2.2-r1.ebuild b/app-text/referencer/referencer-1.2.2-r1.ebuild
index aec67160a1d3..6fa53d118dd7 100644
--- a/app-text/referencer/referencer-1.2.2-r1.ebuild
+++ b/app-text/referencer/referencer-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -40,7 +40,7 @@ DEPEND="
 
 PATCHES=( ${FILESDIR}/${PN}-${PV}-lib_path.patch )
 
-src_prepare () {
+src_prepare() {
 	default
 	python_fix_shebang plugins
 }
diff --git a/app-text/robodoc/Manifest b/app-text/robodoc/Manifest
index 04d75682b075..f6b05715d145 100644
--- a/app-text/robodoc/Manifest
+++ b/app-text/robodoc/Manifest
@@ -1,3 +1,3 @@
 DIST robodoc-4.99.43.tar.gz 310182 BLAKE2B f8f83c50f51e1f690068b881b51a91369bba3c6b1a9be534fd50887abbf6f06cd90706039865bd0ffdd454b4776ab6e5a1d62dbaf12f459bf1eca0e5872f7e29 SHA512 b9d8758512f6921ca773574ed57763b6eaa203134f13839b8b6f89072bb9a5c0b061bcde816ca8cc64ec72aab7566465ffb0ff2f6a0ead66b50058cb5974fff6
-EBUILD robodoc-4.99.43.ebuild 666 BLAKE2B cca32fdbf738d64d1ef8bdc816473c84af3aaef41abbbc90d8105a08bd84973a1aa624a3619f53a0ff04febc0953cb9e8196ebe56a636d8cadeb21153b2cd0be SHA512 fbd720de95a616d9e98619a8171f387edd0db7f08c34db133695cead1bc2f1757c21393a70a1330e8bfaea49bcdf8b881ef565f8ad82826ef050fb7e626c0b59
+EBUILD robodoc-4.99.43.ebuild 570 BLAKE2B f4f805f0bf9cf74fbb6ae70ce65a9d3798a84855ea38d2b3c376eb91de0396f71727f21a0036af952e5ab239b18070ef511b4227d8ac7d3359bf35ea91d82fcd SHA512 3eefa446ac0fd6e89043dd2ab9fcb3c5be48bfb978ba3ac784e8dced8533ae9634d9d9ee7c69be7b5c9621fdec711c2fa1e2a892073940bbfab7d42b4491fa2e
 MISC metadata.xml 458 BLAKE2B 0ec0fedeb47cf44bb16ad0e30fb59dc8c5be8a00f0e08b681228a405cbf9f5fa10f8bfc3bdf6c9b59ff03eb290ef53748fb9d752fd097fdeaf977b47332c3662 SHA512 95ae90341b2c5304348ea4b96a8a98f97413fc250438345617bc82e51ab2407f702424954ae2f8d753ef65d48de57dcb92f96218e2c4629e81418f1c648326ce
diff --git a/app-text/robodoc/robodoc-4.99.43.ebuild b/app-text/robodoc/robodoc-4.99.43.ebuild
index e539d2a3d151..2055ffdc5a0a 100644
--- a/app-text/robodoc/robodoc-4.99.43.ebuild
+++ b/app-text/robodoc/robodoc-4.99.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,12 +15,6 @@ IUSE="examples"
 RDEPEND=">=dev-util/ctags-5.3.1"
 DEPEND="${RDEPEND}"
 
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking
-}
-
 src_install() {
 	default
 
diff --git a/app-text/sary/Manifest b/app-text/sary/Manifest
deleted file mode 100644
index 986e24ba2a01..000000000000
--- a/app-text/sary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sary-1.2.0.tar.gz 393787 BLAKE2B bcfb393dbae4b5edd51b35a9bb542a1988a4293a321a72f9e3fbce48abbd034bcb96bac915fb330166c5d8adcb2f2b572e808b76508c0411521aef722422c074 SHA512 0eeae82a384970b4d96f7a0ca3929e74d17b8b3ebc61459ec9fc7172e61c3835ffe2de8aaab7ebd64f54be24d39f6734949ebc98758c28cec299b3bd25020632
-EBUILD sary-1.2.0-r1.ebuild 938 BLAKE2B fb418be2a456df4101875899ab22485815af0008de55e9444f82e9b7b770a95654018065e9a4cef597c264fc07b20bb4cdc6278d4ad6118f6688b97340999872 SHA512 8c0231270a4bd8aa711c44038d07bf2a0dd4967b1dd5b648b7cd919189b6ee05913f0e7a3b9c58d55cf243665851cfa5f151e9007219bb6eea8cf863005559ff
-MISC metadata.xml 614 BLAKE2B dbab63bef60f0c15430f90761b9660a90cc05561104ee73eb3848ba30fae5d8bd888e091afd6709d9796cc9fa087c350903e5c83077bd014fdfd9cb7d92dca3e SHA512 ef381dbe030d43e46f5b8aaf13c0783cb1a215bb2961793d75500712fd491983e2df30eb838eb504432d2cc844b7e064d0f96c0efd67d190295496b8cc082a15
diff --git a/app-text/sary/metadata.xml b/app-text/sary/metadata.xml
deleted file mode 100644
index c7ef82c510d5..000000000000
--- a/app-text/sary/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<longdescription>Sary is a suffix array library and tools. It provides
-fast full-text search facilities for text files on the order of 10 to
-100 MB using a data structure called a suffix array. It can also
-search specific fields in a text file by assigning index points to
-those fields.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">sary</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/sary/sary-1.2.0-r1.ebuild b/app-text/sary/sary-1.2.0-r1.ebuild
deleted file mode 100644
index bdf3a8a93f11..000000000000
--- a/app-text/sary/sary-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools
-
-DESCRIPTION="Sary: suffix array library and tools"
-HOMEPAGE="http://sary.sourceforge.net/"
-SRC_URI="http://sary.sourceforge.net/${P}.tar.gz"
-IUSE="static-libs"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	echo "libsary_la_LIBADD = @GLIB_LIBS@" >> sary/Makefile.am || die
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-	eautoreconf
-}
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docsdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete
-	fi
-
-}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 20aef4dd1c07..2eeebf0148e0 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,7 +1,9 @@
 DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
 DIST sigil-0.9.18.tar.gz 21396185 BLAKE2B a20a1465032371f9d7e567fff03c859adf4bd2264e9d803efeb3bdeb3b097eca826daa36824370848aea50fffb2b2b74b28568f7dca926565dfd0948d7ade030 SHA512 a8f669ffb76554268aae8aa0f85c6861f80def71e429b44b20ac9b231f3f7584839a82e7b6991f57ca1f2d1f023e24d1f37897bd048379e30565e9bdd7ee188a
 DIST sigil-1.0.0.tar.gz 21623303 BLAKE2B 5772316d3ffc78387f7fb9db1e88397756bf82c25513246033fe71f288d619844e9316f43b7f08b914e4f59912e42eea061079cd4b468de77087bf7a8ea46be0 SHA512 7fc440131fcdd9af60b10f703dcdaf946ac6c667cabbfc842addd68c6c9af35fc8808630a6cfee6db465e7faeec6a6b4f2c6bbe185426a0f845e47c16b02d7d1
+DIST sigil-1.1.0.tar.gz 21370163 BLAKE2B f5e522e6cd6335ef0a897fecdc99f40da5f6be902c02fadc8bf5817bc0e88c4bacab1075995f5da1fd6bbacb8759ab9f20c6810acfeb3736d033241d1ca6f2ed SHA512 855e973b76eee5f06c3efd7f693474c9ea9a30791d0519569696adc4d7737c2ea6036ae932828c7101e78e6903cbdc846a164ba7464ef6c6821b704092cb796e
 EBUILD sigil-0.9.16-r1.ebuild 2960 BLAKE2B f3198426ecfe3f9e01a04a4741049a3e42e54c574a5e8df1500deb5cf632f41c32925b8fee9681da4287b1aaf63eb5c18be4c2372592fb5a7d07796c0fb099a6 SHA512 ce4c4428a22ca2ee06bd38a4cb05c45475a0a2b6ad766128bbfa9d4361ea5bcb756d9167a582e358ba1a80da53e1c1110e51b662a21a708f11b15102d4da35f3
 EBUILD sigil-0.9.18.ebuild 2784 BLAKE2B 33c8b03b32e4a20954f34e26c6e9f41dcc5d9f6f20cde6fb781d1fb3143dea6b58a87d87975df6b618745d5f2ddc22c9b8bb37fe9ef3721292e56cdde380b3d0 SHA512 4f0aabf83ea7cac03a43dee977f763b9631163a6e11003f9facfcef9ba946743b8c8d966fe6c0b996bfea5bb04dcdf010ae4f2b86b5c174239d08c8f95adefb1
 EBUILD sigil-1.0.0.ebuild 2102 BLAKE2B 62b2e071fcd1a6c817f37117864e1cc22b1b29e042de7e3141cc74de32d3dd592629eebc84588a966dd18f600faabe925f058be72b8d1e4e202eae1b5fa7a1c1 SHA512 1f9ca94bf37afa8c5196c1124f18a46777225e923de7cef0a1c5672914e4ff0c9fd08f6054fc2f36fc748b92f5aba08291623e0d0983e5068959be3f1e06a85e
+EBUILD sigil-1.1.0.ebuild 2102 BLAKE2B 62b2e071fcd1a6c817f37117864e1cc22b1b29e042de7e3141cc74de32d3dd592629eebc84588a966dd18f600faabe925f058be72b8d1e4e202eae1b5fa7a1c1 SHA512 1f9ca94bf37afa8c5196c1124f18a46777225e923de7cef0a1c5672914e4ff0c9fd08f6054fc2f36fc748b92f5aba08291623e0d0983e5068959be3f1e06a85e
 MISC metadata.xml 1073 BLAKE2B 5428bda0e56ccfc8a4f5c7df773698fa62e0309daa5cb970df9fe3381a7a45c920a854e793b92a2d7e91c66698ddd40f2cf89001e85d0bdfbf521af9fe8ea4a8 SHA512 cdfca84a4cd89a3d4d8d6d79b7eb6432d51019b3ac2c8f59f09262c7cf52c990886e299557bcf10f698ec84e8c3c4f46da19bd9dc298d7011aaf4e52b9e0b35b
diff --git a/app-text/sigil/sigil-1.1.0.ebuild b/app-text/sigil/sigil-1.1.0.ebuild
new file mode 100644
index 000000000000..0d5c548e6440
--- /dev/null
+++ b/app-text/sigil/sigil-1.1.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="tk"
+
+inherit cmake python-single-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/libpcre:3=[pcre16]
+	$(python_gen_cond_dep \
+		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_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? ( $(python_gen_cond_dep \
+		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_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 )
+
+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_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 0ed3b73bef74..6a0d8b412844 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -46,8 +46,8 @@ DIST tha.traineddata-3.04.00 13565168 BLAKE2B 1fe254a7ace923a88579c46111a0be81ad
 DIST tur.traineddata-3.04.00 14069931 BLAKE2B 385714a9fb0efa7a8299de7152729a7f7e12a29d4c33cc4df6c5592bd1ddca145acb056caaf93f077279489c3a12e2d95285d0790979cbb036206ecdab910080 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e
 DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96b9d626db6cdd8dfc190c4b8dd0919e6955db8ccea45dba2877b4959f3146cbdc5472a1fb813093232de8ea4d97a20 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef
 DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
-EBUILD tesseract-3.05.02.ebuild 5844 BLAKE2B 69b5282ac97e0bec1692f9d72de8bd6563723f2f6f49f9d05fc192a7756285699512bc001f8eddeeb5539461001d7a4b0d8b9fa33a23e4124c42ee462cfcd2dd SHA512 c9b06df240da184f8bb008016c8313d9b2adf5d3ddacbc3beadaaf3f77a70f06a4410560078f6cf05038d3c994ec7a177be213692e2df08d2a6725ed8d6fb40d
-EBUILD tesseract-4.1.0-r1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
-EBUILD tesseract-4.1.1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
-EBUILD tesseract-9999.ebuild 1984 BLAKE2B 2ba645fbf2b694c306b68f12a4340c827f513ef23c59e8d9be0cc956f5339ccccc29fa0c793143398afaa131b1a955214782809fe5b1d250fb5421bfd3bc69da SHA512 1fff8b3531684facc3eedfb41b9474ec2fd379e8a2669d3d53567d819d52a2899e6247a6b28c632d24d7a3aa1068d51b80d17387ad90668a227cfcde39ebb1c3
+EBUILD tesseract-3.05.02.ebuild 5845 BLAKE2B d5b83ff146d960a3b4ee13be151c7e1083b038b308c17c55a41b8728dfb3251bd7fb7b8a32e1fd4c9c3405d240f46a312694e7547786e169d7c44253bcf68593 SHA512 8c70b8bb9e09c70f767286cd9a99d35c67f4a59e0f7867968b16bffa0df9538a135c5f2dd774022b6035bda40cf51b59c9c3893078fe41581a72e1fbe0f379e3
+EBUILD tesseract-4.1.0-r1.ebuild 2059 BLAKE2B e817adce0988a94490891f6cb246636cac20f6552852fa2d684546402822b4cc1736e3e50cf390887e7921fce797fe8271618209d49cff076cd989e65e8ec349 SHA512 e3e1ba6bdb0edc304e1ad2b14ae07cef5469f74cfc9e863f4b84761f6dba75ee3b328c4701a720cc4f50d99165d9fefb2f236f80d902bad67c8b2955f086031e
+EBUILD tesseract-4.1.1.ebuild 2059 BLAKE2B e817adce0988a94490891f6cb246636cac20f6552852fa2d684546402822b4cc1736e3e50cf390887e7921fce797fe8271618209d49cff076cd989e65e8ec349 SHA512 e3e1ba6bdb0edc304e1ad2b14ae07cef5469f74cfc9e863f4b84761f6dba75ee3b328c4701a720cc4f50d99165d9fefb2f236f80d902bad67c8b2955f086031e
+EBUILD tesseract-9999.ebuild 1985 BLAKE2B 61ca3f12ce35a89999de392f8f96a3a55571c7b37a10d59d28fbd8a14f97ba3eea2c96ea17337ace2a6ff768f3bed96efbf45ca0b3bd5cca79ebb0edf15d8a7b SHA512 4e84e0f3a68232333182b1195ef8b443ba95575bd5912acbbe306788d2174ead368becd43fb1d7daa20b7d73e136309143572322b85860adf05826c5289e5023
 MISC metadata.xml 1144 BLAKE2B 1b9ecd743c9a6b016ae04ea28b8bc2f80f6192c8c52d9d7e165cb8a2f222cc08408c97b0e01cebd4840b46cf0f046b2a7511b56c8f14b1a6434fea6e1149a48f SHA512 a86b76ef0f4bdf4339df2d061d1ef4c4fa80b60bc1d748a8c8c06023a9a5bc025bd14ee2d5e06f25706fc8055d8722cef41048e39908fc3771ec5ddd314eea4e
diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
index d68a8f64208e..bc322d2a94ff 100644
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ b/app-text/tesseract/tesseract-3.05.02.ebuild
@@ -10,7 +10,7 @@ JAVA_PKG_OPT_USE="scrollview"
 
 inherit autotools java-pkg-opt-2 ltprune toolchain-funcs
 
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
 SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
diff --git a/app-text/tesseract/tesseract-4.1.0-r1.ebuild b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
index 7313d345c7a4..ac660c1f07d3 100644
--- a/app-text/tesseract/tesseract-4.1.0-r1.ebuild
+++ b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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."
+DESCRIPTION="An OCR Engine, originally 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"
 
diff --git a/app-text/tesseract/tesseract-4.1.1.ebuild b/app-text/tesseract/tesseract-4.1.1.ebuild
index 7313d345c7a4..ac660c1f07d3 100644
--- a/app-text/tesseract/tesseract-4.1.1.ebuild
+++ b/app-text/tesseract/tesseract-4.1.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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."
+DESCRIPTION="An OCR Engine, originally 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"
 
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index 36477196d955..3e7941c6798e 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools git-r3 multilib-minimal toolchain-funcs
 
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
 EGIT_REPO_URI="https://github.com/tesseract-ocr/${PN}.git"
 
diff --git a/app-text/tkinfo/Manifest b/app-text/tkinfo/Manifest
index fb22af361331..c47a3fdbfdc4 100644
--- a/app-text/tkinfo/Manifest
+++ b/app-text/tkinfo/Manifest
@@ -1,3 +1,3 @@
 DIST tkinfo-2.8.tar.gz 56234 BLAKE2B 6351a8c3ee46092a5c46db147006cb462882cc9abec11f49f07f4f4b50888be6537625a0756a8f05837c21d769345e39837f650ad3a6488713adc304880a3674 SHA512 dfce278a1b33eebcebe3f6f9b5885a8c247f3181d154bc35d8b6d894f1f33043e9e40dd4c8dc336fa100700883295e8a648bece6f04ee556d4fa2f69adaecb76
-EBUILD tkinfo-2.8-r1.ebuild 577 BLAKE2B 40c0f49440f6be3c9371fb2dfebf2275775fac81a75d06eac8cf6b3b20e454610593c840801273a1ea53fd04c581d175108b7e47e0d96e186709a090f14ccb1f SHA512 87a3d31753290991e8b59df55d0dca8ad196c17d2caab4620814fac38122c71de068a95b65c89d211ac48fa7dad386f3fec040eb2bc7f96a5df4aabe021bcc56
+EBUILD tkinfo-2.8-r1.ebuild 576 BLAKE2B 5e5fe1dfadc72deb91fd7998fd32f11e289605152e30c9f3e778bed7d8bd754ddabb391f01c21a660849e0bf6d59a42c68207b60939051fecb74bdbee01cf675 SHA512 771969a0284d5d21b156265b232bc467429c7c9a9f2917ca8d6a893f5cc5ebb7b271091c25bab7a28d761c2dc9f164b1c37e3b7bd87066a336dccf4cce7eea04
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/tkinfo/tkinfo-2.8-r1.ebuild b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
index 0f8c3044f5d7..bff5686e6c96 100644
--- a/app-text/tkinfo/tkinfo-2.8-r1.ebuild
+++ b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
@@ -23,7 +23,7 @@ src_prepare() {
 			die "sed tkinfo failed"
 }
 
-src_install () {
+src_install() {
 	dobin "${PN}"
 	doman "${PN}.1"
 }
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index fa1206d912bb..4c3502e5bffa 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,4 @@
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
-EBUILD wv-1.2.9-r2.ebuild 1443 BLAKE2B ba240cb872bb4cabf9c4a804ced32479f691c5ee4f356cfbcbf3e1a8d9b04a70dd2ba17a0b083293438ba4e027d752f6b3c40611c030f2d67a5cd736cda0cdbb SHA512 8df59352cd0be5853b9349434141a9afff6b3873283dc092646e1d7c3845eeec07f4dba7a7981a8cdda1f4aa35135afb880fbd622465f3a3b0db35de8d73371d
+EBUILD wv-1.2.9-r2.ebuild 1442 BLAKE2B 2f573c301a560f4b8fdb94d2645bc381028ade8a0ae6358d6ad46d0708da95ac2e9d4922d54303f234e5e07f35615fc7b19125b7e4fd47cc6adf08ecb69250e6 SHA512 ade44120d9d70bc66de84fd4f2c80e8371dce9d61a992871f4e6d03e8cc2264538d878b7c9de5df84cc121eff167f8927d3afadf99852b32e8bd3abdc201bfb4
 MISC metadata.xml 448 BLAKE2B 2ad03c8351da9b74d3420841cbb63aa4a5f8723bdd698ded80bfbc91f0d7bda75b0f2d671a74882e32f7f7e1b1e3d6bc4f1ff491132af931e5914b853b3ff854 SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
index 64c371e4ece2..2927d8aeef2a 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -51,7 +51,7 @@ src_configure() {
 		$(use_with wmf libwmf)
 }
 
-src_install () {
+src_install() {
 	default
 	prune_libtool_files
 
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index b57f504de25c..8501efb1828c 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -8,14 +8,14 @@ DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde254
 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
 DIST xapian-omega-1.4.9.tar.xz 522100 BLAKE2B af1d01d918ff6b6355bd3ebdd28883d7f833384ba7ca53aa7e8affef77d71bc74602476ef7c6a8b11b67a60e0ff2e007e0d4da38020ddcac9d7ac7f2df4774d9 SHA512 3e784691c7de807a2eb9c00c97e03cfb7e66686d54e0ee572facad7bcfbdcc2c7aba4b60996bc56657a5ecabc79984e838b9d207cf6f1b7df1df90c108d17d1d
-EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B b4595ec9710097dd1ad51bf252ba49919794a71a721059380d7236fd55050d4cdece520c1af7adf707d29579fa00a141395d8a8ac861c8dd422c1a91516bb74e SHA512 d2294a786c6348c229c9faede8b827b61f11ba8add32c7e427af728bbdeb663fdd3fc09fbe894e3ce5e72377bf63f4c00cacf045370edf33582247b77efe557b
-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.13.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
-EBUILD xapian-omega-1.4.14.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
-EBUILD xapian-omega-1.4.5.ebuild 1150 BLAKE2B fc1a716b86782722afd3cb90a0f927b932d357be89e63417d46b10fc8df19282e719c41297aeb449114c6930f67aa0b29f24403a24e1b40325a2665d7cac9568 SHA512 9e46105e8538548cb5d36a8e115cbcbcf7e337bff8dc4b806ffde2678f5aadb978ab8d533f834a63a361c67da53a02dfb5b38f174a73e7facb5bd674d9e1c7c3
-EBUILD xapian-omega-1.4.7.ebuild 1151 BLAKE2B 2cd97e938686e550a3443f494fbabf1d6bd9192e929e2999cfae6acfdf78ca8d3114fac7c4ac3ca31cccb146896c5bd122378e02d7af86e93f470f38f4ef9a5d SHA512 a5eccbcaef56781223718d38f85d0eb14c4ca1d64e3761babd4374064553ce9d3eedd7f604c3c35d5879b57516a57ad63932b91d5ee597c9e8a8dde6a51d47a9
-EBUILD xapian-omega-1.4.8.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
-EBUILD xapian-omega-1.4.9.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
+EBUILD xapian-omega-1.2.25.ebuild 1264 BLAKE2B adf8f14a56a0c6e6330c7ce75cb635a5c4c86ac3131164544c28e04c3739aa782f1aa1544c6dee066978c4066f5e01054a685cb52f4a033bebc79b1ef9b5911b SHA512 e69c60ac074f4d841f72d51c51d6b68175b7c22f40d7eb8ae230ebd76afde1ea9f613861d14499af67d01b0566791cba81aaa56dfdb0ceff0a5bb5e0d3a1ac57
+EBUILD xapian-omega-1.4.10.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+EBUILD xapian-omega-1.4.11.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+EBUILD xapian-omega-1.4.12.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+EBUILD xapian-omega-1.4.13.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+EBUILD xapian-omega-1.4.14.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+EBUILD xapian-omega-1.4.5.ebuild 1149 BLAKE2B 784ae6372400300e3539ecf4f498411d73dceecef6956d97c7cd85b97d41ba3da48d12c5c80602bc504818b0071eca87eef3e92590dba95c0003fea29d02a2d1 SHA512 3f28982cc2bc1963358af9ddf7364880c76dadcf823077c9cbe33d12c4ee08f943623bef12dcc31c757ee31ea7c618936fe614f804c5db0b77ed90af52810384
+EBUILD xapian-omega-1.4.7.ebuild 1150 BLAKE2B 07e0bbefda42b968c1859caf0a6c50cf88b52196b3d875df89280fed4265d802b49c70eec8b5323826bebc1bd935a5aae52da4f9730999778ce5404ea9e32905 SHA512 9385db59006fae5b9227f309e2c6ebf2808f538fa8b0038fce8898dc2e09d585630cb8d6f3a84f87b5f9e99dd6ea80468cf97b1cc4c81ac1598e2a0cd4edf965
+EBUILD xapian-omega-1.4.8.ebuild 1155 BLAKE2B cca347976e779773c5738ed285a995169b39bedafd629a30939fc83bfef16d2bf38f5f885de92524c2ba41e0865a74c78d23083b6ae6d69f63ede687aeae71e1 SHA512 412e291cc0d2f73f384a29c3d92965c89c3dedc8aa911326de78e0a93611b1377dad8355ccf003509701cacfbc8953ba58ec9ff4dac72a29bd854e8d5cf88b38
+EBUILD xapian-omega-1.4.9.ebuild 1155 BLAKE2B cca347976e779773c5738ed285a995169b39bedafd629a30939fc83bfef16d2bf38f5f885de92524c2ba41e0865a74c78d23083b6ae6d69f63ede687aeae71e1 SHA512 412e291cc0d2f73f384a29c3d92965c89c3dedc8aa911326de78e0a93611b1377dad8355ccf003509701cacfbc8953ba58ec9ff4dac72a29bd854e8d5cf88b38
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
index 7689f5835335..dbca81512708 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/1.2.22
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xapian-omega/xapian-omega-1.4.10.ebuild b/app-text/xapian-omega/xapian-omega-1.4.10.ebuild
index 4a7e3ffd806d..f76f70d1acab 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.10.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/30
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xapian-omega/xapian-omega-1.4.11.ebuild b/app-text/xapian-omega/xapian-omega-1.4.11.ebuild
index 4a7e3ffd806d..f76f70d1acab 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.11.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/30
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xapian-omega/xapian-omega-1.4.12.ebuild b/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
index 4a7e3ffd806d..f76f70d1acab 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/30
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xapian-omega/xapian-omega-1.4.13.ebuild b/app-text/xapian-omega/xapian-omega-1.4.13.ebuild
index 4a7e3ffd806d..f76f70d1acab 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.13.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/30
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild b/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
index 4a7e3ffd806d..f76f70d1acab 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/30
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
index 60c5f808c3fa..92413d87bc98 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/30
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild b/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
index 062bc700d6f5..af99b4ba7ec4 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/30
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xapian-omega/xapian-omega-1.4.8.ebuild b/app-text/xapian-omega/xapian-omega-1.4.8.ebuild
index 2790bf5b9f0e..e045628ddf17 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.8.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/30
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xapian-omega/xapian-omega-1.4.9.ebuild b/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
index 2790bf5b9f0e..e045628ddf17 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,7 +19,7 @@ DEPEND="dev-libs/xapian:0/30
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# Protect /etc/omega.conf
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 798429198607..f650a17b97ed 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,8 +1,5 @@
 AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70
 DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e
-DIST xournal-0.4.8.tar.gz 641240 BLAKE2B cbf82f3ddb27854ce4a17fe80d1ed012f47529ee3f41eac0118f4948f4ca76488fb647c77ab21c99cf19de0016df4db31a448d4c626a42219b2b13b297b5d51e SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf
-EBUILD xournal-0.4.8-r1.ebuild 1202 BLAKE2B 7bd649419efc8c130d88e90303f7b1946a907c8737b1dde4cc5aaf3798e3fc54e7459dbb70abf4fc0539245b710f5b5e8f8a9f125452cd2e0a6d4109532c8c39 SHA512 f872b8b3c4b00a265ab0fc74f33f895c1fbfd676d39df4ebe2a1c2d5282b3265d13f741067ce6f417cc03f437db7e10768693bd9de758ec9b5ffc6d920d300e0
-EBUILD xournal-0.4.8.2016.ebuild 1185 BLAKE2B fb8edbf9bdf19cc7f450592c4addb81afa4369c865bb9a276f4c730079b789d12abe0036b3f5cc1d4b578b3cece037e4288d8c44aeff9b3b7436c5ef29d683cc SHA512 247f3963f18a8f4f96ee69e2497428eb424a11c800cadf7302405b9c192f8d32ee4f7ae5657bdc5d14c1c99c66d94361364beb70d3d5f6de23c2ef1f3a6012bb
-EBUILD xournal-0.4.8.ebuild 1069 BLAKE2B 26606ab4d9128be573c91e33025270ed832f71c9b8d6b27cb1fe80defa11936d3ea8d2643376e691aa365d5140e287cad109be3019de6bcf8f02baadbc45a168 SHA512 7f74070413631ace102df1bb34cc06023d17eb35a6da2e5fce6c09914e6afff101e49eff7cfdfcfb9afc7699b4345e07c7d3ad7c575685269d7050e136769eb6
+EBUILD xournal-0.4.8.2016.ebuild 1181 BLAKE2B 7b7a68595c04f314cff458503eedfbcf7a4323d7f99d6b675f8bf08037a5170212d47449862721966ad0f6a0751f743c333842199ac2537ebd8ac18090ccc077 SHA512 bc9bd5408956f06a11f1f8e635ce958fc3e2ecf5f4a26602cfd67a223d50f1fe74edac78528203d389ee6c8a331565a3d4c8594c9181a9995033eaace768a885
 EBUILD xournal-9999.ebuild 998 BLAKE2B b040d45de8ab96b168607a97e249a5e92aec2b7e8a2f95f098ddd63c912e33e90679566fec6cbf03ae4b95d5b039ee7ee65d0249cc35303ff68e0b864cd77d54 SHA512 d45e91904ccc3f71297a79ae9dc2308b7cbc38b574d55dc3483789bb3320dcbcf2267a298dbd5f1c368698caf8750b32f6bae4ed887f5a9f6fd7debf6693f5d9
 MISC metadata.xml 652 BLAKE2B 780548e075d6468df82b41e454b8d77c97eb7c9e4b4e4e286b7cd98a4f6c2d5489b355eb088602f414eeecd32b19b42d7c24aec6b1436aed3c818f60605d54f7 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648
diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild
deleted file mode 100644
index 69d6ceebd250..000000000000
--- a/app-text/xournal/xournal-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG=no
-
-[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
-
-inherit gnome2
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
-	unset SRC_URI
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
-HOMEPAGE="http://xournal.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+pdf vanilla"
-
-COMMONDEPEND="
-	app-text/poppler[cairo]
-	dev-libs/atk
-	dev-libs/glib
-	gnome-base/libgnomecanvas
-	media-libs/freetype
-	media-libs/fontconfig
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-RDEPEND="${COMMONDEPEND}
-	pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default_src_prepare
-	if ! use vanilla; then
-		epatch "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" desktop-install
-
-	dodoc ChangeLog AUTHORS README
-	dohtml -r html-doc/*
-}
diff --git a/app-text/xournal/xournal-0.4.8.2016.ebuild b/app-text/xournal/xournal-0.4.8.2016.ebuild
index 50477f8a4537..c2f75dda057f 100644
--- a/app-text/xournal/xournal-0.4.8.2016.ebuild
+++ b/app-text/xournal/xournal-0.4.8.2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
 	unset SRC_URI
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 fi
 
diff --git a/app-text/xournal/xournal-0.4.8.ebuild b/app-text/xournal/xournal-0.4.8.ebuild
deleted file mode 100644
index 1e879f6a6f85..000000000000
--- a/app-text/xournal/xournal-0.4.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG=no
-
-[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
-
-inherit gnome2
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
-	unset SRC_URI
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
-HOMEPAGE="http://xournal.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+pdf"
-
-COMMONDEPEND="
-	app-text/poppler[cairo]
-	dev-libs/atk
-	dev-libs/glib
-	gnome-base/libgnomecanvas
-	media-libs/freetype
-	media-libs/fontconfig
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-RDEPEND="${COMMONDEPEND}
-	pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" desktop-install
-
-	dodoc ChangeLog AUTHORS README
-	dohtml -r html-doc/*
-}
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
new file mode 100644
index 000000000000..5bb1eb20ce1f
--- /dev/null
+++ b/app-text/xournalpp/Manifest
@@ -0,0 +1,5 @@
+AUX xournalpp-1.0.17-translations.patch 716 BLAKE2B df50ccfdf86069f08b29168af42955d80b363db5d271bd0c97f07cdc626995922471186cd83f7860f0eecbf8e53982639e23a5a2b817310f6d3d12e529577c45 SHA512 83ae3ff7ae1dd4933f063c9e35a38684eeb6638fbc9ec52b863bd1499d2fe958b7565e8609060d9ba8388eb6c89e046b8908c0fd7387981154cf86da3b574184
+DIST xournalpp-1.0.17.tgz 14885382 BLAKE2B 501feb4480eee5aa38cc148f561d6c730505e43fd5d8017936f4b1d15f1b83ae936eb0a2e81b9889c668f9ed0a9c46b9053c984d45815c88829b023b7dbbd209 SHA512 cc3568ce22fd42f0e8458f1428c102d2fc18a9650d8c5968cadd6693fc19374780beb3c7f6206f2f494439296a883b2a5160da37e3a0e10d6fe3654084967ab9
+EBUILD xournalpp-1.0.17.ebuild 897 BLAKE2B 5a9c41c6960ca6317708ce27e379ef269d7e547f12d11122602abbc71ed11f706b81445ec033b54a64b97290b654123b6fe6c8debdce282a7324b56cfcf57145 SHA512 0c2eb1f2a74aa33029a0025e296f6c7014c5ac279ffa42fbfb6816c904cf51ccc81803cbc3eadb475491441d20c478321d76fe5eccd27e520641302d8ffbfddf
+EBUILD xournalpp-9999.ebuild 845 BLAKE2B 75f63c7de44edfbf3a8ec372f6ef50beecd0ea62ca3f71a6700f3521247651f975461ca66de7c8018ff41125b59fee514906c9f2379397b9e524f08bb3e4d83b SHA512 a73628b37075cd9c0f8fbb74a4627d80195e49d8c67b5bb7044a7fbb516dcf4f830bfee9a7683a6af49c60542004fbd20a5c9b9d1c04748f26a9c2d2f704d418
+MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch b/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch
new file mode 100644
index 000000000000..95283b014009
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch
@@ -0,0 +1,24 @@
+From 12387b01a1c7e529580c6f27e92dad3e8b4f9858 Mon Sep 17 00:00:00 2001
+From: Bryan Tan <techniux@gmail.com>
+Date: Fri, 7 Feb 2020 19:47:18 -0800
+Subject: [PATCH] Fix translation target
+
+- Do not modify po files in place
+- Always build translations
+---
+ po/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
+index f957a199d..73ce0f04f 100644
+--- a/po/CMakeLists.txt
++++ b/po/CMakeLists.txt
+@@ -20,7 +20,7 @@ if (XGETTEXT_FOUND)
+       "${PROJECT_SOURCE_DIR}/ui/*.glade"
+   )
+ 
+-  gettext_create_translations ("${potfile}")
++  gettext_create_translations ("${potfile}" ALL NOUPDATE)
+ 
+ else (XGETTEXT_FOUND)
+   message (ERROR "Gettext not found!")
diff --git a/app-text/xournalpp/metadata.xml b/app-text/xournalpp/metadata.xml
new file mode 100644
index 000000000000..b1dfcefdcde9
--- /dev/null
+++ b/app-text/xournalpp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/xournalpp/xournalpp-1.0.17.ebuild b/app-text/xournalpp/xournalpp-1.0.17.ebuild
new file mode 100644
index 000000000000..4dac69f10a5d
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.0.17.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMONDEPEND="
+	app-text/poppler
+	dev-libs/glib
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	media-libs/portaudio
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMONDEPEND}
+"
+DEPEND="${COMMONDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-apps/lsb-release
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-translations.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
new file mode 100644
index 000000000000..6cb1258352c3
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMONDEPEND="
+	app-text/poppler
+	dev-libs/glib
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	media-libs/portaudio
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMONDEPEND}
+"
+DEPEND="${COMMONDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-apps/lsb-release
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /app-text
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)