gentoo resync : 21.05.2019

21 files changed, 357 insertions, 366 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5ad3c9ac9a76..f62f4fc8c4c9 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 7dc6228a628e..05ab5b6d35ed 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,6 +4,8 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 DIST calibre-3.41.3.tar.xz 38508848 BLAKE2B bbbe888bab285207a23a24a152b396cdc51723442e49d6e8ea6d3631cc4c6d67d421452d3d616d03dbe89f6df292dcdce5b564d6ed423dfece60a4bc59678a87 SHA512 9bed5d05fbe0a6b0e5c8d290f21ffc9b61c51767437aafb72afd3db94f755be3bd68f84cd1f73e5d15c7039dd0858a666975e860577f9ce84999aa9ed8e1a895
+DIST calibre-3.42.0.tar.xz 38530420 BLAKE2B 3b1fa7abfed277f7a787fa2b65697817d0fe8553d570901a8817e63756f7edc8321c18768fb9c965382f9027d053af708fdf54c4288c831acb0ec03a64748651 SHA512 0a9b18cbf1d4e75d1e10e9dcf7318f07687e0a39d1d524f99f47240d28bc13cad6f28bc30e7cc9662766264d9a465fa4f24cbc27e5f36d20cfb1a8f94ed8ced2
 EBUILD calibre-3.26.1.ebuild 9312 BLAKE2B b9e7712133717e608f2d6195fb3f4cc88a40f6628f74e7ae08294bc75bbb7ac42e29f7b07db77712028bc12b71950ffa3782a17dd028a7fa0e083cd2a58f733b SHA512 6a5297715b33057a539ddf46d195cdbef6a8fe9cc4f183dbc2dd78ec55352da288c904a969417c53b38db3500f4a2fb88df741fd1a0c54df11739b1e27471eb0
 EBUILD calibre-3.41.3.ebuild 9544 BLAKE2B c59219a990d34e9e1ee641f42e7c5ecd040c425874d2bf81009255b744ba79920ac933e86375112051c8aec995fe2832bf24a666aa3597c267803b0c89dc7cda SHA512 0f8993342fa9a0ba2ada9cdbac9781e0aa84116e54cc875b88d2a38263462781e286c143947f5d3ca5668b901f972f5676411ec39ebc6812e708942c2ea860fb
+EBUILD calibre-3.42.0.ebuild 9381 BLAKE2B 0212217986fc7cbf879ba2561709fe9214dfd041f0559c304d4688149e9aa7b5b37be18cf96a7ce260b95a0eebcebe842ea83184823debaa3fcd60b794eaa5ad SHA512 749550359d7f0413acab0525516fa6cae110ba85dc0547264184e300926b5be9b6add87cb662f442369129a807cbbc32b5a71a4e4efcf396b83bc2a76006070f
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.42.0.ebuild b/app-text/calibre/calibre-3.42.0.ebuild
new file mode 100644
index 000000000000..93cdc79a92ee
--- /dev/null
+++ b/app-text/calibre/calibre-3.42.0.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# don't create/install uninstaller
+	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"/usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"/usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --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/evince/Manifest b/app-text/evince/Manifest
index 0966d8bf7d9d..e5c3548e6bac 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,8 +1,6 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
-DIST evince-3.28.5.tar.xz 2196432 BLAKE2B 992e37ad3cb82934efbdcd83afa89dc7589104045e828c6516650ee0a3fc89b99dff3fe0a723691e95adba9a5cf767a95ec18690697df15310437c7980ccbf55 SHA512 42fcf1396546f62910966b31bc657e5d3532a6bf32e87590b057efded1597de5765ed5c17ae98208a5dafca54da9c8e81f451e4133df656aaf4a9966da457bc3
 DIST evince-3.30.2.tar.xz 2288868 BLAKE2B dd0423b7ec51daf897bfbc45afb298f9ee23b28ada3dfe5d5d2808b4515bdc7077a7e0ae46541876bb2fbfd8aa9ec44abc7aabcb3cb10b6e52912f0ac1358eeb SHA512 dfffcf15547d0720bd2379054d7b9bee02f8bea7113562162cbab62d77cf84c04f70dcc87a3e6b1ba62db38783df8f481d801854d8f0767f60e9cfabd9efc646
 DIST evince-3.32.0.tar.xz 2564236 BLAKE2B 203bc6ff6b8b2a3d30ebd30f7f9be6269ded5044521da7d2732cb759db8e8ebd2d565c2ad04908e11ec1f726ec70dd2931c58c9b31951a7b3d3165c61042c87f SHA512 565298a200d9ae2f6b4cb53c3cba0d0d0e4cfbef60e4145bfb9c82a5682947ceb2371e52c27179cd69a238cd387bcfd744d3c55df814b6347f07781aec3ea658
