From: Jauhien Piatlicki <jauhien@gentoo.org>
Date: Tue, 24 Feb 2015 14:02:37 +0000 (+0000)
Subject: version bump, sync with rust overlay
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bb45f966e2ec10d217c714c6c7ae7bc20bbf40a;p=gentoo.git

version bump, sync with rust overlay

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

diff --git a/dev-lang/rust/ChangeLog b/dev-lang/rust/ChangeLog
index 501e86fd541c..1312b9eabe53 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.11 2015/02/10 11:35:29 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.12 2015/02/24 14:02:34 jauhien Exp $
+
+*rust-1.0.0_alpha2 (24 Feb 2015)
+
+  24 Feb 2015; Jauhien Piatlicki <jauhien@gentoo.org> +rust-1.0.0_alpha2.ebuild,
+  -files/rust-0.13.0-no-ldconfig.patch, -rust-1.0.0_alpha.ebuild:
+  version bump, sync with rust overlay
 
 *rust-1.0.0_alpha (10 Feb 2015)
 
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index e5d01938dfa0..1e672a544abf 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,27 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX rust-0.13.0-no-ldconfig.patch 953 SHA256 069daaf97a35815eb86bfe49da03f0cea9ef2fcf6508260161ba2df7a893ab58 SHA512 67a7696b12d05d72268fbbf0712ce0e8f6699d1a57911b493de6181386912f109d153d4416c1875a5001bd8a2e9b63ce358d6f201a36003b1c6f1fadbd436b4f WHIRLPOOL b3221d197d2519dc06fc35369640b3d81f5aa136505f1dbcc80b4678347c0b23eac34e0e98c4c4e3538f5dbe25431aff22c34250acc7467329832e1a007fc6d0
-DIST rust-stage0-2015-01-07-9e4e524-linux-i386-d8b73fc9aa3ad72ce1408a41e35d78dba10eb4d4.tar.bz2 17018260 SHA256 eed180a34b69e3dc4c04a69255e819cb4c2d84b150fa43974aa55475fb886308 SHA512 804342c8d01e546d0a9ae2158498add752d91c7c36add6250c800d3f3aa67bbb9f5b510af12b2a51845ea533363bcf17ba992daa0ead0d5c3bb470625f2c3e86 WHIRLPOOL e5d0040b76286c93a704bc03131006152336d8420952c28364bc5e9a7c18a088fe697087ddbbd9df0cc9e1ca0e5a67d65be5123f7c308ad196fed40135516fcd
-DIST rust-stage0-2015-01-07-9e4e524-linux-x86_64-697880d3640e981bbbf23284363e8e9a158b588d.tar.bz2 16662646 SHA256 0e417b7970231c7687bb502826b6697d7329da0533743dc94e52046ecf6b18a4 SHA512 0291699331cee6635fe708ef6891f899089f527b3d26972742b5e3478f68f184166e48d40a28a9450c32ea1737b437bfa89712590e3dbdbd11ce4d9978190319 WHIRLPOOL 86195d3b296e064196a437cec4c3dc5f58b1de830c5d31647e4f5c2073d6a8757b595836bfc5a7fb38ffc693b51bf59de6cdaf8a0fdf3099696bda696c058921
-DIST rustc-1.0.0-alpha-src.tar.gz 21344613 SHA256 3a2285726e839fc57ad49ed8907a50bab2d29d8f898e2d5a02f620a0477fc25c SHA512 7285f1a90e75b31d4455a025a93fbdc590203e0875e3c1845df99e20d92a880573dff8ccb9d0ab4e85f64208a4eb46f5f71dd0c7def8e3d589021b90714d7b06 WHIRLPOOL 827b18b363ccde654499b616937df76daaf8b43bf76af2ac438006c3f0d71540df41d1cd109f58822627c9aea1be9f106ced3ff82630e965fce62f82bbceae75
-EBUILD rust-1.0.0_alpha.ebuild 4066 SHA256 b06477bd875077c1b005e534eaab25a1f03a21f889b5f1339253980697fcae3c SHA512 2cd1cdc45ab489ba76fc4192b42d537a757e016536b9b493febb6f8db5d62e1da4c553d864adc418cf6925eabcc53d348a95fff077cea2519b7a2b6a02d6e43d WHIRLPOOL 2301408228c4dd79473a7ef4af72582e5c7f1fc10893ddc680c6966eea40c93099c0b356e43e8f088b49d35a929532535391ea7ac7a616e11a5bd778ff6c4613
-MISC ChangeLog 2952 SHA256 5178b5c65201c08e29431e8e877492ef56b2cbd4315b41b6f246ac98d3ef3ac1 SHA512 d99b01f971c1954180539d93e675b591f16bcb72627f51f2d02ec88a19a788a4bfa77cbfd769279a670d8c282890f039574bab09f344f7aa67c5094cd3064efe WHIRLPOOL 25942ab048d797d58d17599a1b8fee52e843cf1d19e42342ed65b5d309253ed6d44081b8f9bfa87dc3a2f66b8ee9be72eb1bd39f41acd8fb9ee57466f7c32986
+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 rustc-1.0.0-alpha.2-src.tar.gz 22187865 SHA256 a931b945e98f409df68fdff23e98b688024461c28901106896e73708381956c8 SHA512 54e12917a829eaa8d84777564ba91013bb1cef021c2fbcf88688d718ded15718f1063828b453eb66e8a750290bf1b45039669e7185963defd32334b2b69d881b WHIRLPOOL 33627cb218dad44e0163b3d51a6a13d6a7bf79db7fc1ae3c4a34bfe9e3a132d650c0fc8f55fb3e35e822aef2f9347c47058fff2e74fc5679124a700eafaedf71
+EBUILD rust-1.0.0_alpha2.ebuild 3969 SHA256 018defecb67adcf8e5c01d65f9d0d91b51e7909e1eca757972dd0cab37100ca8 SHA512 a93f30e9fbfaaf0726dbe0ed251b3c6f85067b8659ca330731bf90dfc256527e0136ee6577dc3b3a8511820bcf93a6f36b3c9a5c9cf2cf87e09a274aae43769c WHIRLPOOL 119970f5eccc4d02f35e7d5f016ff2b4e9a9798e528eea0297127862f3fecde089b7a698085fd239ccf201122a017dc60596f461d7d712c4bc1c1f57e2a08093
+MISC ChangeLog 3173 SHA256 2048d6042d49de13a77ea2e295b563b4ab9c06e29f385d0253710f92daa865e7 SHA512 9431e8ecef33662786884ed50faf189942c86f696e11b70a977afc92ed775cceef9ae7920e9bc9f6d635dbb3e8b3b299a8b33540ae4748c9552930d701693c5e WHIRLPOOL d3877579f1db681105077c9ffbf783c76e00633005e6d114a3f45b315956ed7036555a509f9e5b24fef0469a2ee8996db31b8b8c6017bd48d0a85f650088ece6
 MISC metadata.xml 741 SHA256 dc03d5b42fa933f3f261f06c02f6723e8847dd581ba1fa337d86fc6e742194ce SHA512 0e5dff49657f0dd2b79db65140c7154d6a1256bf5415570c28b057858680fe78ddecdaa53a5066290a46e146f115790bccdd1bf32309cd0b6b62b5714e1df45e WHIRLPOOL fa8f678aa025da4f6487f23ee8b4dd1056d3affd9c52a9cb4287390cc461fa9e5c77796f407eb576b2757f6ee81d44382d5fb975015ebbe3629af2e8c424b2d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU2e0CAAoJELvuk32y76HUS6kP/jRXkKt6xw/YUo29Pw9iqWVa
-p4cvjxJJdrwmGZyUAkTQ/hLNbwZgYusE4UaToq+nrXhMUo4Wv3dRCqYC3IaPp3//
-37bAAEiKcvie3Vr9wfQW/fs1phT94p8pB4Yuv67vJizjhZSorJSGeKe1l+Qkdh/l
-7fxw3Yi3vYqwfd7N7I8lRQ9AM3BHniyRZSQxkWjEY2xgnMaG+fzWm5vgrPa5SIDq
-bplz6FR54Q1GPxaDPkyceyzvb1id+FSHmHM4tUGhqLF6kmD3Mzobp6ONny5M0kg6
-cupr+qnfMy2AsVEmeTqhhq+PTO3J9rUeNru1Ft5oR/KhZM9UFU01gTRQQdt/WfRx
-Q7HbYHmamUTJR1i/M0m+UFTK74P8hkvm6EFyQce1LSg323jGKJoffdtOuWGksnFo
-P6vd+J00JyokNgQI/nwRAkSa1QFpf2yqpU0KwpiTN21x75vH23Q5Fh4yMkivdp/E
-lLDsB2WTSvxts6GVaWOY9P2RyOIUn5wA4D9DO+E0rcJM3yOsTmM4iwqtOvNbaCgo
-+C5LzwNm7yqdpxko2zncARduZK/bv7sUXAizsXHz8FJozNNbqwJ4h+E+cQe96Mes
-QJ2NPCwA2OkTHg4HE2pbTbtPjZkjeXBmbqbiQrRR2iuTO/hNEEFWXJgd18oqYcwX
-dirgEiMUoFTDnQLKIh9/
-=JpCO
+iQIcBAEBCAAGBQJU7IR7AAoJELvuk32y76HUM4AP/RMQYXojk4UpNpFPUaRemUEu
+h1egJlmC+b/JtSG2NJUHT72dCiohWo6lZSfXAVjeXjUyjsHmPM83v7TC6h4FUXs7
+Vqs/m+Ir3B2b9pJWBOagRFNpwURjYRB2BSsFQheELMb8g/+MnsNeTDqN87Ibirpp
+dZptEnIwlu7vL2I5yd/WCWpEiPjrA2NqI82e4SvaXNSZf9qeTOr+J+NKJEkC0x1G
+Bh/34lpK9ZIQh/504cRnYGTXpn/gvduq0dVgLGIeMIlq8+56isSQlnzQDRrXzj4O
+PCl2ZtIDntj2/zcvEIpqsgoxOAjfPSQU7JFiXS5o7N4M4L5qkGwkB3wJGOKXnfIh
+AearRohtmnv/tcZi5zD/36DPVHRtuIn1mmSnW/jLnaMfB2+sC5CzXLAAkj5MTPaf
+lH3z7H699gB/aPIIlONnyk3xrW8EHWm55cYCWBSfeY7w+S2Hi8yWW7KJv2qfqD5n
+MJyCQAd2k/uWD1fJWw9X6DETX4CAbqC2y3vHD+nmw6uWds7PbNY9kB0arPv7QPB0
+iyitlPevMXfGMP7VTWWGlrkDvaDjpjK/Krn2EeryR+oQQvWdMMAUttGlZAITfFKj
+XrsDaC2xKPFYGXcL+5eckieVcX8+H8+OoL+vDvKdThioSSJ5qGAeyWVxEP+N7wdk
+iuWdmD6x/yKGB5lCjB1A
+=HyPE
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/rust/files/rust-0.13.0-no-ldconfig.patch b/dev-lang/rust/files/rust-0.13.0-no-ldconfig.patch
deleted file mode 100644
index 919fa303254d..000000000000
--- a/dev-lang/rust/files/rust-0.13.0-no-ldconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Remove ldconfig(1) execution to prevent the installation script from accessing
-outside of a sandbox.
-
-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" = "unknown-linux-gnu" -a ! -n "$CFG_DISABLE_LDCONFIG" ]; then
--    msg "running ldconfig"
--    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/rust-1.0.0_alpha.ebuild b/dev-lang/rust/rust-1.0.0_alpha2.ebuild
similarity index 83%
rename from dev-lang/rust/rust-1.0.0_alpha.ebuild
rename to dev-lang/rust/rust-1.0.0_alpha2.ebuild
index f646c7eced68..5bd76a197a03 100644
--- a/dev-lang/rust/rust-1.0.0_alpha.ebuild
+++ b/dev-lang/rust/rust-1.0.0_alpha2.ebuild
@@ -1,30 +1,30 @@
 # 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_alpha.ebuild,v 1.1 2015/02/10 11:35:29 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-1.0.0_alpha2.ebuild,v 1.1 2015/02/24 14:02:34 jauhien Exp $
 
-EAPI="5"
+EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-any-r1
 
-MY_PV="rustc-1.0.0-alpha"
+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-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 )"
+	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 libcxx +system-llvm"
+IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 
 CDEPEND="libcxx? ( sys-libs/libcxx )
-	>=app-admin/eselect-rust-0.2_pre20141128
+	>=app-admin/eselect-rust-0.2_pre20150206
 	!dev-lang/rust:0
 "
 DEPEND="${CDEPEND}
@@ -45,24 +45,19 @@ src_unpack() {
 }
 
 src_prepare() {
-	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"
+	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) \
@@ -70,11 +65,9 @@ src_configure() {
 		$(use_enable !debug optimize-cxx) \
 		$(use_enable !debug optimize-llvm) \
 		$(use_enable !debug optimize-tests) \
+		$(use_enable doc docs) \
 		$(use_enable libcxx libcpp) \
-		${system_llvm} \
-		--disable-manage-submodules \
-		--disable-verify-install \
-		--disable-docs \
+		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
 		|| die
 }
 
@@ -99,6 +92,9 @@ src_install() {
 	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"