gentoo resync : 15.12.2017

13 files changed, 67 insertions, 44 deletions

diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 1acd53902705..f34a052fc0f6 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/aspell-0.60.7_rc1 b/metadata/md5-cache/app-text/aspell-0.60.7_rc1
index d400b0bd869c..5e6cbe94db48 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.7_rc1
+++ b/metadata/md5-cache/app-text/aspell-0.60.7_rc1
@@ -4,11 +4,11 @@ DESCRIPTION=A spell checker replacement for ispell
 EAPI=6
 HOMEPAGE=http://aspell.net/
 IUSE=nls unicode l10n_af linguas_af l10n_be linguas_be l10n_bg linguas_bg l10n_br linguas_br l10n_ca linguas_ca l10n_cs linguas_cs l10n_cy linguas_cy l10n_da linguas_da l10n_de linguas_de l10n_de-1901 linguas_de@1901 l10n_el linguas_el l10n_en linguas_en l10n_eo linguas_eo l10n_es linguas_es l10n_et linguas_et l10n_fi linguas_fi l10n_fo linguas_fo l10n_fr linguas_fr l10n_ga linguas_ga l10n_gl linguas_gl l10n_he linguas_he l10n_hr linguas_hr l10n_hu linguas_hu l10n_hy linguas_hy l10n_is linguas_is l10n_it linguas_it l10n_la linguas_la l10n_lt linguas_lt l10n_nl linguas_nl l10n_no linguas_no l10n_pl linguas_pl l10n_pt linguas_pt l10n_pt-BR linguas_pt_BR l10n_ro linguas_ro l10n_ru linguas_ru l10n_sk linguas_sk l10n_sl linguas_sl l10n_sr linguas_sr l10n_sv linguas_sv l10n_uk linguas_uk l10n_vi linguas_vi
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
 RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 SLOT=0
 SRC_URI=mirror://gnu-alpha/aspell/aspell-0.60.7-rc1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6a0a38dcf3401131848fff207281ccc3
+_md5_=180db5bba0650cb51a384d76251e8747
diff --git a/metadata/md5-cache/app-text/djvu-3.5.27 b/metadata/md5-cache/app-text/djvu-3.5.27
index a92ce7fa9e54..d5e8c2c9254f 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.27
+++ b/metadata/md5-cache/app-text/djvu-3.5.27
@@ -4,10 +4,10 @@ DESCRIPTION=DjVu viewers, encoders and utilities
 EAPI=5
 HOMEPAGE=http://djvu.sourceforge.net/
 IUSE=debug doc jpeg tiff xml
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.27.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1a7becb0f0397f4b32fc0e607532776c
+_md5_=4a517510660480830b0106b6916c6118
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.2.3 b/metadata/md5-cache/app-text/dvisvgm-2.2.3
new file mode 100644
index 000000000000..0b483ac7e146
--- /dev/null
+++ b/metadata/md5-cache/app-text/dvisvgm-2.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=virtual/tex-base app-text/ghostscript-gpl >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc dev-libs/libxslt virtual/pkgconfig test? ( dev-cpp/gtest )
+DESCRIPTION=Converts DVI files to SVG
+EAPI=6
+HOMEPAGE=http://dvisvgm.bplaced.net/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=virtual/tex-base app-text/ghostscript-gpl >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.2.3/dvisvgm-2.2.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=60395cbbc88ffe4ac07957a20343ca9b
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r4 b/metadata/md5-cache/app-text/fbreader-0.99.4-r4
new file mode 100644
index 000000000000..845d01f13d42
--- /dev/null
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl] virtual/pkgconfig
+DESCRIPTION=E-Book Reader. Supports many e-book formats
+EAPI=6
+HOMEPAGE=http://www.fbreader.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl]
+SLOT=0
+SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=117d238b7f4c3d7ce06b1ef56d38181e
diff --git a/metadata/md5-cache/app-text/kbibtex-0.8_pre20171110 b/metadata/md5-cache/app-text/kbibtex-0.8_pre20171110
index 31ab1acc16ce..f2a581d95598 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.8_pre20171110
+++ b/metadata/md5-cache/app-text/kbibtex-0.8_pre20171110
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) zotero? ( app-crypt/qca[qt5] dev-libs/qoauth:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) zotero? ( app-crypt/qca[qt5] dev-libs/qoauth:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/KBibTeX
 IUSE=webengine webkit zotero debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) zotero? ( app-crypt/qca[qt5] dev-libs/qoauth:5 ) !app-text/kbibtex:4 dev-tex/bibtex2html x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.37.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) zotero? ( app-crypt/qca[qt5] dev-libs/qoauth:5 ) !app-text/kbibtex:4 dev-tex/bibtex2html x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=?? ( webengine webkit )
 SLOT=5
 SRC_URI=https://github.com/KDE/kbibtex/archive/4ce7c51f163508f293c3fd39a716770cbb14ef7d.tar.gz -> kbibtex-0.8_pre20171110.tar.gz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	7e2bdf24c0bb1a55b08e9358c3abcab2	kde5-functions	2a200c67179369d3994b5df7155a4a35	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cbc7e9d34d26aff7608988e38c47870a
