gentoo resync : 07.10.2018

11 files changed, 22 insertions, 78 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 47e41c3deecc..e26eaf278ed8 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/cargo/Manifest b/virtual/cargo/Manifest
index 5515aba10acd..ad91b12535f7 100644
--- a/virtual/cargo/Manifest
+++ b/virtual/cargo/Manifest
@@ -1,4 +1,2 @@
-EBUILD cargo-1.25.0.ebuild 317 BLAKE2B 39596c36e8d49b47b33ad848a1d5a39e7dd555ffe69d2bb971852b410ecc3f86cd06cb3b65311600a337746ea6028e47424c509185eb3fa1757c6ee7a7993937 SHA512 0da3f8e2d3883f00c22953ad148a7312019a9af29ae7f8db7b4ef544af00fc68d8fb9bbf51c7e3f412c3b7ac61fb7569ec5d0d557bd4078c023a9244e60d6d51
-EBUILD cargo-1.28.0.ebuild 410 BLAKE2B 5d5bedd3d9c198cd8322ff6376294f88a6f3fd002d39a716b015d848e198d79879272cb730f035be1bfd5d7410dffb39bd147833ccd843f68f2afacb0c8a9bff SHA512 0a57a376867a408f3b24f3ed49cdfd5d4232ef623f0d9bb64ee0aca5bd0294ac36a1a28cb9bccfc2bca85bb50321f319ad4f6a72eac95d7cce8d592e617b3d52
-EBUILD cargo-1.29.1.ebuild 411 BLAKE2B 899395d81f0be64fa30bbcc216bcd9da6ff36830e89f2e57ed4132bf861bcefba4edc2e047e8b99ad38694bcf154c5fa03482c433aec6e40a30a850e24b0edb7 SHA512 330ecbb23d04521f0e066f70a61af5cae1529f43a57406de21abca3e3325a1696bc52fcab00bd94246c6ac400ee979b2ae216d7f20218ba4812d898eccd8f2e4
+EBUILD cargo-1.29.1.ebuild 406 BLAKE2B 95fcbb2f79bf6172755f87f8da1fd7068a9af9f4da1638907467216e5055481990ce6b9f10cde120cbb770344e538fc9dcfb0d2607360b9279ab2699464592e2 SHA512 2137c8e5524319bc8a21f27032c220a94b1bc2b181254f758b50f64cd25c5fb8610c78d7b2e1b91835dbabdbbab2a7563abac5566643e4bf4dbd7edcdd2b5ad7
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/cargo/cargo-1.25.0.ebuild b/virtual/cargo/cargo-1.25.0.ebuild
deleted file mode 100644
index ecc9d88e9198..000000000000
--- a/virtual/cargo/cargo-1.25.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Package manager for Rust"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND=""
-RDEPEND="|| (
-			=dev-lang/rust-${PV}*[extended]
-			=dev-util/cargo-0.26.0*
-		)"
diff --git a/virtual/cargo/cargo-1.28.0.ebuild b/virtual/cargo/cargo-1.28.0.ebuild
deleted file mode 100644
index 58d8d61dc885..000000000000
--- a/virtual/cargo/cargo-1.28.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Package manager for Rust"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0"
-
-RDEPEND="|| (
-			=dev-lang/rust-${PV}*[cargo]
-			=dev-lang/rust-bin-${PV}*[cargo]
-			=dev-util/cargo-${CARGO_DEPEND_VERSION}*
-		)"
diff --git a/virtual/cargo/cargo-1.29.1.ebuild b/virtual/cargo/cargo-1.29.1.ebuild
index e05ec4b31305..078515624fc5 100644
--- a/virtual/cargo/cargo-1.29.1.ebuild
+++ b/virtual/cargo/cargo-1.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0"
 
diff --git a/virtual/libffi/Manifest b/virtual/libffi/Manifest
index 2997c6b983a5..afb8b038b949 100644
--- a/virtual/libffi/Manifest
+++ b/virtual/libffi/Manifest
@@ -1,4 +1,5 @@
 EBUILD libffi-3.0.10.ebuild 600 BLAKE2B 0c6732b0db5ba900f94ae65aae06c196efe64d70fd895aaf58d666bb3d9a43e8a217a0fae75554568ec8c7f44e8fc3b97256d59873ab27c3c3fdae5b6019c9e4 SHA512 4816f4904e24674caea50e8a0ae621a70a53fe2635a91d6e1e3354f35b93d1cb94c0eb92c52b31ce8fe61a5df804e8ab7b2e1cc352f123bc19320b325189002e
 EBUILD libffi-3.0.11.ebuild 601 BLAKE2B be01a763073cd8874f1c3ec07dcd0b9058536f43cc3adf9da5f5e893bffabd37a99971ef52c3dbd6e70db62595fbfe306094a54ae1b616a4a45c291f80fc6e62 SHA512 6651fd8cec053b59ea1297945bc590da58f147fc4d6fed6dcb2b08f8fc9b6277dc5a4124293fea79c2ffdcf85efdd1b799701fd10f84d6e64ad1829445b84cd8
 EBUILD libffi-3.0.13-r1.ebuild 676 BLAKE2B 75a53a2cfe5ea7056c115adb95b980233fad60397c6e5b152b12d4214b0c4866181e48d8cb2ff4ca5868538cc3e46def2dc22c7b77f20b1d613844037c7b0b23 SHA512 e4a943c879412c740720192c9f659ff339226536fcc08b6df0d61845317cea622b24f0aa35071eae8ee8d507e44bad131aae3cd84a31aedb2ba916652d1a61df
