16 files changed, 49 insertions, 35 deletions
diff --git a/metadata/md5-cache/app-doc/pms-5_p20120920 b/metadata/md5-cache/app-doc/pms-5_p20120920
index cf4c36ab1e1b..3bc44ff53ce2 100644
--- a/metadata/md5-cache/app-doc/pms-5_p20120920
+++ b/metadata/md5-cache/app-doc/pms-5_p20120920
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=!binary? ( dev-tex/leaflet dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) html? ( app-text/recode >=dev-tex/tex4ht-20090115_p0029 ) )
+DEPEND=!binary? ( dev-tex/leaflet dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience html? ( app-text/recode >=dev-tex/tex4ht-20090115_p0029 ) )
 DESCRIPTION=Gentoo Package Manager Specification
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification
@@ -8,4 +8,4 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~pp
 LICENSE=CC-BY-SA-3.0
 SLOT=20120920
 SRC_URI=!binary? ( https://dev.gentoo.org/~ulm/distfiles/pms-5.tar.xz ) binary? ( https://dev.gentoo.org/~ulm/distfiles/pms-5-prebuilt.tar.xz )
-_md5_=0c9e49ef888e9cc23dff606018a70a25
+_md5_=0bd0bd4eba6c83848446d7aabbc89907
diff --git a/metadata/md5-cache/app-doc/pms-6_p20170429 b/metadata/md5-cache/app-doc/pms-6_p20170429
index c0b8f01843a2..863710822c6e 100644
--- a/metadata/md5-cache/app-doc/pms-6_p20170429
+++ b/metadata/md5-cache/app-doc/pms-6_p20170429
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=!binary? ( dev-tex/leaflet dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) html? ( app-text/recode >=dev-tex/tex4ht-20090611_p1038-r5 ) )
+DEPEND=!binary? ( dev-tex/leaflet dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience html? ( app-text/recode >=dev-tex/tex4ht-20090611_p1038-r5 ) )
 DESCRIPTION=Gentoo Package Manager Specification
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification
@@ -8,4 +8,4 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~pp
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~ulm/distfiles/pms-6_p20170429.tar.xz ) binary? ( https://dev.gentoo.org/~ulm/distfiles/pms-6_p20170429-prebuilt.tar.xz )
-_md5_=190924aafa2f873c7f448eff8c029d78
+_md5_=d054939b39fb901953d207f711755ba5
diff --git a/metadata/md5-cache/app-doc/pms-9999 b/metadata/md5-cache/app-doc/pms-9999
index 2119a5b03f12..3b11f6902a61 100644
--- a/metadata/md5-cache/app-doc/pms-9999
+++ b/metadata/md5-cache/app-doc/pms-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-tex/leaflet dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) html? ( app-text/recode >=dev-tex/tex4ht-20090611_p1038-r5 ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-tex/leaflet dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience html? ( app-text/recode >=dev-tex/tex4ht-20090611_p1038-r5 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Gentoo Package Manager Specification (draft)
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification
@@ -7,4 +7,4 @@ IUSE=html twoside
 LICENSE=CC-BY-SA-3.0
 SLOT=live
 _eclasses_=git-r3	25b08efef07cea6bcd45b8c6dcce2782
-_md5_=0bf3687ab24798aa4bc3e0563357557a
+_md5_=accfb87c2c58bd37c13fc58c2194df4a
diff --git a/metadata/md5-cache/app-office/lyx-2.2.3-r4 b/metadata/md5-cache/app-office/lyx-2.2.3-r4
index fa14ae8220a4..a8e8915f473e 100644
--- a/metadata/md5-cache/app-office/lyx-2.2.3-r4
+++ b/metadata/md5-cache/app-office/lyx-2.2.3-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) l10n_he? ( dev-tex/culmus-latex ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) virtual/pkgconfig nls? ( sys-devel/gettext ) !qt5? ( dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtx11extras:5 ) >=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) l10n_he? ( dev-tex/culmus-latex ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) virtual/pkgconfig nls? ( sys-devel/gettext ) !qt5? ( dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtx11extras:5 ) >=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
 EAPI=6
 HOMEPAGE=https://www.lyx.org/
 IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he X python_targets_python2_7
 KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) l10n_he? ( dev-tex/culmus-latex ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) l10n_he? ( dev-tex/culmus-latex ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-2.2.3.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/lyx-2.2.3/lyx-2.2.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d41e681551c6a862dff5bac84d5d5687
+_md5_=59cf240a98c1c9e02078181009055bae
diff --git a/metadata/md5-cache/app-office/lyx-2.3.0 b/metadata/md5-cache/app-office/lyx-2.3.0
index b28aa6c2f44c..2e886b604fc8 100644
--- a/metadata/md5-cache/app-office/lyx-2.3.0
+++ b/metadata/md5-cache/app-office/lyx-2.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) virtual/pkgconfig dev-qt/qtconcurrent:5 nls? ( sys-devel/gettext ) >=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) virtual/pkgconfig dev-qt/qtconcurrent:5 nls? ( sys-devel/gettext ) >=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
 EAPI=6
 HOMEPAGE=https://www.lyx.org/
 IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he X python_targets_python2_7
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.0.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.0/lyx-2.3.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=329d4050ca5d6f9c0e4e25ef5d8febb0
+_md5_=8c4b4ee0a6016d9a6a643ad1bb5585b5
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 88e97260ae7d..0b4bb15a3812 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.10-r1
+++ b/metadata/md5-cache/app-text/dblatex-0.3.10-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra ) dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_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(-)]
+DEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_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(-)]
 DESCRIPTION=Transform DocBook using TeX macros
 EAPI=6
 HOMEPAGE=http://dblatex.sourceforge.net/
 IUSE=inkscape python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra ) dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_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(-)]
+RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dblatex/dblatex-0.3.10.tar.bz2
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37a673bc3b08abdd0660641bb2beb544
+_md5_=48149bbca12d4d1ba26d74b037f23d06
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.7 b/metadata/md5-cache/app-text/dblatex-0.3.7
index b7e02c5d4723..c9e47ab0ce4d 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.7
+++ b/metadata/md5-cache/app-text/dblatex-0.3.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra ) dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg python_targets_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(-)]
+DEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg python_targets_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(-)]
 DESCRIPTION=Transform DocBook using TeX macros
 EAPI=5
 HOMEPAGE=http://dblatex.sourceforge.net/
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
-RDEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra ) dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg python_targets_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(-)]
+RDEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dblatex/dblatex-0.3.7.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1da9ce58e77e950957501c27e63ecd52
+_md5_=c87ccdf82f2c4a9a0efa18f10b769639
diff --git a/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1 b/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
index 18313203db84..a9ddeaf34346 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-tex/polytable-0.8.2 || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra ) >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
+DEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
 DESCRIPTION=Preprocessor for typesetting Haskell sources with LaTeX
 EAPI=5
 HOMEPAGE=http://www.andres-loeh.de/lhs2tex/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-tex/polytable-0.8.2 || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra )
+RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/lhs2tex/1.18.1/lhs2tex-1.18.1.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5bdee638e77a48e3c5e5a942278e0112
+_md5_=6553a3d96b77663dd50b71a5372d2b1d
diff --git a/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1 b/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
index d212cd709e02..1b4df02672d2 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-tex/polytable-0.8.2 || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra ) >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
+DEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
 DESCRIPTION=Preprocessor for typesetting Haskell sources with LaTeX
 EAPI=5
 HOMEPAGE=http://www.andres-loeh.de/lhs2tex/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-tex/polytable-0.8.2 || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra )
+RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/lhs2tex/1.19/lhs2tex-1.19.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5bdee638e77a48e3c5e5a942278e0112
+_md5_=6553a3d96b77663dd50b71a5372d2b1d
diff --git a/metadata/md5-cache/dev-python/pyfeyn-1.0.0 b/metadata/md5-cache/dev-python/pyfeyn-1.0.0
index 80131eb82b14..f29ec3fe0e8a 100644
--- a/metadata/md5-cache/dev-python/pyfeyn-1.0.0
+++ b/metadata/md5-cache/dev-python/pyfeyn-1.0.0
@@ -6,9 +6,9 @@ HOMEPAGE=http://pyfeyn.hepforge.org/ https://pypi.python.org/pypi/pyfeyn/
 IUSE=latex python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-python/pyx-0.14[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] latex? ( || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=>=dev-python/pyx-0.14[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] latex? ( dev-texlive/texlive-mathscience ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfeyn/pyfeyn-1.0.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1db71a905f43491b6fa7b50216c24e15
+_md5_=03de4f988fd5c4855d06f86881260111
diff --git a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r1 b/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r1
index 26c82dbaabb0..7fc11bd3851d 100644
--- a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://pyfeyn.hepforge.org/ https://pypi.python.org/pypi/pyfeyn/
 IUSE=latex python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-python/pyx-0.14[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/pyx-0.14[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-mathscience ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfeyn/pyfeyn-1.0.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8de4b0c5cdbedd514a55c38191c691d
+_md5_=d11f3b8ff9ec182c8ddccf0f3af74bae
diff --git a/metadata/md5-cache/dev-python/setuptools-36.7.2 b/metadata/md5-cache/dev-python/setuptools-36.7.2
index 2ad55b65c641..005cdfb59e85 100644
--- a/metadata/md5-cache/dev-python/setuptools-36.7.2
+++ b/metadata/md5-cache/dev-python/setuptools-36.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-36.7.2.zip
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35deae6c133187431606567afd52be8f
+_md5_=579eab775e233318e95dac15340f320a
diff --git a/metadata/md5-cache/net-misc/felix-3.1.0 b/metadata/md5-cache/net-misc/felix-3.1.0
new file mode 100644
index 000000000000..ec90b5b46ae2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/felix-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
+EAPI=6
+HOMEPAGE=https://github.com/projectcalico/felix
+IUSE=+bird
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/ipset bird? ( net-misc/bird )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/projectcalico/felix/archive/3.1.0.tar.gz -> felix-3.1.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz -> github.com-go-ini-ini-5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz -> github.com-ipfs-go-log-4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/opentracing/opentracing-go/archive/328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz -> github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz -> github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz https://github.com/projectcalico/typha/archive/6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz -> github.com-projectcalico-typha-6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz -> github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz -> github.com-vishvananda-netlink-85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz -> github.com-golang-crypto-b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz -> github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz -> github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz https://github.com/kubernetes/apimachinery/archive/ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz -> github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=06c29a6e2b9bb2836867615fe4849d7c
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.6 b/metadata/md5-cache/sci-mathematics/coq-8.6
index 26cac51b52db..60263987bd7e 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.6
+++ b/metadata/md5-cache/sci-mathematics/coq-8.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) !camlp5? ( dev-ml/camlp4:= ) gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] ) dev-ml/findlib doc? ( media-libs/netpbm[png,zlib] virtual/latex-base dev-tex/hevea dev-tex/xcolor dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra ) dev-texlive/texlive-latexextra )
+DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) !camlp5? ( dev-ml/camlp4:= ) gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] ) dev-ml/findlib doc? ( media-libs/netpbm[png,zlib] virtual/latex-base dev-tex/hevea dev-tex/xcolor dev-texlive/texlive-pictures dev-texlive/texlive-mathscience dev-texlive/texlive-latexextra )
 DESCRIPTION=Proof assistant written in O'Caml
 EAPI=5
 HOMEPAGE=http://coq.inria.fr/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[
 SLOT=0
 SRC_URI=http://coq.inria.fr/distrib/V8.6/files/coq-8.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d48f297a3f7a903e539d056da4b4c466
+_md5_=ca587c806061d312cda9f1ca622e5f34
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.6.1 b/metadata/md5-cache/sci-mathematics/coq-8.6.1
index 16c2ad71042e..4496805136ae 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.6.1
+++ b/metadata/md5-cache/sci-mathematics/coq-8.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) !camlp5? ( dev-ml/camlp4:= ) gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] ) dev-ml/findlib doc? ( media-libs/netpbm[png,zlib] virtual/latex-base dev-tex/hevea dev-tex/xcolor dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra ) dev-texlive/texlive-latexextra )
+DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) !camlp5? ( dev-ml/camlp4:= ) gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] ) dev-ml/findlib doc? ( media-libs/netpbm[png,zlib] virtual/latex-base dev-tex/hevea dev-tex/xcolor dev-texlive/texlive-pictures dev-texlive/texlive-mathscience dev-texlive/texlive-latexextra )
 DESCRIPTION=Proof assistant written in O'Caml
 EAPI=5
 HOMEPAGE=http://coq.inria.fr/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[
 SLOT=0
 SRC_URI=http://coq.inria.fr/distrib/V8.6.1/files/coq-8.6.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc617a4dd13ef909d2a8451fe0c6f433
+_md5_=c8ae9161ac77e3422e05b93f4ded9a8d
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index da770cdf8e98..822cf3746050 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Apr 2018 19:32:07 +0000
+Mon, 09 Apr 2018 20:05:26 +0000