gentoo resync : 29.05.2018

6 files changed, 17 insertions, 9 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 5f95bf783c27..6687a9fdd523 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/emacs/Manifest b/virtual/emacs/Manifest
index b61063748cff..b653326f4a27 100644
--- a/virtual/emacs/Manifest
+++ b/virtual/emacs/Manifest
@@ -1,4 +1,5 @@
 EBUILD emacs-23.ebuild 333 BLAKE2B f4bbb98fc948c7c5691dfa7472e669474780174e53dc7b2820908433962cfae609e4abe3cfc129e018a2610e3ef98cce9a40f856b3de23c3bb1ce834be633c8b SHA512 85671bfc6c089c854b4491e0020881b1006822f38e61203421fbed191f2182e72daa0a62317d4a11f000886652f30ecee4a4a13ace65113f346b6f7716e0fee6
 EBUILD emacs-24.ebuild 344 BLAKE2B 09e1fe3af2f4f31c0e1adc0b26c787dcb227baf9f6cf20506641f84bd646138f5f582a3c325de4e83bce91c18247e7352984a35fce39a74453f4d3473cac38b9 SHA512 7b96b59bffc17d70fcb247f79113daa9982648b30e80056c0187b50fe253f62cb91f42b8669ea9a8f3a7c04e2dc24134eddd2986e1cec9cc119802361aa7d030
-EBUILD emacs-25.ebuild 390 BLAKE2B a3477c005364d2f653b2a60cb82a27b2f31e702a838db60697bd91b1c6b50b679aa767a485c0629ab237631c7827d6df9685727458e60e883bf33e3b49901e4e SHA512 49a6072204df801db812cacbfff94220d1e8a13cb9085437199b6fabfc427d6b99fbb68467f5d36ac0470672b596162355f9cb77ff43efaeeb8a6edcc22a941f
+EBUILD emacs-25.ebuild 355 BLAKE2B e2d076e669c8ed66cba52b296cfc7e18bbd1456234913261dae965d1e3dba761d12ef1b0cf9c33e7cb710102b3681eb9d31dfebfcd86e0c227bcfd5694de5a43 SHA512 0eca3e1f54379057091624f952ff66a12a45654897be94365af2a1484a20d44d9f61d81b84539d20599ba24fef0bf9cafc0ac58d1f87c89fb56d53c00da3fdde
+EBUILD emacs-26.ebuild 403 BLAKE2B bfc520e50b7c2996768d45e3864a471d6e75e34e9f78377e123065d01aaaaecfbd610d512e71230d3dd81e1b7814f765285ae83fd84c5f16c96ee51d9b35754a SHA512 3813dbc0394186f91bb39d01b739070a4c7904bb42b969635744bd0f4edac69c58bdd90d7651843e4a820b2db7576ee44d4638c97b699d2054e2e1ba1a19dc31
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/virtual/emacs/emacs-25.ebuild b/virtual/emacs/emacs-25.ebuild
index d6f67f93629b..e5ae3b1d6485 100644
--- a/virtual/emacs/emacs-25.ebuild
+++ b/virtual/emacs/emacs-25.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for GNU Emacs"
 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"
+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"
 
-RDEPEND="|| ( app-editors/emacs:25
-		>=app-editors/emacs-vcs-25.1 )"
+RDEPEND="app-editors/emacs:25"
diff --git a/virtual/emacs/emacs-26.ebuild b/virtual/emacs/emacs-26.ebuild
new file mode 100644
index 000000000000..6621153aa507
--- /dev/null
+++ b/virtual/emacs/emacs-26.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for GNU Emacs"
+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"
+
+RDEPEND="|| ( app-editors/emacs:26 >=app-editors/emacs-vcs-26.1 )"
diff --git a/virtual/os-headers/Manifest b/virtual/os-headers/Manifest
index 368395d445a2..bdf39f797169 100644
--- a/virtual/os-headers/Manifest
+++ b/virtual/os-headers/Manifest
@@ -1,3 +1,3 @@
-EBUILD os-headers-0-r1.ebuild 753 BLAKE2B e1e9e1e36294b6c1f15cb1953e748829d6f05e0110d40a79beea3d1aa7b4107fe3d42a6d72b39293bf9b33810583267bff7ac3630151ce5a52e8f678c5c2abdd SHA512 ddfa5b1a8d89318e363171d35c303f2005a1620bc0c80d83e69bc6722f8cb70538cdf1f493a968113bcddcf573ad3febe41cf4731ed149255f61d07b2a2a7792
+EBUILD os-headers-0-r1.ebuild 729 BLAKE2B 8137887b197dde0ab61002b2bf2327178f1e47a420bb5b7c2a5db634ffc1a6944eada3db4df11a7160a641721557772d242d3833696d93dbb0cb82de87aeb4b8 SHA512 6ea5b897a99fb18385bf28efe0eb0a8e3411b060b50790b66acce1f1217eacf8cac92923a7cec0f72ff0a40ea03a810678696dbc141d8066d2c0b903da28b89f
 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 66f93241d411..2275804ebdbd 100644
--- a/virtual/os-headers/os-headers-0-r1.ebuild
+++ b/virtual/os-headers/os-headers-0-r1.ebuild
@@ -11,9 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 # sets a different SLOT for cross-building
 RDEPEND="
 	|| (
-		kernel_linux? (
-			!prefix-guest? ( sys-kernel/linux-headers:0 )
-		)
+		kernel_linux? ( sys-kernel/linux-headers:0 )
 		kernel_Winnt? (
 			elibc_mingw? ( dev-util/mingw64-runtime )
 		)