commit: 91fa8fe1e54cfd4b25cae067a7b2ce40ef048024
Author: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 06:45:30 2020 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 06:46:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=91fa8fe1
drop virtual/cargo, update rust
Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>
dev-lang/rust/Manifest | 10 ++--
dev-lang/rust/files/1.36.0-libressl.patch | 68 ----------------------
dev-lang/rust/files/1.40.0-add-soname.patch | 36 ++++++++++++
...-1.40.0-r666.ebuild => rust-1.41.0-r666.ebuild} | 2 +-
dev-rust/qt_generator/qt_generator-9999.ebuild | 3 +-
dev-rust/rust-bindgen/rust-bindgen-9999.ebuild | 3 +-
dev-util/SolidOak/SolidOak-9999.ebuild | 5 +-
dev-util/racer/racer-9999.ebuild | 3 +-
eclass/cargo.eclass | 4 +-
virtual/cargo/cargo-1.40.0-r666.ebuild | 17 ------
virtual/cargo/cargo-9999.ebuild | 17 ------
virtual/cargo/metadata.xml | 8 ---
...-1.40.0-r666.ebuild => rust-1.41.0-r666.ebuild} | 2 +-
13 files changed, 50 insertions(+), 128 deletions(-)
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 94543be..41e5914 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,5 +1,5 @@
-DIST rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz 238165960 SHA256
a3f6943ad00bbf7131c8571b21f641082c8ac8298ee3a8bd5428e96743e31e05 SHA512
ad37a8454acb8985a5c2b42d7f8bc4212651a16fb5af6b4314dd97faa47de79893f2f74b516af89cd7e77ef3db64247c4764585eb0a17ac328c9cba5e5b9c407
WHIRLPOOL
44a19ddd42628d841b8d923a64236f319f57ac414d97e679a2cf61834e3d32c43ccc650d085781def16ca17b51490e412ddcf563347403dcb65849d443688429
-DIST rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz 246114456 SHA256
d98a3cfaa427e7bba95a36cbe98cc2ded3ff5ee87242add1e0c393467c069756 SHA512
db2b001a5587e2d5c8cdcb53c974f2332e76f58e362cba55fc971d7244754f1fa0b7e708ad7e73e7250652b442f06929dc1e8981536d7d76850b45ade275d406
WHIRLPOOL
4d1ba915fef3afeb197a236cdaa6af0c7c49b8db1fae9b2381e3fc226714519304d16361cb50ab0b2853ee762990fe17ddf60130cdb6508d6d7042936bacc252
-DIST rust-1.39.0-i686-unknown-linux-gnu.tar.xz 297665804 SHA256
26b57f9c76ef9119e703a5b5acb7026963f18814cc167c2d8d6a562e05ad755c SHA512
930546e79c0b1105eb0604ae33ccdbd8b00b56e56d069f19f0d802093a052fd3f940eaf1390cdecd79833b0c70457ebfee2ce3b9674fff72df1367076584394a
WHIRLPOOL
c77a59a825b2e73cb40670bacda632fcba93273aaa3fb67b794c82dd3038879ebbcbe7da33a70c72260c7039b5df9319267db536225f33d401983b55b505c564
-DIST rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz 284967620 SHA256
095874d294355e95236e07e3e82635d95b8872f751ad21c5d1d9b53ef443e536 SHA512
02ca6c821877379d8bd0bcc38281a87e6f86bdbae1270da19e41336cc3a812d9c11c1e976655c192c39153f92cda90ddbd7b4b0bcb4f6787d6d354d2be827a8a
WHIRLPOOL
9a28af0cebaac330cebe42ac939645b0ed3484558074431ecac6022e6e2c80e94718371180fee2d4536144e171ce57f7cbe718723b3ae42d215d3ebca79e60ff
-DIST rustc-1.40.0-src.tar.xz 92306352 SHA256
6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace SHA512
b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
WHIRLPOOL
2a4f366aec0a129cc3f2b18d623721070613c1ae1b51f797283a73307b5fd425dfde0e32d4308125def62e9a9dfae4503c9a750db3adbdb0d97144e94d8f1a08
+DIST rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz 80285104 SHA256
5817c8c3a919117ae6dac8e9b3039d4e614cc9bed8040bf64fcf2e683b8c6245 SHA512
f601e4251e08a6d66edb0489b6ab840b57622b506547e81036e6dfe08eb71005a22a2777a0b8b2d07a6f88286d58f513482b863116311a6f43c7284769af6e7f
WHIRLPOOL
ae73cdedb25883462131e5d723de49cf7f58f15099c4b6a1e64322be5060c1238c3df80211e3e19b4990e9327aea50e2c01fdfec8781a745661debc13f4f3436
+DIST rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz 84254100 SHA256
a5701ea0b7551e0a77d6e08fee4f4c871d448d4f7e82be0ee39a834918306e7e SHA512
d3345946c5a3d5cb3d7fca4d3200710704d64547ebfa4ab11c45ea1a18ca3c49b429783d499845f31dcb150abe2f6836fe203fd9d7aa53e0475b940da5549492
WHIRLPOOL
e746c620fc235be425ff50ed16d5236894e07c35856b8d16a5877c9dabf79673624d5c23894bca30d84cf2dbbdcbd2c3e9b9358118decc6495898b8f9ec28032
+DIST rust-1.40.0-i686-unknown-linux-gnu.tar.xz 122168896 SHA256
82454e1b60b2bc24779d9c949cc0e1da43f3e423dbfc6b45b5afddf65829fc9d SHA512
d727149afbbc3b2709360dd6080ff301e781aaa94459c1348d3e35382bc9c7ad65c4d70f9bfc7b44ac92ddaf89e3aab92b75b9d184eba86916da25bd629592b6
WHIRLPOOL
b1b68c2bc8eb00390a7e131b6c540290d2516bc690523f839f8e48afb86f3b175d9e2e1ac4e8db8f79d3ba84db0681ceff0a517ea4946a19416645e69e5b4f54
+DIST rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz 110186516 SHA256
37492d6467bcea611b2c7388aed50b655524f81410e255142ef6cfb6cef1ec53 SHA512
11a2ad1d8b9e91cbe9ee6a1954d46ac75eeaa83f0c2425a8ad70d191727b02e86ead33d6464222effca6f5134c31a165801a854aa57bdb5f12944d605de3c1d1
WHIRLPOOL
2a927c6176948a6b3aceed4e224819f2c96beb4acf2523b3da32dd76701bf5b4516cef458cbe2ad4355724a6f745a2eb4c890d4f0c40ff547ca86a2eae73dcd7
+DIST rustc-1.41.0-src.tar.xz 93763052 SHA256
38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f SHA512
0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd
WHIRLPOOL
81acfe88e820cb7422c47968794908097937a1ce665e08b3f08f3cf0a5ed78195c8b6485c9b158ff6ea2bd3562a6b6a50bc959b479188b424ce4ddb1fe8820cc
diff --git a/dev-lang/rust/files/1.36.0-libressl.patch
b/dev-lang/rust/files/1.36.0-libressl.patch
deleted file mode 100644
index cc1ce26..0000000
--- a/dev-lang/rust/files/1.36.0-libressl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/vendor/openssl-sys/.cargo-checksum.json
b/vendor/openssl-sys/.cargo-checksum.json
-index 5c961bcbc..a0ea2d357 100644
---- a/vendor/openssl-sys/.cargo-checksum.json
-+++ b/vendor/openssl-sys/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"681a1f8a8f389c82bbd3d2498a3692c201c63db658e7c3d162f09d5d81892fd4","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928
f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9
098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7
d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"f2cd4ca8fde8298211581f9e1ca61668706d7681a38b95a63591450e1d8366a3","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928
f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9
098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7
d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"}
-diff --git a/vendor/openssl-sys/build/main.rs
b/vendor/openssl-sys/build/main.rs
-index 02b93b90a..f0cf4b4ff 100644
---- a/vendor/openssl-sys/build/main.rs
-+++ b/vendor/openssl-sys/build/main.rs
-@@ -183,27 +183,31 @@ See rust-openssl README for more information:
- if let Some(libressl_version) = libressl_version {
- println!("cargo:libressl_version_number={:x}", libressl_version);
-
-+ let major = (libressl_version >> 28) as u8;
- let minor = (libressl_version >> 20) as u8;
- let fix = (libressl_version >> 12) as u8;
-- let (minor, fix) = match (minor, fix) {
-- (5, 0) => ('5', '0'),
-- (5, 1) => ('5', '1'),
-- (5, 2) => ('5', '2'),
-- (5, _) => ('5', 'x'),
-- (6, 0) => ('6', '0'),
-- (6, 1) => ('6', '1'),
-- (6, 2) => ('6', '2'),
-- (6, _) => ('6', 'x'),
-- (7, _) => ('7', 'x'),
-- (8, 0) => ('8', '0'),
-- (8, 1) => ('8', '1'),
-- (8, _) => ('8', 'x'),
-- (9, 0) => ('9', '0'),
-+ let (major, minor, fix) = match (major, minor, fix) {
-+ (2, 5, 0) => ('2', '5', '0'),
-+ (2, 5, 1) => ('2', '5', '1'),
-+ (2, 5, 2) => ('2', '5', '2'),
-+ (2, 5, _) => ('2', '5', 'x'),
-+ (2, 6, 0) => ('2', '6', '0'),
-+ (2, 6, 1) => ('2', '6', '1'),
-+ (2, 6, 2) => ('2', '6', '2'),
-+ (2, 6, _) => ('2', '6', 'x'),
-+ (2, 7, _) => ('2', '7', 'x'),
-+ (2, 8, 0) => ('2', '8', '0'),
-+ (2, 8, 1) => ('2', '8', '1'),
-+ (2, 8, _) => ('2', '8', 'x'),
-+ (2, 9, 0) => ('2', '9', '0'),
-+ (2, 9, _) => ('2', '9', 'x'),
-+ (3, 0, 0) => ('3', '0', '0'),
-+ (3, 0, _) => ('3', '0', 'x'),
- _ => version_error(),
- };
-
- println!("cargo:libressl=true");
-- println!("cargo:libressl_version=2{}{}", minor, fix);
-+ println!("cargo:libressl_version={}{}{}", major, minor, fix);
- println!("cargo:version=101");
- Version::Libressl
- } else {
-@@ -239,7 +243,7 @@ fn version_error() -> ! {
- "
-
- This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL
2.5
--through 2.9.0, but a different version of OpenSSL was found. The build is now
aborting
-+through 3.0.x, but a different version of OpenSSL was found. The build is now
aborting
- due to this version mismatch.
-
- "
diff --git a/dev-lang/rust/files/1.40.0-add-soname.patch
b/dev-lang/rust/files/1.40.0-add-soname.patch
new file mode 100644
index 0000000..7a5c018
--- /dev/null
+++ b/dev-lang/rust/files/1.40.0-add-soname.patch
@@ -0,0 +1,36 @@
+Description: Set DT_SONAME when building dylibs
+ In Rust, library filenames include a version-specific hash to help
+ the run-time linker find the correct version. Unlike in C/C++, the
+ compiler looks for all libraries matching a glob that ignores the
+ hash and reads embedded metadata to work out versions, etc.
+ .
+ The upshot is that there is no need for the usual "libfoo.so ->
+ libfoo-1.2.3.so" symlink common with C/C++ when building with Rust,
+ and no need to communicate an alternate filename to use at run-time
+ vs compile time. If linking to a Rust dylib from C/C++ however, a
+ "libfoo.so -> libfoo-$hash.so" symlink may well be useful and in
+ this case DT_SONAME=libfoo-$hash.so would be required. More
+ mundanely, various tools (eg: dpkg-shlibdeps) complain if they don't
+ find DT_SONAME on shared libraries in public directories.
+ .
+ This patch passes -Wl,-soname=$outfile when building dylibs (and
+ using a GNU linker).
+Author: Angus Lees <g...@debian.org>
+Forwarded: no
+
+--- a/src/librustc_codegen_ssa/back/link.rs
++++ b/src/librustc_codegen_ssa/back/link.rs
+@@ -1034,6 +1034,13 @@
+ cmd.args(&rpath::get_rpath_flags(&mut rpath_config));
+ }
+
++ if (crate_type == config::CrateType::Dylib || crate_type ==
config::CrateType::Cdylib)
++ && t.options.linker_is_gnu {
++ let filename =
String::from(out_filename.file_name().unwrap().to_str().unwrap());
++ let soname = [String::from("-Wl,-soname=") + &filename];
++ cmd.args(&soname);
++ }
++
+ // Finally add all the linker arguments provided on the command line along
+ // with any #[link_args] attributes found inside the crate
+ if let Some(ref args) = sess.opts.cg.link_args {
diff --git a/dev-lang/rust/rust-1.40.0-r666.ebuild
b/dev-lang/rust/rust-1.41.0-r666.ebuild
similarity index 99%
rename from dev-lang/rust/rust-1.40.0-r666.ebuild
rename to dev-lang/rust/rust-1.41.0-r666.ebuild
index 6732c4d..982582d 100644
--- a/dev-lang/rust/rust-1.40.0-r666.ebuild
+++ b/dev-lang/rust/rust-1.41.0-r666.ebuild
@@ -68,7 +68,7 @@ PDEPEND=""
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
PATCHES=(
- "${FILESDIR}"/1.36.0-libressl.patch
+ "${FILESDIR}"/1.40.0-add-soname.patch
)
S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-rust/qt_generator/qt_generator-9999.ebuild
b/dev-rust/qt_generator/qt_generator-9999.ebuild
index 468d03a..a20733c 100644
--- a/dev-rust/qt_generator/qt_generator-9999.ebuild
+++ b/dev-rust/qt_generator/qt_generator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,7 +21,6 @@ IUSE=""
CDEPEND="dev-db/sqlite"
DEPEND="${CDEPEND}
virtual/rust
-|| ( virtual/cargo dev-util/cargo-bin )
"
RDEPEND="${CDEPEND}
dev-qt/qtchooser
diff --git a/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild
b/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild
index bd499be..491f423 100644
--- a/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild
+++ b/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,6 @@ IUSE=""
EGIT_REPO_URI="https://github.com/servo/rust-bindgen.git";
DEPEND=">=virtual/rust-999
- virtual/cargo
>=sys-devel/clang-3.4.2-r100:*
"
RDEPEND="${DEPEND}"
diff --git a/dev-util/SolidOak/SolidOak-9999.ebuild
b/dev-util/SolidOak/SolidOak-9999.ebuild
index 70c356b..54b122c 100644
--- a/dev-util/SolidOak/SolidOak-9999.ebuild
+++ b/dev-util/SolidOak/SolidOak-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,8 +23,7 @@ RDEPEND="virtual/rust
app-editors/neovim
>=x11-libs/gtk+-3.10
"
-DEPEND="${DEPEND}
- virtual/cargo"
+DEPEND="${DEPEND}"
src_compile() {
cargo build -j$(makeopts_jobs) --release || die
diff --git a/dev-util/racer/racer-9999.ebuild b/dev-util/racer/racer-9999.ebuild
index b3d2e62..2035e02 100644
--- a/dev-util/racer/racer-9999.ebuild
+++ b/dev-util/racer/racer-9999.ebuild
@@ -17,8 +17,7 @@ IUSE=""
EGIT_REPO_URI="https://github.com/phildawes/racer";
COMMON_DEPEND="virtual/rust:*"
-DEPEND="${COMMON_DEPEND}
- virtual/cargo"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
src_compile() {
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index b1f2071..4e874f0 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: cargo.eclass
@@ -13,7 +13,7 @@ if [[ -z ${_CARGO_ECLASS} ]]; then
_CARGO_ECLASS=1
CARGO_DEPEND=""
-[[ ${CATEGORY}/${PN} != dev-util/cargo ]] && CARGO_DEPEND="virtual/cargo"
+[[ ${CATEGORY}/${PN} != dev-lang/rust ]] && CARGO_DEPEND="virtual/rust"
: ${CARGO_FETCH_CRATES:=not}
diff --git a/virtual/cargo/cargo-1.40.0-r666.ebuild
b/virtual/cargo/cargo-1.40.0-r666.ebuild
deleted file mode 100644
index fb4010e..0000000
--- a/virtual/cargo/cargo-1.40.0-r666.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Package manager for Rust"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="|| (
- =dev-lang/rust-${PVR}*
- =dev-lang/rust-bin-${PV}*
- )"
diff --git a/virtual/cargo/cargo-9999.ebuild b/virtual/cargo/cargo-9999.ebuild
deleted file mode 100644
index 5048e80..0000000
--- a/virtual/cargo/cargo-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Package manager for Rust"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="|| (
- ~dev-lang/rust-${PV}
- ~dev-lang/rust-bin-${PV}
- )"
diff --git a/virtual/cargo/metadata.xml b/virtual/cargo/metadata.xml
deleted file mode 100644
index 85cf4eb..0000000
--- a/virtual/cargo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>r...@gentoo.org</email>
- <name>Rust Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/virtual/rust/rust-1.40.0-r666.ebuild
b/virtual/rust/rust-1.41.0-r666.ebuild
similarity index 87%
rename from virtual/rust/rust-1.40.0-r666.ebuild
rename to virtual/rust/rust-1.41.0-r666.ebuild
index c0a4c99..a16b9a6 100644
--- a/virtual/rust/rust-1.40.0-r666.ebuild
+++ b/virtual/rust/rust-1.41.0-r666.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=7
