gentoo resync : 10.02.2020

109 files changed, 343 insertions, 307 deletions

diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index dc4915b9db15..97bf55d4d07d 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/ansifilter-2.14 b/metadata/md5-cache/app-text/ansifilter-2.16
index a1d0b61be897..893473942ecb 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.14
+++ b/metadata/md5-cache/app-text/ansifilter-2.16
@@ -4,10 +4,10 @@ DESCRIPTION=Handles text files containing ANSI terminal escape codes
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=qt5
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
-SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.14.tar.bz2
+SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.16.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ffecc15f71de2714b671ecb0d91af66a
+_md5_=d28149f9b64f6de179020b407cd4813e
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016 b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016-r1
index e5da49836fbc..1cff1aaafb90 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016-r1
@@ -4,13 +4,13 @@ DEPEND=test? ( app-text/dvipng dev-texlive/texlive-latex dev-util/source-highlig
 DESCRIPTION=A plain text human readable/writable document format
 EAPI=7
 HOMEPAGE=http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/
-IUSE=examples graphviz highlight test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7
+IUSE=examples graphviz highlight test python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7
 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
-RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2 python_single_target_pypy3? ( >=dev-python/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) graphviz? ( media-gfx/graphviz ) highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_pypy3(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/highlight ) )
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2 python_single_target_pypy3? ( >=dev-python/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) graphviz? ( media-gfx/graphviz ) highlight? ( || ( dev-util/source-highlight python_single_target_pypy3? ( dev-python/pygments[python_targets_pypy3(-)] ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] ) app-text/highlight ) )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0.tar.gz -> asciidoc-8.6.10_p20181016.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8d00dfa93c5f17bda73d2f4f06c2ed1a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=59f1d8174030d6cfaa55418f9a28808b
diff --git a/metadata/md5-cache/app-text/calibre-3.48.0-r1 b/metadata/md5-cache/app-text/calibre-3.48.0-r1
deleted file mode 100644
index bb001f7c2e4e..000000000000
--- a/metadata/md5-cache/app-text/calibre-3.48.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_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/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~arm x86
-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
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_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/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/3.48.0/calibre-3.48.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac123ffdbb9d7db90674ab2c59f0baf7
diff --git a/metadata/md5-cache/app-text/calibre-3.48.0-r2 b/metadata/md5-cache/app-text/calibre-3.48.0-r2
new file mode 100644
index 000000000000..40836a107b2f
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-3.48.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_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/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) python_single_target_python2_7? ( >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)] dev-python/sip[python_targets_python2_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks +python_single_target_python2_7
+KEYWORDS=amd64 ~arm x86
+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
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_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/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/3.48.0/calibre-3.48.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ecf947645d1f86910767e775e374b80
diff --git a/metadata/md5-cache/app-text/calibre-4.10.1-r2 b/metadata/md5-cache/app-text/calibre-4.10.1-r2
new file mode 100644
index 000000000000..8734dcfa4909
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-4.10.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=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_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) 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 ) python_single_target_python2_7? ( >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)] dev-python/sip[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/setuptools-23.1.0[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-23.1.0[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~x86
+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
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=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_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) 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 ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/4.10.1/calibre-4.10.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5a7ead746ead93137eacdfa034c5d24
diff --git a/metadata/md5-cache/app-text/calibre-4.9.1 b/metadata/md5-cache/app-text/calibre-4.9.1
deleted file mode 100644
index 79dced66d728..000000000000
--- a/metadata/md5-cache/app-text/calibre-4.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=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-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] 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 ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-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
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=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-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] 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 ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/4.9.1/calibre-4.9.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f17e4e9c9d90a15202ec2c025a53570e
diff --git a/metadata/md5-cache/app-text/calibre-4.9.1-r1 b/metadata/md5-cache/app-text/calibre-4.9.1-r1
deleted file mode 100644
index 8b55b615cf4f..000000000000
--- a/metadata/md5-cache/app-text/calibre-4.9.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=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-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] 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 ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~x86
-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
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=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-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] 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 ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/4.9.1/calibre-4.9.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe9768c791e2cdaa9968773f04b89679
diff --git a/metadata/md5-cache/app-text/calibre-4.9.1-r2 b/metadata/md5-cache/app-text/calibre-4.9.1-r2
new file mode 100644
index 000000000000..da4b3160678d
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-4.9.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=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_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) 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 ) python_single_target_python2_7? ( >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)] dev-python/sip[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/setuptools-23.1.0[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-23.1.0[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~arm ~x86
+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
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=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_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) 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 ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/4.9.1/calibre-4.9.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1baebaa27ce2804774351812fa439277
diff --git a/metadata/md5-cache/app-text/capyt-1.1.1 b/metadata/md5-cache/app-text/capyt-1.1.1
index b33ca6445293..32b4cc9e62fd 100644
--- a/metadata/md5-cache/app-text/capyt-1.1.1
+++ b/metadata/md5-cache/app-text/capyt-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/lbatalha/capyt/archive/1.1-1.tar.gz -> capyt-1.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f0f802a0e4a6201d98212731ce29aed8
diff --git a/metadata/md5-cache/app-text/cherrytree-0.37.0-r1 b/metadata/md5-cache/app-text/cherrytree-0.37.0-r1
index 99f273136edf..e8592f1039c2 100644
--- a/metadata/md5-cache/app-text/cherrytree-0.37.0-r1
+++ b/metadata/md5-cache/app-text/cherrytree-0.37.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=nls? ( sys-devel/gettext ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+BDEPEND=nls? ( sys-devel/gettext ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] dev-python/pygtksourceview:2[python_targets_python2_7(-)] )
 DESCRIPTION=A hierarchical note taking application
 EAPI=7
 HOMEPAGE=https://www.giuspen.com/cherrytree
-IUSE=nls +python_targets_python2_7 +python_single_target_python2_7
+IUSE=nls +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] dev-python/pygtksourceview:2[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/giuspen/cherrytree/archive/0.37.0.tar.gz -> cherrytree-0.37.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95407d949a9fdc6a57fe5fbbfed227c9
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=259090bc6838a656ff34903474788e3b
diff --git a/metadata/md5-cache/app-text/cherrytree-0.38.9 b/metadata/md5-cache/app-text/cherrytree-0.38.9
deleted file mode 100644
index 69d3b4265309..000000000000
--- a/metadata/md5-cache/app-text/cherrytree-0.38.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A hierarchical note taking application
-EAPI=7
-HOMEPAGE=https://www.giuspen.com/cherrytree
-IUSE=nls +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/giuspen/cherrytree/archive/0.38.9.tar.gz -> cherrytree-0.38.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9598d910dd79b144a1effba830e1afad
diff --git a/metadata/md5-cache/app-text/cherrytree-0.38.9-r1 b/metadata/md5-cache/app-text/cherrytree-0.38.9-r1
new file mode 100644
index 000000000000..cc4824277f30
--- /dev/null
+++ b/metadata/md5-cache/app-text/cherrytree-0.38.9-r1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] dev-python/pygtksourceview:2[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] )
+DESCRIPTION=A hierarchical note taking application
+EAPI=7
+HOMEPAGE=https://www.giuspen.com/cherrytree
+IUSE=nls +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] dev-python/pygtksourceview:2[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/giuspen/cherrytree/archive/0.38.9.tar.gz -> cherrytree-0.38.9.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2ddf424773d4b05f1b8b574255166e6
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.10-r1 b/metadata/md5-cache/app-text/dblatex-0.3.10-r1
index 569e3a1b07b0..5ad3ec233028 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.10-r1
+++ b/metadata/md5-cache/app-text/dblatex-0.3.10-r1
@@ -10,5 +10,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dblatex/dblatex-0.3.10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=caf7ff251aa57e97dc2a197513b8c0e0
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.7 b/metadata/md5-cache/app-text/dblatex-0.3.7
index 7a86d339a67e..d35f5330984b 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.7
+++ b/metadata/md5-cache/app-text/dblatex-0.3.7
@@ -10,5 +10,5 @@ RDEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-late
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dblatex/dblatex-0.3.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c87ccdf82f2c4a9a0efa18f10b769639
diff --git a/metadata/md5-cache/app-text/dictd-1.12.1-r2 b/metadata/md5-cache/app-text/dictd-1.12.1-r2
index 6becf71a7593..e6cd96a44f2f 100644
--- a/metadata/md5-cache/app-text/dictd-1.12.1-r2
+++ b/metadata/md5-cache/app-text/dictd-1.12.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 ISOC-rfc
 RDEPEND=sys-libs/zlib dev-libs/libmaa dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy ) >=sys-apps/coreutils-6.10
 SLOT=0
 SRC_URI=mirror://sourceforge/dict/dictd-1.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1bc9984579c41bfcc9c9d65dd4b16833
