pay the repoman

30 files changed, 22 insertions, 78 deletions

diff --git a/README.md b/README.md
index 59d6661..0bcddbc 100644
--- a/README.md
+++ b/README.md
@@ -88,8 +88,6 @@ Exceptions are trivial changes and urgent changes (that fix something completely
 Currently we have these slots for `dev-lang/rust`:
 
 * `stable` -- stable release
-* `beta` -- beta version
-* `nightly` -- nightly version
 * `git` -- upstream git version
 
 Note, that source packages use a custom postfix for Rust libraries.
diff --git a/app-emacs/rust-mode/rust-mode-9999.ebuild b/app-emacs/rust-mode/rust-mode-9999.ebuild
index 2e41c0f..757b58b 100644
--- a/app-emacs/rust-mode/rust-mode-9999.ebuild
+++ b/app-emacs/rust-mode/rust-mode-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/app-shells/rust-zshcomp/rust-zshcomp-9999.ebuild b/app-shells/rust-zshcomp/rust-zshcomp-9999.ebuild
index 251492f..c1ebf20 100644
--- a/app-shells/rust-zshcomp/rust-zshcomp-9999.ebuild
+++ b/app-shells/rust-zshcomp/rust-zshcomp-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/app-vim/rust-mode/rust-mode-9999.ebuild b/app-vim/rust-mode/rust-mode-9999.ebuild
index e1ec360..773f044 100644
--- a/app-vim/rust-mode/rust-mode-9999.ebuild
+++ b/app-vim/rust-mode/rust-mode-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/app-vim/vim-racer/vim-racer-9999.ebuild b/app-vim/vim-racer/vim-racer-9999.ebuild
index c95247f..437f61a 100644
--- a/app-vim/vim-racer/vim-racer-9999.ebuild
+++ b/app-vim/vim-racer/vim-racer-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/dev-lang/rust-bin/rust-bin-99.ebuild b/dev-lang/rust-bin/rust-bin-99.ebuild
index ef1ac8b..0f9023f 100644
--- a/dev-lang/rust-bin/rust-bin-99.ebuild
+++ b/dev-lang/rust-bin/rust-bin-99.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/dev-lang/rust-bin/rust-bin-999.ebuild b/dev-lang/rust-bin/rust-bin-999.ebuild
index ebefdde..24adb17 100644
--- a/dev-lang/rust-bin/rust-bin-999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 861b6df..71a9bb0 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -10,13 +10,15 @@
     <name>Heather Cynede</name>
   </maintainer>
   <use>
-	<flag name="source">Install rust source to /user/share/rust-*/src.</flag>
     <flag name="clang">Use <pkg>sys-devel/clang</pkg> for building</flag>
+    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> as standard
     library when building with <pkg>sys-devel/clang</pkg></flag>
+    <flag name="llvm">Build with <pkg>sys-devel/llvm</pkg></flag>
     <flag name="system-llvm">Use system <pkg>sys-devel/llvm</pkg> in
     place of the bundled one</flag>
     <flag name="sanitize">Add LeakSanitizer, ThreadSanitizer, AddressSanitizer and MemorySanitizer support</flag>
+    <flag name="source">Install rust source to /user/share/rust-*/src.</flag>
     <flag name="tools">Enable a build of the and extended rust tool (RLS, analysis data, ...)</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/rust/rust-1.14.0-r1.ebuild b/dev-lang/rust/rust-1.14.0-r1.ebuild
index 1ee4e7f..c8139bb 100644
--- a/dev-lang/rust/rust-1.14.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.14.0-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -42,8 +41,8 @@ IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 
 RDEPEND="libcxx? ( sys-libs/libcxx )
-	system-llvm? ( >=sys-devel/llvm-3.8.1-r2
-		<sys-devel/llvm-3.10.0 )
+	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:=
+		<sys-devel/llvm-3.10.0:= )
 "
 
 DEPEND="${RDEPEND}
diff --git a/dev-lang/rust/rust-1.14.0.ebuild b/dev-lang/rust/rust-1.14.0.ebuild
index 29fa8d0..186e83d 100644
--- a/dev-lang/rust/rust-1.14.0.ebuild
+++ b/dev-lang/rust/rust-1.14.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -42,8 +41,8 @@ IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 
 RDEPEND="libcxx? ( sys-libs/libcxx )