-EBUILD evince-3.28.5-r1.ebuild 2814 BLAKE2B 9d83603446cd2e90815f1b47fcfee1850dac5ae889567c52f05f9deb0a5242fd085392eef8ba23128ba9debb7ef9afaf32a7310a6687e4d555b8898993cb1ee6 SHA512 959d1c47891d826d3d2275d13031352f92fa17049608986cc125e1903249de98040acf2806cb23469ea6ef145afc6621cecabfa545692f15839362cf72da1f04
 EBUILD evince-3.30.2.ebuild 3124 BLAKE2B 18a459e407b968406bfa1220d4ee151cc2668277775ec5a6c91df53019069508e15c7213eeadf73a38c2d975be5a76eefe81e7c76da888d805c6a4b25cde736a SHA512 2eceb17e9f9251517c0b3cb5394e364bd7b2f95ead765a555730094e6686c54c256efba28adb95316a730572cc539a144dcc07607b05af7830e2e9c41c475d6e
 EBUILD evince-3.32.0.ebuild 3127 BLAKE2B 32b9d29b0e68b7a8421730f546dad584d3962ff9e5219ae68f2e5afaf943c6d52c290b3cb82fc0b9d13fdd553e19187b8f611a07218e82be6f1a86deef7b65f2 SHA512 14aab1578a9025b8bbd9d6adc1e8d00f2f54a166f373349167ad993ac524a020e5818622b9b17fd9b0be23ca1db5159077a101d6215c6cb68395849e2941e12d
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.28.5-r1.ebuild b/app-text/evince/evince-3.28.5-r1.ebuild
deleted file mode 100644
index f58dff9453f1..000000000000
--- a/app-text/evince/evince-3.28.5-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.36:2[dbus]
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=x11-libs/gtk+-3.16.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.33[cairo]
-	>=app-arch/libarchive-3.2.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.4 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index a16c2ccd981c..8160893a1e98 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,9 +1,3 @@
-AUX gtranslator-2.91.7-gi-silence.patch 869 BLAKE2B 9916f2b8b83ddf924b55d9839b6d0c48796b593227dd02494e25f652f9ec75fc3e439ce3809116a5dd8337c596acfed89b6baaccd5d053b78379860c4f4f646c SHA512 c23457f2267377aefda4842e2300b33ced326ca7933d5d060e9f4c2e419267f722589f7fc9d7793f5b73e1f3cba2a3f863501c44ddf4f50a2acc45ad3b2b862e
-AUX gtranslator-2.91.7-gucharmap-python3.patch 1851 BLAKE2B dd54f2cd05501e0cdaae7fb082c8731b80cf232886ebef70f86b082996ea3c68e67d1c5fbf737a6dbfed14a63727d6cf937f93800ec24859b2e1afda528ff650 SHA512 0a622e707018fcf27c8d29317d87ad967a98eafb6961c447c566a383b434b4c06d8544e7c8575bfe36b352d9e08b2e6570628b4bf41ac3c41af3e31905a7a1e8
-DIST gtranslator-2.91.7.tar.xz 2835836 BLAKE2B e6e1f7b512705152a520a47bdddd01336ddcecb9ca20409546d64caa124f1bca2985fd2a9cd7564983a8411c6a7227d37b55ce8b3e452ee7a0d5beba3460bd59 SHA512 8d2a582e06ab0fecb9c18bde372ca0cd02d426155d4b30b876bd8f2e177c88c79d410adb0297ab85f18a952eeef32c17352cde18eda3c4c4fe33833db25022b5
-DIST gtranslator-3.30.1.tar.xz 3060168 BLAKE2B e2e238ffc461b99be9df679c431d7cae85c70ca9db7aea4e7c51d9bd12aa417fab0d53d6c512555992dfb2d40f55d6d0dba8c3aacd043ad8c2ebe690de8ac562 SHA512 5f6384bec8bb23afa9aefe5928260b7ccb408d41b8a363d85277435428ca34fe544068526b11801e534911753c95b3049892e647938bee755b37f3f5cbf94f41
 DIST gtranslator-3.32.0.tar.xz 2767988 BLAKE2B cf05561d35adaa77e1bb15adb11faad5346a236d6bf82ccc2b474c2478ea537c89852e0c0322067de1bb24c320ad6732eff5a0f6489a97e57c980b0f1c7d56f6 SHA512 4119b64f671ccb4d8132c4b18f53b614a80c6faaecef212b23268b2a189e7b337dd63f9c0d82e139976a6d5615c4c047ad3be97397734930b5c0d07b57e13531
