gentoo resync : 23.06.2018

14 files changed, 18 insertions, 37 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 19fb5ee9e5d2..36bfe447bf04 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/libc/Manifest b/virtual/libc/Manifest
index 1d19d7585a39..625d9f5e9920 100644
--- a/virtual/libc/Manifest
+++ b/virtual/libc/Manifest
@@ -1,3 +1,3 @@
 EBUILD libc-0.ebuild 709 BLAKE2B 5d42c2234523e4ca8e2cbf1699635d6f9830c524797a0484c3ad5c3726a3e7fd0af35d903fec0eb29466a22a46d6d2e682ce03edb67c69564729579db4d9931a SHA512 566c33b397731694cac6cebf0c1f47d39f3a735a634f98cc1d7094b38481dc9b3507d3c2e091255bf912a2994281d0819442c4731bbedbf18594522b1f108838
-EBUILD libc-1.ebuild 814 BLAKE2B 737bfc3e1ef5ea3d23a0ac59286ea836568946d039b0c6a36d5a69bab2a4e9a41964123c2b73b667efd310c7fe42ebfbcc5f2fa77e33550847d3b79e9df0293c SHA512 f9009d4e70845bc0e6ff5c0a9bcd701f09be90f56bccb5260bf134bb46ff548f574ef475ddd460a01a1d8bc6213d8e047035a373cc51704076f13d856e3263f2
+EBUILD libc-1.ebuild 917 BLAKE2B 3a43888e4941a0e6b3a5c97775b7e980b82a3f492c6179bc4821eeaec01210e1fce9758185d817e7d064e0da1288029f042a872d193b9278d6590d8323566caf SHA512 cd20a2152b8fa0be5191cbdae6dd4eeae1032b4b50e3052e551bf9fadc71dcbfa46b804b5937ddbc01e6a49db390f8cb21d5e04054e72cff74309225f06b9fa2
 MISC metadata.xml 464 BLAKE2B b702a3ffcfeda49ee9c7b760bde3f4b23e041f8ce69ab905a114f49b95b44f40a37d132487e7d31fdbd7295d863a0793b8fcf5995e525b37328c530d9f780b61 SHA512 e968aea2bddffd7f442c1a9a1ca8064e49f12382fd38ec6f60cb031851cc401bea7e52be437f4bb0f7b76ffbc3484cdc8134b63b5a8094b5589de85ade7c2310
diff --git a/virtual/libc/libc-1.ebuild b/virtual/libc/libc-1.ebuild
index 56aeb4ef0e63..08b8357cd59f 100644
--- a/virtual/libc/libc-1.ebuild
+++ b/virtual/libc/libc-1.ebuild
@@ -18,4 +18,9 @@ RDEPEND="!prefix-guest? (
 	)
 	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
 	)"
diff --git a/virtual/opengl/Manifest b/virtual/opengl/Manifest
index 86d3b1bd4487..2fe96e9c3aac 100644
--- a/virtual/opengl/Manifest
+++ b/virtual/opengl/Manifest
@@ -1,4 +1,4 @@
-EBUILD opengl-7.0-r1.ebuild 490 BLAKE2B cab769727599dc362a6d0b9bf0360558f81f5bf4921bb616ca81026dc5fbf3b971ee546ee7c0060e3f93d0336ff49fdd4944c9adfaa2d53952ac0f4c88b14d47 SHA512 a47420716541f2001db6ddf93f24051fc4a493e6bc89f2a10d7db71a746f3ddcfc78ea2a5077b88ce6ba6fe71cd354c5d7c6d9940fcf642a0a4daa551d688bf1
+EBUILD opengl-7.0-r1.ebuild 489 BLAKE2B c1761492eebfb52c119f8fd369cbbc7d90f7b5897c0f7da53686f3588e95ee036b5321d91536de69d1f311d788b5fbee43d514a73ecc38712bdc0ba41aa7c94e SHA512 efe15234a528f9ec833736bc3356635ffbb0e672207c21152c27cc52949d2bcfe3408ac64bccf66466d8077554119b216450a42c8b03168dbcebd9d338601dd9
 EBUILD opengl-7.0-r2.ebuild 526 BLAKE2B a863cf9d5877286a751eee740fd6236bbee1a47d526735c8321ffb25c41b30be030001dd3ad0ae1f4bd772d936a7cc3ff1f97f469af7d274cce8a89e82962b58 SHA512 d6f0c13c7a5bdb6c57b04e81fed04762d2aa826beca264ebc9c86ab31d1e9e5a90a41fc3b07a64b3f4a62f4474bdf641eb1ded48c474cde01c32995b6ec06e12
 EBUILD opengl-7.0.ebuild 422 BLAKE2B 851401ac65e6624d5ee1874484c3c0cf85859e935637f7252f4e50476914d72a75a79053472ef8c806621e768f8cbcc353e964f1165b318114724c7919375d28 SHA512 f0f2e45003fda195cb920ad74410793682ea6de3e73ec56fb75721e977a58953f9e2174ab16caf7a91a7a4faddbfd53582ec3515d5458090fa3eb0c79d7951a5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/virtual/opengl/opengl-7.0-r1.ebuild b/virtual/opengl/opengl-7.0-r1.ebuild