diff --git a/metadata/md5-cache/app-text/diff-pdf-0.3 b/metadata/md5-cache/app-text/diff-pdf-0.3
index 70f67b7372e4..5019c502279e 100644
--- a/metadata/md5-cache/app-text/diff-pdf-0.3
+++ b/metadata/md5-cache/app-text/diff-pdf-0.3
@@ -9,4 +9,4 @@ RDEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0[
 SLOT=0
 SRC_URI=https://github.com/vslavik/diff-pdf/releases/download/v0.3/diff-pdf-0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=098281bf25edb7ff8547a4316639a36f
+_md5_=beb3f514986bab7f3a07dfd4d790de87
diff --git a/metadata/md5-cache/app-text/discount-2.2.6 b/metadata/md5-cache/app-text/discount-2.2.6
index ea0126bc9047..2f605f71c1ce 100644
--- a/metadata/md5-cache/app-text/discount-2.2.6
+++ b/metadata/md5-cache/app-text/discount-2.2.6
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install postinst prepare
+DEFINED_PHASES=compile configure install postinst prepare
 DESCRIPTION=A Markdown-to HTML translator written in C
 EAPI=6
 HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
@@ -9,4 +9,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.6.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=58a66b864a8b326e6de2deaa393d52aa
+_md5_=b5997404848d3015b7d867b0db7e3aba
diff --git a/metadata/md5-cache/app-text/djvusmooth-0.2.18 b/metadata/md5-cache/app-text/djvusmooth-0.2.18
index 0769bfbe9a52..bc095bb37e0e 100644
--- a/metadata/md5-cache/app-text/djvusmooth-0.2.18
+++ b/metadata/md5-cache/app-text/djvusmooth-0.2.18
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-djvulibre[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/jwilk/djvusmooth/releases/download/0.2.18/djvusmooth-0.2.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a4aee1dcf8c2a6c4631046ecd6c5f10
diff --git a/metadata/md5-cache/app-text/doconce-1.4.4 b/metadata/md5-cache/app-text/doconce-1.4.4
index e7a9680f3502..b3e2ca2c8816 100644
--- a/metadata/md5-cache/app-text/doconce-1.4.4
+++ b/metadata/md5-cache/app-text/doconce-1.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/doconce-1.4.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=224ac26329c8e2f01ca521ff2483ef30
diff --git a/metadata/md5-cache/app-text/duali-0.2.0-r1 b/metadata/md5-cache/app-text/duali-0.2.0-r1
index d10a02b3598f..195b95bf42e1 100644
--- a/metadata/md5-cache/app-text/duali-0.2.0-r1
+++ b/metadata/md5-cache/app-text/duali-0.2.0-r1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] >=
 DESCRIPTION=Arabic dictionary based on the DICT protocol
 EAPI=6
 HOMEPAGE=https://www.arabeyes.org/Duali
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86
 LICENSE=BSD
 PDEPEND=>=app-dicts/duali-data-0.1b-r1
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/duali-0.2.0.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0836bc908ca49e496e41e7d853569fc6
diff --git a/metadata/md5-cache/app-text/dvipsk-5.999_p20190410 b/metadata/md5-cache/app-text/dvipsk-5.999_p20190410
index a5415a35cd75..5f4f28903460 100644
--- a/metadata/md5-cache/app-text/dvipsk-5.999_p20190410
+++ b/metadata/md5-cache/app-text/dvipsk-5.999_p20190410
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/texlive-module-dvips-2019.tar.xz doc? ( mirror://gentoo/texlive-module-dvips.doc-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=624995b8867c9699211686c14fee4956
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1 b/metadata/md5-cache/app-text/enchant-1.6.1
deleted file mode 100644
index 412562a6ad70..000000000000
--- a/metadata/md5-cache/app-text/enchant-1.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) virtual/pkgconfig
-DESCRIPTION=Spellchecker wrapping library
-EAPI=6
-HOMEPAGE=https://abiword.github.io/enchant/
-IUSE=aspell +hunspell static-libs test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
-REQUIRED_USE=|| ( hunspell aspell )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ea7788d11e236560195f248f3438601e
diff --git a/metadata/md5-cache/app-text/epspdf-0.6.0-r1 b/metadata/md5-cache/app-text/epspdf-0.6.0-r1
index f8c51b3e0bdc..83fac36a87b2 100644
--- a/metadata/md5-cache/app-text/epspdf-0.6.0-r1
+++ b/metadata/md5-cache/app-text/epspdf-0.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<dev-texlive/texlive-pictures-2011-r1 >=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://tex.aanhet.net/epspdf/epspdf.0.6.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=3755a861e910909d2bcd02d1d3935e48
diff --git a/metadata/md5-cache/app-text/epspdf-0.6.3-r1 b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
index b658191b1319..d19c5facd8db 100644
--- a/metadata/md5-cache/app-text/epspdf-0.6.3-r1
+++ b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<dev-texlive/texlive-pictures-2011-r1 >=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://tex.aanhet.net/epspdf/epspdf.0.6.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=78034c272a0571d598be48c630898532
diff --git a/metadata/md5-cache/app-text/fbless-0.2.3 b/metadata/md5-cache/app-text/fbless-0.2.3
index f05b0c9b0317..47a01797f9e7 100644
--- a/metadata/md5-cache/app-text/fbless-0.2.3
+++ b/metadata/md5-cache/app-text/fbless-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/matimatik/fbless/archive/0.2.3.tar.gz -> fbless-0.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4bf01ff1a2e6856aa804f1c3993acd1
diff --git a/metadata/md5-cache/app-text/grip-4.2.0 b/metadata/md5-cache/app-text/grip-4.2.0
index 0386ba497249..ba4de6019879 100644
--- a/metadata/md5-cache/app-text/grip-4.2.0
+++ b/metadata/md5-cache/app-text/grip-4.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Preview GitHub Markdown files like Readme locally before committing them
 EAPI=6
 HOMEPAGE=https://github.com/joeyespo/grip
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/flask-0.10.1 >=dev-python/markdown-2.5.1 >=dev-python/path-and-address-1.0.0 >=dev-python/pygments-1.6 >=dev-python/requests-2.4.1 python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/flask-0.10.1 >=dev-python/markdown-2.5.1 >=dev-python/path-and-address-1.0.0 >=dev-python/pygments-1.6 >=dev-python/requests-2.4.1 python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grip/grip-4.2.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=603999d92a4bc23a131edea57105ecc1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a1af4c9a7fc9f8e86f66f1b61747900
diff --git a/metadata/md5-cache/app-text/grip-4.5.2 b/metadata/md5-cache/app-text/grip-4.5.2
index 14f150c435ac..4aaec38c8f9d 100644
--- a/metadata/md5-cache/app-text/grip-4.5.2
+++ b/metadata/md5-cache/app-text/grip-4.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/docopt-0.4.0 >=dev-python/flask-0.10.1 >=dev-python/markdow
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grip/grip-4.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=25c6ede8fc3b5627925229b6dc1cdb5b
diff --git a/metadata/md5-cache/app-text/groonga-5.0.3 b/metadata/md5-cache/app-text/groonga-5.0.3
index 4748af92aea4..d3e37300c10d 100644
--- a/metadata/md5-cache/app-text/groonga-5.0.3
+++ b/metadata/md5-cache/app-text/groonga-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) lib
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=http://packages.groonga.org/source/groonga/groonga-5.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3e4cf14cb4ab8c51c2b504a93b20ec5
diff --git a/metadata/md5-cache/app-text/groonga-5.0.9 b/metadata/md5-cache/app-text/groonga-5.0.9
index 1208bb564819..b94e7b9700e8 100644
--- a/metadata/md5-cache/app-text/groonga-5.0.9
+++ b/metadata/md5-cache/app-text/groonga-5.0.9
@@ -10,5 +10,5 @@ RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) lib
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3e4cf14cb4ab8c51c2b504a93b20ec5
diff --git a/metadata/md5-cache/app-text/groonga-6.1.2 b/metadata/md5-cache/app-text/groonga-6.1.2
index a00c4374423b..2a03323604ce 100644
--- a/metadata/md5-cache/app-text/groonga-6.1.2
+++ b/metadata/md5-cache/app-text/groonga-6.1.2
@@ -10,5 +10,5 @@ RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) lib
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=http://packages.groonga.org/source/groonga/groonga-6.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d4755e6e251e4a64f63aa1b9b860f1f3
diff --git a/metadata/md5-cache/app-text/groonga-8.0.2 b/metadata/md5-cache/app-text/groonga-8.0.2
index 763b7c9a05a0..62f3d04330b9 100644
--- a/metadata/md5-cache/app-text/groonga-8.0.2
+++ b/metadata/md5-cache/app-text/groonga-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/onigmo-6.1.1:0= benchmark? ( >=dev-libs/glib-2.8 ) jemalloc?
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=https://packages.groonga.org/source/groonga/groonga-8.0.2.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6fe3c64c8178576f7a55eb526128a9f0
diff --git a/metadata/md5-cache/app-text/gtkspell-2.0.16 b/metadata/md5-cache/app-text/gtkspell-2.0.16
index 33e12894b388..109350c8f255 100644
--- a/metadata/md5-cache/app-text/gtkspell-2.0.16
+++ b/metadata/md5-cache/app-text/gtkspell-2.0.16
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0 dev-util/gtk-doc-am >=dev-util
 DESCRIPTION=Spell checking widget for GTK
 EAPI=4
 HOMEPAGE=http://gtkspell.sourceforge.net/
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0
 SLOT=2
 SRC_URI=http://gtkspell.sourceforge.net/download/gtkspell-2.0.16.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=959d21792fa68c7e2ae9dcf7af361344
+_md5_=1ef86a707f99b59f63bdc8e79e0ea4a9
diff --git a/metadata/md5-cache/app-text/gtkspell-2.0.16-r1 b/metadata/md5-cache/app-text/gtkspell-2.0.16-r1
new file mode 100644
index 000000000000..db20e49aff67
--- /dev/null
+++ b/metadata/md5-cache/app-text/gtkspell-2.0.16-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0 dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig
+DESCRIPTION=Spell checking widget for GTK
+EAPI=7
+HOMEPAGE=http://gtkspell.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0
+SLOT=2
+SRC_URI=http://gtkspell.sourceforge.net/download/gtkspell-2.0.16.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5
+_md5_=397114838200073a70e55bca8102629f
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.9 b/metadata/md5-cache/app-text/gtkspell-3.0.9
index 0dd7a44d79f4..0993b8ec7067 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.9
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Spell checking widget for GTK
 EAPI=6
 HOMEPAGE=http://gtkspell.sourceforge.net/
 IUSE=+introspection vala
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-text/enchant-1.1.6:0 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=3/0
 SRC_URI=mirror://sourceforge/project/gtkspell/3.0.9/gtkspell3-3.0.9.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b90de29ff988a9b133d7b707b0f4fa3
