version bump (bug 550878), fix bug 549220

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

4 files changed, 36 insertions, 164 deletions

diff --git a/dev-lang/rust/ChangeLog b/dev-lang/rust/ChangeLog
index 5666e791ceca..f5718723e2bb 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.18 2015/05/03 16:25:22 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.19 2015/06/04 10:47:28 jauhien Exp $
+
+*rust-1.0.0 (04 Jun 2015)
+
+  04 Jun 2015; Jauhien Piatlicki <jauhien@gentoo.org> +rust-1.0.0.ebuild,
+  -rust-1.0.0_beta2.ebuild, -rust-1.0.0_beta3.ebuild:
+  version bump (bug 550878), fix bug 549220
 
 *rust-1.0.0_beta3 (03 May 2015)
 
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 64f3c6ea0779..dcc9a5025902 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -3,26 +3,24 @@ Hash: SHA256
 
 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-beta.2-src.tar.gz 22115249 SHA256 969f20bfec588456af8ab81c9b00ef46df075bf9ac9955e42a87b1f39cb99771 SHA512 d692284d25ff93aa7f7a444fc0c0f09128d0836ff61396054d1ab0931206abcfa8b8adeef209d8c51f824257691babee85bec68bd716a28722ec93aa322ad64b WHIRLPOOL df88151b87fb97a78840b4f71c1e625b4b68c06ac0a7a7614583b12b914c6ffae470bd552a7d8a1a01c360ba15c4d3fc522ffbcd7d35043b88e12fb26266e93d
-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
-EBUILD rust-1.0.0_beta3.ebuild 3958 SHA256 4ddb26fe374c75a25487afa841d45a4bb4d89ad3d800665bf955528685015be2 SHA512 67ed530df368db49339c1f03a578bb7b14775d9a7b15fdb3df94355f1e6f44efd990c9eee8ab28b7923ca09b1b7069ebfe533733f966a551fb15274f732b5b8d WHIRLPOOL 9e39fd05ca01217f172d7f0a7b79791c8471f3a4109e69220dfbaec253da32a68c967550b3fc369750a4704682cc445a86a7074f043310327e83eeaf27c1038d
-MISC ChangeLog 3953 SHA256 34cd06f6b293767d44e7eac3a2db8dfb841b2bdbe01f129eaacff22bc9d15694 SHA512 c4e676cd3b3c40c9f68dd861593ba78753b7c7d1bc54808c764e86fef21ec7c70754ac8781b04ec76b9707ce8b24c0a3003c81bc61bd0eaad57a49ae61cf85c8 WHIRLPOOL 8a2fec338e9387b6130d8bdfa007e0e76b454df934cca25b907a5a833364c54745190339b64485c8156eea9b9781899e5c956cf3dffea153fc7dd733fc41c441
+DIST rustc-1.0.0-src.tar.gz 22121878 SHA256 c304cbd4f7b25d116b73c249f66bdb5c9da8645855ce195a41bda5077b995eba SHA512 dd34857b3c484d869eb6ab1a1e11e62647ac3e124858a4e39e10d749a6e43ce02e77a386d71fe9c97dce80e464cc115d5364892391c2ebc8ed4501b2206474a8 WHIRLPOOL ce74cbd03f1a806e09f6847ce6fffa30cc0c35361e10e3bafbda5409e63a051f88a08c6abd8e722cabf14799975dc3ee7f69886f14c551630e604af27e4daede
+EBUILD rust-1.0.0.ebuild 4015 SHA256 d9bd5217946ba45184705a1673708e540b3dc253e128baf5b2dd1ee81e6bc029 SHA512 23cc5e92a78154eb3bfd519f6fc8da9dbd2f00c6acf089622e60eece0b686aa7aec119a3c8ece3dd02f5ad7b782d6b660d14d270336583b436eafdfd1c9aa037 WHIRLPOOL 41e5ac1ca0db8cc2a8cd2758cc0c8a1ba3d3d52680c848af06276b19fd92c3bd286b292edcacda233ba10b3725669e5c4d9f6204255c390498111abd751adb63
+MISC ChangeLog 4153 SHA256 5ae89832612b192865b9aeff8f21e7e99b1037c7d8a5ea930b395727421570df SHA512 f0ae66d58f7ccacdf9fde416106d42abe935df79ae7a57deec4fee019848c78d7f92b455b56a6eb874fa06ec3496d9f8f3f879c4e2e0dbeefc31b0e64abe7a22 WHIRLPOOL 45b8ddf55afec6912c8b3b9f38d3e8910ccb4891a035cc46fcf8c888dfb9d440fd75237f46510553942358cc8c859989187a0c9e3a9d906821eb3ca4b14445c2
 MISC metadata.xml 740 SHA256 97a02ffcc66d0502cfa844c9e81cf0bab08399518d8efd1c288d153d1d599ec6 SHA512 33bdcc855fa2f84ff8258beb057478828b6874f70ce5909035b4f2a9c8df32b0d757a9f3ccf483222935e3d20e8b0e78740010de08359d7d9402ed336fb0db3b WHIRLPOOL 64f63d05aa25c7d4fa58cdaa5e3a931f08172fefe8eec6bee82d485d37bcbc860654bd7ae9d284a4d0860dcea6cef3e81a3cebaed13869cef47eb3f3f38c0195
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJVcCzlAAoJELvuk32y76HUN68QAIX/W++sAMESR0pNFDh+twur
+FZzDnq6qNom3SnZwaOEc2HtbDeEsnT9dR/rjw4coB1EQxNibEXWSZLPe+ovWMaf1
+YnXfTwTynHh0EqHe01fASqb0DLVhxj4PP/QQ1ntMbcrDFqxNb4nQF/5KolFeg0NO
+s6TcZRi1R25JsBttlicQ81IntQmGg2H8FA5H+3/v47cu4a822+HYq552grGhA4rU
+mC2b8oXdiaa7cAmmHn3cCZfGhv3OQ3knAucXB488f50sYsd/30Jk6ncY+Ac+zVmb
+KWbkoCBF++fPHbEYsMTag2gB8Xb/rgOLC4ezBH2/J6YgNFXTqBEBN3kS34Z67hfg
+Y9L2rDLCrgFTWkrb9eK0LNm6bUS86TmTXd4gNTuMnc0Bd9Xc9KSiQoedglQnkba8
+wKgVpkyA+YwCzoL6DFFQ6M+aQFOGvv3OaTZ8anASaBFRoqXiOLKXRhcpTgoj6IQ0
+j2I4N2mGfDwYdDOMZau48AbeH9Wm2BaktnbHpOF0IePGnW+QtNButm6wy0Pk6Iu0
+3K0NtZg9Halgc0r6LMFGW2Cfi7sV3d3G+8ajWVQR65LfivkX5Sv5fbSrpxCB72Kd
+0Q3JACXFeJ6ugnQZn8WlPnq0etUcQAlRhgZpUVek9JUnL0L7sdpT/HQX0Q9Xim/A
+d32i/gQpzQZBfT2pO2Os
+=ts/j
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/rust/rust-1.0.0_beta3.ebuild b/dev-lang/rust/rust-1.0.0.ebuild
index 5788bcea83ee..47eeb730cb65 100644
--- a/dev-lang/rust/rust-1.0.0_beta3.ebuild
+++ b/dev-lang/rust/rust-1.0.0.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_beta3.ebuild,v 1.1 2015/05/03 16:25:22 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-1.0.0.ebuild,v 1.1 2015/06/04 10:47:28 jauhien Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit eutils python-any-r1
 
