version bump, close bug #548128

Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0xB2EFA1D4

5 files changed, 47 insertions, 172 deletions

diff --git a/dev-lang/rust/ChangeLog b/dev-lang/rust/ChangeLog
index 19d5ef939e02..5666e791ceca 100644
--- a/dev-lang/rust/ChangeLog
+++ b/dev-lang/rust/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2015/04/20 21:24:13 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.18 2015/05/03 16:25:22 jauhien Exp $
+
+*rust-1.0.0_beta3 (03 May 2015)
+
+  03 May 2015; Jauhien Piatlicki <jauhien@gentoo.org> +rust-1.0.0_beta3.ebuild,
+  -rust-1.0.0_alpha2.ebuild, -rust-1.0.0_beta.ebuild, metadata.xml:
+  version bump, close bug #548128
 
 *rust-1.0.0_beta2 (20 Apr 2015)
 
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 6738554d66d0..64f3c6ea0779 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,32 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST rust-stage0-2015-02-17-f1bb6c2-linux-i386-191ed5ec4f17e32d36abeade55a1c6085e51245c.tar.bz2 18026636 SHA256 434a1c0b30b574e1d80af576dfc178ea44c8aaa61c1ed73355a7003687f1af2d SHA512 04b187e5839de1c6627cb2e53ba6af008ed60bf5f94daf62b4f0e47796d0eec7e7b70bfbf2eb02a0c58bb338efd2598afabaaec66c54ff62480359ba90ad9cf7 WHIRLPOOL 57332352690a84f6686889541b055d246e000e478e68b0d08080f1437ee9cf9bcff46617882ccb92fde2a3074f7ce9173c68bf2f34518670010f4d02b9039fa1
-DIST rust-stage0-2015-02-17-f1bb6c2-linux-x86_64-acec86045632f4f3f085c072ba696f889906dffe.tar.bz2 17606460 SHA256 7e3ad738f0637d0418efc026722fc6c4ae2541e7b8c2cd874489110bd27a5381 SHA512 c2a0d98002945829e45f869148d781bb92862d121f7f720fbb33da98f9654cb8503d3bece8dc601840ba4f4aa23727a0eb129019933a441ea74b17edc8a780a2 WHIRLPOOL 51aedc131be03ae43c87a12c398de122c51b6a0013ef21b53ba2437b952899b06269feb4725f5eff074b90ba5caad3b2160f2f9aff0a755cb99fdd643d239aa0
 DIST rust-stage0-2015-03-27-5520801-linux-i386-1ef82402ed16f5a6d2f87a9a62eaa83170e249ec.tar.bz2 18104375 SHA256 f948477a43dc14436b218a24a81097d0460ca2e2177bebabba24fae89fc62b4b SHA512 86b28b03e8ef730620e593d00786b14736e05fdf5f312ab194175340fad1f24e169f69e381e73c1eb102f059f47a926dabd93bfaad46c50caa3717ee10412a5c WHIRLPOOL 086875d15228ebc68334eb4d663207917e1876044e12296426a00a0fec88a1325fe6a5e620e51b58eb08a58c27896df5fbb6d6ca992e0d754a98697f1bc9ed17
 DIST rust-stage0-2015-03-27-5520801-linux-x86_64-ef2154372e97a3cb687897d027fd51c8f2c5f349.tar.bz2 17935368 SHA256 b62eed6bdb3cb356c90d587e9d9ee7fb5aedad917ff872c04e67e20b4c8f1c91 SHA512 0a978be4865f9e77c5ab552d423e21f1edefc767bc8a8d2936b45b0a9194648c5fb3c32cec0eaea438ad1339802faa1504b511956c2d71f73f2eb0439a4d7b99 WHIRLPOOL 89b0b8c51fd072c33afe8e98bc9aaea301ffa810a166b612d10dd89bbc491c3350f591f57bc3494066d71402910519b07cffa95d2802bdd6334aaad0c2f79334
