gentoo resync : 10.04.2018

8 files changed, 12 insertions, 21 deletions

diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index fa69a0e560ca..0a8659d1601c 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/elisp-manual-25.3 b/metadata/md5-cache/app-doc/elisp-manual-25.3
index e5c53f62702e..7e77eebfd383 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-25.3
+++ b/metadata/md5-cache/app-doc/elisp-manual-25.3
@@ -3,8 +3,8 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=The GNU Emacs Lisp Reference Manual
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/manual/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=FDL-1.3+
 SLOT=25
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/elisp-manual-25.3.tar.xz
-_md5_=8c30536de4629284a4b76c9f50430c22
+_md5_=ade9bea2844739cd04f0a152d9141900
diff --git a/metadata/md5-cache/app-doc/gimp-help-2.8.2 b/metadata/md5-cache/app-doc/gimp-help-2.8.2
index 3bf23884e468..72f80f787275 100644
--- a/metadata/md5-cache/app-doc/gimp-help-2.8.2
+++ b/metadata/md5-cache/app-doc/gimp-help-2.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure setup
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxslt sys-devel/gettext
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-libs/libxml2[python,python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-libs/libxslt sys-devel/gettext
 DESCRIPTION=GNU Image Manipulation Program help files
 EAPI=6
 HOMEPAGE=https://docs.gimp.org/
@@ -8,4 +8,4 @@ LICENSE=FDL-1.2
 SLOT=2
 SRC_URI=mirror://gimp/help/gimp-help-2.8.2.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3c9944deaaaa8a1fd5384e9a2b5ec1b4
+_md5_=47dce00fdbfe3643f7470bb00de0c7da
diff --git a/metadata/md5-cache/app-doc/jargon-4.4.7 b/metadata/md5-cache/app-doc/jargon-4.4.7
deleted file mode 100644
index fe819230357d..000000000000
--- a/metadata/md5-cache/app-doc/jargon-4.4.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A compendium of hacker slang illuminating many aspects of hackish tradition
-EAPI=0
-HOMEPAGE=http://www.catb.org/~esr/jargon
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/jargon/jargon-4.4.7.tar.gz
-_md5_=a54f0994c9c8561cbe402a956d28d21e
diff --git a/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1 b/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
index be71d07692bf..fd50cfd6b341 100644
--- a/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
+++ b/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
@@ -3,8 +3,8 @@ DEPEND=app-doc/doxygen >=dev-lang/perl-5
 DESCRIPTION=mkDoxy generates Doxygen-compatible HTML documentation for makefiles
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/mkdoxy/
-KEYWORDS=~alpha amd64 ~hppa ia64 ~ppc sparc x86
+KEYWORDS=~alpha amd64 ~hppa ia64 ppc sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/mkdoxy/mkdoxy-1.0.0.tar.gz
-_md5_=ee9b11eb1fcf90521f04926e9d241a6a
+_md5_=f7f210e28a551fcab46495b173dad0ca
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