version bump, remove old versions, move all live stuff to the rust overlay

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xB2EFA1D4)

11 files changed, 67 insertions, 1100 deletions

diff --git a/dev-lang/rust/ChangeLog b/dev-lang/rust/ChangeLog
index 5b1955f8b38a..501e86fd541c 100644
--- a/dev-lang/rust/ChangeLog
+++ b/dev-lang/rust/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-lang/rust
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.10 2015/01/12 18:07:32 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.11 2015/02/10 11:35:29 jauhien Exp $
+
+*rust-1.0.0_alpha (10 Feb 2015)
+
+  10 Feb 2015; Jauhien Piatlicki <jauhien@gentoo.org>
+  +files/rust-0.13.0-no-ldconfig.patch, +rust-1.0.0_alpha.ebuild,
+  -files/50rust-mode-gentoo.el, -files/rust-0.11.0-libdir.patch,
+  -files/rust-0.11.0-stage0.patch, -files/rust-0.12.0-libdir.patch,
+  -files/rust-0.12.0-no-ldconfig.patch, -files/rust-0.12.0-stage0.patch,
+  -rust-0.11.0-r2.ebuild, -rust-0.12.0.ebuild, -rust-999-r1.ebuild,
+  -rust-9999-r3.ebuild:
+  version bump, remove old versions, move all live stuff to the rust overlay
 
   12 Jan 2015; William Hubbs <williamh@gentoo.org> metadata.xml:
   add myself as a maintainer