-DIST rustc-1.0.0-alpha.2-src.tar.gz 22187865 SHA256 a931b945e98f409df68fdff23e98b688024461c28901106896e73708381956c8 SHA512 54e12917a829eaa8d84777564ba91013bb1cef021c2fbcf88688d718ded15718f1063828b453eb66e8a750290bf1b45039669e7185963defd32334b2b69d881b WHIRLPOOL 33627cb218dad44e0163b3d51a6a13d6a7bf79db7fc1ae3c4a34bfe9e3a132d650c0fc8f55fb3e35e822aef2f9347c47058fff2e74fc5679124a700eafaedf71
-DIST rustc-1.0.0-beta-src.tar.gz 22294998 SHA256 94248e30487723ac6f6c34a0db5a21085c0b1338e6a32bd12b159e1d2cd80451 SHA512 65142b53a55c136a145e72e8f6fbdf9e3c8c164d298ea28c2198a702ae9d7deab32c38c53c9f30465223f1d322f8f034048fb4f7939f32920b43f86112defd81 WHIRLPOOL 08fd84263c738c637e46468feb85c0552cc8494e155aeb92c4708ef4a5cab136c28936d886f471463408ef7a3afcdb3dcee50f2221b1acf038d89776df17f06c
 DIST rustc-1.0.0-beta.2-src.tar.gz 22115249 SHA256 969f20bfec588456af8ab81c9b00ef46df075bf9ac9955e42a87b1f39cb99771 SHA512 d692284d25ff93aa7f7a444fc0c0f09128d0836ff61396054d1ab0931206abcfa8b8adeef209d8c51f824257691babee85bec68bd716a28722ec93aa322ad64b WHIRLPOOL df88151b87fb97a78840b4f71c1e625b4b68c06ac0a7a7614583b12b914c6ffae470bd552a7d8a1a01c360ba15c4d3fc522ffbcd7d35043b88e12fb26266e93d
-EBUILD rust-1.0.0_alpha2.ebuild 3965 SHA256 a5cf745fb0cb83fcc4b4d1cc5ccbb6bfe6ba01d039bb037b1763e14c85a55473 SHA512 f5c093f415cb0bbc1cae4164606534532b8c0217cd09097a53509072b456cdb56d6688f670de915226e1a597ce3be5212442854bb5a5e994b880083240eaf711 WHIRLPOOL 6c864c2b60d2729def0eb0a7a105c92a947f0c4b179c88278b7cbc328d22f00e9ad903d7f1aeaa4552def2dc18edaf5b3f4d1e78a6b471bafa2b1f8cbb905f64
-EBUILD rust-1.0.0_beta.ebuild 3960 SHA256 c8f1afd107aa284734ca0c397c7b7ae7f785f999730d1b8c4a8afe1adad09f11 SHA512 5fc199520d323f8dcf64f49549e53b15d0fd52f2788a8943dfd873172a10ad256d02977ee5ee0bb68aadbc175a7e2bdbd248aee259a6d844eaf59e81beccb689 WHIRLPOOL 39312d5f7df2d04079c51e1220fefb2ca6a276cd9e84638b13e2ecce28d79989d810380f0ab264c2f9489f5baaf7bc63002aa7dd6d5072c1d5d6c791d49bc4fa
+DIST rustc-1.0.0-beta.3-src.tar.gz 22086520 SHA256 e751bc8a8ad236c8865697f866b2863e224af56b0194ddf9f3edd71f9ff6545f SHA512 4a7b8044fa9efb27ef987d7395c1df4e2a5f6f718c3cf8a6fa0e2c85a9d025ed31b287b40983f66c4c087f585acbdcacad4d707800b49d31b5b7e5b65b9f7a77 WHIRLPOOL 03480dea33bcaa4523ba82dbe71cb7089692e2bf42e79f850c3dded5dd2e5fbe4aeac76c81807fca65bd479aa29a159071ae1d1334e544eb2ebdc8e928b452ab
 EBUILD rust-1.0.0_beta2.ebuild 3934 SHA256 18d05dc611c6efb180233f24cff8d4b2840a41f425039f358878b410adc23e98 SHA512 3e90e7689881020cbd9c582fb2602e697f01b6df8bba0052a8e79d860382f1a5af5067b92040240414a1d770915892f0173c3d8f4cac1747ba7dabbe42859776 WHIRLPOOL 0b02b88999dd62c2dc6b2935167f4e6c83a2b27a80b26b5cc7b59af95836cbd86b18efa1a3aa6cbbe28df3e7dccfded0d5d47612ff4337e3806a2f5264c17c9a
