gentoo resync : 04.07.2020

24 files changed, 490 insertions, 137 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b82900d4008d..d9249bcf7e91 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/binfind/Manifest b/app-text/binfind/Manifest
index a90622c19bec..07e2283312e7 100644
--- a/app-text/binfind/Manifest
+++ b/app-text/binfind/Manifest
@@ -1,3 +1,3 @@
 DIST binfind-0.0.3.tar.gz 91222 BLAKE2B 87ab9faa611064b87771d5ddd799b792e27af457e5a768b4ee7c0f3976c41ed8692673a753b95450124ad0c3c8e5e473081961482b856dfb8e722323915d04d7 SHA512 b3a8b72669f701ce54fb3d1c2331262cfc7f396239d14741d3a106c999ef58739a7f33de87da427983ffb641baa7fae4857aa6aab2e1c0748a61d8b913dca3f1
-EBUILD binfind-0.0.3.ebuild 336 BLAKE2B 68ff0199c4cda256c6d4a9e3630e17e942ca457cd5d9032d0eb240343e81ed8f1f63c3518eb422ac9a8faf51a5417c69692f6077de60b809d54b1e87be2180e2 SHA512 7eca1309f13bdb84fb71448a47a38610141f1d221016db1178046ec78a6f0eec5c1bd3bd732ad1f2dc7614bc8be773edcd9ff4ee4397901234ef9872ef8f8cfe
+EBUILD binfind-0.0.3.ebuild 338 BLAKE2B b01979f55cfb829fec1bdce39caf14cec60348c2271bdad4ec1a23377c464da2ea0219b5b6ee6a288886f01ee22335ef2d82f25894724a4dfa9b2a2a7e59715e SHA512 5140cfd2c64b69cf973350c2cf6b4795db35b85a85b16a79da46fb2bb3e5a005e601876d1cb81f3daa556ee1c1f791f3b782f4795cff8fa10daa0950cab28290
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/binfind/binfind-0.0.3.ebuild b/app-text/binfind/binfind-0.0.3.ebuild
index 8e402c5ed0e1..0285f93dbe53 100644
--- a/app-text/binfind/binfind-0.0.3.ebuild
+++ b/app-text/binfind/binfind-0.0.3.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
 
 DESCRIPTION="Search files for a byte sequence specified on the command line"
-HOMEPAGE="http://www.lith.at/binfind/"
-SRC_URI="http://www.lith.at/binfind/${P}.tar.gz"
+HOMEPAGE="https://www.lith.at/binfind/"
+SRC_URI="https://www.lith.at/binfind/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-text/c2ps/Manifest b/app-text/c2ps/Manifest
index 9559b64107d5..229e73f7c0b2 100644
--- a/app-text/c2ps/Manifest
+++ b/app-text/c2ps/Manifest
@@ -1,4 +1,4 @@
 AUX c2ps-4.0-LDFLAGS.patch 252 BLAKE2B 19ce475e2b7e1eeb4f02059ecf70ebf829043b805a1273feaa096c624d0b6e65166335a1b88e602051dce38db0ecc6df584f3517247d1ec510d60f459b66265e SHA512 78a3993b6f41d129de9f922ec23dd3f07d3a7bf632a6e27aefdcdcb80fb4275aa95d2c87355502d3fddfe5b14800fedef0a58954ef68fdc8b8a07cc699d43b20
 DIST c2ps-4.0.tar.gz 48137 BLAKE2B b2d07f97e1eee0d7e32070d828ec2c06d9d98fd6a480768e6580f8a12bf0974983ed144a6e92a9860f13e6b9ec780f9aa1a28ee42cedaa70c7d4ab6ca5e6eca9 SHA512 dde931a201950412c8aad04a59f9ca0862b21a221bb7212ee64cbba0193421f1538804525361075be3ed601c5015a0c4e0c3592696f8b545f5a45524b2c5c619
