version bump, switch to new eselect version

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

8 files changed, 520 insertions, 143 deletions

diff --git a/dev-lang/rust/ChangeLog b/dev-lang/rust/ChangeLog
index d81bad9630d6..9444f21e5dbc 100644
--- a/dev-lang/rust/ChangeLog
+++ b/dev-lang/rust/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/rust
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.4 2014/08/29 14:12:27 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.5 2014/10/18 12:48:43 jauhien Exp $
+
+*rust-0.12.0 (18 Oct 2014)
+*rust-999-r1 (18 Oct 2014)
+*rust-9999-r3 (18 Oct 2014)
+*rust-0.11.0-r2 (18 Oct 2014)
+
+  18 Oct 2014; Jauhien Piatlicki <jauhien@gentoo.org>
+  +files/rust-0.12.0-libdir.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, -files/rust-9999-libdir.patch, -rust-0.11.0-r1.ebuild,
+  -rust-999.ebuild, -rust-9999-r2.ebuild:
+  version bump, switch to new eselect version
 
 *rust-0.11.0-r1 (29 Aug 2014)
 *rust-999 (29 Aug 2014)
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 28aca74085d2..903d57c2b5e2 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -4,30 +4,35 @@ Hash: SHA256
 AUX 50rust-mode-gentoo.el 99 SHA256 8edbc05ca285e72963bfbf8c62fcf8b81af03f8127fde7e0cd0e44bbe38070bf SHA512 af3612e7a044823c14248a4d45d53a108f5b7c3c40bd7644adf67a9f0ef00d701fc5b9f17c977f0a0fab13ff76a4e221a9000e7cbb7dd6264b1387e39b9bd14e WHIRLPOOL 8ade2d3a0184dc5e9805dae0b136cdd11cad12fd08546db5438f6a575589447ab8f1cd28aee7110f6aa13dc4f0be57672edc619f2a9726b252779bd5988cb229
 AUX rust-0.11.0-libdir.patch 8231 SHA256 c86ed1af308cc0a3486afe406bdbfcb5a4e56bef3e897ec929d104682019fdfe SHA512 08f217cad02b4f7c30fd8431ffa5a1f7d5475d5d7b026e150dabbbc822fe14529dbbc87b08f4d7f05a620076e78ca5c44f7e61ddbe2adcb6fa9f99c2704c2fdc WHIRLPOOL 807305adf449591252a6f6dbc79a482c598fa38c1b678e9ba539ae46bc7b7a0262186fb4d1b5e416730118f67bc8332d45f6ffae1ef115f46c2a9c4b26d39a75
 AUX rust-0.11.0-stage0.patch 843 SHA256 e6a583757f625506da2f19526211b8ec11067566e5b28ea225ac0034081d0ab5 SHA512 84a31d006b0620096d8e224e2a0f429ea3a9bd3befccfd72c82872cd1a32b1e7be0394b5cee2dd5b777e89480f9469e05343b975c7ab4015893d85e6ed8a8156 WHIRLPOOL 53b47116705e5aef97dbe457fdee970f0b5665cbeaf78c12b97ecb0d8c0c92c8596e73ea1ddcb15a3bd8abe5771a41080aa316296c37ef164c423a91fb8bb8b1
+AUX rust-0.12.0-libdir.patch 3802 SHA256 de21b4115126bd8f90e1afd553d1d856e4a0c56323f26dc2d1c415e73c191fde SHA512 d7bc2a63bcaae9a4f1d623fa9a716f66eeafc965c2968b2cbcf789d46254e0499e1f2a5438b103cc3a58c5ab8074172eefb383eab080dabbf5686519f7d87f64 WHIRLPOOL 859b141c0a39eca960d6a9f305c4fd04a74d7e723dae13d19aea35f0c98af208fc613e2facf3e2d07527e634565071b6e21d154e9261aaeff363c308fcdeb60a
 AUX rust-0.12.0-no-ldconfig.patch 805 SHA256 0b7d7dc918ada3ba9a3ab638abb06bbd99e7d4b80d890ed64afe4cce00f11a99 SHA512 798f4e0a87f604f3cbd0c1f8d17144a97c62b37f20b4db18049d1bf18a24997e5e9b636e164055fa07a3ee6115b0eda0aad4229f78d09052ea75e805995965da WHIRLPOOL 727dcb8a22d4c9bd08f1c6cba84c5abe25b43be624b63ba1b7acfe4aea2c3a10283c0bc7b652fdaf83f0de032ff824ed3beb8489d5a27cbe21131ba25557d064
