diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 97d6b69..7baffda 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -16,29 +16,21 @@ DIST rustc-1.43.1-src.tar.xz 94405276 BLAKE2B 8679fe937abc4f758f3e35c2542d57cc1a
 DIST rustc-1.44.1-src.tar.xz 94756856 BLAKE2B 60f536c3ba0fa1fec4b6333ee57809ee5226090ad5041c14a136b4356ff3b898062e06c3fe54effe873e27931ac8fcb902cd48a38615a8de7eebc6ecb3bdc2bd SHA512 1c17002edae844a710db9b144c17171416330dc565343c65af8a6e112fb61555e2025bb4cf33cac1229d7df689e6ff8858b91ae00552400ccacafaf1de11849b
 DIST rustc-1.45.2-src.tar.xz 98683036 BLAKE2B a4102a5d4744b7ccc9b076aba00c39d69532f777e7d39e0e4ce2033b663b43e27b55034fdb3a1e13379fae9a16bff9e7748865a84507f7388ef0ebf9d421eac7 SHA512 cc6250c0bc844e77ca6dd7ae013e434ed3009b001914114866ed31f28edf3960221454d131e298b15050e3b8153fb8298d509559c2f7307c64611aa8e36b4d25
 DIST rustc-1.46.0-src.tar.xz 101868452 BLAKE2B da9798596b124a10d79c236a871228f05e5f571d22c2259328e7026c91e088c85f5de9c0536a16531e0cb10477bfcd16d3ac11467979f5561cb6199442b877ef SHA512 099857f1d295043587a4e2a65ef3e6a90e12c8b6958e98535a1656c113c553f9a9b621aba8a19cf21bd8d2c79d27cbfa4b8e6fabbcb3cbfee23b545be7b450b4
-DIST rustc-1.47.0-src.tar.xz 104143736 BLAKE2B 0454094dde35275488046826da87655e51bf0795481d6d08fd70d644bfc12481bca8641166106ef32f20494906025244715b16ff21a1c023f4bd2818aab42521 SHA512 6ba83c0158f8130ddeae7e070417a2121d8a548c8fe97e28bce116d84048636c75aaee78e0c92cd43a50f5679a1223fc226cc8c5ba9bbd1465e84c5c6034d5c9
-DIST rustc-1.48.0-src.tar.xz 105951736 BLAKE2B 42468fc5ac5e80c4793cfe0913cbb8e43a8def28cc8cf5ed25ab989561e2bf33e155c83e180183362535cbc9008f341eb1273087a2364672b1a4032ac2d6ca45 SHA512 4e12baa6893238a8d336ec9ebe891477d18676f271b32763474fa7a6a8b58fb3187dd4e2aa95bce482989b692cc2e1360221669d6811eec71b326f22a1756c23
-DIST rustc-1.49.0-src.tar.xz 108330280 BLAKE2B 65e36253482ded2df225cbbf15253b6c9a8ae935053b071d9fb9e7b1d47d5d3ac47a138876e4a5cfeda455c655ac06ceff2658c8668cef7d2206116906740653 SHA512 fd8bc67ec0a73d3b6bf9c1fabb7ea981ef817644b4e6ced982fa90b12eae9b55de074634a670bdfb38bfee6588603e818ddcbcc2f2a05f83057c061b4194b4b7
-DIST rustc-1.50.0-src.tar.xz 108666272 BLAKE2B abb1b6f57093334bae5892dd99c964ffaf5e2b906cc92f0b92d5786cf80484cff923643169f24f4f92a5724c21b8bd671c72531c2cd1f6fbe0ea7107b5bd923b SHA512 df3c83c0fdc9ebce6fdccddda781dea0cdbd88d2b2a8220cac40cc3a8fa957923ae834d1fa45283d4ad227b334bd9e220e37a4a1ad7a1c7aeb806ed9ed387245
 EBUILD rust-1.29.0.ebuild 2254 BLAKE2B b6d171e2c93bb9296b02f52e11eb26dc5b759a57a9333b15c2cdf195f3619b54140c9338f05895587c7a5f121d3e4fdffa3feedf81774da453f693264a165dec SHA512 74beda115c43d042e5d6020e65d680874ebf6c3c60b33beb23e3a4819b43ae22d363128429f0199b42714d2987514022613b933406f08436bc5be297c402c30b