-EBUILD c2ps-4.0.ebuild 679 BLAKE2B d3994d4f8e852fb9a984be335efd47460dd5e4400b8d0e1846de38d1f15828c8761b791dc8326d7b0cbe4a8be57cb566f7f85afcf8d7b683ae23c6084b66a680 SHA512 01ba21ce9af76387f3394802b728d53f834df36a8d7ebbc74a3820bb3790927460bcef1f85b0e83852c9c973a9840d0069eb527860a4a4b781996a4da48b92b3
+EBUILD c2ps-4.0.ebuild 679 BLAKE2B 2d245e316aff507e65db3988b1c5b4a01ebb0646456d03e4e74148cb43a4edbdada145da49c98560d36f089e719e4311847433efaa101e89bb02d79c9e2fbab5 SHA512 03012529314885feac80a6cbb43e124501e3b74afea343b9323a50bce5e7ba36ad5722624a288e0e989def8ed79b91de307c025fe78e2deecda411c87b0c2217
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/c2ps/c2ps-4.0.ebuild b/app-text/c2ps/c2ps-4.0.ebuild
index 84c0be2694a3..b0b847069c74 100644
--- a/app-text/c2ps/c2ps-4.0.ebuild
+++ b/app-text/c2ps/c2ps-4.0.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=7
@@ -6,10 +6,10 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Generates a beautified ps document from a source file (c/c++)"
-HOMEPAGE="http://www.cs.technion.ac.il/users/c2ps"
-SRC_URI="http://www.cs.technion.ac.il/users/c2ps/${P}.tar.gz"
+HOMEPAGE="https://www.cs.technion.ac.il/users/c2ps"
+SRC_URI="https://www.cs.technion.ac.il/users/c2ps/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 8d9ab17a42fb..5c45299338ae 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -7,9 +7,11 @@ DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f
 DIST calibre-4.17.0.tar.xz 37027156 BLAKE2B e1e9fbbb93cc14af0790e400d79b433c774f17bb06d99161e27769217ab7eed5c2660ab8a3e09109bade91684a8f5a8b52795667833ddf454343e530109eea63 SHA512 95719c820839a8548c0734a7be105fa4124c3c070fdd79ceeef5fef7f9c81f89d5b2077a71df3cc6cd103c14b813cd0d42add1c75ec4883686a8596de36ef5d0
 DIST calibre-4.18.0.tar.xz 37135328 BLAKE2B 247fc226fade064306309933be008e7636bacfdcfb1c96ae900fce5cc4474e26853b3a9dd932fd758543e31af95374f089d2e7a15c3d9ca7655eabd077727e2c SHA512 cc75e8b78722eb286af57f1d6b1ed783647f69471d903a3d4dd458b3f6966804e8e4fda7bd1947e9107ce9a280486ea7de101f7b843f8365bfe6e874d9ebf3d3
 DIST calibre-4.19.0.tar.xz 37172532 BLAKE2B 1cf3a4727ac7a2e7fe4d926acad7e6324b0673728db862209d98280f4fe9457eb33d734e47ac4882accebad2a6ffd12aa0add6bdcfe64cc4baa8a39dc2b4b94f SHA512 47b767b3f23f01fa1931abd470eb69f5493f5b0e6cd5c0e566b5576d1d831137c28555de3f73ad2a2dd0dd03615171a4c62356278a590ad48b77a6ca1cac890b
+DIST calibre-4.20.0.tar.xz 36997620 BLAKE2B 28ee9539eda96809004f4c276c8dceba119122379867f4b9235ad52a3ec68337330c4cbc2e715462f27ea0c3a0c8470609a50273db49a69f69a60e7fbcef11a5 SHA512 97e33c0a4a53c0b799ed76fde6327570d3e6356a812836d204ce0e6f5273715e274fdf2e987a0446b61ce6aceb4ce5cfda9c0cb8a2f2871efd83b76acbc43820
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
 EBUILD calibre-4.17.0-r1.ebuild 8765 BLAKE2B 5fdb90f47e390d3935639673f63c2fdd9a5e64ae5635f5a1e5732c176831f5b91decb2dead5ddc79eafd786b64ccd95aa6b0943038428f8aa6331ed45beda222 SHA512 3235f8bac83d558268c0e41b6a313204b87e545dd7606309aaed0d2b9ab8a867562f0dd5127e90bd8d8d56dc4371c46c2d0091bcefa9815cbc3b1da31f00b4ec
 EBUILD calibre-4.18.0.ebuild 8697 BLAKE2B 2375f915eb98ca26ac5ad31db9a0ffee9ec8cc6694b0a7daca9eda35604c1ca606f71b3e3b7277033ba9c35e35abbc9ffdf02fceb2f1d72cc286a6d6daf357aa SHA512 48ccd11e78545cd8f489ad0a7fa1e660ed52e68dadf54d1439baa1a378afa67d766e6f7b0c0c5bd53538695e274e2fa4c2a6bb0555d5898d854cac56660a9cda
 EBUILD calibre-4.19.0.ebuild 8550 BLAKE2B fcaf2c66cd59bbe0017ab5ead307bb532ac1ae8f5fcc9c0b4e015ec652646f8faed0d108ccbf29675384265f07fb6720634abe757faa6653a73146c685caa7f4 SHA512 01f6b7944e0ae5ffdf420b8046a104200217f958fcdeef057ba5e81a06bc04ffb9b1b2a8bcddcc3b50bd2d3dfd27b738df9084454d2bd7ae51ed28ab7b78d714