index caf06a13fe4b..c00a058a82e9 100644
--- a/virtual/opengl/opengl-7.0-r1.ebuild
+++ b/virtual/opengl/opengl-7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for OpenGL implementation"
 SLOT="0"
-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="
 	|| (
diff --git a/virtual/os-headers/Manifest b/virtual/os-headers/Manifest
index 5fc102a279d5..e59ee4b651bb 100644
--- a/virtual/os-headers/Manifest
+++ b/virtual/os-headers/Manifest
@@ -1,3 +1,3 @@
-EBUILD os-headers-0-r1.ebuild 757 BLAKE2B 0a2c922a58926a2ba12c9ccd0e35b1659fdab77b9bf1270041888276638db4b20b5954fb64a88d4eacf736d2e05acc860e9169e13900f3e37ab42d26a5b40e83 SHA512 a5862e3d1469d1aa28046a743305ce666b06c68449d06d5f9b7a856f41fcb6d8ab5ca58de23ca1bd1e17a31dd723f3c699ee9b5788e9400139f6123b7217ffa8
+EBUILD os-headers-0-r1.ebuild 832 BLAKE2B adf571952ab72b354c550cb97ba66c6b1e938b8a2c731dd8c47cb5d24432e030a3fe9386f15364ca39add57202b08812076469941f41bbe6492cb2878b1e7025 SHA512 70507ecf70e6d4b910e2df2722b1f65a39e2046d9b28ab9fd843c870189c081f655a82382fdf0da10fc6c74a58f256074f28cc23c24625eddddbe9fe437afe4d
 EBUILD os-headers-0.ebuild 649 BLAKE2B 5f28d3539549e8ae66ea967280175eccbcd62765a9dc58fd4824a752eb2f94fe0fc0060846b1c729d82e0e026e0061d3e5a5295b9c00bbaaad34590330843d7b SHA512 0d8a2399d57757013ad5b0c29156844712fd6bab5f69b0cc2e0d32e59b5ca8266f921ca1a5d8b9178d27cab207e604eb85e88c6251738aab6b04d9bb362b5c14
 MISC metadata.xml 356 BLAKE2B dfdbe957c17aa00de768e659f3406001e0ea7a2e20dcfdc3b737f591fa489737224ac04444060e2993e64981b039ebceff9c1083ed3ed1b9597c253cd2b3a872 SHA512 8771efbd53a5bce7d929691b5e0954eddbf9cdc0aa51922efef0ea7fdedb7aa1197def3a65c8603906b36ed7664f55ea05f99e874a37cd522d1ebf4753db2ed0
diff --git a/virtual/os-headers/os-headers-0-r1.ebuild b/virtual/os-headers/os-headers-0-r1.ebuild
index 1c5db1ee456a..be7781981271 100644
--- a/virtual/os-headers/os-headers-0-r1.ebuild
+++ b/virtual/os-headers/os-headers-0-r1.ebuild
@@ -18,4 +18,8 @@ RDEPEND="
 			)
 			!prefix? ( sys-freebsd/freebsd-lib )
 		)
+	)
+	prefix-guest? (
+		!sys-kernel/linux-headers
+		!sys-freebsd/freebsd-lib
 	)"