-EBUILD gtranslator-2.91.7-r1.ebuild 2190 BLAKE2B 51c8ed4ede8f77a97fbdcb6a0bcc8117917bc67fbaccca8a167c1cd2edddc9a73f90ef7219d5360672d5f40ae2e66969f6395c08c320276b7e79be60ff91ad0a SHA512 46651d7d50bc6de356f5df028a05350d56fa77c01b53f2e37fe0860b3b5984d53c5222ab3272f90625c4457571eb6fbe16ad61659865a01d60fa30ef8975c01b
-EBUILD gtranslator-3.30.1.ebuild 988 BLAKE2B 92f587b8e94fe6e2a8c4c176615f7bbbca241ed6366c10eaf48dca664c76673b72b9e7daa3a9f6e6cd6d5b6a152755bbd671cb62f17adb87171ee2a8e439d887 SHA512 ef41ac1dffd611ccee374fec8cb05c5a190532ae1e10cbf88877c48e0764d439fb14eed95937066c218488cd226b18deb5a713a7c441d02804a5f331e04e8dba
 EBUILD gtranslator-3.32.0.ebuild 1009 BLAKE2B 6a7af19f1b6b4656b8f74f5d1d8176009f9de0333d52d4e6dea5214c88fc4c9576eebf8b96078e2eef5d6f525972f7938f2f07f78375f624ab5ba56bbdb01b7b SHA512 b4efe029a73ba4b6f0ac9438b97860c97a87ae534fcb8e10be079863bc0cdac208c56b167446b502514983c9be9e6f99ff769d079e25ca0752ac949b62c3945f