-AUX rust-9999-libdir.patch 3802 SHA256 de21b4115126bd8f90e1afd553d1d856e4a0c56323f26dc2d1c415e73c191fde SHA512 d7bc2a63bcaae9a4f1d623fa9a716f66eeafc965c2968b2cbcf789d46254e0499e1f2a5438b103cc3a58c5ab8074172eefb383eab080dabbf5686519f7d87f64 WHIRLPOOL 859b141c0a39eca960d6a9f305c4fd04a74d7e723dae13d19aea35f0c98af208fc613e2facf3e2d07527e634565071b6e21d154e9261aaeff363c308fcdeb60a
+AUX rust-0.12.0-stage0.patch 10172 SHA256 3f3921775b4e642d74f3b48d7ca1f670092cd1b7cd9a5cacfcbfa83399afd53a SHA512 924c45ceccf90679ca113ef0e7022a6ae443ab6fa522b3dda34b7592e48241acca4e84871b7bd3917692cf57b264f98590ab00aab7130a25899deaf7b56ee9c8 WHIRLPOOL ddf7ba70d88f61227ec02cdd69b3a92d889e8f54c3abb4fb6573b06f67aab5a14e3ccd9e1d75355ed7887da284c49b95bc6e910b6198b443a5b7ba1f80db22d0
 DIST rust-0.11.0-i686-unknown-linux-gnu.tar.gz 96998445 SHA256 cbfe2050f708479f2625a935d2f41165868f354ff740d2697e08acb2255670b2 SHA512 ed9213ed97351cc7ee30aa4b1177389147771ccaf8d7aa5356cecdb082966a3c5469e08f2693cb840854da523c496c90c47fa3370ceae493638efe82d5994289 WHIRLPOOL baf470655ce9229fad58db537d1fc7d34e5b858d8a06dd94690e0403d0b8d111ed41c22cf1366c7145e22c0ed55851c0bbb56db5d2408c62931c7f76f2a02352
 DIST rust-0.11.0-x86_64-unknown-linux-gnu.tar.gz 97323861 SHA256 331d6374b3c8fca3e2b5fffb65ce75dfce3529bd47333de4a9ce636cb87be432 SHA512 2f98028ddaf9900150fde0bc94f2ffe28a21def3e3c84ffc3d3e5e80ee8b6d5c7010ab01dedf43b768c1c9d356041cf102b43696805f9e15bded2377206510db WHIRLPOOL dd4fcdc4f85fb4aea60cb9b547b4f242b107c3f49f478e10902bf820032b4f620af85a335059bc0fa99e2159be3e66a80a6ea76d193c7643e9cda4c168fd9f5f
 DIST rust-0.11.0.tar.gz 21555837 SHA256 d1b3e36448bf12b8c9289024df416de10774b6d3235d7b1d22b248ef634411ba SHA512 a29e8a1c44097cc78d36d637d1ebf9b1b914d58a56d52f8112959a68916a2df9f5f63f93e596ba6db5be21a962912503e0fd678330a9dac6abe04a59d5af4584 WHIRLPOOL b7fb24920aca2a537af0c7e20925302a20fbd662209a1774a8ecc7c2cf9aaeb9b4fabfdd45620a0fda88b49122abc04882f7254a984b06df47212e537f8713f8