+EBUILD calibre-4.20.0.ebuild 8550 BLAKE2B fcaf2c66cd59bbe0017ab5ead307bb532ac1ae8f5fcc9c0b4e015ec652646f8faed0d108ccbf29675384265f07fb6720634abe757faa6653a73146c685caa7f4 SHA512 01f6b7944e0ae5ffdf420b8046a104200217f958fcdeef057ba5e81a06bc04ffb9b1b2a8bcddcc3b50bd2d3dfd27b738df9084454d2bd7ae51ed28ab7b78d714
 EBUILD calibre-4.9.1-r2.ebuild 8799 BLAKE2B abbcecaeec5f818cf7ed218edef294ee45d53861b3a8a573ac8c119deeb3d6f25ee16c42433daefb41a1b05eb7ffef007759632d6823b731931c57b60272cd30 SHA512 8989bcbb4e122b2e7ad8fde2b671ed71173658a6b05932b2b56e270e600d84ac916d61af1e2eb63dd146b9ff8801670cd42a2ba8db5a6aca3f21e944f1ecbd43
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.20.0.ebuild b/app-text/calibre/calibre-4.20.0.ebuild
new file mode 100644
index 000000000000..ae82240de8bf
--- /dev/null
+++ b/app-text/calibre/calibre-4.20.0.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 ~arm ~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.6.2[${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 )"
+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/djvu/Manifest b/app-text/djvu/Manifest
index 9d249528470d..fbb4946d2771 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,4 +1,3 @@
-AUX fix-CVE-2019-18804.patch 1130 BLAKE2B d83e7f74fca659d58731cb051aface930f1f3d0ffc737056e59323d436bfbad9b43aba5fb2c353b368a4fdbe9c257ca34ba53769e8aa2f0a42ebbd0a8d48181f SHA512 587aa61a9f9f7f845f1f0a23f59503efa7247862074096c707368316ad91aee40025d48c76a7351dc09ec1687c3902198fdbd6aa8623c4f1d8654d0c549ec4e7
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B 1543bc005f55a9ecf74f95295a29aed25100f056da963b5ed75fcde148928ef10e4fa05830b6ad8c17d2e8bc07a0daef3baa1fddc4bc085fb343b667a8edb33a SHA512 30dbaf5409bdf414fcc53246882f6dda413dc25d1689bd489e383a05a39699b2efcaa5eb3d24ec3fc8949a169f51a3642a8552911579e34c8f4970b12c56d945
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/files/fix-CVE-2019-18804.patch b/app-text/djvu/files/fix-CVE-2019-18804.patch
deleted file mode 100644
index b5d790ba1b1c..000000000000
--- a/app-text/djvu/files/fix-CVE-2019-18804.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Thu, 17 Oct 2019 22:20:31 -0400
-Subject: [PATCH] Fixed bug 309
-
----
- libdjvu/IW44EncodeCodec.cpp | 2 +-
- tools/ddjvu.cpp             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
-index 00752a0..f81eaeb 100644
---- a/libdjvu/IW44EncodeCodec.cpp
-+++ b/libdjvu/IW44EncodeCodec.cpp
-@@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale)
-   int y = 0;
-   int s = scale*rowsize;
-   int s3 = s+s+s;
--  h = ((h-1)/scale)+1;
-+  h = (h>0) ? ((h-1)/scale)+1 : 0;
-   y += 1;
-   p += s;
-   while (y-3 < h)
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 6d0df3b..7109952 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno)
-       prect.h = (ih * 100) / dpi;
-     }
-   /* Process aspect ratio */
--  if (flag_aspect <= 0)
-+  if (flag_aspect <= 0 && iw>0 && ih>0)
-     {
-       double dw = (double)iw / prect.w;
-       double dh = (double)ih / prect.h;
--- 
-2.23.0
-
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 0f2cb537bda5..882efa4c2f03 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
-EBUILD grip-4.5.2.ebuild 640 BLAKE2B f7f32f0b1b72a158dbc5916278d224d8bb46a8806f23b1e4cfb706c0ec8b0d32d8035c27496ccbf58549a3aae33838e927de218f3171d89a9f0710719b2728b8 SHA512 4ea96de40e3926ad990d342d9f10a21b5a0e7267f69ed87af0d9f54c5b874efcfd9ace24ae66f0923df758226aeab313cb5088872a53c456b3120811a34ab637
+EBUILD grip-4.5.2.ebuild 639 BLAKE2B da1c384bd58b0d582ef88bbc934123ba559cd542e30221f1c08003551de578e668ba922851a0325b8c98140d8a22cc3b75c6c03e4fd243ba661ad22159ab2987 SHA512 4d369d94d623d0896d691f105a5426b8ec66c25b87887ffc9a74d5a0d914d3e1009d7972cec91cb35b6507400d7f475dde0a60d09aca834ad9f2e0906abcca6d
 MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
diff --git a/app-text/grip/grip-4.5.2.ebuild b/app-text/grip/grip-4.5.2.ebuild
index ebeeb4c683ee..f268c25ab592 100644
--- a/app-text/grip/grip-4.5.2.ebuild
+++ b/app-text/grip/grip-4.5.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index 29c722a1a018..b5ae215fd9d7 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -1,7 +1,9 @@
 DIST nuspell-3.0.0.tar.gz 403043 BLAKE2B b437012e4fb327f13d9ff0944dadf7e865c670daf153be00dd48e9d2fc01c87d410ebd5aeaa094f6446d3035346738010cdba961cfaada3751bedce264beaa6a SHA512 d9cd7dd276e2bca43dec3abaf11c5206695949b9fda8c9b86f2772cc7e8fa95bf17c685a2ef9ca87fe3c4f0b55f2fcb435bc21c187355f5e3fa35dcafab2c8c2
 DIST nuspell-3.1.0.tar.gz 407196 BLAKE2B 688f6f59ba2f7bceaafe9a7cc707c008be93341e855ca60f07d6de67a626539693048af6f5ca40246ccc51e2573b76ba2bd4439aa9c0acb66a212bebd9219617 SHA512 a9bedfd6e2d77fd34d249cf7aa1fcb6bde5bced26f02f8a2dd860416a61488c9b7016a0df6015052fcccb272b342e6205db601107f46efa44c9d78ce261a826c
 DIST nuspell-3.1.1.tar.gz 379636 BLAKE2B 952cbe6f15221c0050f108b9f95718cc1d1ca9a94a7b15e0b6f2a53a92a2c95cf54f317b110bfc4b297943b9128bae8968a735ce68e7c752ff159359f4562f4b SHA512 239855051d9f49ba16913283090c4214a8f6a6cc290d359ab54014ff76fc297c131b67c6748bd1d4cdcec43c00dccc7f0c1bf8b07e06c9c648bff52ff193e096
+DIST nuspell-3.1.2.tar.gz 379029 BLAKE2B 80f773ffdcbfbeee0dd13cd325bb4fec5efa5b54ece92ac1589c418aab46c925419e9e1bc7e257a8320e24399f49bb867600679e34a5e40070b01a660578c92c SHA512 ed5206cb9ffa7e4ec6843988a75627d4ae7d5170444b6e7bd3496c1bf61c25412c4e68864800f2ad238d014b4e50d25282f367de2900f8a230f3ecc9ae5772be
 EBUILD nuspell-3.0.0.ebuild 1091 BLAKE2B 07c8fa7a2b9c03c18821ccd35bc1d9fa5f72490c4a9ec4d52cd4f4f90cb2d295771e2110b6ab50ab8c0bb34db075349735993e61f3d5ddca1380d5cec4e467f8 SHA512 eceed5f031c930296ed451dad77718cd07e4b052598026b4c59219467eb26c7eb050239d1869339791bd9e4bf437af9e54cefa1981ffe939394331a5dde8adff
 EBUILD nuspell-3.1.0.ebuild 1152 BLAKE2B 0ab1b278f6423bcb16a3133fb7c2223bdd654e2757a15d606100794459c411e1703b0426f28edec6b32d767ad4c7071e6b4db5e0c6b1f2e0fab0085cb96cf671 SHA512 ef38093ed47b99964a263505cf3374e4390830b482464082154358c860e47988fb076da79304ad540121424e1f7345652f9f646ed595502fdea364fc833064e2
 EBUILD nuspell-3.1.1.ebuild 1166 BLAKE2B 7e6a0daafb668d060b12dc4484619776d4db960d22710af3aef2161e9f359ae0719103c0a501b3545f1045c31a03677a331efe99fc6585e953c83ac5819da66a SHA512 34406e14d7def8e0f8c92373318dc4e4d7d810108fc3bd040faa76f237e6fddeefceec977399f4649517658c0131f38cfb37f536cdfa5c38a351000951f14b1d
+EBUILD nuspell-3.1.2.ebuild 1166 BLAKE2B 7e6a0daafb668d060b12dc4484619776d4db960d22710af3aef2161e9f359ae0719103c0a501b3545f1045c31a03677a331efe99fc6585e953c83ac5819da66a SHA512 34406e14d7def8e0f8c92373318dc4e4d7d810108fc3bd040faa76f237e6fddeefceec977399f4649517658c0131f38cfb37f536cdfa5c38a351000951f14b1d
 MISC metadata.xml 489 BLAKE2B 51835316b4f8b1b1a016324955d48f6f5126ef7b7caf11f4b46ea858469fc9ebe3154de4fbc99d528bfef3808fe7c95dd2f540038572ae640b00dad9fccbeacf SHA512 ea959020e4b2a90f475d296fd1a43c2ba8efc1c39f2dde70b930165bce165df1011e04af8f54b37740f28e009502a5c64ec0fdb2b7221003388cd47b1ccadeb5
diff --git a/app-text/nuspell/nuspell-3.1.2.ebuild b/app-text/nuspell/nuspell-3.1.2.ebuild
new file mode 100644
index 000000000000..d5c3f19e7d56
--- /dev/null
+++ b/app-text/nuspell/nuspell-3.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Spell checker library and CLI for complex natural languages"
+HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
+SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/3"  # due to libnuspell.so.3
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-libs/icu"
+DEPEND="${RDEPEND}
+	doc? ( app-text/ronn )
+	test? ( >=dev-cpp/catch-2.3.0:0 )
+	>=dev-libs/boost-1.62[icu]"
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	rm -R external/Catch2/ || die
+	if ! use test ; then
+		rm -R external/hunspell/ || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Nuspell needs language packs and/or dictionaries to be of use'
+	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
+	einfo
+	einfo 'Besides MySpell dictionaries, for other options please'
+	einfo 'see https://nuspell.github.io/#languages-and-users .'
+	einfo
+}
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index 9d38ebba4bc0..8fe130f38e25 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1,5 +1,5 @@
 DIST pdfarranger-1.3.1.tar.gz 120834 BLAKE2B 5f429d479d130ec06e795c6cedc2aefa75f89b971b556901fc0bfba02038e36c4fd7b4233b5ce6d0dfb6252862176dc7b07192ab43e458090970a25648bb946e SHA512 6ac13447410477e9125da26adbf7123f7f5ffa25814a4c254247a5ff2d07eba6af0557eafb60b4c68ac5987c8e9e7888da21296fb6a74d31a3d0d763b1077918
 DIST pdfarranger-1.5.3.tar.gz 221208 BLAKE2B 2669a3be00d771542ba2449696de74d633fe31c1ab84ff368ea95ffd6e6f6bdd4d5bbb2b0b2cf1c2ddcddcba9e774f1870ee3c85735f54c832894e2093392042 SHA512 17960786b2197e4035b2c224cbeb8e6d14ca7690920a4366d3dcad8b19f890b52d5e95277372fe3011f3476a5be0c4f253eb4d3ee3b6a8df74e20468be124d8b
 EBUILD pdfarranger-1.3.1.ebuild 732 BLAKE2B d2f04362a6461b10b875fdc00e86e1f71534eefc87c5cea5f9b6ae7e3ea877ec07dd4debb1aaf39c13dd00f553cf09782b35d2a8d07e2159ce0cbd2d8424b6a6 SHA512 97d65731e892b00f5c3e22756c9ca02548982a7a88e5434d7abf76018deba2671d2b378cf9b5c0e0d5179516f6e88c8f8c7e5aa7428ad8c648e13f97f8a10074