-MISC ChangeLog 3737 SHA256 033934c709126fe571dfb74f763704036e7d53ec4a6ea6f7a4c23e6f211f445a SHA512 c1d02dd257e88b5f221bf4965f71ab2c9c1d2c60a30433635d88dc5139bd7ef594343418c9a4613a3c24b8a134f1b8dc052ca713bcb81c871d7fa39eb96522a6 WHIRLPOOL 84b43920e7a426cefa4c2a571918e96c900865b16ca61e48cba9624beb012db43d86371376733951c10e809a77ac8cdb2944565442718a8096a6c4ab8757721e
-MISC metadata.xml 741 SHA256 dc03d5b42fa933f3f261f06c02f6723e8847dd581ba1fa337d86fc6e742194ce SHA512 0e5dff49657f0dd2b79db65140c7154d6a1256bf5415570c28b057858680fe78ddecdaa53a5066290a46e146f115790bccdd1bf32309cd0b6b62b5714e1df45e WHIRLPOOL fa8f678aa025da4f6487f23ee8b4dd1056d3affd9c52a9cb4287390cc461fa9e5c77796f407eb576b2757f6ee81d44382d5fb975015ebbe3629af2e8c424b2d4
+EBUILD rust-1.0.0_beta3.ebuild 3958 SHA256 4ddb26fe374c75a25487afa841d45a4bb4d89ad3d800665bf955528685015be2 SHA512 67ed530df368db49339c1f03a578bb7b14775d9a7b15fdb3df94355f1e6f44efd990c9eee8ab28b7923ca09b1b7069ebfe533733f966a551fb15274f732b5b8d WHIRLPOOL 9e39fd05ca01217f172d7f0a7b79791c8471f3a4109e69220dfbaec253da32a68c967550b3fc369750a4704682cc445a86a7074f043310327e83eeaf27c1038d
+MISC ChangeLog 3953 SHA256 34cd06f6b293767d44e7eac3a2db8dfb841b2bdbe01f129eaacff22bc9d15694 SHA512 c4e676cd3b3c40c9f68dd861593ba78753b7c7d1bc54808c764e86fef21ec7c70754ac8781b04ec76b9707ce8b24c0a3003c81bc61bd0eaad57a49ae61cf85c8 WHIRLPOOL 8a2fec338e9387b6130d8bdfa007e0e76b454df934cca25b907a5a833364c54745190339b64485c8156eea9b9781899e5c956cf3dffea153fc7dd733fc41c441
+MISC metadata.xml 740 SHA256 97a02ffcc66d0502cfa844c9e81cf0bab08399518d8efd1c288d153d1d599ec6 SHA512 33bdcc855fa2f84ff8258beb057478828b6874f70ce5909035b4f2a9c8df32b0d757a9f3ccf483222935e3d20e8b0e78740010de08359d7d9402ed336fb0db3b WHIRLPOOL 64f63d05aa25c7d4fa58cdaa5e3a931f08172fefe8eec6bee82d485d37bcbc860654bd7ae9d284a4d0860dcea6cef3e81a3cebaed13869cef47eb3f3f38c0195
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVNW6LAAoJELvuk32y76HUoJsP/1Qjf5yodoqsGSAYuMr1PP+G
-ww2u2uxK208FLDUxijlQLAkqgWTNJj6lYwbXjHmLNqcJsbbUXZ4TdScXnEZ1DFml
-tN1KpqF7TV7PTcu85Bud1FipPRWFl3ibaDqExgl2QgTOQlCHxmgKkVySxp7Oscfg
-n1P6nAVw00Yh1Lp+7m1l5LfX62wC9FU3hkNTqIECPDQZHpsvk93XC3aOWGumlvWs
-+0Ie6ZE3AHgb9rIgQDTPZge16ZwmhpMvYrxPzgUr7KFvylqQNpV7escRJs73BH4f
-Kj7Rbfd2HB/VvYFtqKArKntm/KSaQVu1MN+zNG+G7ma6LyeFzQ3/jur07FvpnueQ
-IGpFpRYrYfzBkKYPyfkMgblKqkpnR2RoJb/oSfpQGbhxJ+SDWuUg/eTBJnswrzyf
-qXVt/AlkX4xctSA8TGjJgu+1eMNxOhZ1EqO7ycrl1v/mrb46rTgiULoj6tj/TLi/
-hiQD51jrDeDT3D9xgSLuXIDX6VOy5nZZGrweCEUlPYTT4XhTVUEsXTxMSJLIrj2X
-KTMCnOjpdRsT8tq07q/aLmKJsAUXfEo7ZPKzu0KvKJIP3b/NPVn+dh6bBJ0UwMpd
-yI38sFd6DG99mLEQo3i34yCT9eLruRjJA91nr+hqkGZr/eKDbSEqNSf7yY18Y2j6
-S/pyv1ZpLl2I6/V7z3NZ
-=bKHj
+iQIcBAEBCAAGBQJVRkv1AAoJELvuk32y76HU6P8P/24Obz2vnEf4YC2Gq/tQVwsY
+q1qCQrJN81zTLXgRnntQc889eIK39lLtjdgY+5bizAgY4wYKOV2fpdLGyfNapcVA
+OiXLFpx3goug0Y8SE3hrmidDvFhsceYSD2TD3a8VdUCooEyww7FH788OdgTX9uXB
+dSlPeH9Z7KEYAMucTsEYnp7HlXsBwWTcTj0lSx+E+HXXrQlegJONWjnEq19oZHET
+ovU19C1YBdLLnXy4SHP/K6qFnDzLpj5L5WMvO84nJk/PDpBkYyfxirpgzFqQnj3R
+W/iZ9i+/XJesExMJ7Ox3ZSD0OYVlBJXRmNnJvLXyn+ykanR/Yq4/RkgZt/CrFjBJ
+6rxd3LuMwKmhnjlnjUYM3/Th/XFrOCdE8/VzGbej3NdEoQrhfg2/Nwp6/7EWinv6
+XLQYN43Q/WTWdMlTfUsKOoQkFgGgppl9O77+PYO72L3r6mU2LKh9WA6BUDvlZ8vR
+Hmt47ZQcCUYjXP9ZQivR+YWdvRzphHs5jYdmLadC2O3JnHsklaLvLKLhpLs1hgVd
+JWAO7qlYG5sJeuGQeiiY33awZ0fE3jW0RISoBfYcUNMTxY/yCZ9bajdVz1qkh/79
+2Aa2UZKZkKu7XPL9Uj3isccDNYAsCUPSL3Ek9r6tLTQR+IsCRc55UmLiLmMGm7fE
+rhfKWIV+hay6ykTxeYK2
+=Zr4k
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 6bac8c850e8e..cfc7d973d61a 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -10,7 +10,7 @@
     <name>William Hubbs</name>
   </maintainer>
   <maintainer>
