version bump, move live ebuild to rust overlay

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB2EFA1D4

5 files changed, 56 insertions, 151 deletions

diff --git a/dev-lang/rust-bin/ChangeLog b/dev-lang/rust-bin/ChangeLog
index 01f45657d733..a818461a74f5 100644
--- a/dev-lang/rust-bin/ChangeLog
+++ b/dev-lang/rust-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/rust-bin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust-bin/ChangeLog,v 1.1 2014/10/18 12:50:48 jauhien Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust-bin/ChangeLog,v 1.2 2015/02/10 11:54:53 jauhien Exp $
+
+*rust-bin-1.0.0_alpha (10 Feb 2015)
+
+  10 Feb 2015; Jauhien Piatlicki <jauhien@gentoo.org>
+  +rust-bin-1.0.0_alpha.ebuild, -files/rust-bin-0.12.0-no-ldconfig.patch,
+  -rust-bin-0.12.0.ebuild, -rust-bin-999.ebuild:
+  version bump, move live ebuild to rust overlay
 
 *rust-bin-999 (18 Oct 2014)
 *rust-bin-0.12.0 (18 Oct 2014)
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 730edc40e400..4511c2a97450 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX rust-bin-0.12.0-no-ldconfig.patch 702 SHA256 e069f4288537ce64f4d7878d307ed4556f62a7d21433c85f021e9acf5ce054c8 SHA512 0ece0d7a74e79333db159b5cf8e2431439a54fce0dcc3486e3e516fc76069f3928e67bba962e5bcc7a2427b2a6e98e70fbf693b7c9da9dd3e8a79f044c2ddb45 WHIRLPOOL a7c39e54517333847bffd54c4fb5214453f9fe47219fd1d8beb2b113c2acda1dcd7ba00bd31f4e0898ddc1b81cdbe0381db67949c58ffce8d863e8ce42ffaa48
-DIST rust-0.12.0-i686-unknown-linux-gnu.tar.gz 110403651 SHA256 2a96a5662e1248da0c2dc3394646b7e75b2c05b2df332cb6f388bbbb6cb75999 SHA512 466234164e9dea906f2adcce8a4eb423fbce729171ec865cc3162b2c6b73166cbe4b4dad98cd342555ed35497dddde9c9e04b80a607d8862923e05931c406ecc WHIRLPOOL a0244cf7ed0de3417da7e982043c219cd91c08ecfba919bc6ffac9adf632f937bb21d403d1ba5ccc31e6fc44192f3954ed900ecaffc874320b67d879bfab18af
-DIST rust-0.12.0-x86_64-unknown-linux-gnu.tar.gz 110096209 SHA256 bb3e2eda2bd25690c58a3925ca175dedc27fedada33af4159fdb63dae9cc41a3 SHA512 1e08408cd8c8900fba637ce69efeb3ef565323c80aa94bda8679a667d19b16c2c10daa527a54ea401d49537aebfda825e44d690c3e99c025aa8e5ebd1b79c5fe WHIRLPOOL 63cf0b46f51c2010a7485427b179f02baa3a9e7e4a277df70617b50a603fda75591e74d5e4a263ab964e7f6c88ff3713e437a9967879428742431840ca970abf
-EBUILD rust-bin-0.12.0.ebuild 2094 SHA256 dcbd3256c9d86c115094339a0bc20328d23ca95fc6ba3c0fc5e94788b7661749 SHA512 e6277829d0492c6effce21e261684c13b200a57ceba314d2c33f5d8342d6b268a6e08b1ee8d1ebeabcc8707abd3f973db89f78ad4bc1f86693d4e8d8bd39b35f WHIRLPOOL dff3f2aa64a053213a5451fbd97f69c302aed37433574e2c2c184789ae89287d17d7a1374891ba75d432d5a30ae38bdb6303178d48df522d6eeaaaaaca2c167e
-EBUILD rust-bin-999.ebuild 2514 SHA256 594479c4fab73947b99b4787fc40c1123ea21269f6680bbf487a7f52a4471388 SHA512 744c32742dd99c197a9ad4d54cc7e7c6c7450d1657f976b1ea180a48fe999a8be78c4d397b19cc49235a7aa493e1d2174b5ce9543a93825df23317c732caf4c8 WHIRLPOOL 94731faafeacda1b5539276c4cb105923edf841bab3dcb95311255c21e1d189d0be0e2e106693ef0779bf2c29d8dbc70268dd86e1e33918ead423b5cbca4d07a
-MISC ChangeLog 469 SHA256 e2fdcd35e4df044a59b547961cfe14030bdc879fa46963c1dd9d2e72260a26c9 SHA512 d03092e211816319c6f4f5e5798e0221971aad35e342645e0cbb8b393f0886f9d4dab5f6af46f88cee31ddf75fce4cd568ba04b06d9f9152945218f2087e7046 WHIRLPOOL f4076687de99bff4965cb9b12c0a2e26e69e70cebd8a231d3e90b36be70859e9ab912c2c25cef37563a813a5dda46e8ae56136403fb4b9c44d7ac1a629d50b13
+DIST rust-1.0.0-alpha-i686-unknown-linux-gnu.tar.gz 174728415 SHA256 90f817e631a6e0cc9c3128400953752d0b2bcf487a2af36031bcdf9a218ff014 SHA512 e02e6dd56c3247115b4c88bae640686856da876d33c3d3268292b50c8e23e8fb6097d790e093de44271c6f6130ec406ddfcc727b1a1ef7ebedc5f6a37ff74108 WHIRLPOOL c8aec61fc4d4825ad404871118ceeb2286f7901ac63ea73737e5967d29a0e5bf6483a6dfea5c82c74754d0fd6f61e0444d95e82622ef94a3e800c604e791510b
+DIST rust-1.0.0-alpha-x86_64-unknown-linux-gnu.tar.gz 174552165 SHA256 ac44090536b7264d3b770f01c2f544b7f64c649e75dc89e7717a1118239f4b20 SHA512 5ef4875efc8674485e48a6742b79bcb329f61aa00d6fae92379e9b685bb1de4f95c2f11e6046e3a2c009c7a43a42e46e5e5d28136d33a18ebd667a892782c02f WHIRLPOOL e145e7831b310bd03c273091a3a1f30659ec487475bd7fe70b2b41f242c516fbb96226bf7535acf796f8436fe1d659eba431099d396c598ff4e22e5ee316cfaf
+EBUILD rust-bin-1.0.0_alpha.ebuild 2650 SHA256 b7414a25cbcbc9b9b35abd67dcc97ada855f9fb7b2ea26933a03617ef619be23 SHA512 9bd27586b315f0d66444451c1208e0e807c09b8337596ad3bcff6171c2c03eaae8cf06be007fa2d24d1c70ff93ddbc6b83efa2e7e1ac4335fa1313d848805010 WHIRLPOOL 8eb9df915dfbcbd6befbdfea77a128322d72c56feee666e6d1b7e681fa0fb2709fa08d51bb3814f2271ec8f08e03bce456e2334c6ea92a19935017d0e38b618b
+MISC ChangeLog 733 SHA256 e3b92adf04797466ac81eb8573333268fccfeef81a7f4b6fe8bf1e0b716af25c SHA512 8fcdeb5c06a52ccf3a2a637bcaf90456e17ef4cf65e388f16783fa7597a839e26605398ea4f75df8410f0a5d06d2b56a40180c2764a9f134ed062eb817a5c47f WHIRLPOOL 52ae6925ce3a9a4745a09a82a66b762a6b6cdb973c71f6e50e303a35abd7be9fa8b3051130b81623c4dffba83256c2cf71e9f30e64eab0979838cdfcf5956ef3
 MISC metadata.xml 243 SHA256 18abd81b04a3651cbf1290466163ecb9269199286408c133021daa0e74869f47 SHA512 4bdc4acc90c8a444f645f1f058d2eed96adddb53fc28554f8eca840c744c320158daf264e28b644d67dcda59299d921f84eddbdd471b780b2e5bcae78ddbaaae WHIRLPOOL 0643256f713a85f274a4d748f885edc6db04407fb28eaf3c73803b96c8a9d6c79c15ce162c13096958d0f10500f8edf8d1ac0833f2d256988686ad987811622a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUexGgAAoJELvuk32y76HU0UgP/1cZ3BiZFormiy4s+7V1NYpD