diff --git a/metadata/md5-cache/app-text/namazu-2.0.21 b/metadata/md5-cache/app-text/namazu-2.0.21
index 64c85c2f2f73..5868e97c6e2c 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.21
+++ b/metadata/md5-cache/app-text/namazu-2.0.21
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=dev-perl/File-MMagic-1.20 emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx ) nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-perl/File-MMagic emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Namazu is a full-text search engine
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.namazu.org/
-IUSE=emacs nls tk l10n_ja
+IUSE=emacs l10n_ja nls static-libs tk
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-perl/File-MMagic-1.20 emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
+RDEPEND=dev-perl/File-MMagic emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
 SLOT=0
 SRC_URI=http://www.namazu.org/stable/namazu-2.0.21.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7cb8bfbb3aac01785b12dbee1e4985d0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=b618afaebe92b7f8e53e5394b67356bb
diff --git a/metadata/md5-cache/app-text/namazu-2.0.22_p1 b/metadata/md5-cache/app-text/namazu-2.0.22_p1
deleted file mode 100644
index 0c0fef64fd9c..000000000000
--- a/metadata/md5-cache/app-text/namazu-2.0.22_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-perl/File-MMagic-1.20 emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Namazu is a full-text search engine
-EAPI=5
-HOMEPAGE=http://www.namazu.org/
-IUSE=emacs nls tk l10n_ja
-LICENSE=GPL-2
-RDEPEND=>=dev-perl/File-MMagic-1.20 emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
-SLOT=0
-SRC_URI=http://www.namazu.org/test/namazu-2.0.22pre1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=192deafdeff715d9f2fe1c93f64cf534
diff --git a/metadata/md5-cache/app-text/namazu-2.0.22_pre7 b/metadata/md5-cache/app-text/namazu-2.0.22_pre7
new file mode 100644
index 000000000000..4fc99e892256
--- /dev/null
+++ b/metadata/md5-cache/app-text/namazu-2.0.22_pre7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-perl/File-MMagic emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Namazu is a full-text search engine
+EAPI=6
+HOMEPAGE=http://www.namazu.org/
+IUSE=emacs l10n_ja nls static-libs tk
+LICENSE=GPL-2
+RDEPEND=dev-perl/File-MMagic emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
+SLOT=0
+SRC_URI=http://www.namazu.org/test/namazu-2.0.22pre7.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=c238522295de8ce1b6a7c978b329d7c7
diff --git a/metadata/md5-cache/app-text/poppler-0.57.0 b/metadata/md5-cache/app-text/poppler-0.57.0
deleted file mode 100644
index 2eccced5ddb6..000000000000
--- a/metadata/md5-cache/app-text/poppler-0.57.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
-RESTRICT=test
-SLOT=0/68
-SRC_URI=https://poppler.freedesktop.org/poppler-0.57.0.tar.xz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10c0f1a6c328b4d967f4e4cfb65978cc
diff --git a/metadata/md5-cache/app-text/poppler-0.57.0-r1 b/metadata/md5-cache/app-text/poppler-0.57.0-r1
index 6574eab9dc59..9245257645d8 100644
--- a/metadata/md5-cache/app-text/poppler-0.57.0-r1
+++ b/metadata/md5-cache/app-text/poppler-0.57.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
 SLOT=0/68
 SRC_URI=https://poppler.freedesktop.org/poppler-0.57.0.tar.xz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a59129b428bce453c322f4ad2c4d81f
+_md5_=176d22e4f4d015c14095184621d1c4d0
diff --git a/metadata/md5-cache/app-text/sablotron-1.0.3-r1 b/metadata/md5-cache/app-text/sablotron-1.0.3-r1
index 00d44d39a0f0..d63d64da43b9 100644
--- a/metadata/md5-cache/app-text/sablotron-1.0.3-r1
+++ b/metadata/md5-cache/app-text/sablotron-1.0.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An XSLT Parser in C++
 EAPI=6
 HOMEPAGE=http://www.gingerall.org/sablotron.html
 IUSE=perl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/expat-1.95.6-r1
 SLOT=0
 SRC_URI=http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=afa327574b07cb163fc18e52335dffd7
+_md5_=356d2ea38d69c67780b83364666daeb1
diff --git a/metadata/md5-cache/app-text/sgml-common-0.6.3-r6 b/metadata/md5-cache/app-text/sgml-common-0.6.3-r6
new file mode 100644
index 000000000000..a103f0b62ec8
--- /dev/null
+++ b/metadata/md5-cache/app-text/sgml-common-0.6.3-r6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=postinst postrm prepare prerm
+DESCRIPTION=Base ISO character entities and utilities for SGML
+EAPI=6
+HOMEPAGE=http://www.iso.org/standard/16387.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~floppym/dist/sgml-common/sgml-common-0.6.3-gentoo.tar.gz
+_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_md5_=17dbf6a922107611b6a343b44f0695f5