Don't install no longer available contrib files (git-diffall and vim)

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 21 insertions, 24 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 0db457334e18..6f64ec7212b0 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.276 2014/08/19 19:10:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.277 2014/08/21 05:16:37 polynomial-c Exp $
+
+  21 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> git-2.1.0.ebuild:
+  Don't install no longer available contrib files (git-diffall and vim).
 
 *git-2.1.0 (19 Aug 2014)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 7efe42eae473..d1f5275843a7 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -54,28 +54,28 @@ EBUILD git-1.8.5.5.ebuild 18441 SHA256 e17b7af3346757d5f16f8cf0306b60c146e80e39b
 EBUILD git-1.9.3.ebuild 18401 SHA256 b5c8e8c34f18fe480316a4c1a362f5516c6694f9dcdb21cc701796a02c71095e SHA512 8713955f11876f0de849459d327ecdf5d04d454257683187d55477d73ee12cd592f79f0642aa3bbb7c62ef1cbb3b1eca2877fd169bc0cab748a102cc7ca9d05c WHIRLPOOL 363b60787caee4e3fdc24f444dac781138af6e998db0de0c50715ccc040ace7c4c24b1ebc47e1730a8bf85660494d865f929a85dbda0b394205ce1269c581688
 EBUILD git-2.0.2.ebuild 18649 SHA256 e8d23c096185199527edc03756af6a10672a69827ad56b103d61f4cb41bcd9d3 SHA512 cf06f4909e36d9d034b5b3bed4767bc776d1f4b638b53e45137feaaf240f4f411590d5b2c6a8d4526bd42626d0ac1a4d10e2d6d54a28aa9f5d5d2d3df2f78ad2 WHIRLPOOL 19d5add2c9725d71b2b0efd7699d56338b8592c14c5e9a3d75064226fe2107f941a7ef7b10abe42cc04c59211cea437815ab7d7bf4c0226d243c1a5c51ce9875
 EBUILD git-2.0.4.ebuild 18656 SHA256 2e9e9469ad5d67d0c9a75c1f9bfd8bf82ffaf797fe9047a7d03e29d38fe42e69 SHA512 2cffd5e27b62d73d813cdd55f97c4930014458c52367a41998f79624e458c811fb64405bb0000ab15b9857e9a57314f4107addc765b3fb661e6c53fc4ec1597b WHIRLPOOL 449cf0d5212b433813debbc29bc9793973232a03561e34aa7e7a0ec62014bbcc1e7167fbe60de253d284936968def74f223036e665844714fe08d990605bde2c