-    <email>Heather@Cynede.net</email>
+    <email>cynede@gentoo.org</email>
   </maintainer>
   <use>
     <flag name="clang">Use <pkg>sys-devel/clang</pkg> for building</flag>
diff --git a/dev-lang/rust/rust-1.0.0_alpha2.ebuild b/dev-lang/rust/rust-1.0.0_alpha2.ebuild
deleted file mode 100644
index 69d554401c37..000000000000
--- a/dev-lang/rust/rust-1.0.0_alpha2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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-1.0.0_alpha2.ebuild,v 1.4 2015/04/11 14:05:16 jauhien Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-MY_PV="rustc-1.0.0-alpha.2"
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-SRC_URI="http://static.rust-lang.org/dist/${MY_PV}-src.tar.gz
-	x86?   ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-02-17-f1bb6c2-linux-i386-191ed5ec4f17e32d36abeade55a1c6085e51245c.tar.bz2 )
-	amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-02-17-f1bb6c2-linux-x86_64-acec86045632f4f3f085c072ba696f889906dffe.tar.bz2 )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="clang debug doc libcxx +system-llvm"
-REQUIRED_USE="libcxx? ( clang )"
-
-CDEPEND="libcxx? ( sys-libs/libcxx )
-	>=app-eselect/eselect-rust-0.2_pre20150206
-	!dev-lang/rust:0
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.0
-	clang? ( sys-devel/clang )
-	system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
-"
-RDEPEND="${CDEPEND}
-"
-
-S=${WORKDIR}/${MY_PV}
-
-src_unpack() {
-	unpack "${MY_PV}-src.tar.gz" || die
-	mkdir "${MY_PV}/dl" || die
-	cp "${DISTDIR}/rust-stage0"* "${MY_PV}/dl/" || die
-}
-
-src_prepare() {
-	local postfix="gentoo-${SLOT}"
-	sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
-}
-
-src_configure() {
-	export CFG_DISABLE_LDCONFIG="notempty"
-
-	"${ECONF_SOURCE:-.}"/configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/lib/${P}" \
-		--mandir="${EPREFIX}/usr/share/${P}/man" \
-		--disable-manage-submodules \
-		--disable-verify-install \
-		$(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 doc docs) \
-		$(use_enable libcxx libcpp) \
-		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
-		|| 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-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}/"
-
-	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/"
-	rmdir "${D}/usr/share/doc/rust/"
-
-	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 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() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.0.0_beta.ebuild b/dev-lang/rust/rust-1.0.0_beta3.ebuild
index cfa1d1752529..5788bcea83ee 100644
--- a/dev-lang/rust/rust-1.0.0_beta.ebuild
+++ b/dev-lang/rust/rust-1.0.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # 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-1.0.0_beta.ebuild,v 1.1 2015/04/11 14:05:16 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-1.0.0_beta3.ebuild,v 1.1 2015/05/03 16:25:22 jauhien Exp $
 
 EAPI=5
 