-e0YZZIU24u1ULjUxPhSydiwXZBKGXIliJoXoMJ7OaCfNrHlZaJH5SMfkoKKJp1p2
-q7xP3WeWe+bLMkSAedfryIJ2EowMYZYn25GthOrkvFfuKtSAYhv8L2spbvdGaddP
-Y2S+HOzs7yuieYbam8f+SGOAp7bngwPRfuQW/sQvDw1paIwKHCNsV5fxY3ARhyz/
-2TQnowlp0K9boFfOkGy2l6Bzu2EjvDrqYoBjmRLJrp36Eca7YYAzOYt+hV2gbcKb
-pqcAPH7XwBat/fWRB8m0SaU/Yd2feisZIuWukFBkHXIzF78XNIjxfxAvyuZwahAA
-Rqj2U6NZ63R0OchD6tVP3gt+rshrE2LWUUmdZ+Ds+d2bdupOqttULAWRbvKgFMmo
-wAraUgcbSokNHhtz5EP46o7S9O+hFFIn9lky/A80B4PGeHzSkUzZ+jNeMPYXn26N
-MkIMMG0fpXHNGzNW/j0Q6uTnq9Fxh9DyZEKOi0Umjfvu8GPnNqFKuHR9sBY/ZO1+
-gxykXpruwp4k9thLqVXVCkQZ0Y72+7X0NvSi8CaTlqE3X15U1EVg2Lrcz+5TyPnd
-vuobDqXvh8Xn/kmzGHfeqRQ4flH6079cUYl+EI/Mh6bTA9+vc3usA0jw9MvgaqeD
-mwUa5/efs81UXHfvNsF2
-=tpxg
+iQIcBAEBCAAGBQJU2fGOAAoJELvuk32y76HUAhsP/R428Zv/I+RqKIe9AaVBFYZL
+lgH1rm7/UKXkwJOyRZ24zO/Scos7UyTXC4jFajS1dcRtqf9YhT4cACFu01c72g/i
+Y4+vBZRd4Ht1g5bA8Nb7oS48Z3n/jgKlsr8TnHGC9ihj/+Tvp7zXvk+CBWkYGDhU
+6J/P9VXL4M/Rd7gobFcMzzY2uXn3y6K6T026Bv7hzPHoh9GHlJkIacxef1rSaxcD
+8/QYZSJ8iT5Camxzh4GXE8PyNZH/k9st8TpiuBv3E6hRMgL1Wu5JE6CldSoJoTXq
+RMcFodKW+3FZVALfALaehy0wvM2Qq0JmfNOMFZ3mCcmKfeOo1+pLbd1VCyA1Hsi1
+af4OGNJcs5HQ6kenE1zCvKJRjWlr7wCc8OQSJrWGSshcP+cXa4CvIDNUwdvcx78+
+a8ucjC+9rFK4f/Ud5W5E/3UCvRoOEy07ywhbDbt8wh8Qrx2Y85Nr9LXgc2qe1y5j
+XH/Y9E+a6Xa74O2jLk8UTZBoJ3tFGtRfdqG2b5Zmzas3RBSJN9vqsmstSb/jHwqN
+KZ1mNuWVdjrIcbyfIuSx3AtAwUFs/+MCIhLRTX59i9mITSzhqzYLhi6gT8aoSAzS
+woPqj1MEgS9JntoYkD21NjSawuO4BTt04OFKpaN7ubZkd0nuwgS8gHZOtnHfKJsi
+RSiiMDjOCC5t3DXEZRVQ
+=IT4w
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/rust-bin/files/rust-bin-0.12.0-no-ldconfig.patch b/dev-lang/rust-bin/files/rust-bin-0.12.0-no-ldconfig.patch
deleted file mode 100644
index d4c5fd8d1be8..000000000000
--- a/dev-lang/rust-bin/files/rust-bin-0.12.0-no-ldconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Remove ldconfig(1) execution to prevent the installation script from accessing
-outside of a sandbox.
-
---- install.sh
-+++ 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"
-
--# Run ldconfig to make dynamic libraries available to the linker
--if [ "$CFG_OSTYPE" = "Linux" ]
--    then
--    ldconfig
--    if [ $? -ne 0 ]
--    then
--        warn "failed to run ldconfig."
--        warn "this may happen when not installing as root and may be fine"
--    fi
--fi
--
- # Sanity check: can we run the installed binaries?
- #
- # As with the verification above, make sure the right LD_LIBRARY_PATH-equivalent
diff --git a/dev-lang/rust-bin/rust-bin-0.12.0.ebuild b/dev-lang/rust-bin/rust-bin-0.12.0.ebuild
deleted file mode 100644
index 531dd377f703..000000000000
--- a/dev-lang/rust-bin/rust-bin-0.12.0.ebuild
+++ /dev/null
@@ -1,77 +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-bin/rust-bin-0.12.0.ebuild,v 1.1 2014/10/18 12:50:48 jauhien Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/rust-${PV}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/rust-${PV}-i686-unknown-linux-gnu.tar.gz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="emacs vim-syntax zsh-completion"
-
-DEPEND=">=app-admin/eselect-rust-0.2_pre20141011
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}
-	emacs? ( >=app-emacs/rust-mode-${PV} )
-	vim-syntax? ( >=app-vim/rust-mode-${PV} )
-	zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
-"
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/rust-${PV}-${postfix}" "${S}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
-}
-
-src_install() {
-	./install.sh \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man"
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	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-bin/rust-bin-999.ebuild b/dev-lang/rust-bin/rust-bin-1.0.0_alpha.ebuild
index 579915984026..427dd9c2a5a1 100644
--- a/dev-lang/rust-bin/rust-bin-999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.0.0_alpha.ebuild
@@ -1,65 +1,55 @@
-# 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-bin/rust-bin-999.ebuild,v 1.2 2014/11/30 12:46:22 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust-bin/rust-bin-1.0.0_alpha.ebuild,v 1.1 2015/02/10 11:54:53 jauhien Exp $
 
 EAPI="5"
 
 inherit eutils
 
+MY_PV="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/rust-nightly"
+SRC_URI="amd64? ( http://static.rust-lang.org/dist/rust-${MY_PV}-x86_64-unknown-linux-gnu.tar.gz )
+	x86? ( http://static.rust-lang.org/dist/rust-${MY_PV}-i686-unknown-linux-gnu.tar.gz )"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 IUSE="emacs vim-syntax zsh-completion"
 
-CDEPEND=">=app-admin/eselect-rust-0.2_pre20141128
+DEPEND=">=app-admin/eselect-rust-0.2_pre20150206
 	!dev-lang/rust:0
 "
-DEPEND="${CDEPEND}
-	net-misc/wget
-"
-RDEPEND="${CDEPEND}
-	emacs? ( >=app-emacs/rust-mode-${PV} )
-	vim-syntax? ( >=app-vim/rust-mode-${PV} )
-	zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
-"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
+	default
+
 	local postfix
 	use amd64 && postfix=x86_64-unknown-linux-gnu
 	use x86 && postfix=i686-unknown-linux-gnu
-
-	wget "${MY_SRC_URI}-${postfix}.tar.gz" || die
-	unpack ./"rust-nightly-${postfix}.tar.gz"
-
-	mv "${WORKDIR}/rust-nightly-${postfix}" "${S}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
+	mv "${WORKDIR}/rust-${MY_PV}-${postfix}" "${S}" || die
 }
 
 src_install() {
 	./install.sh \
 		--disable-verify \
 		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man"
+		--mandir="${D}/usr/share/${P}/man" \
+		--disable-ldconfig
 
 	local rustc=rustc-bin-${PV}
 	local rustdoc=rustdoc-bin-${PV}
-	local rustlldb=rust-lldb-bin-${PV}
+	local rustgdb=rust-gdb-bin-${PV}
 
 	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
 	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-lldb" "${D}/opt/${P}/bin/${rustlldb}" || die
+	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
 
 	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
 	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "/opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
+	dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
 
 	cat <<-EOF > "${T}"/50${P}
 	LDPATH="/opt/${P}/lib"
@@ -79,10 +69,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-bin-${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-bin-${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() {