-	system-llvm? ( >=sys-devel/llvm-3.8.1-r2
-		<sys-devel/llvm-3.10.0 )
+	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:=
+		<sys-devel/llvm-3.10.0:= )
 "
 
 DEPEND="${RDEPEND}
diff --git a/dev-lang/rust/rust-1.16.0.ebuild b/dev-lang/rust/rust-1.16.0.ebuild
index 66ae66a..1cdf534 100644
--- a/dev-lang/rust/rust-1.16.0.ebuild
+++ b/dev-lang/rust/rust-1.16.0.ebuild
@@ -40,9 +40,9 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 IUSE="clang debug doc libcxx system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 
-#TODO: put supported llvm version here
 RDEPEND="libcxx? ( sys-libs/libcxx )
-	system-llvm? ( sys-devel/llvm )
+	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:=
+		<sys-devel/llvm-3.10.0:= )
 "
 
 DEPEND="${RDEPEND}
diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild
index b42b09d..d74ab8b 100644
--- a/dev-lang/rust/rust-9999.ebuild
+++ b/dev-lang/rust/rust-9999.ebuild
@@ -25,8 +25,8 @@ REQUIRED_USE="libcxx? ( clang )"
 CDEPEND="libcxx? ( sys-libs/libcxx )
 	>=app-eselect/eselect-rust-0.3_pre20150425
 	!dev-lang/rust:0
-	system-llvm? ( >=sys-devel/llvm-3.8.1-r2
-			<sys-devel/llvm-5.0.0 )
+	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:=
+			<sys-devel/llvm-5.0.0:= )
 "
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
diff --git a/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild b/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild
index 31bdb22..ea1e372 100644
--- a/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild
+++ b/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -19,7 +18,7 @@ EGIT_REPO_URI="https://github.com/crabtw/rust-bindgen.git"
 
 DEPEND=">=virtual/rust-999
 	dev-util/cargo
-	>=sys-devel/clang-3.4.2-r100
+	>=sys-devel/clang-3.4.2-r100:*
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-util/SolidOak/SolidOak-9999.ebuild b/dev-util/SolidOak/SolidOak-9999.ebuild
index 50131a4..f947130 100644
--- a/dev-util/SolidOak/SolidOak-9999.ebuild
+++ b/dev-util/SolidOak/SolidOak-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/dev-util/cargo-bin/cargo-bin-99.ebuild b/dev-util/cargo-bin/cargo-bin-99.ebuild
index c1e0b6f..40d494f 100644
--- a/dev-util/cargo-bin/cargo-bin-99.ebuild
+++ b/dev-util/cargo-bin/cargo-bin-99.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -12,7 +11,7 @@ MY_SRC_URI="http://static.rust-lang.org/dist/rust-beta"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS=""
 
 IUSE="libressl"
 
diff --git a/dev-util/cargo-bin/cargo-bin-999.ebuild b/dev-util/cargo-bin/cargo-bin-999.ebuild
index ea05f42..c237c18 100644
--- a/dev-util/cargo-bin/cargo-bin-999.ebuild
+++ b/dev-util/cargo-bin/cargo-bin-999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -12,7 +11,7 @@ MY_SRC_URI="http://static.rust-lang.org/dist/rust-nightly"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS=""
 
 IUSE="libressl"
 
