Tidy up verions, fetch tarballs, stablize

2 files changed, 27 insertions, 20 deletions

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 824b4f4..50ba0bb 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,7 +1,7 @@
-DIST gocode-110f355028eeaf1987863e9921eda6692a4a9d7c.zip 136435 SHA256 4cafe0a7592295ae40a6d1e2c128ee36fbc5e698213736f242c086cb5ea8bd2f SHA512 06e3ae26306f27555d094bbcaf5a08407e32ece5e696256da130411b7f25bcb47308a5b7c2536e174b4b0db35b5418883f55bf1c2563e9888c1e47174429a975 WHIRLPOOL 507621615b34c6fd20bb3e7fb11a20d992de5cae49ee8f9ffefbe31339a0f47ba626e2ea7c5ced06ba26cdd8bbfb2549d4a8ce10ea101c1dc59995bfd6b509e4
-DIST omnisharp-server-e1902915c6790bcec00b8d551199c8a3537d33c9.zip 3160038 SHA256 daa98c780de9ef2de43d6237cd309ef84c773e7295647aad240710f78fd49392 SHA512 24872e1160058da910e53a0db5caebca697d27dbc60a77094d3658f98fa0652e99734f34f3961f5ef00c4d11df3556bcbc0359e34f19112b932ce88e590a8b7e WHIRLPOOL 485aeb34942cc4a09ca6124cf33bcf6847c02d2c49a677fd852ed16a899976a70b863020a5ec87db369efd166a6db822d7dfd63f2af6a041061ec155d123c5b1
-DIST python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a.zip 4445 SHA256 c18090751815ad86dcefc5b8cdad819cb89206c24e6e451e8f35a56932e76f3b SHA512 9206786953b93afb4256e2969bb35e28444033bfac920f2965afecefcea6024017cb087cf1eae041446304cc5c3d3a819ca85da3bfbc3fffa19f8615eaf75fd4 WHIRLPOOL f5114a646efbaa2bdb0e181312b36a4c0e11c343bfb2847e3c862fbfec49d02da7b9f4a5a459d7407554aa510d07a3c30b81a32a0a17067755bdd715780607f7
-DIST requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.zip 8095 SHA256 7936d7f4c4063e7c17d6c437aac7c5df173b1c58d883740b983c75c7e1314489 SHA512 d931fa5382ba4506a764a07c32fa3412aebb834c05158b59459cfccfa541fcdae16a838b016a012690b2633d3f41fa8c3be9bc1b1225a573e427de571d689465 WHIRLPOOL afd54803978442b837a575743aa452eee7e61afdbea012b655728e8da76bdaae60cea081f740f98793fefcf573f47b0193906a59d31c6eae370648aedf9b9a52
-DIST ycmd-b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5.zip 6826787 SHA256 8a430ff4282298b797eba824727bf7233a51d1c88805e02664240dac5ff20563 SHA512 9e41f6675f70d75de0ed25a458c5cbae4634e7b2a14dd8edff7d9d22ed81e19432467ea04cbb7255f2461ee617e0dceddba8bd696404d430f09c1b8176000151 WHIRLPOOL 47344968277c2f5a6183ff8031ec74e3e9df0f6a17fdda450ca0c07aabc1dedff4ae27da9d75d7632075a3827d6057f45957ec444428b867dcc2eb09a0b84ccc
-DIST youcompleteme-a2808ee3ff7e8f4e90f6157f062c2aac6057c087.zip 227836 SHA256 97f615c9721510eda2d90751ad4e7b0abeb8a64bbc591cee6e4339c5e7ff4dc6 SHA512 9ac4919636b3b820ff149c3957dc9ec89df2070032bf8c2e325528296ccd9011fb78265d619968f978af1f5d5c4a10aa9957e13fa9f0e02238c1ef19e3445227 WHIRLPOOL c5126fb1e0deb2d6947800ae19673e25b7cb468aebc003ad691dda7641337793fabbfcfbb57d16050cef4db91a24baaff2e797173144dacd7dacc5ff7eae54a8
-EBUILD youcompleteme-20150902.ebuild 3816 SHA256 bb1e7e700829fa27c6a7a63e6d47318f048904211d54e43f826b8115f8798932 SHA512 c533a9ebaf609db03d2e9ebbd3167462c47b05c92de151d62ae8749f930ad5951d58458192aa90ac9407f927b71f86e3050bde85590986466911046d677080ae WHIRLPOOL 0e601355c1fd367f0021929cfadebcc479b08b542bfc71832e475e6834aeebe08dd7ce76cffb098385ca63cd3304d8533d6a51c16bf35cd5b5558a4b8c8f1aa8
+DIST gocode-110f355028eeaf1987863e9921eda6692a4a9d7c.tar.gz 67052 SHA256 654a706d0bdfc8bb317de7ed88addbe2737cb30f39319e12a1b191649e2d0bc2 SHA512 85b7289786ece493a339f94cedb3fe4b50319dd610084ac83c260c91f2d6bf5b65d511e4cb5342b5228bc33276749dd58155c3b45b34e77a0266ff04bd932981 WHIRLPOOL 5f4a8f1d5e16336e73d5048f348610e327544680228b643139d6a5b7bfbaa462d40833d1f900df2dd27af62e7286d85d1890b35dbe8f6bff562d66a3bca087f8
+DIST omnisharp-server-e1902915c6790bcec00b8d551199c8a3537d33c9.tar.gz 3004637 SHA256 1d7c03280605f6a820297806b10fcbe60c8df3b0d9668f4f7cbf894d6054eef3 SHA512 bf4f85af145f931084423dcc69d9a19a9c8202b3141e9186c6a332f6fcb6f74ee7a6868227a3fe35a701dad9c3805830cb6d11692b84705fb856450a43b1dba0 WHIRLPOOL 8d643f816820bfbd0e4561229cb10dedebb832bc8c7a06095fd3a68834a06fce240e66c50882994103080ab569ac79afd5f179dc9a7b12c3e3890ad6780aa097
+DIST python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a.tar.gz 2192 SHA256 c6d7aafa881a949157ec08eac7a6c474720e34b053e3a05d9d657885923f6089 SHA512 f943e17e9ad5de31c1c8971e26a45cd61e972cbca31ce26e03285070728364e27edab4549532128a51bbcae38a5166ce8ea6e700069d242b0971f8004fb280f4 WHIRLPOOL cf8821c0ef924199b82936f13078c482e595ecafa47b2e1c1cf66ff8d3b4dc3362e790ef8efcdd11cac797a324ab6a089b731aade9327a0ab98b39972b6abae2
+DIST requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.tar.gz 4550 SHA256 38138e40c0c3d2b7672dee3e1c8e08dd59fc41f517eb9c7cb3c238e566a9257c SHA512 38f0c86ab8f74f4f48a6b4279c5d83580f5486a59b71d4d7009835e3f4e8fcbe07e188d0920de9b223d7c88592998c93e6c66f8aae19d22cf4a31705e066e54c WHIRLPOOL 38e2bbdea5d2da13a9749f633956e0ed32e0c6b97d416d115e04092c23c79bdc8c9484cdb7f68ecc03487d4b2df7dd07ad0152a936f29e1ed75863adef1f7fdd
+DIST ycmd-b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5.tar.gz 3978618 SHA256 942a8408edd7a9c753858327b54beebed0c5c533cfc9bbe3e999733757234469 SHA512 50edcc17b916a80d1b35ffa8d7d3cca455e08d6b4a4f5db95a1d350bf80b9a397f07d4b0316b8c4a7e2d4db3c00691b89acd594f7ff43ba1f0be1e341983a5a3 WHIRLPOOL d2951653fcaddba5f78969847d3f19d1d336baf026ff3c0bb5d207c4791f213c3c6809f6be56aa2a3c31604ba5f92791a094c1d4fb9841ddf72c0387bd31f4a1
+DIST youcompleteme-a2808ee3ff7e8f4e90f6157f062c2aac6057c087.tar.gz 192130 SHA256 00504bbc84d2072c351bf79a5ebe4c83794ffe916de69acaf4ae730a5c88f9f2 SHA512 f0d3c08de4041089d9f5c5a03177fb0113a83f4bdca17378cd1e3386ebedab4905256d950d69d5351ba6b7518015b5a1a48db8d9afe534d95d7c76bce5b2903b WHIRLPOOL c8cde51ebd6c006c149a7c1552a5306a43d3218e54c0b24f0133bc25841e4989034b749c1fd4cab79d582f0cb9ddbaab6bdbae6f5c2e165fb104b48ffea9609b
+EBUILD youcompleteme-20150902.ebuild 3573 SHA256 c606acedae74dfd6feb6ccb839df6a717c868de5f499e1e8c6e40dbf51760227 SHA512 625f61076cfbae68f8f7112c0d4f2ba5e508f8083c72288b1ccf404cba772addc6d7f969bdad838a8b91d28f951c2e7c731670d9d516da9091cd7a858c82593f WHIRLPOOL ba7977263aa298f23937396b164ebb1a3d8239c34a5bce7a662a6233252b07d38ce0e45b3f30b235e06664497c1d1b1faf9a49761e30c3b5310f81609ad0fb92
diff --git a/app-vim/youcompleteme/youcompleteme-20150902.ebuild b/app-vim/youcompleteme/youcompleteme-20150902.ebuild
index c95f42e..4bd2a74 100644
--- a/app-vim/youcompleteme/youcompleteme-20150902.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20150902.ebuild
@@ -6,14 +6,21 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 inherit multilib python-single-r1 cmake-utils vim-plugin
 