diff --git a/dev-lang/rust/files/50rust-mode-gentoo.el b/dev-lang/rust/files/50rust-mode-gentoo.el
deleted file mode 100644
index 92eb10d13ee2..000000000000
--- a/dev-lang/rust/files/50rust-mode-gentoo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-
-;;; rust-mode site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(require 'rust-mode)
diff --git a/dev-lang/rust/files/rust-0.11.0-libdir.patch b/dev-lang/rust/files/rust-0.11.0-libdir.patch
deleted file mode 100644
index f895e76903e9..000000000000
--- a/dev-lang/rust/files/rust-0.11.0-libdir.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-This patch adds proper support for --libdir configure option
-See https://github.com/rust-lang/rust/issues/11671 and
-https://github.com/rust-lang/rust/pull/16552
-
-diff -r -u rust-0.11.0.orig/configure rust-0.11.0/configure
---- rust-0.11.0.orig/configure
-+++ rust-0.11.0/configure
-@@ -453,6 +453,14 @@
- 
- valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
- 
-+case "$CFG_LIBDIR" in
-+    "$CFG_PREFIX"/*) CAT_INC=2;;
-+    "$CFG_PREFIX"*)  CAT_INC=1;;
-+    *)
-+        err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
-+esac
-+CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-+
- if [ $HELP -eq 1 ]
- then
-     echo
-@@ -838,6 +846,15 @@
- do
-     for t in $CFG_TARGET
-     do
-+        # host lib dir stage0
-+        make_dir $h/stage0/lib
-+
-+        # target bin dir stage0
-+        make_dir $h/stage0/lib/rustlib/$t/bin
-+
-+        # target lib dir stage0
-+        make_dir $h/stage0/lib/rustlib/$t/lib
-+
-         for i in 0 1 2 3
-         do
-             # host bin dir
-diff -r -u rust-0.11.0.orig/mk/main.mk rust-0.11.0/mk/main.mk
---- rust-0.11.0.orig/mk/main.mk
-+++ rust-0.11.0/mk/main.mk
-@@ -304,7 +304,11 @@
- # Destinations of artifacts for the host compiler
- HROOT$(1)_H_$(3) = $(3)/stage$(1)
- HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
-+ifeq ($(1),0)
-+HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
-+else
- HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
-+endif
- 
- # Destinations of artifacts for target architectures
- TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
-diff -r -u rust-0.11.0.orig/src/etc/install.sh rust-0.11.0/src/etc/install.sh
---- rust-0.11.0.orig/src/etc/install.sh
-+++ rust-0.11.0/src/etc/install.sh
-@@ -35,6 +35,13 @@
-     fi
- }
- 
-+need_cmd() {
-+    if command -v $1 >/dev/null 2>&1
-+    then msg "found $1"
-+    else err "need $1"
-+    fi
-+}
-+
- putvar() {
-     local T
-     eval T=\$$1
-@@ -198,7 +205,16 @@
-     ABSOLUTIFIED="${FILE_PATH}"
- }
- 
--CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
-+msg "looking for install programs"
-+need_cmd mkdir
-+need_cmd printf
-+need_cmd cut
-+need_cmd grep
-+need_cmd uname
-+need_cmd tr
-+need_cmd sed
-+
-+CFG_SRC_DIR="$(cd $(dirname $0) && pwd)"
- CFG_SELF="$0"
- CFG_ARGS="$@"
- 
-@@ -216,16 +232,85 @@
-     step_msg "processing $CFG_SELF args"
- fi
- 
-+# Check for mingw or cygwin in order to special case $CFG_LIBDIR_RELATIVE.
-+# This logic is duplicated from configure in order to get the correct libdir
-+# for Windows installs.
-+CFG_OSTYPE=$(uname -s)
-+
-+case $CFG_OSTYPE in
-+
-+    MINGW32*)
-+        CFG_OSTYPE=pc-mingw32
-+        ;;
-+
-+    MINGW64*)
-+        # msys2, MSYSTEM=MINGW64
-+        CFG_OSTYPE=w64-mingw32
-+        ;;
-+
-+# Thad's Cygwin identifers below
-+
-+#   Vista 32 bit
-+    CYGWIN_NT-6.0)
-+        CFG_OSTYPE=pc-mingw32
-+        ;;
-+
-+#   Vista 64 bit
-+    CYGWIN_NT-6.0-WOW64)
-+        CFG_OSTYPE=w64-mingw32
-+        ;;
-+
-+#   Win 7 32 bit
-+    CYGWIN_NT-6.1)
-+        CFG_OSTYPE=pc-mingw32
-+        ;;
-+
-+#   Win 7 64 bit
-+    CYGWIN_NT-6.1-WOW64)
-+        CFG_OSTYPE=w64-mingw32
-+        ;;
-+esac
-+
- OPTIONS=""
- BOOL_OPTIONS=""
- VAL_OPTIONS=""
- 
-+# On windows we just store the libraries in the bin directory because
-+# there's no rpath. This is where the build system itself puts libraries;
-+# --libdir is used to configure the installation directory.
-+# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
-+CFG_LIBDIR_RELATIVE=lib
-+if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
-+then
-+    CFG_LIBDIR_RELATIVE=bin
-+fi
-+
-+if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
-+then
-+    CFG_LD_PATH_VAR=PATH
-+    CFG_OLD_LD_PATH_VAR=$PATH
-+elif [ "$CFG_OSTYPE" = "Darwin" ]
-+then
-+    CFG_LD_PATH_VAR=DYLD_LIBRARY_PATH
-+    CFG_OLD_LD_PATH_VAR=$DYLD_LIBRARY_PATH
-+else
-+    CFG_LD_PATH_VAR=LD_LIBRARY_PATH
-+    CFG_OLD_LD_PATH_VAR=$LD_LIBRARY_PATH
-+fi
-+
- flag uninstall "only uninstall from the installation prefix"
- opt verify 1 "verify that the installed binaries run correctly"
- valopt prefix "/usr/local" "set installation prefix"
--# NB This isn't quite the same definition as in `configure`.
--# just using 'lib' instead of CFG_LIBDIR_RELATIVE
--valopt libdir "${CFG_PREFIX}/lib" "install libraries"
-+# NB This is exactly the same definition as in `configure`.
-+valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
-+case "$CFG_LIBDIR" in
-+    "$CFG_PREFIX"/*) CAT_INC=2;;
-+    "$CFG_PREFIX"*)  CAT_INC=1;;
-+    *)
-+        err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
-+esac
-+CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-+
- valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
- 
- if [ $HELP -eq 1 ]
-@@ -247,11 +332,13 @@
-     if [ -z "${CFG_UNINSTALL}" ]
-     then
-         msg "verifying platform can run binaries"
-+        export $CFG_LD_PATH_VAR="${CFG_SRC_DIR}/lib":$CFG_OLD_LD_PATH_VAR
-         "${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
-         if [ $? -ne 0 ]
-         then
-             err "can't execute rustc binary on this platform"
-         fi
-+        export $CFG_LD_PATH_VAR=$CFG_OLD_LD_PATH_VAR
-     fi
- fi
- 
-@@ -348,9 +435,9 @@
-     # Decide the destination of the file
-     FILE_INSTALL_PATH="${CFG_PREFIX}/$p"
- 
--    if echo "$p" | grep "^lib/" > /dev/null
-+    if echo "$p" | grep "^${CFG_LIBDIR_RELATIVE}/" > /dev/null
-     then
--        pp=`echo $p | sed 's/^lib\///'`
-+        pp=`echo $p | sed "s%^${CFG_LIBDIR_RELATIVE}/%%"`
-         FILE_INSTALL_PATH="${CFG_LIBDIR}/$pp"
-     fi
- 
-@@ -384,24 +471,36 @@
-     need_ok "failed to update manifest"
- 
- # The manifest lists all files to install
--done < "${CFG_SRC_DIR}/lib/rustlib/manifest.in"
-+done < "${CFG_SRC_DIR}/${CFG_LIBDIR_RELATIVE}/rustlib/manifest.in"
- 
- # Sanity check: can we run the installed binaries?
-+#
-+# As with the verification above, make sure the right LD_LIBRARY_PATH-equivalent
-+# is in place. Try first without this variable, and if that fails try again with
-+# the variable. If the second time tries, print a hopefully helpful message to
-+# add something to the appropriate environment variable.
- if [ -z "${CFG_DISABLE_VERIFY}" ]
- then
-     msg "verifying installed binaries are executable"
--    "${CFG_PREFIX}/bin/rustc" --version > /dev/null
-+    "${CFG_PREFIX}/bin/rustc" --version 2> /dev/null 1> /dev/null
-     if [ $? -ne 0 ]
-     then
--        ERR="can't execute installed rustc binary. "
--        ERR="${ERR}installation may be broken. "
--        ERR="${ERR}if this is expected then rerun install.sh with \`--disable-verify\` "
--        ERR="${ERR}or \`make install\` with \`--disable-verify-install\`"
--        err "${ERR}"
-+        export $CFG_LD_PATH_VAR="${CFG_PREFIX}/lib":$CFG_OLD_LD_PATH_VAR
-+        "${CFG_PREFIX}/bin/rustc" --version > /dev/null
-+        if [ $? -ne 0 ]
-+        then
-+            ERR="can't execute installed rustc binary. "
-+            ERR="${ERR}installation may be broken. "
-+            ERR="${ERR}if this is expected then rerun install.sh with \`--disable-verify\` "
-+            ERR="${ERR}or \`make install\` with \`--disable-verify-install\`"
-+            err "${ERR}"
-+        else
-+            echo
-+            echo "    Note: please ensure '${CFG_PREFIX}/lib' is added to ${CFG_LD_PATH_VAR}"
-+        fi
-     fi
- fi
- 
--
- echo
- echo "    Rust is ready to roll."
- echo
-diff -r -u rust-0.11.0.orig/src/librustc/metadata/filesearch.rs rust-0.11.0/src/librustc/metadata/filesearch.rs
---- rust-0.11.0.orig/src/librustc/metadata/filesearch.rs
-+++ rust-0.11.0/src/librustc/metadata/filesearch.rs
-@@ -243,10 +243,14 @@
-     // of the directory where librustc is located, rather than where the rustc
-     // binary is.
- 
--    if sysroot.join(primary_libdir_name()).join(rustlibdir()).exists() {
--        return primary_libdir_name();
--    } else {
--        return secondary_libdir_name();
-+    match option_env!("CFG_LIBDIR_RELATIVE") {
-+        None => if sysroot.join(primary_libdir_name()).join(rustlibdir()).exists() {
-+            return primary_libdir_name();
-+        } else {
-+            return secondary_libdir_name();
-+        },
-+
-+        Some(libdir) => return libdir.to_string()
-     }
- 
-     #[cfg(target_word_size = "64")]
diff --git a/dev-lang/rust/files/rust-0.11.0-stage0.patch b/dev-lang/rust/files/rust-0.11.0-stage0.patch
deleted file mode 100644
index 2416cefa9d3d..000000000000
--- a/dev-lang/rust/files/rust-0.11.0-stage0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/libcore/ops.rs
-+++ src/libcore/ops.rs
-@@ -570,12 +570,6 @@
- 
- macro_rules! shl_impl(
-     ($($t:ty)*) => ($(
--        #[cfg(stage0)]
--        impl Shl<$t, $t> for $t {
--            #[inline]
--            fn shl(&self, other: &$t) -> $t { (*self) << (*other) }
--        }
--        #[cfg(not(stage0), not(test))]
-         impl Shl<$t, $t> for $t {
-             #[inline]
-             fn shl(&self, other: &$t) -> $t {
-@@ -619,12 +613,6 @@
- 
- macro_rules! shr_impl(
-     ($($t:ty)*) => ($(
--        #[cfg(stage0, not(test))]
--        impl Shr<$t, $t> for $t {
--            #[inline]
--            fn shr(&self, other: &$t) -> $t { (*self) >> (*other) }
--        }
--        #[cfg(not(stage0), not(test))]
-         impl Shr<$t, $t> for $t {
-             #[inline]
-             fn shr(&self, other: &$t) -> $t { (*self) >> (*other as uint) }
diff --git a/dev-lang/rust/files/rust-0.12.0-libdir.patch b/dev-lang/rust/files/rust-0.12.0-libdir.patch
deleted file mode 100644
index 33098b87c921..000000000000
--- a/dev-lang/rust/files/rust-0.12.0-libdir.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-This patch adds proper support for --libdir configure option
-See https://github.com/rust-lang/rust/issues/11671 and
-https://github.com/rust-lang/rust/pull/16552
-
-diff --git a/configure b/configure
-index 636d502..fff67b6 100755
---- a/configure
-+++ b/configure
-@@ -459,6 +459,14 @@ fi
- 
- valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
- 
-+case "$CFG_LIBDIR" in
-+    "$CFG_PREFIX"/*) CAT_INC=2;;
-+    "$CFG_PREFIX"*)  CAT_INC=1;;
-+    *)
-+        err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
-+esac
-+CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-+
- if [ $HELP -eq 1 ]
- then
-     echo
-@@ -855,6 +863,15 @@ for h in $CFG_HOST
- do
-     for t in $CFG_TARGET
-     do
-+        # host lib dir stage0
-+        make_dir $h/stage0/lib
-+
-+        # target bin dir stage0
-+        make_dir $h/stage0/lib/rustlib/$t/bin
-+
-+        # target lib dir stage0
-+        make_dir $h/stage0/lib/rustlib/$t/lib
-+
-         for i in 0 1 2 3
-         do
-             # host bin dir
-diff --git a/mk/main.mk b/mk/main.mk
-index 2bdfc1b..bca5b3b 100644
---- a/mk/main.mk
-+++ b/mk/main.mk
-@@ -311,7 +311,11 @@ define SREQ
- # Destinations of artifacts for the host compiler
- HROOT$(1)_H_$(3) = $(3)/stage$(1)
- HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
-+ifeq ($(1),0)
-+HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
-+else
- HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
-+endif
- 
- # Destinations of artifacts for target architectures
- TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
-diff --git a/src/etc/install.sh b/src/etc/install.sh
-index c949743..1a472c6 100644
---- a/src/etc/install.sh
-+++ b/src/etc/install.sh
-@@ -301,9 +301,16 @@ fi
- flag uninstall "only uninstall from the installation prefix"
- opt verify 1 "verify that the installed binaries run correctly"
- valopt prefix "/usr/local" "set installation prefix"
--# NB This isn't quite the same definition as in `configure`.
--# just using 'lib' instead of CFG_LIBDIR_RELATIVE
-+# NB This is exactly the same definition as in `configure`.
- valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
-+case "$CFG_LIBDIR" in
-+    "$CFG_PREFIX"/*) CAT_INC=2;;
-+    "$CFG_PREFIX"*)  CAT_INC=1;;
-+    *)
-+        err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
-+esac
-+CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-+
- valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
- 
- if [ $HELP -eq 1 ]
-@@ -428,9 +435,9 @@ while read p; do
-     # Decide the destination of the file
-     FILE_INSTALL_PATH="${CFG_PREFIX}/$p"
- 
--    if echo "$p" | grep "^lib/" > /dev/null
-+    if echo "$p" | grep "^${CFG_LIBDIR_RELATIVE}/" > /dev/null
-     then
--        pp=`echo $p | sed 's/^lib\///'`
-+        pp=`echo $p | sed "s%^${CFG_LIBDIR_RELATIVE}/%%"`
-         FILE_INSTALL_PATH="${CFG_LIBDIR}/$pp"
-     fi
- 
-diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs
-index 99b98b6..f3e37ff 100644
---- a/src/librustc/metadata/filesearch.rs
-+++ b/src/librustc/metadata/filesearch.rs
-@@ -243,10 +243,14 @@ fn find_libdir(sysroot: &Path) -> String {
-     // of the directory where librustc is located, rather than where the rustc
-     // binary is.
- 
--    if sysroot.join(primary_libdir_name()).join(rustlibdir()).exists() {
--        return primary_libdir_name();
--    } else {
--        return secondary_libdir_name();
-+    match option_env!("CFG_LIBDIR_RELATIVE") {
-+        None => if sysroot.join(primary_libdir_name()).join(rustlibdir()).exists() {
-+            return primary_libdir_name();
-+        } else {
-+            return secondary_libdir_name();
-+        },
-+
-+        Some(libdir) => return libdir.to_string()
-     }
- 
-     #[cfg(target_word_size = "64")]
diff --git a/dev-lang/rust/files/rust-0.12.0-stage0.patch b/dev-lang/rust/files/rust-0.12.0-stage0.patch
deleted file mode 100644
index c1b20e405fc9..000000000000
--- a/dev-lang/rust/files/rust-0.12.0-stage0.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-diff -u -r rust-0.12.0.orig/src/libcollections/string.rs rust-0.12.0/src/libcollections/string.rs
---- rust-0.12.0.orig/src/libcollections/string.rs	2014-10-11 14:54:06.303867073 +0200
-+++ rust-0.12.0/src/libcollections/string.rs	2014-10-11 14:54:44.063471071 +0200
-@@ -928,29 +928,6 @@
-     }
- }
- 
--#[cfg(stage0)]
--impl ops::Slice<uint, str> for String {
--    #[inline]
--    fn as_slice_<'a>(&'a self) -> &'a str {
--        self.as_slice()
--    }
--
--    #[inline]
--    fn slice_from_<'a>(&'a self, from: &uint) -> &'a str {
--        self[][*from..]
--    }
--
--    #[inline]
--    fn slice_to_<'a>(&'a self, to: &uint) -> &'a str {
--        self[][..*to]
--    }
--
--    #[inline]
--    fn slice_<'a>(&'a self, from: &uint, to: &uint) -> &'a str {
--        self[][*from..*to]
--    }
--}
--#[cfg(not(stage0))]
- impl ops::Slice<uint, str> for String {
-     #[inline]
-     fn as_slice_<'a>(&'a self) -> &'a str {
-diff -u -r rust-0.12.0.orig/src/libcollections/trie.rs rust-0.12.0/src/libcollections/trie.rs
---- rust-0.12.0.orig/src/libcollections/trie.rs	2014-10-11 14:54:06.303867073 +0200
-+++ rust-0.12.0/src/libcollections/trie.rs	2014-10-11 14:55:10.623192469 +0200
-@@ -389,15 +389,6 @@
- 
- impl<T> TrieMap<T> {
-     // If `upper` is true then returns upper_bound else returns lower_bound.
--    #[cfg(stage0)]
--    #[inline]
--    fn bound<'a>(&'a self, key: uint, upper: bool) -> Entries<'a, T> {
--        bound!(Entries, self = self,
--               key = key, is_upper = upper,
--               slice_from = slice_from_, iter = iter,
--               mutability = )
--    }
--    #[cfg(not(stage0))]
-     #[inline]
-     fn bound<'a>(&'a self, key: uint, upper: bool) -> Entries<'a, T> {
-         bound!(Entries, self = self,
-@@ -440,15 +431,6 @@
-         self.bound(key, true)
-     }
-     // If `upper` is true then returns upper_bound else returns lower_bound.
--    #[cfg(stage0)]
--    #[inline]
--    fn bound_mut<'a>(&'a mut self, key: uint, upper: bool) -> MutEntries<'a, T> {
--        bound!(MutEntries, self = self,
--               key = key, is_upper = upper,
--               slice_from = slice_from_mut_, iter = iter_mut,
--               mutability = mut)
--    }
--    #[cfg(not(stage0))]
-     #[inline]
-     fn bound_mut<'a>(&'a mut self, key: uint, upper: bool) -> MutEntries<'a, T> {
-         bound!(MutEntries, self = self,
-diff -u -r rust-0.12.0.orig/src/libcollections/vec.rs rust-0.12.0/src/libcollections/vec.rs
---- rust-0.12.0.orig/src/libcollections/vec.rs	2014-10-11 14:54:06.303867073 +0200
-+++ rust-0.12.0/src/libcollections/vec.rs	2014-10-11 14:55:35.422932321 +0200
-@@ -460,28 +460,6 @@
-     }
- }*/
- 
--#[cfg(stage0)]
--impl<T> ops::Slice<uint, [T]> for Vec<T> {
--    #[inline]
--    fn as_slice_<'a>(&'a self) -> &'a [T] {
--        self.as_slice()
--    }
--
--    #[inline]
--    fn slice_from_<'a>(&'a self, start: &uint) -> &'a [T] {
--        self.as_slice().slice_from_(start)
--    }
--
--    #[inline]
--    fn slice_to_<'a>(&'a self, end: &uint) -> &'a [T] {
--        self.as_slice().slice_to_(end)
--    }
--    #[inline]
--    fn slice_<'a>(&'a self, start: &uint, end: &uint) -> &'a [T] {
--        self.as_slice().slice_(start, end)
--    }
--}
--#[cfg(not(stage0))]
- impl<T> ops::Slice<uint, [T]> for Vec<T> {
-     #[inline]
-     fn as_slice_<'a>(&'a self) -> &'a [T] {
-@@ -503,28 +481,6 @@
-     }
- }
- 
--#[cfg(stage0)]
--impl<T> ops::SliceMut<uint, [T]> for Vec<T> {
--    #[inline]
--    fn as_mut_slice_<'a>(&'a mut self) -> &'a mut [T] {
--        self.as_mut_slice()
--    }
--
--    #[inline]
--    fn slice_from_mut_<'a>(&'a mut self, start: &uint) -> &'a mut [T] {
--        self.as_mut_slice().slice_from_mut_(start)
--    }
--
--    #[inline]
--    fn slice_to_mut_<'a>(&'a mut self, end: &uint) -> &'a mut [T] {
--        self.as_mut_slice().slice_to_mut_(end)
--    }
--    #[inline]
--    fn slice_mut_<'a>(&'a mut self, start: &uint, end: &uint) -> &'a mut [T] {
--        self.as_mut_slice().slice_mut_(start, end)
--    }
--}
--#[cfg(not(stage0))]
- impl<T> ops::SliceMut<uint, [T]> for Vec<T> {
-     #[inline]
-     fn as_mut_slice_<'a>(&'a mut self) -> &'a mut [T] {
-diff -u -r rust-0.12.0.orig/src/libcore/intrinsics.rs rust-0.12.0/src/libcore/intrinsics.rs
---- rust-0.12.0.orig/src/libcore/intrinsics.rs	2014-10-11 14:54:06.313867033 +0200
-+++ rust-0.12.0/src/libcore/intrinsics.rs	2014-10-11 14:57:53.081488143 +0200
-@@ -254,7 +254,6 @@
-     /// enabling further optimizations.
-     ///
-     /// NB: This is very different from the `unreachable!()` macro!
--    #[cfg(not(stage0))]
-     pub fn unreachable() -> !;
- 
-     /// Execute a breakpoint trap, for inspection by a debugger.
-diff -u -r rust-0.12.0.orig/src/libcore/ops.rs rust-0.12.0/src/libcore/ops.rs
---- rust-0.12.0.orig/src/libcore/ops.rs	2014-10-11 14:54:06.313867033 +0200
-+++ rust-0.12.0/src/libcore/ops.rs	2014-10-11 14:56:38.552270110 +0200
-@@ -711,7 +711,6 @@
-  * }
-  * ```
-  */
--#[cfg(not(stage0))]
- #[lang="slice"]
- pub trait Slice<Idx, Sized? Result> for Sized? {
-     /// The method for the slicing operation foo[]
-@@ -723,21 +722,6 @@
-     /// The method for the slicing operation foo[from..to]
-     fn slice_or_fail<'a>(&'a self, from: &Idx, to: &Idx) -> &'a Result;
- }
--#[cfg(stage0)]
--/**
-- *
-- */
--#[lang="slice"]
--pub trait Slice<Idx, Sized? Result> for Sized? {
--    /// The method for the slicing operation foo[]
--    fn as_slice_<'a>(&'a self) -> &'a Result;
--    /// The method for the slicing operation foo[from..]
--    fn slice_from_<'a>(&'a self, from: &Idx) -> &'a Result;
--    /// The method for the slicing operation foo[..to]
--    fn slice_to_<'a>(&'a self, to: &Idx) -> &'a Result;
--    /// The method for the slicing operation foo[from..to]
--    fn slice_<'a>(&'a self, from: &Idx, to: &Idx) -> &'a Result;
--}
- 
- /**
-  *
-@@ -776,7 +760,7 @@
-  * }
-  * ```
-  */
--#[cfg(not(stage0))]
-+
- #[lang="slice_mut"]
- pub trait SliceMut<Idx, Sized? Result> for Sized? {
-     /// The method for the slicing operation foo[]
-@@ -788,21 +772,7 @@
-     /// The method for the slicing operation foo[from..to]
-     fn slice_or_fail_mut<'a>(&'a mut self, from: &Idx, to: &Idx) -> &'a mut Result;
- }
--#[cfg(stage0)]
--/**
-- *
-- */
--#[lang="slice_mut"]
--pub trait SliceMut<Idx, Sized? Result> for Sized? {
--    /// The method for the slicing operation foo[mut]
--    fn as_mut_slice_<'a>(&'a mut self) -> &'a mut Result;
--    /// The method for the slicing operation foo[mut from..]
--    fn slice_from_mut_<'a>(&'a mut self, from: &Idx) -> &'a mut Result;
--    /// The method for the slicing operation foo[mut ..to]
--    fn slice_to_mut_<'a>(&'a mut self, to: &Idx) -> &'a mut Result;
--    /// The method for the slicing operation foo[mut from..to]
--    fn slice_mut_<'a>(&'a mut self, from: &Idx, to: &Idx) -> &'a mut Result;
--}
-+
- /**
-  *
-  * The `Deref` trait is used to specify the functionality of dereferencing
-diff -u -r rust-0.12.0.orig/src/libcore/slice.rs rust-0.12.0/src/libcore/slice.rs
---- rust-0.12.0.orig/src/libcore/slice.rs	2014-10-11 14:54:06.313867033 +0200
-+++ rust-0.12.0/src/libcore/slice.rs	2014-10-11 14:57:08.101960051 +0200
-@@ -488,7 +488,6 @@
- 
- 
- 
--#[cfg(not(stage0))]
- impl<T> ops::Slice<uint, [T]> for [T] {
-     #[inline]
-     fn as_slice_<'a>(&'a self) -> &'a [T] {
-@@ -516,36 +515,7 @@
-         }
-     }
- }
--#[cfg(stage0)]
--impl<T> ops::Slice<uint, [T]> for [T] {
--    #[inline]
--    fn as_slice_<'a>(&'a self) -> &'a [T] {
--        self
--    }
--
--    #[inline]
--    fn slice_from_<'a>(&'a self, start: &uint) -> &'a [T] {
--        self.slice_(start, &self.len())
--    }
- 
--    #[inline]
--    fn slice_to_<'a>(&'a self, end: &uint) -> &'a [T] {
--        self.slice_(&0, end)
--    }
--    #[inline]
--    fn slice_<'a>(&'a self, start: &uint, end: &uint) -> &'a [T] {
--        assert!(*start <= *end);
--        assert!(*end <= self.len());
--        unsafe {
--            transmute(RawSlice {
--                    data: self.as_ptr().offset(*start as int),
--                    len: (*end - *start)
--                })
--        }
--    }
--}
--
--#[cfg(not(stage0))]
- impl<T> ops::SliceMut<uint, [T]> for [T] {
-     #[inline]
-     fn as_mut_slice_<'a>(&'a mut self) -> &'a mut [T] {
-@@ -567,35 +537,6 @@
-         assert!(*start <= *end);
-         assert!(*end <= self.len());
-         unsafe {
--            transmute(RawSlice {
--                    data: self.as_ptr().offset(*start as int),
--                    len: (*end - *start)
--                })
--        }
--    }
--}
--#[cfg(stage0)]
--impl<T> ops::SliceMut<uint, [T]> for [T] {
--    #[inline]
--    fn as_mut_slice_<'a>(&'a mut self) -> &'a mut [T] {
--        self
--    }
--
--    #[inline]
--    fn slice_from_mut_<'a>(&'a mut self, start: &uint) -> &'a mut [T] {
--        let len = &self.len();
--        self.slice_mut_(start, len)
--    }
--
--    #[inline]
--    fn slice_to_mut_<'a>(&'a mut self, end: &uint) -> &'a mut [T] {
--        self.slice_mut_(&0, end)
--    }
--    #[inline]
--    fn slice_mut_<'a>(&'a mut self, start: &uint, end: &uint) -> &'a mut [T] {
--        assert!(*start <= *end);
--        assert!(*end <= self.len());
--        unsafe {
-             transmute(RawSlice {
-                     data: self.as_ptr().offset(*start as int),
-                     len: (*end - *start)
-diff -u -r rust-0.12.0.orig/src/libcore/str.rs rust-0.12.0/src/libcore/str.rs
---- rust-0.12.0.orig/src/libcore/str.rs	2014-10-11 14:54:06.313867033 +0200
-+++ rust-0.12.0/src/libcore/str.rs	2014-10-11 14:55:53.262745176 +0200
-@@ -1164,29 +1164,6 @@
-         fn equiv(&self, other: &S) -> bool { eq_slice(*self, other.as_slice()) }
-     }
- 
--    #[cfg(stage0)]
--    impl ops::Slice<uint, str> for str {
--        #[inline]
--        fn as_slice_<'a>(&'a self) -> &'a str {
--            self
--        }
--
--        #[inline]
--        fn slice_from_<'a>(&'a self, from: &uint) -> &'a str {
--            self.slice_from(*from)
--        }
--
--        #[inline]
--        fn slice_to_<'a>(&'a self, to: &uint) -> &'a str {
--            self.slice_to(*to)
--        }
--
--        #[inline]
--        fn slice_<'a>(&'a self, from: &uint, to: &uint) -> &'a str {
--            self.slice(*from, *to)
--        }
--    }
--    #[cfg(not(stage0))]
-     impl ops::Slice<uint, str> for str {
-         #[inline]
-         fn as_slice_<'a>(&'a self) -> &'a str {
diff --git a/dev-lang/rust/files/rust-0.12.0-no-ldconfig.patch b/dev-lang/rust/files/rust-0.13.0-no-ldconfig.patch
index 0ab3a5a836bb..919fa303254d 100644
--- a/dev-lang/rust/files/rust-0.12.0-no-ldconfig.patch
+++ b/dev-lang/rust/files/rust-0.13.0-no-ldconfig.patch
@@ -1,17 +1,17 @@
 Remove ldconfig(1) execution to prevent the installation script from accessing
 outside of a sandbox.
 
-diff --git a/src/etc/install.sh b/src/etc/install.sh
-index c949743..7c3daa5 100644
---- a/src/etc/install.sh
-+++ b/src/etc/install.sh
-@@ -466,17 +466,6 @@ while read p; do
- # The manifest lists all files to install
- done < "${CFG_SRC_DIR}/${CFG_LIBDIR_RELATIVE}/rustlib/manifest.in"
-
+diff --git a/install-template.sh b/install-template.sh
+index 11bf392..bc579f5 100644
+--- a/src/rust-installer/install-template.sh
++++ b/src/rust-installer/install-template.sh
+@@ -697,17 +697,6 @@ done
+ # Drop the version number into the manifest dir
+ echo "$TEMPLATE_RUST_INSTALLER_VERSION" > "${ABS_LIBDIR}/${TEMPLATE_REL_MANIFEST_DIR}/rust-installer-version"
+ 
 -# Run ldconfig to make dynamic libraries available to the linker
--if [ "$CFG_OSTYPE" = "Linux" ]
--    then
+-if [ "$CFG_OSTYPE" = "unknown-linux-gnu" -a ! -n "$CFG_DISABLE_LDCONFIG" ]; then
+-    msg "running ldconfig"
 -    ldconfig
 -    if [ $? -ne 0 ]
 -    then
diff --git a/dev-lang/rust/rust-0.11.0-r2.ebuild b/dev-lang/rust/rust-0.11.0-r2.ebuild
deleted file mode 100644
index 544602c2febb..000000000000
--- a/dev-lang/rust/rust-0.11.0-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-0.11.0-r2.ebuild,v 1.1 2014/10/18 12:48:43 jauhien Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils python-any-r1
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-ARCH_SRC_URI="amd64? ( http://static.rust-lang.org/dist/${P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${P}-i686-unknown-linux-gnu.tar.gz )"
-
-SRC_URI="http://static.rust-lang.org/dist/${P}.tar.gz ${ARCH_SRC_URI}"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="0.11"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
-REQUIRED_USE="libcxx? ( clang )"
-
-CDEPEND="libcxx? ( sys-libs/libcxx )
-	>=app-admin/eselect-rust-0.2_pre20141011
-	!dev-lang/rust:0
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.0
-	clang? ( sys-devel/clang )
-"
-RDEPEND="${CDEPEND}
-	emacs? ( >=app-emacs/rust-mode-${PV} )
-	vim-syntax? ( >=app-vim/rust-mode-${PV} )
-	zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-stage0.patch" "${FILESDIR}/${P}-libdir.patch"
-}
-
-src_configure() {
-	use amd64 && ARCH_POSTFIX="x86_64"
-	use x86 && ARCH_POSTFIX="i686"
-	LOCAL_RUST_PATH="${WORKDIR}/${P}-${ARCH_POSTFIX}-unknown-linux-gnu"
-
-	"${ECONF_SOURCE:-.}"/configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/lib/${P}" \
-		--mandir="${EPREFIX}/usr/share/${P}/man" \
-		$(use_enable clang) \
-		$(use_enable debug) \
-		$(use_enable debug llvm-assertions) \
-		$(use_enable !debug optimize) \
-		$(use_enable !debug optimize-cxx) \
-		$(use_enable !debug optimize-llvm) \
-		$(use_enable !debug optimize-tests) \
-		$(use_enable libcxx libcpp) \
-		--enable-local-rust \
-		--local-rust-root="${LOCAL_RUST_PATH}" \
-		--disable-manage-submodules \
-		--disable-verify-install \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/usr/lib/${P}"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	dodir /etc/env.d/rust
-	touch "${D}/etc/env.d/rust/provider-${P}" || die
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust uses slots now, use 'eselect rust list'"
-	elog "and 'eselect rust set' to list and set rust version."
-	elog "For more information see 'eselect rust help'"
-	elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-0.12.0.ebuild b/dev-lang/rust/rust-0.12.0.ebuild
deleted file mode 100644
index 1d66ef9e43a6..000000000000
--- a/dev-lang/rust/rust-0.12.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-0.12.0.ebuild,v 1.1 2014/10/18 12:48:43 jauhien Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils python-any-r1
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-ARCH_SRC_URI="amd64? ( http://static.rust-lang.org/dist/${P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${P}-i686-unknown-linux-gnu.tar.gz )"
-
-SRC_URI="http://static.rust-lang.org/dist/${P}.tar.gz ${ARCH_SRC_URI}"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="0.12"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
-REQUIRED_USE="libcxx? ( clang )"
-
-CDEPEND="libcxx? ( sys-libs/libcxx )
-	>=app-admin/eselect-rust-0.2_pre20141011
-	!dev-lang/rust:0
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.0
-	clang? ( sys-devel/clang )
-"
-RDEPEND="${CDEPEND}
-	emacs? ( >=app-emacs/rust-mode-${PV} )
-	vim-syntax? ( >=app-vim/rust-mode-${PV} )
-	zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-stage0.patch" "${FILESDIR}/${P}-no-ldconfig.patch" "${FILESDIR}/${P}-libdir.patch"
-
-	local postfix="gentoo-${SLOT}"
-	sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
-}
-
-src_configure() {
-	use amd64 && ARCH_POSTFIX="x86_64"
-	use x86 && ARCH_POSTFIX="i686"
-	LOCAL_RUST_PATH="${WORKDIR}/${P}-${ARCH_POSTFIX}-unknown-linux-gnu"
-
-	"${ECONF_SOURCE:-.}"/configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/lib/${P}" \
-		--mandir="${EPREFIX}/usr/share/${P}/man" \
-		$(use_enable clang) \
-		$(use_enable debug) \
-		$(use_enable debug llvm-assertions) \
-		$(use_enable !debug optimize) \
-		$(use_enable !debug optimize-cxx) \
-		$(use_enable !debug optimize-llvm) \
-		$(use_enable !debug optimize-tests) \
-		$(use_enable libcxx libcpp) \
-		--enable-local-rust \
-		--local-rust-root="${LOCAL_RUST_PATH}" \
-		--disable-manage-submodules \
-		--disable-verify-install \
-		--disable-docs \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/usr/lib/${P}"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	dodir /etc/env.d/rust
-	touch "${D}/etc/env.d/rust/provider-${P}" || die
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust uses slots now, use 'eselect rust list'"
-	elog "and 'eselect rust set' to list and set rust version."
-	elog "For more information see 'eselect rust help'"
-	elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-999-r1.ebuild b/dev-lang/rust/rust-1.0.0_alpha.ebuild
index 4162bd8350ca..f646c7eced68 100644
--- a/dev-lang/rust/rust-999-r1.ebuild
+++ b/dev-lang/rust/rust-1.0.0_alpha.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-999-r1.ebuild,v 1.4 2014/11/30 12:45:15 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-1.0.0_alpha.ebuild,v 1.1 2015/02/10 11:35:29 jauhien Exp $
 
 EAPI="5"
 
@@ -8,17 +8,19 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-any-r1
 
-MY_P=${PN}-nightly
-
+MY_PV="rustc-1.0.0-alpha"
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
-MY_SRC_URI="http://static.rust-lang.org/dist/${MY_P}.tar.gz"
+
+SRC_URI="http://static.rust-lang.org/dist/${MY_PV}-src.tar.gz
+	x86?   ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-01-07-9e4e524-linux-i386-d8b73fc9aa3ad72ce1408a41e35d78dba10eb4d4.tar.bz2 )
+	amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-01-07-9e4e524-linux-x86_64-697880d3640e981bbbf23284363e8e9a158b588d.tar.bz2 )"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="nightly"
-KEYWORDS=""
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="clang debug emacs libcxx +system-llvm vim-syntax zsh-completion"
+IUSE="clang debug libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 
 CDEPEND="libcxx? ( sys-libs/libcxx )
@@ -28,39 +30,32 @@ CDEPEND="libcxx? ( sys-libs/libcxx )
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5.0
-	net-misc/wget
 	clang? ( sys-devel/clang )
-	system-llvm? ( >=sys-devel/llvm-3.5.0[multitarget(-)] )
+	system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
 "
 RDEPEND="${CDEPEND}
-	emacs? ( >=app-emacs/rust-mode-${PV} )
-	vim-syntax? ( >=app-vim/rust-mode-${PV} )
-	zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
 "
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_PV}
 
 src_unpack() {
-	wget "${MY_SRC_URI}" || die
-	unpack ./"${PN}-nightly.tar.gz"
-
-	use amd64 && BUILD_TRIPLE=x86_64-unknown-linux-gnu
-	use x86 && BUILD_TRIPLE=i686-unknown-linux-gnu
-	export CFG_SRC_DIR="${S}" && \
-		cd ${S} && \
-		mkdir -p "${S}/dl" && \
-		mkdir -p "${S}/${BUILD_TRIPLE}/stage0/bin" && \
-		python2 "${S}/src/etc/get-snapshot.py" ${BUILD_TRIPLE} || die
+	unpack "${MY_PV}-src.tar.gz" || die
+	mkdir "${MY_PV}/dl" || die
+	cp "${DISTDIR}/rust-stage0"* "${MY_PV}/dl/" || die
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
+	epatch "${FILESDIR}/${PN}-0.13.0-no-ldconfig.patch"
 
 	local postfix="gentoo-${SLOT}"
 	sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
 }
 
 src_configure() {
+	use amd64 && ARCH_POSTFIX="x86_64"
+	use x86 && ARCH_POSTFIX="i686"
+	LOCAL_RUST_PATH="${WORKDIR}/rust-1.0.0-alpha-${ARCH_POSTFIX}-unknown-linux-gnu/bin"
+
 	local system_llvm
 	use system-llvm && system_llvm="--llvm-root=${EPREFIX}/usr"
 
@@ -92,7 +87,17 @@ src_install() {
 
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
 	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+
+	dodoc COPYRIGHT LICENSE-APACHE LICENSE-MIT
+
+	rm "${D}/usr/share/doc/rust" -rf
+
+	# le kludge that fixes https://github.com/Heather/gentoo-rust/issues/41
+	mv "${D}/usr/lib/rust-${PV}/rust-${PV}/rustlib"/* "${D}/usr/lib/rust-${PV}/rustlib/"
+	rmdir "${D}/usr/lib/rust-${PV}/rust-${PV}/rustlib"
+	mv "${D}/usr/lib/rust-${PV}/rust-${PV}/"/* "${D}/usr/lib/rust-${PV}/"
+	rmdir "${D}/usr/lib/rust-${PV}/rust-${PV}/"
 
 	cat <<-EOF > "${T}"/50${P}
 	LDPATH="/usr/lib/${P}"
@@ -112,10 +117,20 @@ pkg_postinst() {
 	elog "For more information see 'eselect rust help'"
 	elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
 
-	elog "Rust installs a helper script for calling LLDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-lldb-${PV},"
-	elog "but note, that there is no LLDB ebuild in the tree currently,"
-	elog "so you are on your own if you want to use it."
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-mode to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
 }
 
 pkg_postrm() {
diff --git a/dev-lang/rust/rust-9999-r3.ebuild b/dev-lang/rust/rust-9999-r3.ebuild
deleted file mode 100644
index e76f9a2e3b0d..000000000000
--- a/dev-lang/rust/rust-9999-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-9999-r3.ebuild,v 1.3 2014/11/30 12:45:15 jauhien Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils git-r3 python-any-r1
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-EGIT_REPO_URI="git://github.com/rust-lang/rust.git"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="git"
-KEYWORDS=""
-
-IUSE="clang debug emacs libcxx +system-llvm vim-syntax zsh-completion"
-REQUIRED_USE="libcxx? ( clang )"
-
-CDEPEND="libcxx? ( sys-libs/libcxx )
-	>=app-admin/eselect-rust-0.2_pre20141128
-	!dev-lang/rust:0
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.0
-	clang? ( sys-devel/clang )
-	system-llvm? ( >=sys-devel/llvm-3.5.0[multitarget(-)] )
-"
-RDEPEND="${CDEPEND}
-	emacs? ( >=app-emacs/rust-mode-${PV} )
-	vim-syntax? ( >=app-vim/rust-mode-${PV} )
-	zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
-"
-
-src_unpack() {
-	git-r3_src_unpack
-
-	use amd64 && BUILD_TRIPLE=x86_64-unknown-linux-gnu
-	use x86 && BUILD_TRIPLE=i686-unknown-linux-gnu
-	export CFG_SRC_DIR="${S}" && \
-		cd ${S} && \
-		mkdir -p "${S}/dl" && \
-		mkdir -p "${S}/${BUILD_TRIPLE}/stage0/bin" && \
-		python2 "${S}/src/etc/get-snapshot.py" ${BUILD_TRIPLE} || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
-
-	local postfix="gentoo-${SLOT}"
-	sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
-}
-
-src_configure() {
-	local system_llvm
-	use system-llvm && system_llvm="--llvm-root=${EPREFIX}/usr"
-
-	"${ECONF_SOURCE:-.}"/configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/lib/${P}" \
-		--mandir="${EPREFIX}/usr/share/${P}/man" \
-		$(use_enable clang) \
-		$(use_enable debug) \
-		$(use_enable debug llvm-assertions) \
-		$(use_enable !debug optimize) \
-		$(use_enable !debug optimize-cxx) \
-		$(use_enable !debug optimize-llvm) \
-		$(use_enable !debug optimize-tests) \
-		$(use_enable libcxx libcpp) \
-		${system_llvm} \
-		--disable-manage-submodules \
-		--disable-verify-install \
-		--disable-docs \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/usr/lib/${P}"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	dodir /etc/env.d/rust
-	touch "${D}/etc/env.d/rust/provider-${P}" || die
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust uses slots now, use 'eselect rust list'"
-	elog "and 'eselect rust set' to list and set rust version."
-	elog "For more information see 'eselect rust help'"
-	elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
-
-	elog "Rust installs a helper script for calling LLDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-lldb-${PV},"
-	elog "but note, that there is no LLDB ebuild in the tree currently,"
-	elog "so you are on your own if you want to use it."
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}