-EBUILD git-2.1.0.ebuild 18675 SHA256 334b190be51e523297375973b0b10312181cee0051000b9b5cb89c0613c895c7 SHA512 ef0fe141219784721a96cade0c374a0260b021a455e7559fdbc87d854f7f556af57ce24bc2a9e771704d2e569184e801f85bd242cff2b93e5c3f19ab8dbcec9c WHIRLPOOL b109f1478412ce8a0436ccbf313de23508c82da26ee0f4ca24d33aae6c346b4990cff4626a6a1fb5283f382b29edd3f702789d6e005c2ab5cd62d96eb0da987f
+EBUILD git-2.1.0.ebuild 18530 SHA256 94df9d0b8f649efeb37bb0ee03404021d83984c88320b37755baae67bcedd661 SHA512 816ea18e9e65a4aa5d9515232e22c8ec4b01eef0acdf3441a8cd5653d6986b3704e614745dd829f7728aaa4871d590f367410d1cef972715c545dc1ba68f631a WHIRLPOOL 7f595580f746a66fcfe1a9dade01b9151ef9aac03507c2da6623803c270f0c6d53e2ea0d89632adddb425d0a4d343667e0c701b0b86191c21113c10c729c0591
 EBUILD git-9999-r1.ebuild 18658 SHA256 dedf3765ee6589510eb5b2e8005d4843dbdc5d811ca65225dbc3c7d561818ed4 SHA512 5477c589c0e99dfac685582274f9390a2faba1d5a1034d5ce58fbeaec16e12b367930b2303141fbdb96a899a4aff626c53778308d587e20dfaa8ac758716795a WHIRLPOOL 6766b3eefc173f3432f8d8961cc19c36c6be9b8e058e25588714ba768ab75f46e1a8e435ae179894665c37d7f6499cb7f3af81554ed8b3faab046cc67763aa62
 EBUILD git-9999-r2.ebuild 18657 SHA256 56624b2a8bf6363f7472908440091eab253c814e89858c3b32f19916debab3e2 SHA512 38ea0d330e42d415a87231216043ca8c6d8f8832e158f97b646b3be28f06727dc444910e72e0459f20a546310c003b8541fe62333a1640e644c4868106f22c87 WHIRLPOOL 2f5884f27439ecf0b2aad1ccd1f403ee45e130a502cb06454f3339c4514c798995f1d58f71e9e94ba89cbc4823b27aeb5078a24d4321d5a3122041462f0d2b1b
 EBUILD git-9999-r3.ebuild 18655 SHA256 a81be5bbba71cd6021407ac1a5789ca4bb533dd206cf483571cab771e707b8eb SHA512 cba78f0679d947945b582da66c7a57ecf426e222fc5b422801a56eab0043c68d687c035b1d6a8f724b227491dd68df556ef7a9b9ef0e73d757e13a6d35b0ed12 WHIRLPOOL 8fd8daadc1824ab3c7867fe14d2cb9be6d6918a9c76f950b320857de95205a50030af3305f30f0389dfb67648f00267445ea7b298bf35d39bb6702f625c48705
 EBUILD git-9999.ebuild 18657 SHA256 451642af7dff08b7c79f81286f88d2a630a006019b2a1a67dc061ab9c0ec2f45 SHA512 d379379bef880512866eea7059fd72823c95c2a542d2c7b823c5ea8e1be8e5ffa248e550a298c97ca31f15296556f593bb80449e3d40e0453cd215da2c7b20f7 WHIRLPOOL 8dcce9a4f4e7e253b418e06add449243cdd841979f18dd595b85d303f626e5705641fd89c738a2e028461cb0088a232ff5a0d5d5ce911c0cf34e74b44feb15dd
-MISC ChangeLog 17956 SHA256 9e9ca9f47901f103e259c708639aec5d0ae60b894413b5234e8bc959b8f7a74c SHA512 da186e57af2aeecd77b6c7d61bf4a3ec458d30f01c1c88d39729d3b569ed0e936a77e310c14783da6cb7ae550d4c8fc4a8b91cf9add639a859d69f55c44f953a WHIRLPOOL 5d613c4aa1dc022b0a42fcb65ff8db2c71e1656f30b5b8c512c59e6d0a53c209f129652214878a6c389ccb0456c756ba6cc8d0a5e7732761bb4051e37b6a93d3
+MISC ChangeLog 18102 SHA256 4eea66dc629eed8bcb545d7593eaf8025aaaeeab1045912bfcf5da6853e90791 SHA512 26e6e480efc64327aaaf3aa85b9265755feb4f5dd44e2b49f2b00ae941cf7c0950179f7751a35ecccf736c2b65b2b5f9dde07aac5ee761709d43dc1c6c0620bd WHIRLPOOL 9dd178ae832ef0f54616b19b38d274b9429f072dd6e9489d6b5d9e6f9e8c98f60604148542fe37119b4c214badc3a18bdc0957a6091e359da22e0b18d71324f0
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT86EYAAoJEPiazRVxLXTFrwkP/3RxUTr3U+8iSUy2y3KaoEaJ
-ROyGBbj3Rj+6TNPGg25sjkG5HqfD6ws5VcDbDFkEI/udWMPMtVwwUPQFyodcr4kW
-SEQuyxGL52raMqOz4DgN8qudr35vx+F+8NsRbBILPCj5uIdUXvifp84Pstyn1pkJ
-ebo+s9jsFpuIgSqhiO/a1ZM3wEKTnIHzHSz3JNIZfErEAAoQz5awoypuWVmJ2QfP
-0Gqosyp7H1L95C5D1MF+3jIVV/7puKcxBu83jnNMUfKMfeIameObqYh/kt+rkL34
-behl+TJuNHwjRFi1dS1Amya0PmY9PId0gtgd48LMASxdhDwnaSCPNXWbZ3Ve3dhO
-Zuko3Vpv/1TZsKsI73u3H5euTsTD2BUpTEM7eHFaWYi0Botq/N27GSuPTPcsPOJ0
-Acalmdnk/FbRIsj6Qb38m0lVUrXrDXCsPgwmIDJzobLJnejTbvhRKAUrL3MqNxhl
-H9tHNzsbbXD8Lpk7YSD3ORyId9PIxnR0L7ylKBiM2dE6qHBliktnsgDKOrqcj0w6
-7knM02I+CVdosEonyq65HFYavR2ZzKGZ3U7sZkuvyGwJSofo75MzT25pJZTttWQF
-oNolIquf7xtDlUogZKTHdMyjE2Khw/iXS7syD9MNLQmAfBTXNzpI78MXa+dfrZxI
-pWpyC2pLaoGgIKM/FlQ4
-=+hvw
+iQIcBAEBCAAGBQJT9YC2AAoJEPiazRVxLXTFFZwQAMVHq/XlYQeV7HcEJ9eN0qRW
+dtnQcKGLcAztksLQPU0b03CSndGNLMwciCA7APR+JM/sYZ5/PSeGjXANC1cWB5gV
+Z9E6AdmKYaqzp+Ob8TirqDXN03PgEt/1tZfxEjiIdLmmgUX2YbdQ9SN4cfIFN2MW
+fMcNzQYpVA9u/LwBYUUEYJLpkJ4suQM/9yQTQhkQop1HsaFQV0OS/1uUMjxe2+Qg
+aurFdXYrTAdz7ymRcwhA2DuZfGS+m3268dEyDy6Uw3lD43XsuvrOGX2Esqfo8mLH
+61Oz/OozDK5SILIH7xZafBaNOSG3wvTwE2qVwdjDMJZM+UE2oaw7K3McPjUakz3H
+5+qWGGsXKdGnvx8sS2Vl5ajBlPoNVKDeQySJcG2qivdAMmSgd/SHFpQrsdkatGZ7
+3b0QSwk5aWkKBjzRIoOs/StJt6B2uKpC/ovGmNoruI8raNK/9rGh6bEHErT5BBXi
+7hXiydJyCADM702NaAfGwUeG9pbadSGbA+xLdfeGd7w8PNFTc1sER01cnzXvNnTs
+OjPY7PfBBqAix11+lVjH1jsiTmdzPmOiDHuW1ncgKCGHcqivmk+kLARP0Yz3vra9
+KL88ziSJ3Zy0BfzfMUTYUiAa61/zxzWI5OgPn7x9flM/Uik6a0dmWWZVMJ/B0wr1
+AwucYrwu5eR106mh0Jss
+=LIy+
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-2.1.0.ebuild b/dev-vcs/git/git-2.1.0.ebuild
index ef2a17f1cf34..00fc67b54c3f 100644
--- a/dev-vcs/git/git-2.1.0.ebuild
+++ b/dev-vcs/git/git-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v 1.1 2014/08/19 19:10:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v 1.2 2014/08/21 05:16:37 polynomial-c Exp $
 
 EAPI=5
 
@@ -420,10 +420,6 @@ src_install() {
 		cd "${S}"
 	fi
 
-	# git-diffall
-	dobin contrib/diffall/git-diffall
-	newdoc contrib/diffall/README git-diffall.txt
-
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
@@ -463,7 +459,6 @@ src_install() {
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
-	# diffall - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
@@ -478,7 +473,7 @@ src_install() {
 	for i in \
 		buildsystems convert-objects fast-import \
 		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats vim workdir \
+		stats workdir \
 		; do
 		cp -rf \
 			"${S}"/contrib/${i} \
@@ -526,7 +521,6 @@ src_install() {
 }
 
 src_test() {
-	# t7004 segfaults
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \