cargo: convert to versioned include file

We'll need the prior version of cargo to boot strap ourselves going
forward so include the version info so we can support multiple versions
in the tree.

recipes-devtools/cargo/cargo.inc

@@ -1,15 +1,12 @@
-require cargo-snapshot.inc
-
 SECTION = "devel"
 
 DEPENDS = "openssl zlib libgit2 curl ca-certificates libssh2"
 
 SRC_URI += "\
-	http://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${CARGO_SNAPSHOT} \
+	https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT};name=cargo-snapshot \
 "
 
 LIC_FILES_CHKSUM += " \
-file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
 file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \
 "