-MISC metadata.xml 1064 BLAKE2B 7f39febe016d5aea980f3b4ec1eded4825c3fe3cd03a4314dd21cb0d3077cfebb21826c9bbf3f5c30d7581355379427923f9e2e284c7b7520c2fc5f915a746b3 SHA512 185b4b7bfb14d3ea94454b9405875b07884f19c52df2afa46de6a470b65cab521dfd19f09cbecf7168ac5722d871b085c029da7b11b533f26f6afb1f23ada6a9
+MISC metadata.xml 812 BLAKE2B 9a347a373b7b39cd522c7bcacd845252798a5b9b06cef89ce14b71160e6b6673d65d5d9eee806c52aa104dde2d937894cb0e12a8d51b8d53feecb4bd52bb3db2 SHA512 e9cab01e3126862ab79cd223d87ed3bb927844b6a0cd7a40e94dc6ece54a2e2c4fe820032b4dd3c25b876a6704c866f3429f5ad98d82b9893ba9337a3a85d6a4
diff --git a/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch b/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch
deleted file mode 100644
index 19a3a6d1e985..000000000000
--- a/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From acc785dd63379f08f08b52fae9d7e5c5666495c8 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 17 Apr 2017 00:15:58 +0200
-Subject: [PATCH] Silence gobject-introspection warning on version-less imports
-
----
- plugins/charmap/charmap/__init__.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/plugins/charmap/charmap/__init__.py b/plugins/charmap/charmap/__init__.py
-index b504cb61..6f8c2b61 100644
---- a/plugins/charmap/charmap/__init__.py
-+++ b/plugins/charmap/charmap/__init__.py
-@@ -16,6 +16,9 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
-+import gi
-+gi.require_version('Gucharmap', '2.90')
-+
- from gi.repository import GObject, Gio, Pango, Gtk, Gtranslator, Gucharmap
- from .panel import CharmapPanel
- import sys
--- 
-2.12.2
-
diff --git a/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch b/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch
deleted file mode 100644
index 1ad491cf3c00..000000000000
--- a/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1e4d042f7e9b28a58bd09af5c97e4282441113d2 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 16 Apr 2017 23:48:29 +0200
-Subject: [PATCH 1/2] Switch gucharmap plugin to python3 loader
-
----
- plugins/charmap/charmap/__init__.py           | 2 +-
- plugins/charmap/gtr-charmap.plugin.desktop.in | 2 +-
- src/gtr-plugins-engine.c                      | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/charmap/charmap/__init__.py b/plugins/charmap/charmap/__init__.py
-index 414157b1..b504cb61 100644
---- a/plugins/charmap/charmap/__init__.py
-+++ b/plugins/charmap/charmap/__init__.py
-@@ -17,7 +17,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- from gi.repository import GObject, Gio, Pango, Gtk, Gtranslator, Gucharmap
--from panel import CharmapPanel
-+from .panel import CharmapPanel
- import sys
- import gettext
- 
-diff --git a/plugins/charmap/gtr-charmap.plugin.desktop.in b/plugins/charmap/gtr-charmap.plugin.desktop.in
-index 3949c5f6..a872a545 100644
---- a/plugins/charmap/gtr-charmap.plugin.desktop.in
-+++ b/plugins/charmap/gtr-charmap.plugin.desktop.in
-@@ -1,5 +1,5 @@
- [Plugin]
--Loader=python
-+Loader=python3
- Module=charmap
- IAge=3
- _Name=Character Map
-diff --git a/src/gtr-plugins-engine.c b/src/gtr-plugins-engine.c
-index 903ea735..8e41010a 100644
---- a/src/gtr-plugins-engine.c
-+++ b/src/gtr-plugins-engine.c
-@@ -64,7 +64,7 @@ gtr_plugins_engine_init (GtrPluginsEngine * engine)
-                                               GTR_TYPE_PLUGINS_ENGINE,
-                                               GtrPluginsEnginePrivate);
- 
--  peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
-+  peas_engine_enable_loader (PEAS_ENGINE (engine), "python3");
- 
-   engine->priv->plugin_settings = g_settings_new ("org.gnome.gtranslator.plugins");
- 
--- 
-2.12.2
-
diff --git a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
deleted file mode 100644
index f545af711723..000000000000
--- a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="An enhanced gettext po file editor for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+introspection gnome-dictionary gucharmap spell"
-REQUIRED_USE="gucharmap? ( introspection ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2[dbus]
-	>=x11-libs/gtk+-3.4.2:3[introspection?]
-	>=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
-	>=dev-libs/gdl-3.6:3=
-	>=dev-libs/libxml2-2.4.12:2
-	>=dev-libs/json-glib-0.12.0
-	>=dev-libs/libpeas-1.2[gtk]
-	gnome-extra/libgda:5=
-	>=app-text/iso-codes-0.35
-
-	gnome-base/gsettings-desktop-schemas
-
-	gnome-dictionary? ( app-dicts/gnome-dictionary:0/10 )
-	gucharmap? ( ${PYTHON_DEPS} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	spell? ( app-text/gtkspell:3= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	gucharmap? (
-		>=dev-libs/libpeas-1.2[gtk,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-extra/gucharmap:2.90[introspection]
-		x11-libs/gtk+:3[introspection] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-# eautoreconf requires gnome-base/gnome-common, app-text/yelp-tools
-
-PATCHES=(
-	# Switch plugin to python3 loader
-	"${FILESDIR}"/${P}-gucharmap-python3.patch
-	# Silence g-i import warnings
-	"${FILESDIR}"/${P}-gi-silence.patch
-)
-
-pkg_setup() {
-	use gucharmap && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
-
-	gnome2_src_prepare
-
-	if ! use gucharmap ; then
-		# don't install charmap plugin, it requires gnome-extra/gucharmap
-		sed -e 's:\scharmap\s: :g' -i plugins/Makefile.* ||
-			die "sed plugins/Makefile.* failed"
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_with gnome-dictionary dictionary) \
-		$(use_with spell gtkspell)
-}
diff --git a/app-text/gtranslator/gtranslator-3.30.1.ebuild b/app-text/gtranslator/gtranslator-3.30.1.ebuild
deleted file mode 100644
index 88e7d00a7c7a..000000000000
--- a/app-text/gtranslator/gtranslator-3.30.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME Translation Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk-doc"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=x11-libs/gtk+-3.22.20:3
-	>=app-text/iso-codes-0.35
-	gnome-extra/libgda:5=
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/gspell-1.2.0:=
-	>=x11-libs/gtksourceview-4.0.2:4
-	>=dev-libs/libxml2-2.4.12:2
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/meson-0.46.0
-	gtk-doc? ( dev-util/gtk-doc )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
index fac790dbf919..8a993fd39f8b 100644
--- a/app-text/gtranslator/metadata.xml
+++ b/app-text/gtranslator/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gnome-dictionary">Enable plugin for dictionary lookups using <pkg>app-dicts/gnome-dictionary</pkg>.</flag>
-		<flag name="gucharmap">Enable plugin for unicode symbols selection using <pkg>gnome-extra/gucharmap</pkg>.</flag>
-	</use>
 	<longdescription lang="en">
 		Gtranslator is an enhanced gettext po file editor for the GNOME desktop
 		environment.
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 4cc7fd823319..5cc85b6d5687 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,5 +1,3 @@
-DIST libgepub-0.5.3.tar.xz 25576 BLAKE2B c51f6850c78185fec6f027ad5507b2402ab578b2ce6e4b91c674c3a3c6945857ce3d3ebd4560408ae8e5552ca658c40b30c73b42db1ef61f4814cde36a404df7 SHA512 8eb3370b6ca639135a1365756f3977f6daea3039bcb7ec4d5cd116d869584be2a2b1e8bb7f202d4c101f1afb0f7b9a45bd48c1b2337197ec4320d50a4c8d0183
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
-EBUILD libgepub-0.5.3.ebuild 644 BLAKE2B df2cf465d0d68cd90e2f8bedc84c38b9ebc88891bf1f2194fc1e68b2ba3eb9c23a2a0b8b8c5acf4842959d4f70ee7f5bbc0f8d884a1ffc20f5f95a706be50ef4 SHA512 324a75f046affb0911b7a95a5b3aba11c5aeb65cb969e87f5028028be1868901ea612f597a82796c73a13f7031ed584a63c0d11302704b13f7be3a189bf3610f
 EBUILD libgepub-0.6.0.ebuild 644 BLAKE2B df2cf465d0d68cd90e2f8bedc84c38b9ebc88891bf1f2194fc1e68b2ba3eb9c23a2a0b8b8c5acf4842959d4f70ee7f5bbc0f8d884a1ffc20f5f95a706be50ef4 SHA512 324a75f046affb0911b7a95a5b3aba11c5aeb65cb969e87f5028028be1868901ea612f597a82796c73a13f7031ed584a63c0d11302704b13f7be3a189bf3610f
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.5.3.ebuild b/app-text/libgepub/libgepub-0.5.3.ebuild
deleted file mode 100644
index 9685b374db7e..000000000000
--- a/app-text/libgepub/libgepub-0.5.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="GObject based library for handling and rendering epub documents"
-HOMEPAGE="https://git.gnome.org/browse/libgepub"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection"
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib:2
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	meson_src_configure \
-		$(meson_use introspection)
-}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index b5636b577356..3fe9d6db588b 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -12,6 +12,6 @@ AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a76
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
 DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
 EBUILD mupdf-1.14.0-r2.ebuild 3116 BLAKE2B 1700ed8f0eacc1c986393b597df20d4b45a2158ddedbe472281e900d8dc79ce4a76aafc5be0e3f35977afd6cecb643b7a382c6a7e0a422987d23b20bf2697343 SHA512 442a258938c868062ddd3de127da51c475c89908f466aa12d8baf44b4c29fa961c99f3e1eb3649672e1855cc447eb1b30f2aa31ed80ff1c2c751716b743ee6d8
-EBUILD mupdf-1.14.0-r3.ebuild 3236 BLAKE2B c2f0ac79635932c9c662c176056342a1e26428390fa850da680e2682b26ae01b09e687cfdbe5426403c96e0cafe992bfb4adf157b0b095d23763818dd6ec9495 SHA512 090559082f61ccaa0e9e787de6e660b68ff8143300dbab9605e00a4d95901ab278586fd8d702a7e854678e1ec879fc1990580fee88b338b4f2126990dc64acdb
+EBUILD mupdf-1.14.0-r3.ebuild 3235 BLAKE2B 044653b910e0ab537c1ee7c25edc49dff68cd70b139970bccafbb99f8b8cebe7884686022efac19bad9d177205087355ae4e82ab10bb7b552d370f5513af4b39 SHA512 85a86cca7813202b9043428effb459ce486c19e194f4399b8beb4081a937681322ca02f93c4e6512663593cac96683f727851cbef34d7abeb593df33f69125bc
 EBUILD mupdf-1.15.0.ebuild 3505 BLAKE2B be357aae0944fda68a0e95cf12e2936ec94428d5baa645399add9f87ca5127de85898f22fb56762d7fb88d6ed3e61874723f7668fb9c4a2ac942585e3ddbde6f SHA512 41209dd40db318acaa224a031672fb9281dd674a6803b789da1cd673ab18af08c4fcdd2f5d82ccc5076026fec056986d2b67f1adc4b4cf3a7a0aca56787d7b75
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index cc0d347167e7..c414dd711611 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 806206f8bc50..a7ddf4a8ed37 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,6 +1,8 @@
 DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c96660c2a34137a425f879688822ddc8bbc19805444bf2b49369c3dccf8a5303748ff9e7cbde3910d6ba501652 SHA512 9e04e6a2009cc134f74410d8c8349831467192e7524287e23cad0b68232f2b5dd04f5d98505222d71eb3441e466bccec1cafc7f6e3c6bfcb4c5e57e4ab0fadda
 DIST pelican-4.0.0.tar.gz 1314626 BLAKE2B 18924209949b43063416f2e2c6e22a5524a36bab79a801f7cc6953c0822beb1bd5b05e715f5bcdb7c4877aba8d7a62cf4276e8abc43406f3c6fd7af8ef0c7c2f SHA512 5d98f5e13e6dde6b27cc299f9fb166edec79efb3fc53b29567218e0d0ba164989ce51830029ec8359697bc039661f6b0ced8d4155105e29098c038840c97d253
+DIST pelican-4.0.1.tar.gz 1314716 BLAKE2B 1fbe01f5df7f1c730d7a45429369311f77c7e8e278a05cc037e03d8193dc2ae9075ee1346fea072a08ee5d73baf9aaed8c1f8f210fd4331754accca9ebffa4da SHA512 26f91046124bb92de6fa31d17ab89f743cf9408c15b9b259875e2378342133313368418da083d1d4abc5de0537806a9dede327719c8fcf89d135805c47618a4a
 EBUILD pelican-3.7.1.ebuild 1468 BLAKE2B 0fe9e784ad7514b9d92e35c2e6f07bd5d8b5a9fc68e83c7e1367968c809b0f90566f7109789b142cb56c7090e6d4060ea0b754bed7614894848ce18829ef6678 SHA512 f6e81e8e93d6de41516b6e0b018974e8bd8174f10b0bca7047859644a1fbac3b0a199da331cce29a0e205362a0f935000178f4212bc27692a34f592fc8a9cc8d
 EBUILD pelican-4.0.0.ebuild 1486 BLAKE2B f4359af3f68b0e9e05d7238d3b3cf4efe58bd494b059f13d8e0af92d65f55bbb924b9cb672fcc4651e7dca101051bca43073353895cd6a2501f3d91e3c80a20a SHA512 b87631cf9a40de695173e114cf3fc347a8d7ea876174476b997c7ae9e49d2c7d5906ad90e25c72af401d236e62ee3d653bf88029ca3ab333e743bd3ef82f7a0a
+EBUILD pelican-4.0.1.ebuild 1486 BLAKE2B b1f81ae6d9924380f7181c0af735e3436fc727a14f1a7604e61bf70e7698b73865801cc95bcab17500f91a52150b1416e1a019bc2742423a9144176fc0ae5f32 SHA512 676cb7c561ddd1770da789dffa866aea2725b3eb3c9c0436758aad7c909c8d1fe26b8c7d6a739e8cbcdf3400444d0c217c46ccf2973243ad48b54cebf14c0843
 EBUILD pelican-9999.ebuild 1545 BLAKE2B 7571deb70118ea2764b71544a3adcbf863be67713a68f5a71dd336397c69fcc9bb0c285dc7ea7a533f72547be398fc5dc43c7440348b1a386e55a583c4d55d6f SHA512 f7f9c00e6905be764bd93a2612460a9db99d5e57c2bbb8d3df5f4164085ce1455a41ff42541e24ad6cd5c1afcc3bb5d38761e3362ac7f4f9d4fdd3287ec3670e
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-4.0.1.ebuild b/app-text/pelican/pelican-4.0.1.ebuild
new file mode 100644
index 000000000000..c165da40c9a6
--- /dev/null
+++ b/app-text/pelican/pelican-4.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples markdown test"
+
+DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+RESTRICT="test"
+
+DOCS=( README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/samples"
+		doins -r samples
+	fi
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 9e4aa7b8d3b7..104be9ae5889 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 4631 BLAKE2B cb2fade5d5a237561ed7b897fca4af55c0345e4e3701c8d0e5fdf80f406ff3e3a0fae4648a857de00c12bf82904fa04df694e12d7a4318160d91674f3c4a73e6 SHA512 5b2e49129b6251921d7cd9fa9f1d3ab3e1682372f01d0743ab2e5e2ba8f4d45291de7b3d28746680b7875cd943d4a8376a4b1104c2669d4f167251f7a44c4b59
+EBUILD podofo-0.9.6_p20180715.ebuild 4629 BLAKE2B 7c1c0487e26cdf237b0f706e2371a7703a9bdc1c7e448847ec6e4f4168b26f9801c6dfdeb782415f70b5a8deb47e565a132ba1e79ad205cba1ec2edb638b7ed6 SHA512 6af85afbdff5ea5c877d8fe46725f4bd6c41a98885f2c38c4e3efe4f20d74edccbbbff1ba3463baf558db00a8afeec137c75b3764ffc0f894e8d4afab437bbc6
 EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4581 BLAKE2B 7ae073e6e68192232440f925b0bef5cd9a5193ab7cea1d76bf303a2f01ccc3fbba42907408904da4043da0b38532134cff9c9deef868ec8c9d94e70d1360e80d SHA512 abc3b61b00606184996b904475ad9d41d61bbf6e9c301216df47a8c93b8c42f1f03fcd8c200c06e2c9c630105c39546097dc02df153f825aeecc4638a0ae65f3
 EBUILD podofo-0.9.6_pre20171027.ebuild 4643 BLAKE2B 38214968a021b0412e5a52b5d72f3a308a4d5c8fd0d47cef955c352a0f465b3e86e56917e46022cb4aa58767e8f7f4e2c131daefe06dd534d83fa63aaeb4a53b SHA512 5d333d71840298a02ac3bb209ca93946f760e1c443b943fad95ef9fcb726e56f7547979394818061b0fe826490888f39cb7ca53d99dd5b87f4670acc9983ad92
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
index c8a06f9532b0..9d6a95c7f0f3 100644
--- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index a51e4a21a60e..21acba543a5d 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -3,5 +3,5 @@ AUX sdcv-t_list.patch 588 BLAKE2B ea7106246204d2c18eaecdb05e4bf7a9c1d12d0ef6e150
 DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B f2cca4dea35df82015607c88b225da593780d027978f5cd9c03d6f31b03d7ca134e0f2be3bd7ad6c4ed71f7c4ce8fab1bdd546914867b247e6c814ca669e7da5 SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00 SHA512 8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
 EBUILD sdcv-0.5.0_beta2-r1.ebuild 1426 BLAKE2B 6711cb854f6f010a06bf7e016de9739d719a3429e400005009847ee53087c4c1c2b49bd64e342b365cbe70d1fd9efbf333bf3287470537585ef29da1f7fe8023 SHA512 c721c50436f5f3224412f6229ca2796ab685bec580702025a341656b1d3b62400e5cbddbeea13ef0178e7635b55ee7616db6ac39c06ce4640ac464d837423d00
-EBUILD sdcv-0.5.2.ebuild 1587 BLAKE2B c24d31dde663516dfba35363d80896498da53dee8e344634228dc3971c2f194ab6d80286fb9de5c520a24fc30e098f1ca6d9b0cc746d3eba9220a51af8fd69f4 SHA512 5bc612298d2cb1b562acaef6e60156ce7b2103837f4ea4e95d1942ac4f0b8a65b849335a992603034e52d5e53626a7838ec6ab788e3e043361f3489c876413f8
+EBUILD sdcv-0.5.2.ebuild 1583 BLAKE2B 3cfabacdc4937baf92450af012052f57b5c07251cd18a572327c030b993708d1bb419807080ebc67eb05a601e9b0ada709039d01c618bf39db375b0db9842552 SHA512 e38f01bee566df106b226d6af44d82ce30e0df06cc3200546daa111d16e56411041709812ab1d048831020d5ebf66ba9a18445345a31c871be4e0bebffce43c4
 MISC metadata.xml 528 BLAKE2B 56e25a716843e62cb0a90bb7e75abf3811dbbb38c5c91a4153d5b340c355efdd4db771a815b116650e696b637deb4dc42320e0300d903ddbbc9b124b57934071 SHA512 0128fc0c89045f17ca1dbd13e18d2351dbcdc7af76451b80ba586ad223025c8c96f9100c09db5857e88f503534c6d699e649bf68c1bb3e23c6972ca2e5536c99
diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
index 722ad64a802e..d408750a82c6 100644
--- a/app-text/sdcv/sdcv-0.5.2.ebuild
+++ b/app-text/sdcv/sdcv-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="darkterm nls readline test"
 
 RDEPEND="