+_md5_=a1966e42a9f9b2f7a0d86b1b1c4e60fb
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.11_pre20170909 b/metadata/md5-cache/app-text/htmlmin-0.1.11_pre20170909
index 19f2bc128c66..9c66f7db90c5 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.11_pre20170909
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.11_pre20170909
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mankyd/htmlmin/archive/7bcbb995778fc07e427872dc74af9646fd0c907d.tar.gz -> htmlmin-0.1.11_pre20170909.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b8947d792ae5586fba935478d30f580
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
index e6681ece9dc5..c8031f643158 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.12
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/h/htmlmin/htmlmin-0.1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ea2c1c4f6ed8a835182fdbfd9d738fd
diff --git a/metadata/md5-cache/app-text/jadetex-3.13-r8 b/metadata/md5-cache/app-text/jadetex-3.13-r8
index c9c3412c2c6a..c40f669168f4 100644
--- a/metadata/md5-cache/app-text/jadetex-3.13-r8
+++ b/metadata/md5-cache/app-text/jadetex-3.13-r8
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=app-text/openjade-1.3.1 dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric
+DEPEND=>=app-text/openjade-1.3.1 dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=TeX macros used by Jade TeX output
 EAPI=7
 HOMEPAGE=http://jadetex.sourceforge.net/
@@ -10,5 +9,5 @@ RDEPEND=virtual/latex-base
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jadetex/jadetex-3.13.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=ee1b78f6edf2f724c9787d0b01e5221e
diff --git a/metadata/md5-cache/app-text/keepnote-0.7.9-r2 b/metadata/md5-cache/app-text/keepnote-0.7.9-r2
index c88d7b27ae96..67ee2b704f74 100644
--- a/metadata/md5-cache/app-text/keepnote-0.7.9-r2
+++ b/metadata/md5-cache/app-text/keepnote-0.7.9-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://keepnote.org/download-test/keepnote-0.7.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=874902d0957236962e0ef10b0b546e4e
diff --git a/metadata/md5-cache/app-text/krop-0.5.1 b/metadata/md5-cache/app-text/krop-0.5.1
index 791aef59e170..90c4d1503992 100644
--- a/metadata/md5-cache/app-text/krop-0.5.1
+++ b/metadata/md5-cache/app-text/krop-0.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A tool to crop PDF files
 EAPI=6
 HOMEPAGE=http://arminstraub.com/software/krop
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-python/python-poppler-qt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://arminstraub.com/downloads/krop/krop-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8616b96a4575be091d54c1c0eba040d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ec2531fc5394c8c61304c3ca4b4e7ca7
diff --git a/metadata/md5-cache/app-text/krop-9999 b/metadata/md5-cache/app-text/krop-9999
index 4afb6ccc4f8e..ca009590ac63 100644
--- a/metadata/md5-cache/app-text/krop-9999
+++ b/metadata/md5-cache/app-text/krop-9999
@@ -1,13 +1,13 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DESCRIPTION=A tool to crop PDF files
 EAPI=7
 HOMEPAGE=http://arminstraub.com/software/krop
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-python/python-poppler-qt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a14e013c72816ff3ecd2798b538c933e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fd0d28955ab0e12f7ad4752c47b5e825
diff --git a/metadata/md5-cache/app-text/landslide-1.1.3 b/metadata/md5-cache/app-text/landslide-1.1.3
index 1e0d03347b0f..19ccbc3b9b11 100644
--- a/metadata/md5-cache/app-text/landslide-1.1.3
+++ b/metadata/md5-cache/app-text/landslide-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/adamzap/landslide/tarball/v1.1.3 -> landslide-1.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=952981f9a454e8e7b46744c0786f7404
diff --git a/metadata/md5-cache/app-text/libebook-0.1.3 b/metadata/md5-cache/app-text/libebook-0.1.3
index 61cf571621f1..145cc02c4205 100644
--- a/metadata/md5-cache/app-text/libebook-0.1.3
+++ b/metadata/md5-cache/app-text/libebook-0.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Library parsing various ebook formats
 EAPI=6
 HOMEPAGE=https://www.sourceforge.net/projects/libebook/
 IUSE=doc test tools
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=app-text/liblangtag dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.3.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe459c6a46c96df2692af988da2b53a0
+_md5_=3ad50f0cad16232947022c730363821b
diff --git a/metadata/md5-cache/app-text/liblangtag-0.6.3 b/metadata/md5-cache/app-text/liblangtag-0.6.3
index a4fecfe8ea60..5ddeac161a98 100644
--- a/metadata/md5-cache/app-text/liblangtag-0.6.3
+++ b/metadata/md5-cache/app-text/liblangtag-0.6.3
@@ -5,11 +5,11 @@ DESCRIPTION=An interface library to access tags for identifying languages
 EAPI=7
 HOMEPAGE=https://bitbucket.org/tagoh/liblangtag/wiki/Home
 IUSE=debug doc introspection static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=|| ( LGPL-3 MPL-2.0 )
 RDEPEND=dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.3.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d543e6c9825ec9fcbe6b6350da454af4
+_md5_=3d9ef9d5db85261fc2e3dd11949f6cd9
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.24_p5 b/metadata/md5-cache/app-text/libpaper-1.1.24_p5
index b964f8293542..fae8296b5cd0 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.24_p5
+++ b/metadata/md5-cache/app-text/libpaper-1.1.24_p5
@@ -4,9 +4,9 @@ DESCRIPTION=Library for handling paper characteristics
 EAPI=6
 HOMEPAGE=http://packages.debian.org/unstable/source/libpaper
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24+nmu5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=47cb95e22ea1901f3823f9dd4d39c08f
+_md5_=4bed0c72649fc81c373d49e0cafd9cbb
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.2 b/metadata/md5-cache/app-text/libqxp-0.0.2
index 95b7e4225552..7ece034ca49a 100644
--- a/metadata/md5-cache/app-text/libqxp-0.0.2
+++ b/metadata/md5-cache/app-text/libqxp-0.0.2
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/librevenge dev-libs/icu:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.2.tar.xz
-_md5_=9cc87d415717655805b1e64b10616d93
+_md5_=a66b157541943826591fec3c411d2e1f
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
index d6687c9dbff5..dd7b584746c6 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff sys-devel/flex virtual/awk doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base )
+DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff sys-devel/flex virtual/awk doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
 EAPI=7
 HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ MIT SGMLUG
 RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.73/linuxdoc-tools-0.9.73.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	latex-package	17f13abe0de88340745e52e6b627aee7	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	latex-package	663b0e5f0410bc8e8d51f11346f0258a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=66c0c6261850b64fa14be1a728a2ad31
diff --git a/metadata/md5-cache/app-text/manpager-1 b/metadata/md5-cache/app-text/manpager-1
index 53b62b206c5a..f07085966fce 100644
--- a/metadata/md5-cache/app-text/manpager-1
+++ b/metadata/md5-cache/app-text/manpager-1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Enable colorization of man pages
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0a8761bd4d6d531fb7a15c60c205368f
+_md5_=19cc7f0e3a9bfda7343453a7db261832
diff --git a/metadata/md5-cache/app-text/mftrace-1.2.18-r3 b/metadata/md5-cache/app-text/mftrace-1.2.18-r3
index 03cee89c1755..bb0899434f8c 100644
--- a/metadata/md5-cache/app-text/mftrace-1.2.18-r3
+++ b/metadata/md5-cache/app-text/mftrace-1.2.18-r3
@@ -3,13 +3,13 @@ DEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge
 DESCRIPTION=Traces TeX fonts to PFA or PFB fonts (formerly pktrace)
 EAPI=6
 HOMEPAGE=http://lilypond.org/mftrace/
-IUSE=test truetype +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test truetype +python_single_target_python2_7
 KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://lilypond.org/downloads/sources/mftrace/mftrace-1.2.18.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5b6510860004761a6d2f499cb231e568
diff --git a/metadata/md5-cache/app-text/mftrace-1.2.19-r1 b/metadata/md5-cache/app-text/mftrace-1.2.19-r1
index 128af6078c20..41e09a4d8ac2 100644
--- a/metadata/md5-cache/app-text/mftrace-1.2.19-r1
+++ b/metadata/md5-cache/app-text/mftrace-1.2.19-r1
@@ -3,13 +3,13 @@ DEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge
 DESCRIPTION=Traces TeX fonts to PFA or PFB fonts (formerly pktrace)
 EAPI=6
 HOMEPAGE=http://lilypond.org/mftrace/