-KEYWORDS="~amd64 ~x86"
+youcompletemev="a2808ee3ff7e8f4e90f6157f062c2aac6057c087"
+ycmdv="b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5"
+reqfuv="98712e7d0f6be2a090b6fda2a925f85e63656b58"
+ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
+pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
+gocodev="110f355028eeaf1987863e9921eda6692a4a9d7c"
+
+KEYWORDS="amd64 x86"
 SRC_URI="
-	https://github.com/Valloric/YouCompleteMe/archive/a2808ee3ff7e8f4e90f6157f062c2aac6057c087.zip -> youcompleteme-a2808ee3ff7e8f4e90f6157f062c2aac6057c087.zip
-	https://github.com/Valloric/ycmd/archive/b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5.zip -> ycmd-b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5.zip
-	https://github.com/ross/requests-futures/archive/98712e7d0f6be2a090b6fda2a925f85e63656b58.zip -> requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.zip
-	https://github.com/OmniSharp/omnisharp-server/archive/e1902915c6790bcec00b8d551199c8a3537d33c9.zip -> omnisharp-server-e1902915c6790bcec00b8d551199c8a3537d33c9.zip
-	https://github.com/slezica/python-frozendict/archive/b27053e4d11f5891319fd29eda561c130ba3112a.zip -> python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a.zip
-	https://github.com/nsf/gocode/archive/110f355028eeaf1987863e9921eda6692a4a9d7c.zip -> gocode-110f355028eeaf1987863e9921eda6692a4a9d7c.zip
+	https://github.com/Valloric/YouCompleteMe/archive/$youcompletemev.tar.gz -> youcompleteme-$youcompletemev.tar.gz
+	https://github.com/Valloric/ycmd/archive/$ycmdv.tar.gz -> ycmd-$ycmdv.tar.gz
+	https://github.com/ross/requests-futures/archive/$reqfuv.tar.gz -> requests-futures-$reqfuv.tar.gz
+	https://github.com/OmniSharp/omnisharp-server/archive/$ossv.tar.gz -> omnisharp-server-$ossv.tar.gz
+	https://github.com/slezica/python-frozendict/archive/$pfdv.tar.gz -> python-frozendict-$pfdv.tar.gz
+	https://github.com/nsf/gocode/archive/$gocodev.tar.gz -> gocode-$gocodev.tar.gz
 "
 
 DESCRIPTION="vim plugin: a code-completion engine for Vim"
@@ -51,7 +58,7 @@ DEPEND="
 	)
 "
 
-S="${WORKDIR}/YouCompleteMe-a2808ee3ff7e8f4e90f6157f062c2aac6057c087"
+S="${WORKDIR}/YouCompleteMe-$youcompletemev"
 CMAKE_IN_SOURCE_BUILD=1
 CMAKE_USE_DIR=${S}/third_party/ycmd/cpp
 
@@ -61,11 +68,11 @@ src_prepare() {
 	for third_party_module in ycmd requests pythonfutures requests-futures; do
 		rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
 	done
-	mv ${WORKDIR}/ycmd-b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5 ${S}/third_party/ycmd
-	mv ${WORKDIR}/omnisharp-server-e1902915c6790bcec00b8d551199c8a3537d33c9 ${S}/third_party/ycmd/third_party/omnisharp-server
-	mv ${WORKDIR}/python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a ${S}/third_party/ycmd/third_party/python-frozendict
-	mv ${WORKDIR}/gocode-110f355028eeaf1987863e9921eda6692a4a9d7c ${S}/third_party/ycmd/third_party/gocode
-	mv ${WORKDIR}/requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58 ${S}/third_party/request-futures
+	mv ${WORKDIR}/ycmd-$ycmdv ${S}/third_party/ycmd
+	mv ${WORKDIR}/omnisharp-server-$ossv ${S}/third_party/ycmd/third_party/omnisharp-server
+	mv ${WORKDIR}/python-frozendict-$pfdv ${S}/third_party/ycmd/third_party/python-frozendict
+	mv ${WORKDIR}/gocode-$gocodev ${S}/third_party/ycmd/third_party/gocode
+	mv ${WORKDIR}/requests-futures-$reqfuv ${S}/third_party/request-futures
 }
 
 src_configure() {