-EBUILD pdfarranger-1.5.3.ebuild 732 BLAKE2B d2f04362a6461b10b875fdc00e86e1f71534eefc87c5cea5f9b6ae7e3ea877ec07dd4debb1aaf39c13dd00f553cf09782b35d2a8d07e2159ce0cbd2d8424b6a6 SHA512 97d65731e892b00f5c3e22756c9ca02548982a7a88e5434d7abf76018deba2671d2b378cf9b5c0e0d5179516f6e88c8f8c7e5aa7428ad8c648e13f97f8a10074
+EBUILD pdfarranger-1.5.3-r1.ebuild 1077 BLAKE2B 283fd218247e772d2d33366b0b54f2a2d541c479f145ad34480a6eaf6f74cf00090eb69697868afce44914dae499e379fe123a980610c560c4e73acc6b5ec831 SHA512 f1f3c911f98f8032892d80c09277e0121f0f3631c0c3e599bd8e61ee2713d6ff4d165727c52936d420caf17da34736696080ba23b5e497c4946af94f90b4e115
 MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/pdfarranger-1.5.3.ebuild b/app-text/pdfarranger/pdfarranger-1.5.3-r1.ebuild
index d42ba6dcc63b..ca5563883b52 100644
--- a/app-text/pdfarranger/pdfarranger-1.5.3.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.5.3-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 xdg-utils
 
 DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
 HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