-IUSE=test truetype +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test truetype +python_single_target_python2_7
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://lilypond.org/downloads/sources/mftrace/mftrace-1.2.19.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bd34780899e702e9fa25391f8420769b
diff --git a/metadata/md5-cache/app-text/nfoview-1.26 b/metadata/md5-cache/app-text/nfoview-1.26
index 3f0381d028a5..d08c6bb9a185 100644
--- a/metadata/md5-cache/app-text/nfoview-1.26
+++ b/metadata/md5-cache/app-text/nfoview-1.26
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.26.tar.gz -> nfoview-1.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b1571c60e4794e30ab2e0b19b189fc3
diff --git a/metadata/md5-cache/app-text/nfoview-1.27 b/metadata/md5-cache/app-text/nfoview-1.27
index c32541032271..363e2fd16117 100644
--- a/metadata/md5-cache/app-text/nfoview-1.27
+++ b/metadata/md5-cache/app-text/nfoview-1.27
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.27.tar.gz -> nfoview-1.27.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94987a404ded5b5afe0f58fae1d5fd08
diff --git a/metadata/md5-cache/app-text/nfoview-9999 b/metadata/md5-cache/app-text/nfoview-9999
index 00f22bb66714..3146eafe2384 100644
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ b/metadata/md5-cache/app-text/nfoview-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/terminus-font python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b1571c60e4794e30ab2e0b19b189fc3
diff --git a/metadata/md5-cache/app-text/nuspell-3.0.0 b/metadata/md5-cache/app-text/nuspell-3.0.0
new file mode 100644
index 000000000000..c3cdfb495d87
--- /dev/null
+++ b/metadata/md5-cache/app-text/nuspell-3.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/icu doc? ( app-text/ronn ) test? ( >=dev-cpp/catch-2.3.0:0 ) >=dev-libs/boost-1.62[icu]
+DESCRIPTION=Spell checker library and CLI for complex natural languages
+EAPI=7
+HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=test? ( || ( MPL-1.1 GPL-2+ LGPL-2.1+ ) ) LGPL-3+
+RDEPEND=dev-libs/icu
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://github.com/nuspell/nuspell/archive/v3.0.0.tar.gz -> nuspell-3.0.0.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e86f426b2f18fd873e63d33ee910366e
diff --git a/metadata/md5-cache/app-text/openlp-2.4.6 b/metadata/md5-cache/app-text/openlp-2.4.6
index 6b80cd85a47e..525912e41dc1 100644
--- a/metadata/md5-cache/app-text/openlp-2.4.6
+++ b/metadata/md5-cache/app-text/openlp-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/alembic[python_targets_python3_6(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://get.openlp.org/2.4.6/OpenLP-2.4.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da1e5274b4b89c6129445b1cd51e83c4
diff --git a/metadata/md5-cache/app-text/paperwork-1.2.4-r2 b/metadata/md5-cache/app-text/paperwork-1.2.4-r2
index 0d1a75499d85..037ff42ee3eb 100644
--- a/metadata/md5-cache/app-text/paperwork-1.2.4-r2
+++ b/metadata/md5-cache/app-text/paperwork-1.2.4-r2
@@ -10,5 +10,5 @@ RDEPEND=~app-text/paperwork-backend-1.2.4[python_targets_python3_6(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e219542aaf64a9a9cc858a3abb79daa3
diff --git a/metadata/md5-cache/app-text/paperwork-1.3.0 b/metadata/md5-cache/app-text/paperwork-1.3.0
index f30c05b0f8d5..551770aa8b68 100644
--- a/metadata/md5-cache/app-text/paperwork-1.3.0
+++ b/metadata/md5-cache/app-text/paperwork-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=~app-text/paperwork-backend-1.3.0[python_targets_python3_6(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c4ed7d91b02bd559204518b3e71fe5e
diff --git a/metadata/md5-cache/app-text/paperwork-1.3.1 b/metadata/md5-cache/app-text/paperwork-1.3.1
index 3f1af29c8459..2510314af426 100644
--- a/metadata/md5-cache/app-text/paperwork-1.3.1
+++ b/metadata/md5-cache/app-text/paperwork-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=~app-text/paperwork-backend-1.3.1[python_targets_python3_6(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=048c9c2a9bc5e7743df57d8619b708b2
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.2.4 b/metadata/md5-cache/app-text/paperwork-backend-1.2.4
index 5a2dd860a7f3..22e639ef33ff 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-1.2.4
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=160792403dce97aaaf95a611ab6e9b34
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.3.0 b/metadata/md5-cache/app-text/paperwork-backend-1.3.0
index 7d347c192f60..51eeed1c471f 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-1.3.0
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f475e6e74d330d6ee51b42ced6ea001
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.3.1 b/metadata/md5-cache/app-text/paperwork-backend-1.3.1
index 0e6b52c9700f..fb5b04fd7478 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-1.3.1
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b65aebb3015b50642793489e0918cdf5
diff --git a/metadata/md5-cache/app-text/passivetex-1.25-r1 b/metadata/md5-cache/app-text/passivetex-1.25-r1
index 9a3de3ae3ee7..82cef193e756 100644
--- a/metadata/md5-cache/app-text/passivetex-1.25-r1
+++ b/metadata/md5-cache/app-text/passivetex-1.25-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=dev-tex/xmltex-1.9 app-arch/unzip
+DEPEND=virtual/latex-base >=dev-tex/xmltex-1.9 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A namespace-aware XML parser written in Tex
 EAPI=7
 HOMEPAGE=http://www.tei-c.org.uk/Software/passivetex/
@@ -9,5 +8,5 @@ LICENSE=MIT
 RDEPEND=virtual/latex-base >=dev-tex/xmltex-1.9 virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/passivetex-1.25.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=f5559b7ce8e74281572671b89a90deb5
diff --git a/metadata/md5-cache/app-text/pastebinit-1.5 b/metadata/md5-cache/app-text/pastebinit-1.5
deleted file mode 100644
index 260fad691a92..000000000000
--- a/metadata/md5-cache/app-text/pastebinit-1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=app-text/docbook-xsl-stylesheets
-DESCRIPTION=A software that lets you send anything you want directly to a pastebin
-EAPI=5
-HOMEPAGE=https://launchpad.net/pastebinit
-IUSE=crypt python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] crypt? ( app-crypt/gnupg )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://launchpad.net/pastebinit/trunk/1.5/+download/pastebinit-1.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24e4713911097ed9fcb3b3bef1a2f6c0
diff --git a/metadata/md5-cache/app-text/pastebinit-1.5-r1 b/metadata/md5-cache/app-text/pastebinit-1.5-r1
new file mode 100644
index 000000000000..8a6fa55702e8
--- /dev/null
+++ b/metadata/md5-cache/app-text/pastebinit-1.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=app-text/docbook-xsl-stylesheets
+DESCRIPTION=A software that lets you send anything you want directly to a pastebin
+EAPI=5
+HOMEPAGE=https://launchpad.net/pastebinit
+IUSE=crypt +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/configobj[python_targets_python3_6(-)] ) crypt? ( app-crypt/gnupg )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://launchpad.net/pastebinit/trunk/1.5/+download/pastebinit-1.5.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6c0d645d53ff670f7e89427db726df5d
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.3.1 b/metadata/md5-cache/app-text/pdfarranger-1.3.1
index 7751bd765ab7..d3d510cdbaf2 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.3.1
+++ b/metadata/md5-cache/app-text/pdfarranger-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pikepdf[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.3.1.tar.gz -> pdfarranger-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1811afbfcdd03e3f9e02ce5098f439a5
diff --git a/metadata/md5-cache/app-text/pdfminer-20140328 b/metadata/md5-cache/app-text/pdfminer-20140328
index b59079bb8926..afccf82c86b6 100644
--- a/metadata/md5-cache/app-text/pdfminer-20140328
+++ b/metadata/md5-cache/app-text/pdfminer-20140328
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20140328.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d1b81cb66233f986b4e0144a429f17a
diff --git a/metadata/md5-cache/app-text/pdfminer-20140328-r1 b/metadata/md5-cache/app-text/pdfminer-20140328-r1
index cbdc95773a21..80acfbb222cd 100644
--- a/metadata/md5-cache/app-text/pdfminer-20140328-r1
+++ b/metadata/md5-cache/app-text/pdfminer-20140328-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20140328.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=facb61716e61afd9694fa94f0ee2e28e
diff --git a/metadata/md5-cache/app-text/pdfminer-20191020 b/metadata/md5-cache/app-text/pdfminer-20191020
index a11c4dfb045b..7a6a810725ca 100644
--- a/metadata/md5-cache/app-text/pdfminer-20191020
+++ b/metadata/md5-cache/app-text/pdfminer-20191020
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20191020.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ac1891fa85c221f564eaa581bfa9b2d2
diff --git a/metadata/md5-cache/app-text/pelican-3.7.1 b/metadata/md5-cache/app-text/pelican-3.7.1
index a4890760c052..509caee931fa 100644
--- a/metadata/md5-cache/app-text/pelican-3.7.1
+++ b/metadata/md5-cache/app-text/pelican-3.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/3.7.1.tar.gz -> pelican-3.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f0a847a0347088b1790d656b8fb7ad2
diff --git a/metadata/md5-cache/app-text/pelican-4.0.0 b/metadata/md5-cache/app-text/pelican-4.0.0
index dbe25d8ca981..007cd828294b 100644
--- a/metadata/md5-cache/app-text/pelican-4.0.0
+++ b/metadata/md5-cache/app-text/pelican-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.0.0.tar.gz -> pelican-4.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f32d6c03e52b2b60e1e18db63adbedc
diff --git a/metadata/md5-cache/app-text/pelican-4.0.1 b/metadata/md5-cache/app-text/pelican-4.0.1
index 3fd4c1e74f83..d95b41585a67 100644
--- a/metadata/md5-cache/app-text/pelican-4.0.1
+++ b/metadata/md5-cache/app-text/pelican-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.0.1.tar.gz -> pelican-4.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c3909cb3c87de95a773ec89f259f7aba
diff --git a/metadata/md5-cache/app-text/pelican-4.1.2 b/metadata/md5-cache/app-text/pelican-4.1.2
index f55042186912..b42291954b4f 100644
--- a/metadata/md5-cache/app-text/pelican-4.1.2
+++ b/metadata/md5-cache/app-text/pelican-4.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.1.2.tar.gz -> pelican-4.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c3909cb3c87de95a773ec89f259f7aba
diff --git a/metadata/md5-cache/app-text/pelican-4.2.0 b/metadata/md5-cache/app-text/pelican-4.2.0
index 8dc47dd38161..0f79b2062596 100644
--- a/metadata/md5-cache/app-text/pelican-4.2.0
+++ b/metadata/md5-cache/app-text/pelican-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.2.0.tar.gz -> pelican-4.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1856b971700a3b57942f40ea1f563c0f
diff --git a/metadata/md5-cache/app-text/pelican-9999 b/metadata/md5-cache/app-text/pelican-9999
index 9471d39d2a32..c68c0a4ea338 100644
--- a/metadata/md5-cache/app-text/pelican-9999
+++ b/metadata/md5-cache/app-text/pelican-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e49811ec4997d178e5db0dab7849d038
diff --git a/metadata/md5-cache/app-text/pybookreader-0.5.0-r1 b/metadata/md5-cache/app-text/pybookreader-0.5.0-r1
index 3a5a2018c457..2f0c15f1a460 100644
--- a/metadata/md5-cache/app-text/pybookreader-0.5.0-r1
+++ b/metadata/md5-cache/app-text/pybookreader-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pybookreader/PyBookReader-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad0cc85134f542c95594c827f66201e7
diff --git a/metadata/md5-cache/app-text/pylize-1.3b-r1 b/metadata/md5-cache/app-text/pylize-1.3b-r1
deleted file mode 100644
index 359efd449e6c..000000000000
--- a/metadata/md5-cache/app-text/pylize-1.3b-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/empy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Python HTML Slideshow Generator using HTML and CSS
-EAPI=5
-HOMEPAGE=http://www.chrisarndt.de/en/software/pylize/
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-python/empy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.chrisarndt.de/en/software/pylize/download/pylize-1.3b.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08e39eb9df9fb921d2aaf6d0a642e051
diff --git a/metadata/md5-cache/app-text/pylize-1.3b-r2 b/metadata/md5-cache/app-text/pylize-1.3b-r2
new file mode 100644
index 000000000000..fed07518ce2d
--- /dev/null
+++ b/metadata/md5-cache/app-text/pylize-1.3b-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( dev-python/empy[python_targets_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=Python HTML Slideshow Generator using HTML and CSS
+EAPI=5
+HOMEPAGE=http://www.chrisarndt.de/en/software/pylize/
+IUSE=doc +python_single_target_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( dev-python/empy[python_targets_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://www.chrisarndt.de/en/software/pylize/download/pylize-1.3b.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=72195cd1a161641ab5ebd6f0228bd441
diff --git a/metadata/md5-cache/app-text/pytextile-2.3.3 b/metadata/md5-cache/app-text/pytextile-2.3.3
index 69940b0501d0..56a80241f762 100644
--- a/metadata/md5-cache/app-text/pytextile-2.3.3
+++ b/metadata/md5-cache/app-text/pytextile-2.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/2.3.3.tar.gz -> pytextile-2.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4642a8c6fd062b264844c9c30645fbe4
diff --git a/metadata/md5-cache/app-text/pytextile-3.0.3 b/metadata/md5-cache/app-text/pytextile-3.0.3
index 052a3de0b6f7..c3458ed8d98f 100644
--- a/metadata/md5-cache/app-text/pytextile-3.0.3
+++ b/metadata/md5-cache/app-text/pytextile-3.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/3.0.3.tar.gz -> pytextile-3.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2952f7fdd59bb6c7eb5a30f450b9f3d8
diff --git a/metadata/md5-cache/app-text/qpdf-9.1.1-r1 b/metadata/md5-cache/app-text/qpdf-9.1.1-r1
new file mode 100644
index 000000000000..538b3bafc105
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdf-9.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0= test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
+DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
+EAPI=7
+HOMEPAGE=http://qpdf.sourceforge.net/
+IUSE=doc examples static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+LICENSE=|| ( Apache-2.0 Artistic-2 )
+RDEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0=
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=mirror://sourceforge/qpdf/qpdf-9.1.1.tar.gz
+_md5_=0ec00cdfbcdb233f9a1b5616e0364127
diff --git a/metadata/md5-cache/app-text/queequeg-0.91-r2 b/metadata/md5-cache/app-text/queequeg-0.91-r2
index fa54958e2075..8955fab918f9 100644
--- a/metadata/md5-cache/app-text/queequeg-0.91-r2
+++ b/metadata/md5-cache/app-text/queequeg-0.91-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A checker for English grammar, for people who are not native English
 EAPI=6
 HOMEPAGE=http://queequeg.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-dicts/wordnet
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/queequeg/queequeg-0.91.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8296002c637e83456b70f887e5f67aa9
diff --git a/metadata/md5-cache/app-text/referencer-1.2.2-r1 b/metadata/md5-cache/app-text/referencer-1.2.2-r1
index 6dff6731f98a..514d57a6f6c9 100644
--- a/metadata/md5-cache/app-text/referencer-1.2.2-r1
+++ b/metadata/md5-cache/app-text/referencer-1.2.2-r1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Application to organise documents or references, and to generate BibTeX files
 EAPI=6
 HOMEPAGE=https://launchpad.net/referencer
-IUSE=test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/poppler-0.12.3-r3[cairo] >=dev-cpp/gtkmm-2.8:2.4 >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4:=
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/referencer/1./1.2.2/+download/referencer-1.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc9178371a6aa93f6a9139626409dee0
diff --git a/metadata/md5-cache/app-text/restview-2.9.2 b/metadata/md5-cache/app-text/restview-2.9.2
index a44f96c19caa..dc25a2017dfd 100644
--- a/metadata/md5-cache/app-text/restview-2.9.2
+++ b/metadata/md5-cache/app-text/restview-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/restview/restview-2.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91a81e29b0319ff8880c56720bd60b83
diff --git a/metadata/md5-cache/app-text/rpl-1.5.5-r1 b/metadata/md5-cache/app-text/rpl-1.5.5-r1
index f4a939ba0d5b..7a4daee8dbfb 100644
--- a/metadata/md5-cache/app-text/rpl-1.5.5-r1
+++ b/metadata/md5-cache/app-text/rpl-1.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rpl/rpl-1.5.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38ea701415ced81ad9b831f8827873a3
diff --git a/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15 b/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15
index f97fe143bb8c..7155daa960df 100644
--- a/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15
+++ b/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Python interface to SGML software in a DocBook/OpenJade env
 EAPI=7
 HOMEPAGE=http://sgmltools-lite.sourceforge.net/
-IUSE=jadetex +python_targets_python2_7 +python_single_target_python2_7
+IUSE=jadetex +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/sgml-common app-text/docbook-sgml-dtd:3.1 app-text/docbook-dsssl-stylesheets app-text/openjade jadetex? ( app-text/jadetex ) || ( www-client/w3m www-client/lynx ) >=app-text/sgml-common-0.6.3-r7
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/sgmltools-lite/sgmltools-lite/3.0.3/sgmltools-lite-3.0.3.tar.gz https://downloads.sourceforge.net/project/sgmltools-lite/support%20files/0.0.1-1/nw-eps-icons-0.0.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c70f56ddcfbfe202529a4b573c7e2d98
diff --git a/metadata/md5-cache/app-text/sigil-0.9.16 b/metadata/md5-cache/app-text/sigil-0.9.16
deleted file mode 100644
index 6f365a2c8b30..000000000000
--- a/metadata/md5-cache/app-text/sigil-0.9.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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 >=dev-qt/qtxmlpatterns-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
-DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
-EAPI=7
-HOMEPAGE=https://sigil-ebook.com/
-IUSE=+plugins system-mathjax python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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 >=dev-qt/qtxmlpatterns-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/0.9.16.tar.gz -> sigil-0.9.16.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3320fed1d3f6e11d272b94e05e81d2ad
diff --git a/metadata/md5-cache/app-text/sigil-0.9.16-r1 b/metadata/md5-cache/app-text/sigil-0.9.16-r1
new file mode 100644
index 000000000000..b8cc6022c76e
--- /dev/null
+++ b/metadata/md5-cache/app-text/sigil-0.9.16-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=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 >=dev-qt/qtxmlpatterns-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
+DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
+EAPI=7
+HOMEPAGE=https://sigil-ebook.com/
+IUSE=+plugins system-mathjax python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ Apache-2.0
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=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 >=dev-qt/qtxmlpatterns-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/0.9.16.tar.gz -> sigil-0.9.16.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4fdb3cda75af5dc52fb3bc6b555069ed
diff --git a/metadata/md5-cache/app-text/sigil-0.9.18 b/metadata/md5-cache/app-text/sigil-0.9.18
index 2f18c28c9c6b..f78b3341a9da 100644
--- a/metadata/md5-cache/app-text/sigil-0.9.18
+++ b/metadata/md5-cache/app-text/sigil-0.9.18
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=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_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=7
 HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
-IUSE=+plugins system-mathjax python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+plugins system-mathjax python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=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_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/0.9.18.tar.gz -> sigil-0.9.18.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa40a0abb554a1045960899e52385923
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fd2e708ee2d1b3b36293b812cb14ce24
diff --git a/metadata/md5-cache/app-text/sigil-1.0.0 b/metadata/md5-cache/app-text/sigil-1.0.0
index cd367f76f289..5eeb3fd7ed58 100644
--- a/metadata/md5-cache/app-text/sigil-1.0.0
+++ b/metadata/md5-cache/app-text/sigil-1.0.0
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/pyth
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=7
 HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
-IUSE=+plugins system-mathjax python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+plugins system-mathjax python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ Apache-2.0
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/libpcre:3=[pcre16] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=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_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.0.0.tar.gz -> sigil-1.0.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=218e9e3e2df0b2e0453c7a928da4075e
diff --git a/metadata/md5-cache/app-text/silvercity-0.9.7-r1 b/metadata/md5-cache/app-text/silvercity-0.9.7-r1
index f6483dd52350..eb4d321f97b0 100644
--- a/metadata/md5-cache/app-text/silvercity-0.9.7-r1
+++ b/metadata/md5-cache/app-text/silvercity-0.9.7-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/silvercity/SilverCity-0.9.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bc738aebe819d573647523d05870edf
diff --git a/metadata/md5-cache/app-text/stardict-3.0.6-r3 b/metadata/md5-cache/app-text/stardict-3.0.6-r3
index dc6b08dc28cc..734c152afeb5 100644
--- a/metadata/md5-cache/app-text/stardict-3.0.6-r3
+++ b/metadata/md5-cache/app-text/stardict-3.0.6-r3
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.16:2 dev-libs/libsigc++:2= sys-libs/zlib:= x11-libs/gdk
 DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
 EAPI=6
 HOMEPAGE=http://stardict-4.sourceforge.net/
-IUSE=advertisement debug dictdotcn espeak examples +gucharmap +htmlparse man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse +python_targets_python2_7 +python_single_target_python2_7
+IUSE=advertisement debug dictdotcn espeak examples +gucharmap +htmlparse man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse +python_single_target_python2_7
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86
 LICENSE=CPL-1.0 GPL-3 LGPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 dev-libs/libsigc++:2= sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/pango gucharmap? ( gnome-extra/gucharmap:0= ) spell? ( >=app-text/enchant-1.2:0 ) tools? ( dev-db/mysql-connector-c dev-libs/libpcre:= dev-libs/libxml2:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ) espeak? ( >=app-accessibility/espeak-1.29 ) perl? ( dev-lang/perl )
-REQUIRED_USE=tools? ( python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) )
+REQUIRED_USE=tools? ( python? ( ^^ ( python_single_target_python2_7 ) ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict-4/stardict-3.0.6.tar.bz2 pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e9512706a4cc2c29a317f2f4a0e2779
diff --git a/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304 b/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304
index 5573aa88ebb6..219958eb037e 100644
--- a/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304
+++ b/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libsigc++:2= media-libs/libcanberra[gtk3]
 DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
 EAPI=6
 HOMEPAGE=http://stardict-4.sourceforge.net/ https://github.com/huzheng001/stardict-3
-IUSE=advertisement cal debug dictdotcn espeak examples flite fortune gucharmap +htmlparse info man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse youdaodict +python_targets_python2_7 +python_single_target_python2_7
+IUSE=advertisement cal debug dictdotcn espeak examples flite fortune gucharmap +htmlparse info man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse youdaodict +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=CPL-1.0 GPL-3 LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libsigc++:2= media-libs/libcanberra[gtk3] sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango espeak? ( >=app-accessibility/espeak-1.29 ) flite? ( app-accessibility/flite ) gucharmap? ( gnome-extra/gucharmap:2.90= ) spell? ( >=app-text/enchant-1.2:0 ) tools? ( dev-db/mysql-connector-c dev-libs/expat dev-libs/libpcre:= dev-libs/libxml2:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ) info? ( sys-apps/texinfo ) fortune? ( games-misc/fortune-mod ) perl? ( dev-lang/perl )
-REQUIRED_USE=tools? ( python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) )
+REQUIRED_USE=tools? ( python? ( ^^ ( python_single_target_python2_7 ) ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/stardict-4.0.0_pre20170304.tar.xz pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43d7e2b73040d7fc386cc6c27aa22bb4
diff --git a/metadata/md5-cache/app-text/texlive-core-2019-r4 b/metadata/md5-cache/app-text/texlive-core-2019-r4
index 2f71a018267b..812624701f5a 100644
--- a/metadata/md5-cache/app-text/texlive-core-2019-r4
+++ b/metadata/md5-cache/app-text/texlive-core-2019-r4
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.7 ) >=app-text/poppler-0.76.1:= >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/texlive-core-patches-2019-4.tar.xz mirror://gentoo/texlive-tlpdb-2019.tar.xz mirror://gentoo/texlive-module-tetex-2019.tar.xz mirror://gentoo/texlive-module-hyphen-base-2019.tar.xz mirror://gentoo/texlive-module-gsftopk-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra-2019.tar.xz mirror://gentoo/texlive-module-a2ping-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2019.tar.xz mirror://gentoo/texlive-module-arara-2019.tar.xz mirror://gentoo/texlive-module-asymptote-2019.tar.xz mirror://gentoo/texlive-module-bundledoc-2019.tar.xz mirror://gentoo/texlive-module-checklistings-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk-2019.tar.xz mirror://gentoo/texlive-module-ctanify-2019.tar.xz mirror://gentoo/texlive-module-ctanupload-2019.tar.xz mirror://gentoo/texlive-module-ctie-2019.tar.xz mirror://gentoo/texlive-module-cweb-2019.tar.xz mirror://gentoo/texlive-module-de-macro-2019.tar.xz mirror://gentoo/texlive-module-dtl-2019.tar.xz mirror://gentoo/texlive-module-dtxgen-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty-2019.tar.xz mirror://gentoo/texlive-module-dviasm-2019.tar.xz mirror://gentoo/texlive-module-dvicopy-2019.tar.xz mirror://gentoo/texlive-module-dvidvi-2019.tar.xz mirror://gentoo/texlive-module-dviljk-2019.tar.xz mirror://gentoo/texlive-module-dvipos-2019.tar.xz mirror://gentoo/texlive-module-findhyph-2019.tar.xz mirror://gentoo/texlive-module-fragmaster-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2019.tar.xz mirror://gentoo/texlive-module-hyphenex-2019.tar.xz mirror://gentoo/texlive-module-installfont-2019.tar.xz mirror://gentoo/texlive-module-lacheck-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize-2019.tar.xz mirror://gentoo/texlive-module-latex2man-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion-2019.tar.xz mirror://gentoo/texlive-module-latexpand-2019.tar.xz mirror://gentoo/texlive-module-latexindent-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2019.tar.xz mirror://gentoo/texlive-module-ltximg-2019.tar.xz mirror://gentoo/texlive-module-listings-ext-2019.tar.xz mirror://gentoo/texlive-module-make4ht-2019.tar.xz mirror://gentoo/texlive-module-match_parens-2019.tar.xz mirror://gentoo/texlive-module-mflua-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2019.tar.xz mirror://gentoo/texlive-module-patgen-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2019.tar.xz mirror://gentoo/texlive-module-pdftools-2019.tar.xz mirror://gentoo/texlive-module-pdfxup-2019.tar.xz mirror://gentoo/texlive-module-pfarrei-2019.tar.xz mirror://gentoo/texlive-module-pkfix-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2019.tar.xz mirror://gentoo/texlive-module-purifyeps-2019.tar.xz mirror://gentoo/texlive-module-seetexk-2019.tar.xz mirror://gentoo/texlive-module-srcredact-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx-2019.tar.xz mirror://gentoo/texlive-module-synctex-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook-2019.tar.xz mirror://gentoo/texlive-module-texcount-2019.tar.xz mirror://gentoo/texlive-module-texdef-2019.tar.xz mirror://gentoo/texlive-module-texdiff-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten-2019.tar.xz mirror://gentoo/texlive-module-texdoc-2019.tar.xz mirror://gentoo/texlive-module-texfot-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser-2019.tar.xz mirror://gentoo/texlive-module-texosquery-2019.tar.xz mirror://gentoo/texlive-module-texware-2019.tar.xz mirror://gentoo/texlive-module-tie-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2019.tar.xz mirror://gentoo/texlive-module-web-2019.tar.xz mirror://gentoo/texlive-module-collection-binextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2019.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2019.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2019.tar.xz mirror://gentoo/texlive-module-arara.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2019.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2019.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2019.tar.xz mirror://gentoo/texlive-module-ctie.doc-2019.tar.xz mirror://gentoo/texlive-module-cweb.doc-2019.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2019.tar.xz mirror://gentoo/texlive-module-dtl.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2019.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2019.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2019.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2019.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2019.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2019.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2019.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz mirror://gentoo/texlive-module-installfont.doc-2019.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2019.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2019.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2019.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2019.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2019.tar.xz mirror://gentoo/texlive-module-patgen.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2019.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2019.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2019.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2019.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2019.tar.xz mirror://gentoo/texlive-module-synctex.doc-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2019.tar.xz mirror://gentoo/texlive-module-texcount.doc-2019.tar.xz mirror://gentoo/texlive-module-texdef.doc-2019.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2019.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-texfot.doc-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2019.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2019.tar.xz mirror://gentoo/texlive-module-texware.doc-2019.tar.xz mirror://gentoo/texlive-module-tie.doc-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-web.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2019.tar.xz mirror://gentoo/texlive-module-arara.source-2019.tar.xz mirror://gentoo/texlive-module-checklistings.source-2019.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2019.tar.xz mirror://gentoo/texlive-module-pythontex.source-2019.tar.xz mirror://gentoo/texlive-module-texdef.source-2019.tar.xz mirror://gentoo/texlive-module-texosquery.source-2019.tar.xz )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6af03454666c62302d79544a9f17a552
diff --git a/metadata/md5-cache/app-text/texlive-core-2019-r7 b/metadata/md5-cache/app-text/texlive-core-2019-r8
index 0f3854283dc4..0cbfe2314991 100644
--- a/metadata/md5-cache/app-text/texlive-core-2019-r7
+++ b/metadata/md5-cache/app-text/texlive-core-2019-r8
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.7 ) >=app-text/poppler-0.76.1:= >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
-SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/texlive-core-patches-2019-7.tar.xz mirror://gentoo/texlive-tlpdb-2019.tar.xz mirror://gentoo/texlive-module-tetex-2019.tar.xz mirror://gentoo/texlive-module-hyphen-base-2019.tar.xz mirror://gentoo/texlive-module-gsftopk-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra-2019.tar.xz mirror://gentoo/texlive-module-a2ping-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2019.tar.xz mirror://gentoo/texlive-module-arara-2019.tar.xz mirror://gentoo/texlive-module-asymptote-2019.tar.xz mirror://gentoo/texlive-module-bundledoc-2019.tar.xz mirror://gentoo/texlive-module-checklistings-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk-2019.tar.xz mirror://gentoo/texlive-module-ctanify-2019.tar.xz mirror://gentoo/texlive-module-ctanupload-2019.tar.xz mirror://gentoo/texlive-module-ctie-2019.tar.xz mirror://gentoo/texlive-module-cweb-2019.tar.xz mirror://gentoo/texlive-module-de-macro-2019.tar.xz mirror://gentoo/texlive-module-dtl-2019.tar.xz mirror://gentoo/texlive-module-dtxgen-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty-2019.tar.xz mirror://gentoo/texlive-module-dviasm-2019.tar.xz mirror://gentoo/texlive-module-dvicopy-2019.tar.xz mirror://gentoo/texlive-module-dvidvi-2019.tar.xz mirror://gentoo/texlive-module-dviljk-2019.tar.xz mirror://gentoo/texlive-module-dvipos-2019.tar.xz mirror://gentoo/texlive-module-findhyph-2019.tar.xz mirror://gentoo/texlive-module-fragmaster-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2019.tar.xz mirror://gentoo/texlive-module-hyphenex-2019.tar.xz mirror://gentoo/texlive-module-installfont-2019.tar.xz mirror://gentoo/texlive-module-lacheck-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize-2019.tar.xz mirror://gentoo/texlive-module-latex2man-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion-2019.tar.xz mirror://gentoo/texlive-module-latexpand-2019.tar.xz mirror://gentoo/texlive-module-latexindent-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2019.tar.xz mirror://gentoo/texlive-module-ltximg-2019.tar.xz mirror://gentoo/texlive-module-listings-ext-2019.tar.xz mirror://gentoo/texlive-module-make4ht-2019.tar.xz mirror://gentoo/texlive-module-match_parens-2019.tar.xz mirror://gentoo/texlive-module-mflua-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2019.tar.xz mirror://gentoo/texlive-module-patgen-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2019.tar.xz mirror://gentoo/texlive-module-pdftools-2019.tar.xz mirror://gentoo/texlive-module-pdfxup-2019.tar.xz mirror://gentoo/texlive-module-pfarrei-2019.tar.xz mirror://gentoo/texlive-module-pkfix-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2019.tar.xz mirror://gentoo/texlive-module-purifyeps-2019.tar.xz mirror://gentoo/texlive-module-seetexk-2019.tar.xz mirror://gentoo/texlive-module-srcredact-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx-2019.tar.xz mirror://gentoo/texlive-module-synctex-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook-2019.tar.xz mirror://gentoo/texlive-module-texcount-2019.tar.xz mirror://gentoo/texlive-module-texdef-2019.tar.xz mirror://gentoo/texlive-module-texdiff-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten-2019.tar.xz mirror://gentoo/texlive-module-texdoc-2019.tar.xz mirror://gentoo/texlive-module-texfot-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser-2019.tar.xz mirror://gentoo/texlive-module-texosquery-2019.tar.xz mirror://gentoo/texlive-module-texware-2019.tar.xz mirror://gentoo/texlive-module-tie-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2019.tar.xz mirror://gentoo/texlive-module-web-2019.tar.xz mirror://gentoo/texlive-module-collection-binextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2019.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2019.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2019.tar.xz mirror://gentoo/texlive-module-arara.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2019.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2019.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2019.tar.xz mirror://gentoo/texlive-module-ctie.doc-2019.tar.xz mirror://gentoo/texlive-module-cweb.doc-2019.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2019.tar.xz mirror://gentoo/texlive-module-dtl.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2019.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2019.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2019.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2019.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2019.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2019.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2019.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz mirror://gentoo/texlive-module-installfont.doc-2019.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2019.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2019.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2019.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2019.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2019.tar.xz mirror://gentoo/texlive-module-patgen.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2019.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2019.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2019.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2019.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2019.tar.xz mirror://gentoo/texlive-module-synctex.doc-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2019.tar.xz mirror://gentoo/texlive-module-texcount.doc-2019.tar.xz mirror://gentoo/texlive-module-texdef.doc-2019.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2019.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-texfot.doc-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2019.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2019.tar.xz mirror://gentoo/texlive-module-texware.doc-2019.tar.xz mirror://gentoo/texlive-module-tie.doc-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-web.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2019.tar.xz mirror://gentoo/texlive-module-arara.source-2019.tar.xz mirror://gentoo/texlive-module-checklistings.source-2019.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2019.tar.xz mirror://gentoo/texlive-module-pythontex.source-2019.tar.xz mirror://gentoo/texlive-module-texdef.source-2019.tar.xz mirror://gentoo/texlive-module-texosquery.source-2019.tar.xz )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6f02aa2717c835f69f47c53393e753cc
+SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/texlive-core-patches-2019-8.tar.xz mirror://gentoo/texlive-tlpdb-2019.tar.xz mirror://gentoo/texlive-module-tetex-2019.tar.xz mirror://gentoo/texlive-module-hyphen-base-2019.tar.xz mirror://gentoo/texlive-module-gsftopk-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra-2019.tar.xz mirror://gentoo/texlive-module-a2ping-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2019.tar.xz mirror://gentoo/texlive-module-arara-2019.tar.xz mirror://gentoo/texlive-module-asymptote-2019.tar.xz mirror://gentoo/texlive-module-bundledoc-2019.tar.xz mirror://gentoo/texlive-module-checklistings-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk-2019.tar.xz mirror://gentoo/texlive-module-ctanify-2019.tar.xz mirror://gentoo/texlive-module-ctanupload-2019.tar.xz mirror://gentoo/texlive-module-ctie-2019.tar.xz mirror://gentoo/texlive-module-cweb-2019.tar.xz mirror://gentoo/texlive-module-de-macro-2019.tar.xz mirror://gentoo/texlive-module-dtl-2019.tar.xz mirror://gentoo/texlive-module-dtxgen-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty-2019.tar.xz mirror://gentoo/texlive-module-dviasm-2019.tar.xz mirror://gentoo/texlive-module-dvicopy-2019.tar.xz mirror://gentoo/texlive-module-dvidvi-2019.tar.xz mirror://gentoo/texlive-module-dviljk-2019.tar.xz mirror://gentoo/texlive-module-dvipos-2019.tar.xz mirror://gentoo/texlive-module-findhyph-2019.tar.xz mirror://gentoo/texlive-module-fragmaster-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2019.tar.xz mirror://gentoo/texlive-module-hyphenex-2019.tar.xz mirror://gentoo/texlive-module-installfont-2019.tar.xz mirror://gentoo/texlive-module-lacheck-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize-2019.tar.xz mirror://gentoo/texlive-module-latex2man-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion-2019.tar.xz mirror://gentoo/texlive-module-latexpand-2019.tar.xz mirror://gentoo/texlive-module-latexindent-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2019.tar.xz mirror://gentoo/texlive-module-ltximg-2019.tar.xz mirror://gentoo/texlive-module-listings-ext-2019.tar.xz mirror://gentoo/texlive-module-make4ht-2019.tar.xz mirror://gentoo/texlive-module-match_parens-2019.tar.xz mirror://gentoo/texlive-module-mflua-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2019.tar.xz mirror://gentoo/texlive-module-patgen-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2019.tar.xz mirror://gentoo/texlive-module-pdftools-2019.tar.xz mirror://gentoo/texlive-module-pdfxup-2019.tar.xz mirror://gentoo/texlive-module-pfarrei-2019.tar.xz mirror://gentoo/texlive-module-pkfix-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2019.tar.xz mirror://gentoo/texlive-module-purifyeps-2019.tar.xz mirror://gentoo/texlive-module-seetexk-2019.tar.xz mirror://gentoo/texlive-module-srcredact-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx-2019.tar.xz mirror://gentoo/texlive-module-synctex-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook-2019.tar.xz mirror://gentoo/texlive-module-texcount-2019.tar.xz mirror://gentoo/texlive-module-texdef-2019.tar.xz mirror://gentoo/texlive-module-texdiff-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten-2019.tar.xz mirror://gentoo/texlive-module-texdoc-2019.tar.xz mirror://gentoo/texlive-module-texfot-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser-2019.tar.xz mirror://gentoo/texlive-module-texosquery-2019.tar.xz mirror://gentoo/texlive-module-texware-2019.tar.xz mirror://gentoo/texlive-module-tie-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2019.tar.xz mirror://gentoo/texlive-module-web-2019.tar.xz mirror://gentoo/texlive-module-collection-binextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2019.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2019.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2019.tar.xz mirror://gentoo/texlive-module-arara.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2019.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2019.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2019.tar.xz mirror://gentoo/texlive-module-ctie.doc-2019.tar.xz mirror://gentoo/texlive-module-cweb.doc-2019.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2019.tar.xz mirror://gentoo/texlive-module-dtl.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2019.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2019.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2019.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2019.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2019.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2019.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2019.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz mirror://gentoo/texlive-module-installfont.doc-2019.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2019.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2019.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2019.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2019.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2019.tar.xz mirror://gentoo/texlive-module-patgen.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2019.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2019.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2019.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2019.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2019.tar.xz mirror://gentoo/texlive-module-synctex.doc-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2019.tar.xz mirror://gentoo/texlive-module-texcount.doc-2019.tar.xz mirror://gentoo/texlive-module-texdef.doc-2019.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2019.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-texfot.doc-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2019.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2019.tar.xz mirror://gentoo/texlive-module-texware.doc-2019.tar.xz mirror://gentoo/texlive-module-tie.doc-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-web.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2019.tar.xz mirror://gentoo/texlive-module-arara.source-2019.tar.xz mirror://gentoo/texlive-module-checklistings.source-2019.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2019.tar.xz mirror://gentoo/texlive-module-pythontex.source-2019.tar.xz mirror://gentoo/texlive-module-texdef.source-2019.tar.xz mirror://gentoo/texlive-module-texosquery.source-2019.tar.xz )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4076b97d18d8400dbe9d7aa119ff2891
diff --git a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410 b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410
index f066e04540fb..976a40ed1f3d 100644
--- a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410
+++ b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-lib
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5aabdfaf33de6d4ed7aebe4fd8d557ac
+_md5_=9b9752ab0da2d9259d983316a860bbb7
diff --git a/metadata/md5-cache/app-text/txt2tags-2.6-r1 b/metadata/md5-cache/app-text/txt2tags-2.6-r1
index 9cad4340eb7f..089bb4a855a2 100644
--- a/metadata/md5-cache/app-text/txt2tags-2.6-r1
+++ b/metadata/md5-cache/app-text/txt2tags-2.6-r1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] >=d
 DESCRIPTION=Generate marked up documents (HTML, etc.)from a plain text file with markup
 EAPI=5
 HOMEPAGE=https://txt2tags.org
-IUSE=emacs tk vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=emacs tk vim-syntax +python_single_target_python2_7
 KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) tk? ( dev-lang/tk ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) emacs? ( >=app-editors/emacs-23.1:* )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://txt2tags.googlecode.com/files/txt2tags-2.6.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d4eeab5f0c94eacb062372290b7ba135
diff --git a/metadata/md5-cache/app-text/txt2tags-3.3 b/metadata/md5-cache/app-text/txt2tags-3.3
index cad04cf1fcf9..06c901d39ed7 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.3
+++ b/metadata/md5-cache/app-text/txt2tags-3.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jendrikseipp/txt2tags/archive/3.3.tar.gz -> txt2tags-3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4c334a8d108f0f699858e68908988d1
diff --git a/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023 b/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023
new file mode 100644
index 000000000000..1b98c9460934
--- /dev/null
+++ b/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=virtual/libiconv
+DESCRIPTION=HTML to ASCII converter programmed to handle incorrect html
+EAPI=7
+HOMEPAGE=https://bhaak.net/vilistextum/
+IUSE=unicode
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/bhaak/vilistextum/tarball/f299bb5e5f661c345c4b85a3e8de9ad8615ad17a -> vilistextum-2.8.0.20191023.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e6a839b202dbf2649a5bce9ad66b8b22
diff --git a/metadata/md5-cache/app-text/wiki2beamer-0.10.0 b/metadata/md5-cache/app-text/wiki2beamer-0.10.0
index 3116b3c9cb4b..e890fdfd4429 100644
--- a/metadata/md5-cache/app-text/wiki2beamer-0.10.0
+++ b/metadata/md5-cache/app-text/wiki2beamer-0.10.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/unzip doc? ( dev-ruby/asciidoctor )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/unzip doc? ( dev-ruby/asciidoctor )
 DESCRIPTION=Tool to produce LaTeX Beamer code from wiki-like input
 EAPI=7
 HOMEPAGE=https://wiki2beamer.github.io/
-IUSE=doc +examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc +examples python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/wiki2beamer/wiki2beamer/archive/wiki2beamer-v0.10.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e7af31a0a6417d743b849536ecfe8e30
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f557b1d2efb472dd7b015c9149f7cd7b
diff --git a/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1 b/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
index 563a2aeeb592..1fc44fe0d36a 100644
--- a/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
+++ b/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-arch/unzip
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-arch/unzip
 DESCRIPTION=Tool to produce LaTeX Beamer code from wiki-like input
 EAPI=5
 HOMEPAGE=http://wiki2beamer.sourceforge.net/
-IUSE=+examples python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+examples +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 ) FDL-1.3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wiki2beamer/wiki2beamer-0.9.5.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e6e2daa573979707f85495e5c25946f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1cca9c94918c58d95a03033cb015d049
diff --git a/metadata/md5-cache/app-text/wscr-1.2-r1 b/metadata/md5-cache/app-text/wscr-1.2-r1
index e52f7c24f519..a093a5ae5b2b 100644
--- a/metadata/md5-cache/app-text/wscr-1.2-r1
+++ b/metadata/md5-cache/app-text/wscr-1.2-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Lightweight and Fast Anagram Solver
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=public-domain
 RDEPEND=sys-apps/miscfiles
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/wscr-1.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e10c8d20d44b6793c47dc10f53caea70
+_md5_=5ba9dfd5136755f91e9012820922c9a1
diff --git a/metadata/md5-cache/app-text/wscr-1.2-r2 b/metadata/md5-cache/app-text/wscr-1.2-r2
index 2a1a32e640fd..a9cf68b69ed6 100644
--- a/metadata/md5-cache/app-text/wscr-1.2-r2
+++ b/metadata/md5-cache/app-text/wscr-1.2-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Lightweight and Fast Anagram Solver
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~mips ~ppc ~x86
 LICENSE=public-domain
 RDEPEND=sys-apps/miscfiles
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/wscr-1.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=264958d4f0e928fa03e03a0ff07a3b2a
+_md5_=e29124030c8be8b4ee9ff29bd3155f50
diff --git a/metadata/md5-cache/app-text/xapers-0.8.2 b/metadata/md5-cache/app-text/xapers-0.8.2
index a552da66eea6..df1a93860233 100644
--- a/metadata/md5-cache/app-text/xapers-0.8.2
+++ b/metadata/md5-cache/app-text/xapers-0.8.2
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://finestructure.net/xapers/releases/xapers-0.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=646949f5d747fe6c1be4af4d85cb7194
diff --git a/metadata/md5-cache/app-text/xiphos-4.0.6a-r1 b/metadata/md5-cache/app-text/xiphos-4.0.6a-r1
deleted file mode 100644
index bff7b77c5757..000000000000
--- a/metadata/md5-cache/app-text/xiphos-4.0.6a-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.7.4 dev-libs/glib:2 dev-libs/libxml2:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/gnome-doc-utils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/rarian dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/intltool dev-util/glib-utils >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
-EAPI=6
-HOMEPAGE=http://xiphos.org/
-IUSE=dbus debug +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64
-LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.7.4 dev-libs/glib:2 dev-libs/libxml2:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.0.6a/xiphos-4.0.6a-20170820.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8714dbd10e90568cf5c0cb81723c386e
diff --git a/metadata/md5-cache/app-text/xiphos-4.0.6a-r2 b/metadata/md5-cache/app-text/xiphos-4.0.6a-r2
new file mode 100644
index 000000000000..303f87aea924
--- /dev/null
+++ b/metadata/md5-cache/app-text/xiphos-4.0.6a-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.7.4 dev-libs/glib:2 gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 python_single_target_python2_7? ( dev-libs/libxml2:2[python_targets_python2_7(-)] gnome-base/gconf[python_targets_python2_7(-)] ) dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/rarian dev-util/intltool dev-util/glib-utils >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext python_single_target_python2_7? ( app-text/gnome-doc-utils[python_targets_python2_7(-)] dev-libs/libxslt[python_targets_python2_7(-)] )
+DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
+EAPI=6
+HOMEPAGE=http://xiphos.org/
+IUSE=dbus debug +python_single_target_python2_7
+KEYWORDS=amd64
+LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.7.4 dev-libs/glib:2 gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 python_single_target_python2_7? ( dev-libs/libxml2:2[python_targets_python2_7(-)] gnome-base/gconf[python_targets_python2_7(-)] ) dbus? ( dev-libs/dbus-glib )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.0.6a/xiphos-4.0.6a-20170820.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0ff810c5bf135769ccf6761bad172541
diff --git a/metadata/md5-cache/app-text/xiphos-4.1.0-r1 b/metadata/md5-cache/app-text/xiphos-4.1.0-r1
deleted file mode 100644
index 96ae684011f4..000000000000
--- a/metadata/md5-cache/app-text/xiphos-4.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.8.0 dev-libs/glib:2 dev-libs/libxml2:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/gnome-doc-utils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/rarian dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/glib-utils dev-util/intltool >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
-EAPI=6
-HOMEPAGE=http://xiphos.org/
-IUSE=dbus debug +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.8.0 dev-libs/glib:2 dev-libs/libxml2:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.1.0/xiphos-4.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b2109e6cb15dd3e1053570f7dd0dd91
diff --git a/metadata/md5-cache/app-text/xiphos-4.1.0-r2 b/metadata/md5-cache/app-text/xiphos-4.1.0-r2
new file mode 100644
index 000000000000..fadbacda88e8
--- /dev/null
+++ b/metadata/md5-cache/app-text/xiphos-4.1.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.8.0 dev-libs/glib:2 gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 python_single_target_python2_7? ( dev-libs/libxml2:2[python_targets_python2_7(-)] gnome-base/gconf[python_targets_python2_7(-)] ) dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/rarian dev-util/glib-utils dev-util/intltool >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext python_single_target_python2_7? ( app-text/gnome-doc-utils[python_targets_python2_7(-)] dev-libs/libxslt[python_targets_python2_7(-)] )
+DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
+EAPI=6
+HOMEPAGE=http://xiphos.org/
+IUSE=dbus debug +python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.8.0 dev-libs/glib:2 gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 python_single_target_python2_7? ( dev-libs/libxml2:2[python_targets_python2_7(-)] gnome-base/gconf[python_targets_python2_7(-)] ) dbus? ( dev-libs/dbus-glib )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.1.0/xiphos-4.1.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=33b1f391fb4e7add337e152dd9f569a2
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.6 b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
index a18b8ad6b295..01002bbbe4d5 100644
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7.6
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3e4669ac21e251a705d0aa35b884dd28
diff --git a/metadata/md5-cache/app-text/xmldiff-1.1.1 b/metadata/md5-cache/app-text/xmldiff-1.1.1
index f6b981aca3cd..5d07fe80b28a 100644
--- a/metadata/md5-cache/app-text/xmldiff-1.1.1
+++ b/metadata/md5-cache/app-text/xmldiff-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future dev-python/lxml dev-python/six python_targets_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Shoobx/xmldiff/archive/1.1.1.tar.gz -> xmldiff-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82d010b7e6b8c7e82e2fec521ca0af91