-EBUILD rust-1.30.1.ebuild 7588 BLAKE2B 677e006fc5e50e1c85812ef85d0f067852bd75bba04d1f585d75945cfd73831bce97be72ccfc3a3a34d51232a4a5b634dbd05b05171941f81f638078824a2774 SHA512 79c8407547da5eb79631bbda905c4a7c0caa6e30db1dabea1568b5ca485674ebbd19565717088dc7a0339e840b528cd5f5385d7babf4bed4574e13a8f96b8d35
-EBUILD rust-1.31.1.ebuild 7588 BLAKE2B 677e006fc5e50e1c85812ef85d0f067852bd75bba04d1f585d75945cfd73831bce97be72ccfc3a3a34d51232a4a5b634dbd05b05171941f81f638078824a2774 SHA512 79c8407547da5eb79631bbda905c4a7c0caa6e30db1dabea1568b5ca485674ebbd19565717088dc7a0339e840b528cd5f5385d7babf4bed4574e13a8f96b8d35
-EBUILD rust-1.32.0.ebuild 7588 BLAKE2B 677e006fc5e50e1c85812ef85d0f067852bd75bba04d1f585d75945cfd73831bce97be72ccfc3a3a34d51232a4a5b634dbd05b05171941f81f638078824a2774 SHA512 79c8407547da5eb79631bbda905c4a7c0caa6e30db1dabea1568b5ca485674ebbd19565717088dc7a0339e840b528cd5f5385d7babf4bed4574e13a8f96b8d35
-EBUILD rust-1.33.0.ebuild 7588 BLAKE2B 677e006fc5e50e1c85812ef85d0f067852bd75bba04d1f585d75945cfd73831bce97be72ccfc3a3a34d51232a4a5b634dbd05b05171941f81f638078824a2774 SHA512 79c8407547da5eb79631bbda905c4a7c0caa6e30db1dabea1568b5ca485674ebbd19565717088dc7a0339e840b528cd5f5385d7babf4bed4574e13a8f96b8d35
-EBUILD rust-1.34.2.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.35.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.36.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.37.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.38.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.39.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.40.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.41.1.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.42.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.43.1.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.44.1.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.45.2.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.46.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.47.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.48.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.49.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
-EBUILD rust-1.50.0.ebuild 7661 BLAKE2B bdd2b8665b452afc54702481d7bd50e84c016ab61710ecb2b73cbf3134a633bca9b839e96e28b76dfac2cbe236fde1c7f9121e5c3d00a645aebc92aed4be4255 SHA512 34c600840598b288a8b010daedad439611bc86366aac573a6b880bae732bc247eab36e54c7acb1892b444bbaa06936a29ca5869442155582973721ce94652b4d
+EBUILD rust-1.30.1.ebuild 7597 BLAKE2B e8caabdff29bc13354ea9ae750e44b47bd7d8b595439dbfac0f4e902b163525cbbea5613cd40d07a894906ceaeb84b1ba0cded08f502fe3865405fb88468f9b1 SHA512 78987f43bff1cc15f10df2ec6249d0fb475815717ed4e39c5efcee8d3b93a0c8443d6acd5add751361de5a49ae7dcb9b241e03db55a5919d46928f03304d6fa1
+EBUILD rust-1.31.1.ebuild 7597 BLAKE2B e8caabdff29bc13354ea9ae750e44b47bd7d8b595439dbfac0f4e902b163525cbbea5613cd40d07a894906ceaeb84b1ba0cded08f502fe3865405fb88468f9b1 SHA512 78987f43bff1cc15f10df2ec6249d0fb475815717ed4e39c5efcee8d3b93a0c8443d6acd5add751361de5a49ae7dcb9b241e03db55a5919d46928f03304d6fa1
+EBUILD rust-1.32.0.ebuild 7597 BLAKE2B e8caabdff29bc13354ea9ae750e44b47bd7d8b595439dbfac0f4e902b163525cbbea5613cd40d07a894906ceaeb84b1ba0cded08f502fe3865405fb88468f9b1 SHA512 78987f43bff1cc15f10df2ec6249d0fb475815717ed4e39c5efcee8d3b93a0c8443d6acd5add751361de5a49ae7dcb9b241e03db55a5919d46928f03304d6fa1
+EBUILD rust-1.33.0.ebuild 7597 BLAKE2B e8caabdff29bc13354ea9ae750e44b47bd7d8b595439dbfac0f4e902b163525cbbea5613cd40d07a894906ceaeb84b1ba0cded08f502fe3865405fb88468f9b1 SHA512 78987f43bff1cc15f10df2ec6249d0fb475815717ed4e39c5efcee8d3b93a0c8443d6acd5add751361de5a49ae7dcb9b241e03db55a5919d46928f03304d6fa1
+EBUILD rust-1.34.2.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.35.0.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.36.0.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.37.0.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.38.0.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.39.0.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.40.0.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.41.1.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.42.0.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.43.1.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.44.1.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.45.2.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
+EBUILD rust-1.46.0.ebuild 7670 BLAKE2B 43bb55369449f2b2548fbc58d974299743fcec4aa1efb3c8c449c6ea564963dc5079fccd81274285833d441627edaa5679c38beb3ae4dd5763286a358183747a SHA512 64289d3e04d1f4885e02a751ecee44d001887c34be2298649f6834d422c3d31096f60e1253fc183e7374aa10d2261ced31850ef9a0448a5ec51dbd66fbad7dc2
diff --git a/dev-lang/rust/rust-1.30.1.ebuild b/dev-lang/rust/rust-1.30.1.ebuild
index 8621c57..7bf61ab 100644
--- a/dev-lang/rust/rust-1.30.1.ebuild
+++ b/dev-lang/rust/rust-1.30.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.31.1.ebuild b/dev-lang/rust/rust-1.31.1.ebuild
index 8621c57..7bf61ab 100644
--- a/dev-lang/rust/rust-1.31.1.ebuild
+++ b/dev-lang/rust/rust-1.31.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.32.0.ebuild b/dev-lang/rust/rust-1.32.0.ebuild
index 8621c57..7bf61ab 100644
--- a/dev-lang/rust/rust-1.32.0.ebuild
+++ b/dev-lang/rust/rust-1.32.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.33.0.ebuild b/dev-lang/rust/rust-1.33.0.ebuild
index 8621c57..7bf61ab 100644
--- a/dev-lang/rust/rust-1.33.0.ebuild
+++ b/dev-lang/rust/rust-1.33.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.34.2.ebuild
+++ b/dev-lang/rust/rust-1.34.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.35.0.ebuild b/dev-lang/rust/rust-1.35.0.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.35.0.ebuild
+++ b/dev-lang/rust/rust-1.35.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.36.0.ebuild b/dev-lang/rust/rust-1.36.0.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.36.0.ebuild
+++ b/dev-lang/rust/rust-1.36.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.37.0.ebuild b/dev-lang/rust/rust-1.37.0.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.37.0.ebuild
+++ b/dev-lang/rust/rust-1.37.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.38.0.ebuild b/dev-lang/rust/rust-1.38.0.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.38.0.ebuild
+++ b/dev-lang/rust/rust-1.38.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.39.0.ebuild b/dev-lang/rust/rust-1.39.0.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.39.0.ebuild
+++ b/dev-lang/rust/rust-1.39.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.40.0.ebuild b/dev-lang/rust/rust-1.40.0.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.40.0.ebuild
+++ b/dev-lang/rust/rust-1.40.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.41.1.ebuild b/dev-lang/rust/rust-1.41.1.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.41.1.ebuild
+++ b/dev-lang/rust/rust-1.41.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.42.0.ebuild b/dev-lang/rust/rust-1.42.0.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.42.0.ebuild
+++ b/dev-lang/rust/rust-1.42.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.43.1.ebuild b/dev-lang/rust/rust-1.43.1.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.43.1.ebuild
+++ b/dev-lang/rust/rust-1.43.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.44.1.ebuild b/dev-lang/rust/rust-1.44.1.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.44.1.ebuild
+++ b/dev-lang/rust/rust-1.44.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.45.2.ebuild b/dev-lang/rust/rust-1.45.2.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.45.2.ebuild
+++ b/dev-lang/rust/rust-1.45.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.46.0.ebuild b/dev-lang/rust/rust-1.46.0.ebuild
index f6afdff..e4d353e 100644
--- a/dev-lang/rust/rust-1.46.0.ebuild
+++ b/dev-lang/rust/rust-1.46.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.47.0.ebuild b/dev-lang/rust/rust-1.47.0.ebuild
deleted file mode 100644
index f6afdff..0000000
--- a/dev-lang/rust/rust-1.47.0.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_DEPEND="
-	|| (
-		sys-devel/llvm:9[llvm_targets_WebAssembly?]
-	)
-	<sys-devel/llvm-10:=
-"
-LLVM_MAX_SLOT=9
-
-BOOTSTRAP_DEPEND=">=dev-lang/rust-1.$(($(ver_cut 2) - 1))"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser:=
-	net-misc/curl[ssl]
-"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	${BOOTSTRAP_DEPEND}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-eselect/eselect-rust-20190311
-"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
-	x86? ( cpu_flags_x86_sse2 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/bin/*-${PV}
-	usr/lib*/lib*.so
-	usr/lib/rustlib/*/codegen-backends/librustc_codegen_llvm-llvm.so
-	usr/lib/rustlib/*/lib/lib*.so
-"
-
-QA_SONAME="usr/lib.*/librustc_macros.*.so"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-pre_build_checks() {
-	CHECKREQS_DISK_BUILD="9G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="14G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
-	done
-	rust_targets="${rust_targets#,}"
-
-	local extended="true" tools="\"cargo\","
-	if use clippy; then
-		tools="\"clippy\",$tools"
-	fi
-	if use rls; then
-		tools="\"rls\",\"analysis\",\"src\",$tools"
-	fi
-	if use rustfmt; then
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root
-	rust_stage0_root="$(rustc --print sysroot)"
-
-	rust_target="$(rust_abi)"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		compiler-docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = ${extended}
-		tools = [${tools}]
-		verbose = 2
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "lib"
-		docdir = "share/doc/${PF}"
-		mandir = "share/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debug = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		default-linker = "$(tc-getCC)"
-		channel = "stable"
-		rpath = false
-		lld = false
-		[dist]
-		src-tarball = false
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-	done
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \
-	--exclude src/tools/miri || die
-
-	# bug #689562, #689160
-	rm "${D}/etc/bash_completion.d/cargo" || die
-	rmdir "${D}"/etc{/bash_completion.d,} || die
-	dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
-
-	mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
-	mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
-	mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
-	mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
-	if use clippy; then
-		mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
-		mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
-	fi
-	if use rls; then
-		mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
-		mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
-	fi
-
-	# Move public shared libs to abi specific libdir
-	# Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib
-	if [[ $(get_libdir) != lib ]]; then
-		dodir /usr/$(get_libdir)
-		mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die
-	fi
-
-	dodoc COPYRIGHT
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-	EOF
-	echo /usr/bin/cargo >> "${T}/provider-${P}"
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-		echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
-	ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
-	ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
-
-	if has_version app-editors/emacs; 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-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/rust-1.48.0.ebuild b/dev-lang/rust/rust-1.48.0.ebuild
deleted file mode 100644
index f6afdff..0000000
--- a/dev-lang/rust/rust-1.48.0.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_DEPEND="
-	|| (
-		sys-devel/llvm:9[llvm_targets_WebAssembly?]
-	)
-	<sys-devel/llvm-10:=
-"
-LLVM_MAX_SLOT=9
-
-BOOTSTRAP_DEPEND=">=dev-lang/rust-1.$(($(ver_cut 2) - 1))"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser:=
-	net-misc/curl[ssl]
-"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	${BOOTSTRAP_DEPEND}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-eselect/eselect-rust-20190311
-"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
-	x86? ( cpu_flags_x86_sse2 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/bin/*-${PV}
-	usr/lib*/lib*.so
-	usr/lib/rustlib/*/codegen-backends/librustc_codegen_llvm-llvm.so
-	usr/lib/rustlib/*/lib/lib*.so
-"
-
-QA_SONAME="usr/lib.*/librustc_macros.*.so"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-pre_build_checks() {
-	CHECKREQS_DISK_BUILD="9G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="14G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
-	done
-	rust_targets="${rust_targets#,}"
-
-	local extended="true" tools="\"cargo\","
-	if use clippy; then
-		tools="\"clippy\",$tools"
-	fi
-	if use rls; then
-		tools="\"rls\",\"analysis\",\"src\",$tools"
-	fi
-	if use rustfmt; then
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root
-	rust_stage0_root="$(rustc --print sysroot)"
-
-	rust_target="$(rust_abi)"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		compiler-docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = ${extended}
-		tools = [${tools}]
-		verbose = 2
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "lib"
-		docdir = "share/doc/${PF}"
-		mandir = "share/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debug = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		default-linker = "$(tc-getCC)"
-		channel = "stable"
-		rpath = false
-		lld = false
-		[dist]
-		src-tarball = false
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-	done
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \
-	--exclude src/tools/miri || die
-
-	# bug #689562, #689160
-	rm "${D}/etc/bash_completion.d/cargo" || die
-	rmdir "${D}"/etc{/bash_completion.d,} || die
-	dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
-
-	mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
-	mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
-	mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
-	mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
-	if use clippy; then
-		mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
-		mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
-	fi
-	if use rls; then
-		mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
-		mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
-	fi
-
-	# Move public shared libs to abi specific libdir
-	# Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib
-	if [[ $(get_libdir) != lib ]]; then
-		dodir /usr/$(get_libdir)
-		mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die
-	fi
-
-	dodoc COPYRIGHT
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-	EOF
-	echo /usr/bin/cargo >> "${T}/provider-${P}"
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-		echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
-	ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
-	ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
-
-	if has_version app-editors/emacs; 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-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/rust-1.49.0.ebuild b/dev-lang/rust/rust-1.49.0.ebuild
deleted file mode 100644
index f6afdff..0000000
--- a/dev-lang/rust/rust-1.49.0.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_DEPEND="
-	|| (
-		sys-devel/llvm:9[llvm_targets_WebAssembly?]
-	)
-	<sys-devel/llvm-10:=
-"
-LLVM_MAX_SLOT=9
-
-BOOTSTRAP_DEPEND=">=dev-lang/rust-1.$(($(ver_cut 2) - 1))"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser:=
-	net-misc/curl[ssl]
-"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	${BOOTSTRAP_DEPEND}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-eselect/eselect-rust-20190311
-"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
-	x86? ( cpu_flags_x86_sse2 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/bin/*-${PV}
-	usr/lib*/lib*.so
-	usr/lib/rustlib/*/codegen-backends/librustc_codegen_llvm-llvm.so
-	usr/lib/rustlib/*/lib/lib*.so
-"
-
-QA_SONAME="usr/lib.*/librustc_macros.*.so"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-pre_build_checks() {
-	CHECKREQS_DISK_BUILD="9G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="14G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
-	done
-	rust_targets="${rust_targets#,}"
-
-	local extended="true" tools="\"cargo\","
-	if use clippy; then
-		tools="\"clippy\",$tools"
-	fi
-	if use rls; then
-		tools="\"rls\",\"analysis\",\"src\",$tools"
-	fi
-	if use rustfmt; then
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root
-	rust_stage0_root="$(rustc --print sysroot)"
-
-	rust_target="$(rust_abi)"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		compiler-docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = ${extended}
-		tools = [${tools}]
-		verbose = 2
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "lib"
-		docdir = "share/doc/${PF}"
-		mandir = "share/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debug = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		default-linker = "$(tc-getCC)"
-		channel = "stable"
-		rpath = false
-		lld = false
-		[dist]
-		src-tarball = false
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-	done
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \
-	--exclude src/tools/miri || die
-
-	# bug #689562, #689160
-	rm "${D}/etc/bash_completion.d/cargo" || die
-	rmdir "${D}"/etc{/bash_completion.d,} || die
-	dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
-
-	mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
-	mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
-	mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
-	mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
-	if use clippy; then
-		mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
-		mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
-	fi
-	if use rls; then
-		mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
-		mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
-	fi
-
-	# Move public shared libs to abi specific libdir
-	# Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib
-	if [[ $(get_libdir) != lib ]]; then
-		dodir /usr/$(get_libdir)
-		mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die
-	fi
-
-	dodoc COPYRIGHT
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-	EOF
-	echo /usr/bin/cargo >> "${T}/provider-${P}"
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-		echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
-	ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
-	ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
-
-	if has_version app-editors/emacs; 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-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/rust-1.50.0.ebuild b/dev-lang/rust/rust-1.50.0.ebuild
deleted file mode 100644
index f6afdff..0000000
--- a/dev-lang/rust/rust-1.50.0.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_DEPEND="
-	|| (
-		sys-devel/llvm:9[llvm_targets_WebAssembly?]
-	)
-	<sys-devel/llvm-10:=
-"
-LLVM_MAX_SLOT=9
-
-BOOTSTRAP_DEPEND=">=dev-lang/rust-1.$(($(ver_cut 2) - 1))"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser:=
-	net-misc/curl[ssl]
-"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	${BOOTSTRAP_DEPEND}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-eselect/eselect-rust-20190311
-"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
-	x86? ( cpu_flags_x86_sse2 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/bin/*-${PV}
-	usr/lib*/lib*.so
-	usr/lib/rustlib/*/codegen-backends/librustc_codegen_llvm-llvm.so
-	usr/lib/rustlib/*/lib/lib*.so
-"
-
-QA_SONAME="usr/lib.*/librustc_macros.*.so"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-pre_build_checks() {
-	CHECKREQS_DISK_BUILD="9G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="14G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
-	done
-	rust_targets="${rust_targets#,}"
-
-	local extended="true" tools="\"cargo\","
-	if use clippy; then
-		tools="\"clippy\",$tools"
-	fi
-	if use rls; then
-		tools="\"rls\",\"analysis\",\"src\",$tools"
-	fi
-	if use rustfmt; then
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root
-	rust_stage0_root="$(rustc --print sysroot)"
-
-	rust_target="$(rust_abi)"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		compiler-docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = ${extended}
-		tools = [${tools}]
-		verbose = 2
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "lib"
-		docdir = "share/doc/${PF}"
-		mandir = "share/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debug = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		default-linker = "$(tc-getCC)"
-		channel = "stable"
-		rpath = false
-		lld = false
-		[dist]
-		src-tarball = false
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-	done
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \
-	--exclude src/tools/miri || die
-
-	# bug #689562, #689160
-	rm "${D}/etc/bash_completion.d/cargo" || die
-	rmdir "${D}"/etc{/bash_completion.d,} || die
-	dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
-
-	mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
-	mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
-	mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
-	mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
-	if use clippy; then
-		mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
-		mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
-	fi
-	if use rls; then
-		mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
-		mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
-	fi
-
-	# Move public shared libs to abi specific libdir
-	# Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib
-	if [[ $(get_libdir) != lib ]]; then
-		dodir /usr/$(get_libdir)
-		mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die
-	fi
-
-	dodoc COPYRIGHT
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-	EOF
-	echo /usr/bin/cargo >> "${T}/provider-${P}"
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-		echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
-	ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
-	ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
-
-	if has_version app-editors/emacs; 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-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 8e1e763..31770bd 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,10 +1,2 @@
 EBUILD rust-1.41.1.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
 EBUILD rust-1.42.0.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
-EBUILD rust-1.43.1.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
-EBUILD rust-1.44.1.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
-EBUILD rust-1.45.2.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
-EBUILD rust-1.46.0.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
-EBUILD rust-1.47.0.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
-EBUILD rust-1.48.0.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
-EBUILD rust-1.49.0.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
-EBUILD rust-1.50.0.ebuild 341 BLAKE2B 46814889235011806589f1ab14dd1c3714469299c42ddec516ec0fea24aace127fad72775a7cebc3e81d75be24e18418d0d30d94ac81351eb25e81fb1565cf6b SHA512 fdb6978acd346022383cca79f2e61433504ac3626b8ac335f52553aff36aa53888afc94492016f368976754a8c1e3c719184e1634e7b81ce7f2e086f15e2ff6a
diff --git a/virtual/rust/rust-1.43.1.ebuild b/virtual/rust/rust-1.43.1.ebuild
deleted file mode 100644
index a9b74cc..0000000
--- a/virtual/rust/rust-1.43.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.44.1.ebuild b/virtual/rust/rust-1.44.1.ebuild
deleted file mode 100644
index a9b74cc..0000000
--- a/virtual/rust/rust-1.44.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.45.2.ebuild b/virtual/rust/rust-1.45.2.ebuild
deleted file mode 100644
index a9b74cc..0000000
--- a/virtual/rust/rust-1.45.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.46.0.ebuild b/virtual/rust/rust-1.46.0.ebuild
deleted file mode 100644
index a9b74cc..0000000
--- a/virtual/rust/rust-1.46.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.47.0.ebuild b/virtual/rust/rust-1.47.0.ebuild
deleted file mode 100644
index a9b74cc..0000000
--- a/virtual/rust/rust-1.47.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.48.0.ebuild b/virtual/rust/rust-1.48.0.ebuild
deleted file mode 100644
index a9b74cc..0000000
--- a/virtual/rust/rust-1.48.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.49.0.ebuild b/virtual/rust/rust-1.49.0.ebuild
deleted file mode 100644
index a9b74cc..0000000
--- a/virtual/rust/rust-1.49.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.50.0.ebuild b/virtual/rust/rust-1.50.0.ebuild
deleted file mode 100644
index a9b74cc..0000000
--- a/virtual/rust/rust-1.50.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"