-EBUILD rust-0.11.0-r1.ebuild 3323 SHA256 df8bf49862c996a13ce88c89f7f418442141bca4387206ba2c5120c11e251e6a SHA512 b4d8904cd7c8160a4330069869297e7729adb8d173b2dc950020ac292f003245294a284a396e456a2e4d717e2a5e80aebe0e65b9b4820d94f99566f106529e30 WHIRLPOOL a5f12d60ed713b309e491ee49edbde1f81ab88da1eb615700ebeeb1d1417315c3da03ac0294975c16d8f693ec3709421587d0686048ef8ea7c5d42a19c28fd5b
-EBUILD rust-999.ebuild 3364 SHA256 9fd8b4752ca02cd405752c1995fdbe114b91ed0fb526a9167359c2240eddd3e7 SHA512 7df685a877f86d9c41a089502221b7cadc77bc6f00c40c2fa0882e883b38eb86df1157636baeaa83e951de902611205252f4e3c47edc2c7738126353d40579b5 WHIRLPOOL 57030c37e1869ae59485e9b2a4c1b9153314585f3792c78e591d7e514f66285b66f5b162b8b1c6e380777f8b1e29836c3b4f43be4c66b1c2a0dd5e3ffe38b2cb
-EBUILD rust-9999-r2.ebuild 3392 SHA256 5985ff8442bda3121d2027df9588d7249ecf04940ad8ddcd561cc7cda2a0d349 SHA512 e9ec19d4a61bb4afc6f594a7878120d3af0021a967a1d2f1e991aa89fc3a872336cd1047b5ed82342cd0b9644909dbed77e3eedeaf6192cc35dd4605639b3992 WHIRLPOOL 82f138fc3a045146ab48aa27e3d4cdba377b37aa35799f86dcc34646a9bbdd67d8a7671b995911f4f3952070578d0969a082a444c56d845a01b1eeca0d97c2fe
-MISC ChangeLog 1374 SHA256 742ac331d713abf27108efd4c2842405a0899156630546cac480e76c4e6c7e41 SHA512 86f9c6ebb0fc8f0252dd42012de2f7a9a77274f3e8b996a8d3ec32f63824a14f4e509ce42650183a0c68d1680661e63897de3a21ed29b5848bce000d1c69e011 WHIRLPOOL 033331a3a4183839b3fd26ccc47bfde24af79034e1a1c8571519dd2ea036f66e936c1516397ee36466c59fcaa8c8db17b87926b7fa306b18e99f102f827a41ac
+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
+DIST rust-0.12.0.tar.gz 21223176 SHA256 883e66b24d90d9957c5c538469fcde6f0668e5fb6448beecfc60884060e769b7 SHA512 b01f6ae97fb012ab701b47a8f240a764d0a6f3ee2224ab67289c61f021a1cef2e99a4b61aa3f8991ce90f52b19d6ec93a5a041e5ee4988803e6ef239c8b91445 WHIRLPOOL 8f952936f06d95c4eba4803752d690831d9e60b5f66e289d5c9083108f66bae403917c42744d4a611d636a69c2bd11d69c51c59ce3f899fe3fa94d15e30c4cfd
+EBUILD rust-0.11.0-r2.ebuild 2681 SHA256 592ae50e12baba81a43cdc32fde8d533524e34ca6bf27098fe0179a1f8d93102 SHA512 1a8f9b793101716f39d6c1738ca160911f5879eee754da919d2a500240fa0da21ea136c10951811f43f85667ce0865fb9221c4be709f4bc809b40a91bbbd6a6a WHIRLPOOL 9a951c8b438546a776c16d3d4ba16bd3e94a9bc1ec76c18b983d772f81aac927635a7d854fb106ba3c3d37af9b13c832992c93caf7298b8005261e4838d4c595
+EBUILD rust-0.12.0.ebuild 2853 SHA256 f42641ffbe5099412673e31b1af817858fc4e9c0f5fa502f473d3a7ee332af9d SHA512 13598476ec6020017b5e8ede25996d7bc86ced6da926245a6768a1f62127c86606d190db517150a58ef8069f9aa23053cb60efe99f16a0cb4fc8548c881f1def WHIRLPOOL 738f9db1280d23da4c040b1362ff9f90c751c7a2c4a5b21eb8cc76b3fe18e66f5efea027962bf9dff4dc2a796525a2e9328d7d3640411426ad16562a7a252a91
+EBUILD rust-999-r1.ebuild 2865 SHA256 c9eae75c6872ec641af7a597e400be39483f140649ae69a61230127281c2b5b6 SHA512 21538c96cad0ba007f1b06196b7abe1440647d56e072c69e5a4510d34722f4d40f970c07779c21b0a3ae83f41247293c387a30d9d2c387db37023ab5f9c6050b WHIRLPOOL 6399a051108005c1f36f4cb5026ffb014a35983f0d9e5cb79ac9311c87efff8b2675ee45773b5318c83a304b9933ff9b8efe0df5181311a3706c18e852e0a7a2
+EBUILD rust-9999-r3.ebuild 2758 SHA256 4f0e579e75c7f290085109cd1aacb1624a70776999b017ab0409e62025b2b0c6 SHA512 d3f3be7c2396a04a6fe8379985716a5f9def4b87ce6dd1e12273dc029687be5a6742074ec73d6e19842b6c4d5986462ec0935e856f35980924c2c567ee0114b1 WHIRLPOOL ff40730a002589203cdb4f552e31e82b191cb45d5698a8b7d58dcf8d8e49bfe9ada63be1a2f9cc151004c73e50aa5717949764248e7c8428a711f05fe1975257
+MISC ChangeLog 1845 SHA256 c9a21fd237a240c5eb0d09a32bd14ef00eccf7c9ef45d5f71b390f2005eabc1f SHA512 0e5908c458d1352cb4a13051303dfc67d3f01ef29328bcbd8c7a7d4f7765ab9029df94fdb9588212aed5878bb5ec4ff01b899cd1a09b374028109a224ea4adb9 WHIRLPOOL 65fa221bec1788b96c7a75fc58da4df71db590ba5976f09f4c6cd69c8b51b09a5f0beae05792f08326412dde6a36f0f405bb5966070585c5362251409865046d
 MISC metadata.xml 535 SHA256 17df65c4702c3ce2a237e6cc623285e67b862d7ca2d704653d5a06a2f7818cc0 SHA512 ac82235e80a43097e83a6a484def8bb6caa788956c9d2293bd2c473a71166e9de247d562a39b56f05367d3231516b4859e562b0dafddf4d99d8afa5fe4bc667f WHIRLPOOL a3721ce9389ffb2362ceb84dfb3aed1c81f26e8daa5c53fe41da6bb4ce0bc06367c24e5d7fe6999b894dd75d79a717ff0dc4bdd42562885a41076496a444f041
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUAIpMAAoJELvuk32y76HUGeUQALtYc/hgp7sQ+7zHO3SPeD54
-nUDUpuA01vT+0wV3PxwdR4WuPNHbZ6xLWHgc2bo49dcc5OX5wh0OixlgJ6itHGJb
-6YiA8QPl4VeRKmWPLtMjZpnbRHStrRDw6ry2empmwDL2nQfk0XczbVOrjxwXDGGr
-e0S+1bxJKlXcR/OaWTd01cGKUKY1C3ecXzOcbxEYB7QD9nKwDAn2DrvzRfHKHIlS
-f8hL/osCfXEujcpBO/3vj+J5+mhMnndlpXx7t8hgdkvH5g368cHcjiN8TTa1x7C7
-Hg24tpr7xYOaoBtFDJ09u6QThjwRqkHw6HePXXXVZQAXZL8SBRJni8D3cG/wvX2E
-lv/D2CFyrbuXphjnEUqXi3oLhGKLbQfr4bsNVwl9M1hdANbMoj5g7v67yo0lNILm
-b66r2zAha92MXRCDeKMXTeSMrFhP3shsZNqMs2qmKd5b96Ec/3urAbWyKjsRB2co
-Oi7jVGQsQ9+UMSgcagy+zHzPAZv3OmAuJej2hGfpgD7xOCdwhdYmUe1a9yhWSwFT
-38KC8ekyLqPoEmj1PdJVageec5J27bdRvo6xKBrvYTTHo83nllY3zd/f9AYOR3Ql
-LxS2YZM7VDaAgld42SPiUwteabIkBJPvUeA8DLaNyWAk7Ws4cn8KsIGjeA8NAZyG
-coU9T9Y+sRuO5CSYv0CM
-=QTI7
+iQIcBAEBCAAGBQJUQmGsAAoJELvuk32y76HUyEIP/21DlU8kH+5INhDhyQebrSfo
+ScsruDUEvIrYfH0SmnsUVzJpO+kAePBU8b84kmpQ123xL5u33pA+JUsqBaSoQaxT
+pknlRQxb3tUVRRG+53wk/54xTLbSQ0ywpwEfs63pt8sv17gE5wWmbTcLJFmwUn4H
+8qIPEfZnftlszYf6nAHul7h1+7FiEDWOVDdjhWcFPHHQcHVRhA05fUGSzmZwSprI
+O47HjWTN056cnoo0dWCgRkD3c1Z5X98UcXgPAeH8Uu4YEvo78+7DgXj+Cpf2igMI
+neBYie52Xo9aENyhrMGz/Z21GVkqQ+fbVy9E2zcIs68mjSm5YBsiFpU7vFarwmk5
+D+X68ZbqrWkHekzldXtaZrkXjjpXGn/hIXe3vhqeOptOF41KAx44i04t0kbVIyHz
+oaaMVPMF0NWZLQxPfnHL79jCWPXRNPCrI84sPcHl4a10+aVg2Ui2PNk8c3CRLJVJ
+/vi4pfruyxUFMDtw1nk9iXWXFnbJJskh1NHlcKtE9I5zjtmJust8gxnPBd6ugQyo
+hXkAs4SR6FtDjfEKz89c4YEs5J5HjpXnkjN9d8FiM7s8wgz0w/7zcjnmuk9eI0vN
+Ow7iWsF/hApoGo8Txc59EdMN/M/U1qxPNmMxXrky0az8s6iZE8xnWOTNX3WDi8nZ
+v3iPQYQkf06i/QEQvYFo
+=0Z7r
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/rust/files/rust-9999-libdir.patch b/dev-lang/rust/files/rust-0.12.0-libdir.patch
index 33098b87c921..33098b87c921 100644
--- a/dev-lang/rust/files/rust-9999-libdir.patch
+++ b/dev-lang/rust/files/rust-0.12.0-libdir.patch
diff --git a/dev-lang/rust/files/rust-0.12.0-stage0.patch b/dev-lang/rust/files/rust-0.12.0-stage0.patch
new file mode 100644
index 000000000000..c1b20e405fc9
--- /dev/null
+++ b/dev-lang/rust/files/rust-0.12.0-stage0.patch
@@ -0,0 +1,322 @@
+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/rust-0.11.0-r1.ebuild b/dev-lang/rust/rust-0.11.0-r2.ebuild
index e3be7ee19530..544602c2febb 100644
--- a/dev-lang/rust/rust-0.11.0-r1.ebuild
+++ b/dev-lang/rust/rust-0.11.0-r2.ebuild
@@ -1,12 +1,12 @@
 # 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-r1.ebuild,v 1.1 2014/08/29 14:12:27 jauhien Exp $