diff --git a/dev-util/cargo/cargo-0.14.0-r1.ebuild b/dev-util/cargo/cargo-0.14.0-r1.ebuild
index 4b45d73..88a9883 100644
--- a/dev-util/cargo/cargo-0.14.0-r1.ebuild
+++ b/dev-util/cargo/cargo-0.14.0-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/dev-util/cargo/cargo-9999.ebuild b/dev-util/cargo/cargo-9999.ebuild
index 0e68c33..33bee4f 100644
--- a/dev-util/cargo/cargo-9999.ebuild
+++ b/dev-util/cargo/cargo-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/dev-util/racer/racer-9999.ebuild b/dev-util/racer/racer-9999.ebuild
index 84d74ea..c18095f 100644
--- a/dev-util/racer/racer-9999.ebuild
+++ b/dev-util/racer/racer-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/dev-util/rusty-tags/rusty-tags-9999.ebuild b/dev-util/rusty-tags/rusty-tags-9999.ebuild
index be62dd4..2d19d90 100644
--- a/dev-util/rusty-tags/rusty-tags-9999.ebuild
+++ b/dev-util/rusty-tags/rusty-tags-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/virtual/rust/rust-1.14.0.ebuild b/virtual/rust/rust-1.14.0.ebuild
index b3f7b43..70acf9e 100644
--- a/virtual/rust/rust-1.14.0.ebuild
+++ b/virtual/rust/rust-1.14.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -13,7 +12,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
-RDEPEND="|| (
-	=dev-lang/rust-${PV}*
-	=dev-lang/rust-bin-${PV}*
-)"
+RDEPEND="=dev-lang/rust-${PV}*"
diff --git a/virtual/rust/rust-1.15.0.ebuild b/virtual/rust/rust-1.15.0.ebuild
index b3f7b43..c9b716b 100644
--- a/virtual/rust/rust-1.15.0.ebuild
+++ b/virtual/rust/rust-1.15.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -13,7 +12,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
-RDEPEND="|| (
-	=dev-lang/rust-${PV}*
-	=dev-lang/rust-bin-${PV}*
-)"
+RDEPEND="=dev-lang/rust-bin-${PV}*"
diff --git a/virtual/rust/rust-1.15.1.ebuild b/virtual/rust/rust-1.15.1.ebuild
index b3f7b43..f4dc2f8 100644
--- a/virtual/rust/rust-1.15.1.ebuild
+++ b/virtual/rust/rust-1.15.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/virtual/rust/rust-1.16.0.ebuild b/virtual/rust/rust-1.16.0.ebuild
index b3f7b43..70acf9e 100644
--- a/virtual/rust/rust-1.16.0.ebuild
+++ b/virtual/rust/rust-1.16.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -13,7 +12,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
-RDEPEND="|| (
-	=dev-lang/rust-${PV}*
-	=dev-lang/rust-bin-${PV}*
-)"
+RDEPEND="=dev-lang/rust-${PV}*"
diff --git a/virtual/rust/rust-1.17.0.ebuild b/virtual/rust/rust-1.17.0.ebuild
index 03c30ec..a613d2e 100644
--- a/virtual/rust/rust-1.17.0.ebuild
+++ b/virtual/rust/rust-1.17.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -15,7 +14,4 @@ SLOT="0"
 #KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
-RDEPEND="|| (
-	=dev-lang/rust-${PV}*
-	=dev-lang/rust-bin-${PV}*
-)"
+RDEPEND="=dev-lang/rust-${PV}*"
diff --git a/virtual/rust/rust-999.ebuild b/virtual/rust/rust-999.ebuild
deleted file mode 100644
index 0cd38de..0000000
--- a/virtual/rust/rust-999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="-*"
-
-DEPEND=""
-RDEPEND="
-	=dev-lang/rust-bin-${PV}*
-"
diff --git a/virtual/rust/rust-9999.ebuild b/virtual/rust/rust-9999.ebuild
index 9813ffd..e179385 100644
--- a/virtual/rust/rust-9999.ebuild
+++ b/virtual/rust/rust-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -10,9 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS=""
 
 DEPEND=""
-RDEPEND="|| (
-	=dev-lang/rust-${PV}*
-)"
+RDEPEND="=dev-lang/rust-${PV}*"
diff --git a/www-apps/geckodriver/geckodriver-0.10.0.ebuild b/www-apps/geckodriver/geckodriver-0.10.0.ebuild
index ec726fa..d6eaa87 100644
--- a/www-apps/geckodriver/geckodriver-0.10.0.ebuild
+++ b/www-apps/geckodriver/geckodriver-0.10.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -72,7 +71,7 @@ SRC_URI="https://github.com/mozilla/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS=""
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/www-apps/geckodriver/geckodriver-0.11.1.ebuild b/www-apps/geckodriver/geckodriver-0.11.1.ebuild
index 9675165..7621526 100644
--- a/www-apps/geckodriver/geckodriver-0.11.1.ebuild
+++ b/www-apps/geckodriver/geckodriver-0.11.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -85,7 +84,7 @@ SRC_URI="https://github.com/mozilla/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS=""
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/www-client/servo-bin/servo-bin-9999.ebuild b/www-client/servo-bin/servo-bin-9999.ebuild
index 91945c4..434ec1c 100644
--- a/www-client/servo-bin/servo-bin-9999.ebuild
+++ b/www-client/servo-bin/servo-bin-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="6"