-RUST_CHANNEL="beta"
+RUST_CHANNEL="stable"
 
 BETA_NUM="${PV##*beta}"
 MY_PV="${PV/_/-}"
@@ -31,7 +31,7 @@ IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 
 CDEPEND="libcxx? ( sys-libs/libcxx )
-	>=app-eselect/eselect-rust-0.3_pre20150428
+	>=app-eselect/eselect-rust-0.3_pre20150425
 	!dev-lang/rust:0
 "
 DEPEND="${CDEPEND}
@@ -83,6 +83,8 @@ src_compile() {
 }
 
 src_install() {
+	unset SUDO_USER
+
 	default
 
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
@@ -91,16 +93,15 @@ src_install() {
 
 	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/"
+	mv "${D}/usr/lib/rust-${PV}/rust-${PV}/rustlib"/* "${D}/usr/lib/rust-${PV}/rustlib/" || die
+	rmdir "${D}/usr/lib/rust-${PV}/rust-${PV}/rustlib" || die
+	mv "${D}/usr/lib/rust-${PV}/rust-${PV}/"/* "${D}/usr/lib/rust-${PV}/" || die
+	rmdir "${D}/usr/lib/rust-${PV}/rust-${PV}/" || die
+
+	dodir "/usr/share/doc/rust-${PV}/"
+	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
+	rmdir "${D}/usr/share/doc/rust/" || die
 
 	cat <<-EOF > "${T}"/50${P}
 	LDPATH="/usr/lib/${P}"
diff --git a/dev-lang/rust/rust-1.0.0_beta2.ebuild b/dev-lang/rust/rust-1.0.0_beta2.ebuild
deleted file mode 100644
index 6e5b1b2dc727..000000000000
--- a/dev-lang/rust/rust-1.0.0_beta2.ebuild
+++ /dev/null
@@ -1,133 +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_beta2.ebuild,v 1.1 2015/04/20 21:24:13 jauhien Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-MY_PV="rustc-1.0.0-beta.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-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 )"
-
-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 \
-		$(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
-}