@@ -20,3 +21,21 @@ RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
 	app-text/poppler[introspection,cairo]"
 DEPEND="${RDEPEND}
 	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	insinto /usr/share/icons
+	doins -r data/icons/hicolor
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c9ad1481d0ec..63c2782dfee7 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,7 +6,9 @@ AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2eba
 AUX poppler-0.88.0-pdfsig-crash.patch 918 BLAKE2B 1cafb94e03afb06729633e117951edf0a14c6d52786eee4d785786e249f22fb4579d909f946ec595c6a7a54fbd594b6b1e94006ea37f97cacc49a93336cb2d37 SHA512 8967348da204da57002fbbff55d318e8065ce422e99bc5fbe7d517aed70c5f962dac87996bd949053ff5844f44aac528de08bbb1b2f7131b7852b3f5ad11653e
 DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880
 DIST poppler-0.89.0.tar.xz 1612156 BLAKE2B 071724f823214f3b3a775a1e6ee57992c18c65815cc139d88953ea3a7b348066981ce7933bd00ea27ddb60bf9f2f34a245bf09944d8cfda9732f0e33feecb017 SHA512 e2af2ab20cc1bba72080d42e229379bda0802aff355d2932dd970ee5924f454577529aef21f0f90fc57efba54caf15cd973c75446f309498f88199d5c2d93f11