@@ -8,11 +8,18 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit eutils python-any-r1
 
-MY_PV="rustc-1.0.0-beta"
+RUST_CHANNEL="beta"
+
+BETA_NUM="${PV##*beta}"
+MY_PV="${PV/_/-}"
+# beta => beta BUT beta2 => beta.2
+[ -n "${BETA_NUM}" ] && MY_PV="${MY_PV/beta/beta.}"
+MY_P="rustc-${MY_PV}"
+
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 
-SRC_URI="http://static.rust-lang.org/dist/${MY_PV}-src.tar.gz
+SRC_URI="http://static.rust-lang.org/dist/${MY_P}-src.tar.gz
 	x86?   ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-03-27-5520801-linux-i386-1ef82402ed16f5a6d2f87a9a62eaa83170e249ec.tar.bz2 )
 	amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-03-27-5520801-linux-x86_64-ef2154372e97a3cb687897d027fd51c8f2c5f349.tar.bz2 )"
 
@@ -24,7 +31,7 @@ IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 
 CDEPEND="libcxx? ( sys-libs/libcxx )
-	>=app-eselect/eselect-rust-0.2_pre20150206
+	>=app-eselect/eselect-rust-0.3_pre20150428
 	!dev-lang/rust:0
 "
 DEPEND="${CDEPEND}
@@ -36,12 +43,12 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 "
 
-S=${WORKDIR}/${MY_PV}
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
-	unpack "${MY_PV}-src.tar.gz" || die
-	mkdir "${MY_PV}/dl" || die
-	cp "${DISTDIR}/rust-stage0"* "${MY_PV}/dl/" || die
+	unpack "${MY_P}-src.tar.gz" || die
+	mkdir "${MY_P}/dl" || die
+	cp "${DISTDIR}/rust-stage0"* "${MY_P}/dl/" || die
 }
 
 src_prepare() {
@@ -56,8 +63,8 @@ src_configure() {
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/lib/${P}" \
 		--mandir="${EPREFIX}/usr/share/${P}/man" \
+		--release-channel=${RUST_CHANNEL} \
 		--disable-manage-submodules \
-		--disable-verify-install \
 		$(use_enable clang) \
 		$(use_enable debug) \
 		$(use_enable debug llvm-assertions) \
@@ -101,18 +108,18 @@ src_install() {
 	EOF
 	doenvd "${T}"/50${P}
 
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
 	dodir /etc/env.d/rust
-	touch "${D}/etc/env.d/rust/provider-${P}" || die
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
 }
 
 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 GDB now,"
 	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."