+# $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 elisp-common eutils python-any-r1
+inherit eutils python-any-r1
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
@@ -23,18 +23,20 @@ KEYWORDS="~amd64 ~x86"
 IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
 REQUIRED_USE="libcxx? ( clang )"
 
-RDEPEND="vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
+CDEPEND="libcxx? ( sys-libs/libcxx )
+	>=app-admin/eselect-rust-0.2_pre20141011
+	!dev-lang/rust:0
+"
+DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
-	app-admin/eselect-rust
 	>=dev-lang/perl-5.0
 	clang? ( sys-devel/clang )
-	emacs? ( virtual/emacs )
-	libcxx? ( sys-libs/libcxx )
-	!dev-lang/rust:0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
+"
+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"
@@ -66,40 +68,11 @@ src_configure() {
 
 src_compile() {
 	emake VERBOSE=1
-
-	if use emacs; then
-		cd src/etc/emacs || die
-		elisp-compile *.el
-		elisp-make-autoload-file "${PN}-mode-autoloads.el" .
-	fi
 }
 
 src_install() {
 	default
 
-	if use emacs; then
-		local sf="${T}/${SITEFILE}"
-		local my_elisp_pn=${PN}-mode
-
-		insinto "/usr/share/${P}/emacs/site-lisp/${my_elisp_pn}"
-		doins -r src/etc/emacs/*.el src/etc/emacs/*.elc
-
-		cp "${FILESDIR}/${SITEFILE}" "${sf}" || die
-		sed -i -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_elisp_pn}:g" "${sf}" || die
-		insinto "/usr/share/${P}/emacs/site-lisp/site-gentoo.d/"
-		doins "${sf}"
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/${P}/vim/vimfiles
-		doins -r src/etc/vim/*
-	fi
-
-	if use zsh-completion; then
-		insinto "/usr/share/${P}/zsh/site-functions"
-		doins src/etc/zsh/_rust
-	fi
-
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
 	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
 
@@ -108,6 +81,9 @@ src_install() {
 	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() {
diff --git a/dev-lang/rust/rust-0.12.0.ebuild b/dev-lang/rust/rust-0.12.0.ebuild
new file mode 100644
index 000000000000..1d66ef9e43a6
--- /dev/null
+++ b/dev-lang/rust/rust-0.12.0.ebuild
@@ -0,0 +1,104 @@
+# 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.ebuild b/dev-lang/rust/rust-999-r1.ebuild
index 5669a63d5c48..27f7da3e1ea1 100644
--- a/dev-lang/rust/rust-999.ebuild
+++ b/dev-lang/rust/rust-999-r1.ebuild
@@ -1,12 +1,12 @@
 # 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-999.ebuild,v 1.1 2014/08/29 14:12:27 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-999-r1.ebuild,v 1.1 2014/10/18 12:48:43 jauhien Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit elisp-common eutils python-any-r1
+inherit eutils python-any-r1
 
 MY_P=${PN}-nightly
 
@@ -21,22 +21,24 @@ KEYWORDS=""
 IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
 REQUIRED_USE="libcxx? ( clang )"
 
-RDEPEND="vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
+CDEPEND="libcxx? ( sys-libs/libcxx )
+	>=app-admin/eselect-rust-0.2_pre20141011
+	!dev-lang/rust:0
+"
+DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
-	app-admin/eselect-rust
 	>=dev-lang/perl-5.0
 	net-misc/wget
 	clang? ( sys-devel/clang )
-	emacs? ( virtual/emacs )
-	libcxx? ( sys-libs/libcxx )
-	!dev-lang/rust:0"
+"
+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}"
 
-SITEFILE="50${PN}-mode-gentoo.el"
-
 src_unpack() {
 	wget "${MY_SRC_URI}" || die
 	unpack ./"${PN}-nightly.tar.gz"
@@ -51,7 +53,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch" "${FILESDIR}/${PN}-9999-libdir.patch"
+	epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch" "${FILESDIR}/${PN}-0.12.0-libdir.patch"
+
+	local postfix="gentoo-${SLOT}"
+	sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
 }
 
 src_configure() {
@@ -69,45 +74,17 @@ src_configure() {
 		$(use_enable libcxx libcpp) \
 		--disable-manage-submodules \
 		--disable-verify-install \
+		--disable-docs \
 		|| die
 }
 
 src_compile() {
 	emake VERBOSE=1
-
-	if use emacs; then
-		cd src/etc/emacs || die
-		elisp-compile *.el
-		elisp-make-autoload-file "${PN}-mode-autoloads.el" .
-	fi
 }
 
 src_install() {
 	default
 
-	if use emacs; then
-		local sf="${T}/${SITEFILE}"
-		local my_elisp_pn=${PN}-mode
-
-		insinto "/usr/share/${P}/emacs/site-lisp/${my_elisp_pn}"
-		doins -r src/etc/emacs/*.el src/etc/emacs/*.elc
-
-		cp "${FILESDIR}/${SITEFILE}" "${sf}" || die
-		sed -i -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_elisp_pn}:g" "${sf}" || die
-		insinto "/usr/share/${P}/emacs/site-lisp/site-gentoo.d/"
-		doins "${sf}"
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/${P}/vim/vimfiles
-		doins -r src/etc/vim/*
-	fi
-
-	if use zsh-completion; then
-		insinto "/usr/share/${P}/zsh/site-functions"
-		doins src/etc/zsh/_rust
-	fi
-
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
 	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
 
@@ -116,6 +93,9 @@ src_install() {
 	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() {
diff --git a/dev-lang/rust/rust-9999-r2.ebuild b/dev-lang/rust/rust-9999-r3.ebuild
index d3b3c85ace3d..7318d4e66573 100644
--- a/dev-lang/rust/rust-9999-r2.ebuild
+++ b/dev-lang/rust/rust-9999-r3.ebuild
@@ -1,12 +1,12 @@
 # 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-r2.ebuild,v 1.1 2014/08/29 14:12:27 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-9999-r3.ebuild,v 1.1 2014/10/18 12:48:43 jauhien Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit elisp-common eutils git-r3 python-any-r1
+inherit eutils git-r3 python-any-r1
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
@@ -19,18 +19,20 @@ KEYWORDS=""
 IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
 REQUIRED_USE="libcxx? ( clang )"
 
-RDEPEND="vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
+CDEPEND="libcxx? ( sys-libs/libcxx )
+	>=app-admin/eselect-rust-0.2_pre20141011
+	!dev-lang/rust:0
+"
+DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
-	app-admin/eselect-rust
 	>=dev-lang/perl-5.0
 	clang? ( sys-devel/clang )
-	emacs? ( virtual/emacs )
-	libcxx? ( sys-libs/libcxx )
-	!dev-lang/rust:0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
+"
+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
@@ -45,9 +47,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch" "${FILESDIR}/${P}-libdir.patch"
-	local commit_hash=`git rev-parse --short HEAD`
-	sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${commit_hash}/" mk/main.mk || die
+	epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch" "${FILESDIR}/${PN}-0.12.0-libdir.patch"
+
+	local postfix="gentoo-${SLOT}"
+	sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
 }
 
 src_configure() {
@@ -65,45 +68,17 @@ src_configure() {
 		$(use_enable libcxx libcpp) \
 		--disable-manage-submodules \
 		--disable-verify-install \
+		--disable-docs \
 		|| die
 }
 
 src_compile() {
 	emake VERBOSE=1
-
-	if use emacs; then
-		cd src/etc/emacs || die
-		elisp-compile *.el
-		elisp-make-autoload-file "${PN}-mode-autoloads.el" .
-	fi
 }
 
 src_install() {
 	default
 
-	if use emacs; then
-		local sf="${T}/${SITEFILE}"
-		local my_elisp_pn=${PN}-mode
-
-		insinto "/usr/share/${P}/emacs/site-lisp/${my_elisp_pn}"
-		doins -r src/etc/emacs/*.el src/etc/emacs/*.elc
-
-		cp "${FILESDIR}/${SITEFILE}" "${sf}" || die
-		sed -i -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_elisp_pn}:g" "${sf}" || die
-		insinto "/usr/share/${P}/emacs/site-lisp/site-gentoo.d/"
-		doins "${sf}"
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/${P}/vim/vimfiles
-		doins -r src/etc/vim/*
-	fi
-
-	if use zsh-completion; then
-		insinto "/usr/share/${P}/zsh/site-functions"
-		doins src/etc/zsh/_rust
-	fi
-
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
 	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
 
@@ -112,6 +87,9 @@ src_install() {
 	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() {