+DIST poppler-0.90.0.tar.xz 1619960 BLAKE2B 479c89b6e0881c674beb5c760e08e9277df40c08904dcb1bfc1b039e9ca95f3d24d4548017b3d06ac4e1324172b2c9e412db665d6ee1d7ffd11da0f3d0a0b42c SHA512 3b2a45c7fcdc41b0dad80b6454cd8bb50a6625537edbc537898790ef4b6425bb62e1934fd2aaa8565be9c045ab1ac40a8de2e939c5b5abf0254d8e6c833b4450
 EBUILD poppler-0.88.0-r1.ebuild 3393 BLAKE2B 3ab052ad53eaf884e6ae388010b8273c4e801b316490f040786dfd10cc115f420e00fba9a3e8449b89b8ac3f76c5e530601d9ca7f69eb4a57691407289dd9bbc SHA512 4dcd8052f9d6c4bc95c7670090e67de51b85329a91f39d266e9c92870b0931d91eb7c6f6d18039052416a1449b59cb7bded9b3b840db34d8a28b9d96ff234292
 EBUILD poppler-0.89.0.ebuild 3364 BLAKE2B dda70a754a90e073ade7ea7212798448976bd3ef6789a40e5b487a813804bc80cc1f5ae521954dfaca22ea7ae07c3b59404c69310df8d4c2d4ff36e439acac1e SHA512 9b24944e3f04ee159fd1493c04fb5d1a0fe277b04c85630faad6772a868609f16c6f07ec70aff4f700f24422d361b7eaeb62e46234c23045a28183c23379c532
