gentoo resync : 23.06.2018

7 files changed, 10 insertions, 18 deletions

diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 738b42079922..fa27743b164d 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/libc-1 b/metadata/md5-cache/virtual/libc-1
index 2cc532348aa7..0db588f36da6 100644
--- a/metadata/md5-cache/virtual/libc-1
+++ b/metadata/md5-cache/virtual/libc-1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the C library
 EAPI=5
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( || ( sys-libs/uclibc-ng sys-libs/uclibc ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-lib ) ) prefix-guest? ( elibc_Cygwin? ( sys-libs/cygwin-crypt ) )
+RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( || ( sys-libs/uclibc-ng sys-libs/uclibc ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-lib ) ) prefix-guest? ( elibc_Cygwin? ( sys-libs/cygwin-crypt ) !sys-libs/glibc !sys-libs/musl !sys-libs/uclibc-ng !sys-libs/uclibc !sys-freebsd/freebsd-lib )
 SLOT=0
-_md5_=805666296fe7729e1f69b2cf9cb84429
+_md5_=7926761f644c069e8ec524882a626ab6
diff --git a/metadata/md5-cache/virtual/opengl-7.0-r1 b/metadata/md5-cache/virtual/opengl-7.0-r1
index dea31dd0b413..c10d8e7f6471 100644
--- a/metadata/md5-cache/virtual/opengl-7.0-r1
+++ b/metadata/md5-cache/virtual/opengl-7.0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for OpenGL implementation
 EAPI=5
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-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-macos ~sparc-solaris ~x64-solaris ~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-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/opengl-apple )
 SLOT=0
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86a4e997f153de8f0229841864bff526
+_md5_=69fbafc65a38260ecc8d64e78fcf73f9
diff --git a/metadata/md5-cache/virtual/os-headers-0-r1 b/metadata/md5-cache/virtual/os-headers-0-r1
index d989736923e3..f801a89fb1cd 100644
--- a/metadata/md5-cache/virtual/os-headers-0-r1
+++ b/metadata/md5-cache/virtual/os-headers-0-r1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for operating system headers
 EAPI=6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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
-RDEPEND=!prefix-guest? ( || ( kernel_linux? ( sys-kernel/linux-headers:0 ) kernel_Winnt? ( elibc_mingw? ( dev-util/mingw64-runtime ) ) !prefix? ( sys-freebsd/freebsd-lib ) ) )
+RDEPEND=!prefix-guest? ( || ( kernel_linux? ( sys-kernel/linux-headers:0 ) kernel_Winnt? ( elibc_mingw? ( dev-util/mingw64-runtime ) ) !prefix? ( sys-freebsd/freebsd-lib ) ) ) prefix-guest? ( !sys-kernel/linux-headers !sys-freebsd/freebsd-lib )
 SLOT=0
-_md5_=e203631242038bf8627bdc9fa8fa8076
+_md5_=7dd57b56688e84bf4b35b9d149d37cf7
diff --git a/metadata/md5-cache/virtual/ruby-1 b/metadata/md5-cache/virtual/ruby-1
deleted file mode 100644
index 731c06394919..000000000000
--- a/metadata/md5-cache/virtual/ruby-1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual ebuild for ruby
-EAPI=5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( dev-lang/ruby:2.2 ) virtual/rubygems
-SLOT=0
-_eclasses_=ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c
-_md5_=35eb8fac62aa9a93496661a4eddbfbc5
diff --git a/metadata/md5-cache/virtual/texi2dvi-0-r1 b/metadata/md5-cache/virtual/texi2dvi-0-r1
index 05995b5c306e..2992b09a8df4 100644
--- a/metadata/md5-cache/virtual/texi2dvi-0-r1
+++ b/metadata/md5-cache/virtual/texi2dvi-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for texi2dvi (and texi2pdf)
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 RDEPEND=sys-apps/texinfo virtual/latex-base || ( dev-texlive/texlive-plaingeneric >=dev-texlive/texlive-plainextra-2013 )
 SLOT=0
-_md5_=1b80b7cb57a8d85ffceab058ac1dd0f9
+_md5_=fa06a3c1e756498921742b3264e759a0
diff --git a/metadata/md5-cache/virtual/w3m-0 b/metadata/md5-cache/virtual/w3m-0
index b437d74b7e4e..4f2c11cbea37 100644
--- a/metadata/md5-cache/virtual/w3m-0
+++ b/metadata/md5-cache/virtual/w3m-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the w3m web browser
 EAPI=6
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 RDEPEND=|| ( www-client/w3m www-client/w3mmee )
 SLOT=0
-_md5_=22ff6d7109ca8166f78fdf97e9ca6374
+_md5_=c9abf4fd5011d1494acbe4786e935c62