diff --git a/virtual/ruby/Manifest b/virtual/ruby/Manifest
deleted file mode 100644
index c96dce3ae9f2..000000000000
--- a/virtual/ruby/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD ruby-1.ebuild 757 BLAKE2B 3c7d02c05cd348dfd5e6ec1a1283ecf9b5369802e7a96e51803b1d2861e68f3e453d4e6ce240a57ac86cc4b07c6053ee2a3ee7bb50ae4a6ab88498fc7027aa1b SHA512 6830e1e0a88282072b8da88222cc568730ee07323f60f1f2b6181794e8e28d0a2f6253ef480534dd534e05be89e67a21f4056f0dc3d5b45cb1c6905632636ee0
-MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/virtual/ruby/metadata.xml b/virtual/ruby/metadata.xml
deleted file mode 100644
index 28ab0c15f206..000000000000
--- a/virtual/ruby/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/virtual/ruby/ruby-1.ebuild b/virtual/ruby/ruby-1.ebuild
deleted file mode 100644
index 8930ff92cac3..000000000000
--- a/virtual/ruby/ruby-1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22 rbx"
-
-inherit ruby-single
-
-DESCRIPTION="Virtual ebuild for ruby"
-SLOT="0"
-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="${RUBY_DEPS}"
-
-# The purpose of this ebuild is to provide a mechanism for end-users to
-# install the "best" ruby version on their system, based on current
-# stable versions and default RUBY_TARGETS. Other ebuilds should not
-# depend on this but instead use the ruby-single eclass.
diff --git a/virtual/texi2dvi/Manifest b/virtual/texi2dvi/Manifest
index e0c689af02a6..8e18433d3278 100644
--- a/virtual/texi2dvi/Manifest
+++ b/virtual/texi2dvi/Manifest
@@ -1,2 +1,2 @@
-EBUILD texi2dvi-0-r1.ebuild 492 BLAKE2B dca865cb4cd75e0ef2654140da793c910ce7d6628d5ad002d00af79f7e2fe1bf1d7876b5be50ca23729821bc1e21c45f15a12b92e831b7bcacbc9b362d3dbb9a SHA512 bbe730ea6de25443365bdb3701f239590d996884e270e367381964c0c5adae2de893db2617689766db6e3a1f6ce49f4015d7ce5b0ab9f28c747b25d2e5418f1c
+EBUILD texi2dvi-0-r1.ebuild 491 BLAKE2B 8e9af05e1a581ad8c0829a5e57c46b2013a14e148e48f671789c7596bfc2e2013a3bdc6810096161efb72e74eaedfb755482edb82296a2137a84cf25eaa9e171 SHA512 1c6dea28f7c67e381e808cbcabddfaaf115ff99c1d301edb837c0fed783cc2041ca5e3a393db15f324a5dd67e4b7562f109995654aa8bb3c55c258572de87baa
 MISC metadata.xml 359 BLAKE2B 2ea428cd832710fc7b9cc25393e15a874b726be6a1bbccc284bca872fc2ba2a80c2a72ca587dd43c440d4cd6650e13cd20f1fe7f3c0057fc06e7640811aad719 SHA512 aaec61de8f382de09053c63ffec9c01c4b5c1516edf005693274ce0434b1c104327d2ea57111f9a3a34e169a3e3e14886b44736cb3bf295f6b226da163a5ee90
diff --git a/virtual/texi2dvi/texi2dvi-0-r1.ebuild b/virtual/texi2dvi/texi2dvi-0-r1.ebuild
index 58c61cde7057..7713bf4d6644 100644
--- a/virtual/texi2dvi/texi2dvi-0-r1.ebuild
+++ b/virtual/texi2dvi/texi2dvi-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for texi2dvi (and texi2pdf)"
 SLOT="0"
-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
diff --git a/virtual/w3m/Manifest b/virtual/w3m/Manifest
index 6ab5684b2666..236160040522 100644
--- a/virtual/w3m/Manifest
+++ b/virtual/w3m/Manifest
@@ -1,2 +1,2 @@
-EBUILD w3m-0.ebuild 379 BLAKE2B 4b76a48fc6f2e3dd39950bfd8c0a8649ec9e6a17072194c0d9dd4540c05bb3e897a9fba7afada843acad764c88ed878775506e2d1755c7497439cd2c06407aba SHA512 edf865584bdc0cacd15f937bbd8850692ec41659e3b83f2f415ab7d04840f413befef31d56a17f48c602640650b134cfafaeecee84dc05f2084274df276d678f
+EBUILD w3m-0.ebuild 374 BLAKE2B d56b622453136cfdd51232e73c4ab99221df4bd2c92a105bd797075e7fe3e73ef20e30576d65fecafaea5b69fd1b05de3100199af74212e20cf403e22aa87d14 SHA512 8ca1056355a4f00a9bee8b85b7961eec49b2acafabe8d53a019df789660826f42009e38cb4e66bea69e37689dfaa85d31310a2f3545284b78a93dcc1625ea888
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/virtual/w3m/w3m-0.ebuild b/virtual/w3m/w3m-0.ebuild
index a2fb9e6329e3..00837ac67a44 100644
--- a/virtual/w3m/w3m-0.ebuild
+++ b/virtual/w3m/w3m-0.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual for the w3m web browser"
 SLOT="0"
-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