+EBUILD libffi-3.3_rc0.ebuild 711 BLAKE2B 1d5305c18f507d75177cc9335f45132e7dc0067764ea683e9d01bb7fab8d2b9f43af64b3fdcfdc4d322645ebadc75cbd5f1fe36f2276b0757db94ecb1f355937 SHA512 b3460e3a4be37ec9e8d61c1921582d04de0d609241f9fe319566335e7c473c5fe4172f82b2eea60a2584edab9bcb04ce24d90111eb45a87bc989d811cc04d4a6
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/virtual/libffi/libffi-3.3_rc0.ebuild b/virtual/libffi/libffi-3.3_rc0.ebuild
new file mode 100644
index 000000000000..793387cd3e83
--- /dev/null
+++ b/virtual/libffi/libffi-3.3_rc0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The purpose of this ebuild is to provide quick fallback if and when we need to
+# switch back to internal copy of libffi from sys-devel/gcc.
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="A virtual for the Foreign Function Interface implementation"
+SLOT="0/7" # SONAME=libffi.so.7
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-libs/libffi-3.3_rc0:0/7[${MULTILIB_USEDEP}]"
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index bc2805f23d45..7f4b0e02b786 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,2 @@
-EBUILD rust-1.25.0.ebuild 315 BLAKE2B 9b8dc0635a5f3616c6aae90b9d9deebfda2e410f5bdf14560305d5e8f732e40e4f19dca8fb9ddd024403aba02269ea572f9534a66a79b01a63cdd8ae73711e7a SHA512 e1788d6d3877f1b04ce08ad35668673e3e52f2d1243fe167e1fb38c7dbb816f1c70cb778d839a96aea2130bc672e8026bf6f0f8608bb0ca328c14fce4157d96a
-EBUILD rust-1.28.0.ebuild 315 BLAKE2B d930ce879f0c355eb27e9499c4080f5044553b2fcd9432f28b4f29c6c4b53294d0c36c0d1ac589c245dafbc4f3ab0c69b456fa903db72837d2347fb5bbbd2b57 SHA512 0f9d7135ac168d829e90b66ee9dc7cb5969b8015fc5840a794f8bfea44180aacdaa716c3465b9c9bd8b833d66b7b0dab523a64ad9b545fee68931acda3f40089
-EBUILD rust-1.29.1.ebuild 316 BLAKE2B 42011cc292fb034308820d2daf342120b736834151bd05ccb12378551862a8fc5dba286401872c8af6a71741018cd5f709d0e7401cb92dcb295d36f23d91d28b SHA512 1083147da3fa25ba69f561eae232f1a60e8bb967205bb483dde126e3e3e69f83cbe02a8179d46849d3ef70aada88cb8d8ed1af4aa0ff1eacc558b141a28deb4e
+EBUILD rust-1.29.1.ebuild 311 BLAKE2B 2da16fc2517bdef6fba4c22e3c0be641ea877ad69a221f6e0f0fdfe0b102cf8375e747453fa911443387397638966554ce399076198b7da9900f146738242fa6 SHA512 8340b1479cdf26fa44497e26786389946870c73883f1aa2fb331eb5d3de7c44189e44384b08a9f36b8ece50037a323a8c2425b8834b56d105ace54e349e05a00
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.25.0.ebuild b/virtual/rust/rust-1.25.0.ebuild
deleted file mode 100644
index 7cc0e2e73fb0..000000000000
--- a/virtual/rust/rust-1.25.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.28.0.ebuild b/virtual/rust/rust-1.28.0.ebuild
deleted file mode 100644
index 529febdafe20..000000000000
--- a/virtual/rust/rust-1.28.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.29.1.ebuild b/virtual/rust/rust-1.29.1.ebuild
index fa78c78a3e78..f0bd8de3f2a8 100644
--- a/virtual/rust/rust-1.29.1.ebuild
+++ b/virtual/rust/rust-1.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND=""
 RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"