-EBUILD poppler-9999.ebuild 3364 BLAKE2B dda70a754a90e073ade7ea7212798448976bd3ef6789a40e5b487a813804bc80cc1f5ae521954dfaca22ea7ae07c3b59404c69310df8d4c2d4ff36e439acac1e SHA512 9b24944e3f04ee159fd1493c04fb5d1a0fe277b04c85630faad6772a868609f16c6f07ec70aff4f700f24422d361b7eaeb62e46234c23045a28183c23379c532
+EBUILD poppler-0.90.0.ebuild 3364 BLAKE2B fca621779d0ea5db5d08cd627f43a426d9cd31e2e98d1fe498ecf3763b4dbea3914f2269369ce495dcb83e68516e55b49174bf7dccec0ff9ab0e3392d63b2e93 SHA512 aa952862044c9829b6b6b2bf9187e1c6ccb0da41eda6c14fd5a6259d8eb2602fbb4a8cdef49667e5e876c0c522d10ebf8d613377ae92b4af22bb9a39861f1f5b
+EBUILD poppler-9999.ebuild 3364 BLAKE2B fca621779d0ea5db5d08cd627f43a426d9cd31e2e98d1fe498ecf3763b4dbea3914f2269369ce495dcb83e68516e55b49174bf7dccec0ff9ab0e3392d63b2e93 SHA512 aa952862044c9829b6b6b2bf9187e1c6ccb0da41eda6c14fd5a6259d8eb2602fbb4a8cdef49667e5e876c0c522d10ebf8d613377ae92b4af22bb9a39861f1f5b
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-0.90.0.ebuild b/app-text/poppler/poppler-0.90.0.ebuild
new file mode 100644
index 000000000000..7c34ec504ee9
--- /dev/null
+++ b/app-text/poppler/poppler-0.90.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2005-2020 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/101"   # 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
+		-DRUN_GPERF_IF_PRESENT=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-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index ce0b37279855..7c34ec504ee9 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/100"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/101"   # 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/pylize/Manifest b/app-text/pylize/Manifest
deleted file mode 100644
index 06b700fec95c..000000000000
--- a/app-text/pylize/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pylize-pillow.patch 375 BLAKE2B 9aaf388fc67d03d9af957a1aee350891ded225b0f0def122120d23e7cb1981fe70a8ba7169806a94de913ddea4d8019687ac3088b2e0b318451dc423e6eb75e6 SHA512 5e6beeb1a0192328039d581eeaf568e606a1fa002f8d91ddb397e27d873e23834fda67cd88a5afb24563a515cb37c234ed2d8c913472ce9fccd431249be852dc
-DIST pylize-1.3b.tar.bz2 70979 BLAKE2B 3b90d60ef7c314e6f7683ebdfa4d518b64ebbfe3bbe39148409d50c41577c7850304eb11e588f99e9c22d550548cf81f5f93265624200395e7abe7557d738a0e SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454
-EBUILD pylize-1.3b-r2.ebuild 1064 BLAKE2B b18a5af5e8e69673b445be5d0771c54ce3e3e3f58d11937343123e26e759b127d9b39290b6bcff17ff32a0599c183c4e0dccc11640386a49bc42543ae1238502 SHA512 bac5e62884904d7a7c3ade9333db0ab0dc8c47b64de3ce027d8bf6e835c53620e8012e0bc023e2e37e9ddb6b2f2e70a59a54841b47273a635b4fc92fc585a40d
-MISC metadata.xml 547 BLAKE2B d6d76c0357be91f51c01a0d0031c2a221e27dcdb65b300bd63bd614bd5fd29ea000903ed7206167ef3055b1da85297319a4d5517a0f80077ae2a0d072124afd1 SHA512 bf43543c0b0c4f90940d0a5b40c342d9151673418994e074421e723ed8242fa742cc06b93cf846bf8b860b997faa68b4f0f978d274434bb33b77c3e9cddec435
diff --git a/app-text/pylize/files/pylize-pillow.patch b/app-text/pylize/files/pylize-pillow.patch
deleted file mode 100644
index 0b454b0b1712..000000000000
--- a/app-text/pylize/files/pylize-pillow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Change PIL imports for Pillow compat
-https://bugs.gentoo.org/show_bug.cgi?id=471502
---- a/pylize.in
-+++ b/pylize.in
-@@ -113,7 +113,7 @@
- def mkLogoLink(meta):
-     if meta.has_key('logo'):
-         try:
--            import Image
-+            from PIL import Image
-             if os.path.exists(meta['logo']):
-                 i = Image.open(meta['logo'])
-             else:
diff --git a/app-text/pylize/metadata.xml b/app-text/pylize/metadata.xml
deleted file mode 100644
index cd617926fcf3..000000000000
--- a/app-text/pylize/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-pylize is a Python script that generates a set of HTML files that
-make up an on-screen presentation from a master file. The HTML files
-can be viewed with any CSS-aware browser. The master file contains
-the text for all the slides and some additional information like
-title, author etc. pylize can also create a template master file for
-you
-</longdescription>
-</pkgmetadata>
diff --git a/app-text/pylize/pylize-1.3b-r2.ebuild b/app-text/pylize/pylize-1.3b-r2.ebuild
deleted file mode 100644
index 1dc2b94a9c30..000000000000
--- a/app-text/pylize/pylize-1.3b-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python HTML Slideshow Generator using HTML and CSS"
-HOMEPAGE="http://www.chrisarndt.de/en/software/pylize/"
-SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
-
-IUSE="doc"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/empy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-	')"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
-
-python_configure() {
-	set -- "${PYTHON}" configure.py
-	echo "$@"
-	"$@" || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize "${ED%/}/usr/share/pylize"
-}
-
-python_install_all() {
-	local DOCS=( Changelog README README.empy TODO )
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 113ff209b5b7..0970543565ad 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2020-r3.ebuild 6984 BLAKE2B 4e5eff7a8c961922a2ba012a65d8d6ce239e11d9137839ac6fcc39a7f892e0c14c348941c69cea86b0fc8d4e0a229ec9a2658aac3016de2c8e02eb201b3b84ad SHA512 5b65064c1ff7b810e1a606a89321bb513bd18427c6ab13c9fe214e29e0f40243207b2a73d61cdbd51f3f1416eb91410ad4176c97ecc74715af2f8c283e2e71e3
+EBUILD texlive-2020-r4.ebuild 6953 BLAKE2B df669543e8512a88ee605af3b53190ace1572d1466fcac3d5d17d99b0362ad9659aecbac20f461259a9ba3f9ad8ee977fd6b9dc0f2306d6b5e794d27183ff162 SHA512 f1e4e93fc8a93e0f5fec578f28a006c4a4c2491b331b0c838ca1b766fa641cf926f45304a0009b52660c926971f0af05998e66c084af015c4d3231fa02ad1ad8
 MISC metadata.xml 2321 BLAKE2B fc9c387d08100e543a6752ee7644f878c9430db5f2f66b5d16991dc292cf8ac01fc80bb6d805a8d6694edabffb68bc23f031974eece051114809c90deaa32941 SHA512 ca224c87c1bae60752d3d77b62b5a54632bd42379551523f479d8b470ad61c91ac34ddd4c7539f4bd667ae4f60f08d10726f31329b7fc194a24b6d4c642ab536
diff --git a/app-text/texlive/texlive-2020-r3.ebuild b/app-text/texlive/texlive-2020-r4.ebuild
index a75573b772d6..b06a7f6c1a0c 100644
--- a/app-text/texlive/texlive-2020-r3.ebuild
+++ b/app-text/texlive/texlive-2020-r4.ebuild
@@ -79,8 +79,7 @@ RDEPEND="${DEPEND}
 	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
 	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
 	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
-		   >=dev-tex/cjk-latex-4.8.4 )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV} )
 	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
 	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )