Auto merge of #6295 - metajack:cargo-cleanup, r=frewsxcv

Overlaps a bunch with #6288. Putting this here so @frewsxcv can take a look and we can figure out how to merge our work together.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6295)
<!-- Reviewable:end -->

components/compositing/Cargo.toml

@@ -52,21 +52,21 @@ git = "https://github.com/servo/rust-layers"
 [dependencies.png]
 git = "https://github.com/servo/rust-png"
 
-[dependencies.core_graphics]
-git = "https://github.com/servo/rust-core-graphics"
-
-[dependencies.core_text]
-git = "https://github.com/servo/rust-core-text"
-
 [dependencies.gleam]
 git = "https://github.com/servo/gleam"
 
 [dependencies.clipboard]
-git = "https://github.com/servo/rust-x11-clipboard"
+git = "https://github.com/aweinstock314/rust-clipboard"
 
 [dependencies]
 log = "*"
 num = "0.1.24"
 url = "0.2.35"
 time = "0.1.17"
 libc = "*"
+
+[target.x86_64-apple-darwin.dependencies]
+core-graphics = "*"
+
+[target.x86_64-apple-darwin.dependencies.core-text]
+git = "https://github.com/servo/core-text-rs"

components/gfx/Cargo.toml

@@ -47,21 +47,6 @@ git = "https://github.com/servo/rust-stb-image"
 [dependencies.png]
 git = "https://github.com/servo/rust-png"
 
-[dependencies.fontconfig]
-git = "https://github.com/servo/rust-fontconfig"
-
-[dependencies.freetype]
-git = "https://github.com/servo/rust-freetype"
-
-[dependencies.core_foundation]
-git = "https://github.com/servo/rust-core-foundation"
-
-[dependencies.core_graphics]
-git = "https://github.com/servo/rust-core-graphics"
-
-[dependencies.core_text]
-git = "https://github.com/servo/rust-core-text"
-
 [dependencies.skia]
 git = "https://github.com/servo/skia"
 
@@ -80,3 +65,28 @@ rustc-serialize = "0.3"
 libc = "*"
 rand = "*"
 harfbuzz = "0.1"
+
+[target.x86_64-apple-darwin.dependencies]
+core-foundation = "*"
+core-graphics = "*"
+
+[target.i686-unknown-linux-gnu.dependencies.fontconfig]
+git = "https://github.com/servo/rust-fontconfig"
+
+[target.x86_64-unknown-linux-gnu.dependencies.fontconfig]
+git = "https://github.com/servo/rust-fontconfig"
+
+[target.arm-linux-androideabi.dependencies.fontconfig]
+git = "https://github.com/servo/rust-fontconfig"
+
+[target.i686-unknown-linux-gnu.dependencies.freetype]
+git = "https://github.com/servo/rust-freetype"
+
+[target.x86_64-unknown-linux-gnu.dependencies.freetype]
+git = "https://github.com/servo/rust-freetype"
+
+[target.arm-linux-androideabi.dependencies.freetype]
+git = "https://github.com/servo/rust-freetype"
+
+[target.x86_64-apple-darwin.dependencies.core-text]
+git = "https://github.com/servo/core-text-rs"

components/msg/Cargo.toml

@@ -22,17 +22,18 @@ git = "https://github.com/servo/rust-geom"
 [dependencies.layers]
 git = "https://github.com/servo/rust-layers"
 
-[dependencies.core_foundation]
-git = "https://github.com/servo/rust-core-foundation"
-
-[dependencies.io_surface]
-git = "https://github.com/servo/rust-io-surface"
-
 [dependencies.png]
 git = "https://github.com/servo/rust-png"
 
 [dependencies]
 url = "0.2.35"
 bitflags = "*"
 hyper = "0.5"
-rustc-serialize = "0.3.4"
+rustc-serialize = "0.3.4"
+
+[target.x86_64-apple-darwin.dependencies]
+core-foundation = "*"
+
+[target.x86_64-apple-darwin.dependencies.io-surface]
+git = "https://github.com/servo/io-surface-rs"
+