Convert to git-2 eclass.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

31 files changed, 139 insertions, 118 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index b2d4af76a2e1..3e9ac58851a1 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.369 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.370 2011/07/05 00:18:26 vapier Exp $
+
+  05 Jul 2011; Mike Frysinger <vapier@gentoo.org> wine-1.2.ebuild,
+  wine-1.2.1.ebuild, wine-1.2.2.ebuild, wine-1.2.3.ebuild, wine-1.3.0.ebuild,
+  wine-1.3.1.ebuild, wine-1.3.2.ebuild, wine-1.3.3.ebuild, wine-1.3.4.ebuild,
+  wine-1.3.5.ebuild, wine-1.3.6.ebuild, wine-1.3.7.ebuild, wine-1.3.8.ebuild,
+  wine-1.3.9.ebuild, wine-1.3.10.ebuild, wine-1.3.11.ebuild,
+  wine-1.3.12.ebuild, wine-1.3.13.ebuild, wine-1.3.14.ebuild,
+  wine-1.3.15.ebuild, wine-1.3.16.ebuild, wine-1.3.17.ebuild,
+  wine-1.3.18.ebuild, wine-1.3.19.ebuild, wine-1.3.20.ebuild,
+  wine-1.3.21.ebuild, wine-1.3.22.ebuild, wine-1.3.23.ebuild, wine-9999.ebuild:
+  Convert to git-2 eclass.
 
   05 Jul 2011; Mike Frysinger <vapier@gentoo.org> wine-1.3.9.ebuild,
   wine-1.3.10.ebuild, wine-1.3.11.ebuild, wine-1.3.12.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index eb2851dd6048..aca72eadc3ea 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX wine-1.1.15-configure-host.patch 314 RMD160 1c8d09d5265a23b1931eba949a614eaeff251ac7 SHA1 af887b963cf154e8bcf1e9b8b19731bbdda5f487 SHA256 c281217f6e221a6235485918750907b02aa1e40fa68e45133cc4c14ebb40bfe9
 AUX wine-1.1.15-winegcc.patch 1556 RMD160 ca7e0df0a45507e7d31ed81c5712111b83ed9bfa SHA1 4b155fe7cb5e831b7f92757d52aa1ab12569b232 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d
 AUX wine-1.3.14-mouse-warp.patch 20111 RMD160 43098f5ec5b597d6186fc7dad6e783c512b037b2 SHA1 ecb919b56503e522c32268b0bce1ec4dcb966c88 SHA256 08d84e68f4358709b943baa09b99b72ea80b4dbbe89e55c2fbe9d874da032b42
@@ -48,34 +51,41 @@ DIST winepulse-configure.ac-1.3.19.patch 2730 RMD160 f4a94bbad4452b6fffdd706f6bc
 DIST winepulse-configure.ac-1.3.20.patch 2748 RMD160 d69f7ca5ed9952d3a2a715069a17c1111bae1c5c SHA1 dbd80b1f59b863ea40f8b5f1ed6894e5f45ac361 SHA256 4ff599243f70e38ecdea59f771cfa5611924733344face454a0a876f3165b105
 DIST winepulse-configure.ac-1.3.22.patch 2763 RMD160 cc10e67124ac429c9b1d75e90643835b7f521b46 SHA1 143017cdfdd4270b7da0eea3283bc2098789a0b3 SHA256 691438f7c04e33ce1d43acb47dc26129b41d46cd4a1461bd3fc4d3becc7e7b14
 DIST winepulse-winecfg-1.3.11.patch 1781 RMD160 1659eaaa43ab630e29a1542f97c158aad1cd8a80 SHA1 212f436367c75bbf3060874739a08e0741a3d711 SHA256 2458c3b52b92587a93161b0d07e4fbef4f621a37ae63981007ec5a9ac8edabae
-EBUILD wine-1.2.1.ebuild 5616 RMD160 4c66e500d006cca7a878ee8045d5e4fcc7e655b9 SHA1 104d3d0787404c17125830411488fd9df806130d SHA256 77c7cb741fdb7637bb3226f2accd8965e416b99ac93bf048292209313b651613
-EBUILD wine-1.2.2.ebuild 5616 RMD160 600d9d2626087cab96fdba9f83814bd7e157ea6d SHA1 9968c54585f7a992e23ccba58e2552b82197aa8f SHA256 e785cfc05665c81b03d255b0d8ce54343b73908ccbe1be782d7fee8ebffd0cac
-EBUILD wine-1.2.3.ebuild 5616 RMD160 59336de9669cadc43f1fa1c31fbc3402171eea09 SHA1 58d6a86206208e28822fccc2a5af4e6ee1ec423d SHA256 2703512605f628d2b1192064e9e4b64aefca6722488b720d82d9ba1e62356e65
-EBUILD wine-1.2.ebuild 5076 RMD160 a13116e22ce4ab71740727c2e48ef1c4cdebac54 SHA1 42a85284664e78de6a6a1e1bc45a3ecb0fa5a340 SHA256 11c521776b0d4791e2d8090bd438f41636a10ce8165c4fa578191b210e088fa3
-EBUILD wine-1.3.0.ebuild 5619 RMD160 8c57bdb8bb2670b8f4b917135cdfa8ec7e1776eb SHA1 d4ca24f3f1260e8bc89c51caad26141bb388361e SHA256 decfb4d21c527ba673058b1e3d9310d664f925d22bf49f86f1e77717ae1ce41e
-EBUILD wine-1.3.1.ebuild 5618 RMD160 90a43347402c798c6b6c48000359d3b8fe9d6956 SHA1 481e4071a9b85c6a6c3b8993865014cbe755f791 SHA256 be63cb10c0065da87f69d37c5fc0badcbf8aa8173b636abe60002f3526f2941c
-EBUILD wine-1.3.10.ebuild 5941 RMD160 f26fc9a7e3e9c9661826b1cc8953849c56f51e41 SHA1 b7f1f10c4dd40a4da60bb24e30a0a909e0f5fd60 SHA256 44bcc4d3683a9f21b703b16ce56a4fe979db3e5eb0d6bda3e6804ea89b539fc2
-EBUILD wine-1.3.11.ebuild 6003 RMD160 ccdcf5d6c54a5e88645b409ca369b5ebda6322de SHA1 e726ae94b108572f80dbeafa02594f3dd33110fd SHA256 43df2977809b8f11acf5ceb449a34460c4bfabf4568b7e7b8726bf5cf823779a
-EBUILD wine-1.3.12.ebuild 6005 RMD160 5c5da849d98a5dcbc0187b2a2bf9e0d8b67fc5bf SHA1 aa8482a84402a1fc59dc046dbe2f5dcc677ba61e SHA256 0d37e2d9fc0f8a30f5a4462845e4aa8263cfac51b895a42e7981c63eda762d7e
-EBUILD wine-1.3.13.ebuild 6005 RMD160 c67f7651dd6d5df689321befa1bc3b024d9456ef SHA1 3c714943dcaff7635c0dbd28c3ccf1dba72f40d6 SHA256 e09a6869126fae688d62f8f14780cfab402a9a41e45d8dc70de6dc3afeb026d9
-EBUILD wine-1.3.14.ebuild 6084 RMD160 6c7ca93ced9eebcffb36aeca58efccc8503844ed SHA1 35e38c0a9d9f593ad4e82a17967e7cde977bf38d SHA256 146d34650b5247cafb63ac65c5cc061d7983e3049a62aa52194a71a65e874d91
-EBUILD wine-1.3.15.ebuild 6084 RMD160 6d2d60e84218b4f484520be3db9e2abc55a34f8c SHA1 e964e0a59d616dbf25ef79686d772dcb37298697 SHA256 4af9760afa1519798022ec3d95aa92f6756cec72bea3a9480d5c482d24b48531
-EBUILD wine-1.3.16.ebuild 6084 RMD160 8a6fd2b1c18e2c21f649b1ed6908c7d7ec9fba25 SHA1 0cca7e74e72bf131c841153ad8a3566e671f840e SHA256 51f4d9f109306bd23e4984b7c3f3c7e3ad64ed542aec0ee92393d7864c7a830c
-EBUILD wine-1.3.17.ebuild 6084 RMD160 1fce5c58c937cd7f980d975f288ca9e592707305 SHA1 022b479554fb8e2ab271c524bdbefe2447c6eec3 SHA256 3cc2daf47a7326530f44c762c9172dcfb77e1879ec79aba6a721387c996c6b28
-EBUILD wine-1.3.18.ebuild 6008 RMD160 c9de0bf19c8e6092c9f8e1ef9267363a11676096 SHA1 ae5db454b10d436a6e9298bf8ec1e2d0da778214 SHA256 ad4306b505f2097ead341819d7e82de825557c148fbd287f65ed3963cd6ab6d6
-EBUILD wine-1.3.19.ebuild 6008 RMD160 b1cce75fc5871377acaa4f8e92d0ddefa939454e SHA1 fecb1fa367630d57dc50708b05d6241b78fc0326 SHA256 4f66606add8793934026bc362a38a891cdc1a7618d6e9e846dc348f7b6499af6
-EBUILD wine-1.3.2.ebuild 5768 RMD160 973bd9ad577964bbc9da7ed909a66068c326a02f SHA1 4400d39a63f95bca9245d7d78bdf2896f2a9c2bc SHA256 5e16c3fef8bc7d80db1b27782fb50bf421f3dd9c6473f40755bed121745ad1ce
-EBUILD wine-1.3.20.ebuild 6005 RMD160 dde22b20dd3a7973aec95eb04878727bec95e8c5 SHA1 c8ec866dcb6686d8dcd5e1d133d4206fc5c38a4b SHA256 68dec1647929f8c580f776ef4e32b38728ee62db039e22c877bea810f11d429b
-EBUILD wine-1.3.21.ebuild 6005 RMD160 1c11586227bb05dfbf63c3186a9976b808440cf3 SHA1 1d5e74f8d4ceb720210e6714b0adf4a32a38a5b1 SHA256 01e1d25c071c1e3d04451cadccf457456f93e36c879444a1b8867c44abec9ed0
-EBUILD wine-1.3.22.ebuild 6005 RMD160 0763e0d531fa5198ab3edeec059f8d70957ba1d0 SHA1 6f7ba03bb26e82bcbf2dff7bbd0dcb2c8e93e4b9 SHA256 f80fb03fb9450adc539b535ae565f2fcf0143cc5e202692e9daccab3536ab766
-EBUILD wine-1.3.23.ebuild 6005 RMD160 b7eed8b2cf174fb1bc1ae611e7448d8165d241a4 SHA1 7a03bbd4b622e7c35d27b62c4e60cfc01e704395 SHA256 a173d0ff1b877e5c36f2a876f3c58893a9c0822e9c0c9c412ce887837402c424
-EBUILD wine-1.3.3.ebuild 5767 RMD160 90c344c1c1b1dcbae1dda9ece96749f5d50ca716 SHA1 c454b8d67646b71a8eb8b98aa7352827a17dc3e9 SHA256 223e4e7dca05e8b0ab6b92c27e80e3742e2f49d5a476d4916c85ee0535779cf7
-EBUILD wine-1.3.4.ebuild 5767 RMD160 1588b859fb375590944be5a2ffad278ca2cecd87 SHA1 45c03347d2fb2af1b7a8b3da24aabcbf3b576b5d SHA256 5edc212373ece364d843431f16672f4d538b0aa48b35afc290e598dea3109a57
-EBUILD wine-1.3.5.ebuild 5767 RMD160 de961b3a4c4d2be494029e8d1ac888a32379d98d SHA1 e8d640aa7bb6bddbd0562ddb4dad95bcecab6ad8 SHA256 25c1edfca3f7f7be16611d1036c0088b3d66b170fd2a607728b58d14900f919a
-EBUILD wine-1.3.6.ebuild 5868 RMD160 715189105e7a20edda409c260b0686c10f488ba8 SHA1 885ca36a9eb564f371948f56cb91a597a6832b71 SHA256 d946fc1305e0f247870a4bef409e98e035a4a57046c553a6b07f096a45f1fc20
-EBUILD wine-1.3.7.ebuild 5868 RMD160 66c1339f479e9fec7c2e4a21863f0b057389d9d3 SHA1 85e1b77a7ebdf0782d756db760d77710c26b56ce SHA256 95ba8a95614b3d3f5ee1db9de6e07b758465ad3a9ca15cc0df6a1bcd6287fec0
-EBUILD wine-1.3.8.ebuild 5868 RMD160 d09c25bf01d964476b2f98cc54ef725e32300bb9 SHA1 4402fa9f5717b41c82282cb40b5a544f6480dc8c SHA256 68236afc593f12d8398f75e1dd46409b379159e9058e039850855e3062605a72
-EBUILD wine-1.3.9.ebuild 5938 RMD160 8500da60566f2b91a124a0f16714101a150ebd5f SHA1 e05a691a124ff2cd59237091b12cc4305cb62f9d SHA256 538e9ea5b989663cf5c253fe61162f6299e3bb0437a865e0f292a52cc4b27998
-EBUILD wine-9999.ebuild 6004 RMD160 c76c9f6c13234110c1954eaa82529ca6763d61d4 SHA1 b2254c30272b58671a37c69a572ff399d8214748 SHA256 652cf28481ae8ed5b368bd768a0d6efa9e2ab90c15ba703c6dce0be825d61300
-MISC ChangeLog 70627 RMD160 c4588bc2607c86151b4f0895ca888ad780975f04 SHA1 ea425a9c656bb653abdf468c6cc9e8896a04f580 SHA256 e767d5ade929b5962f4adaec1cc4364a45d000202e9580f51eb4e5574a397439
+EBUILD wine-1.2.1.ebuild 5620 RMD160 71ed6114232b27a266d24251528ac9d1e7343c8e SHA1 11ae0e010d242db4c0d74467c6a764155a7a3bb5 SHA256 20a4c7a5b074e246cd2847661732f1457cee85ea9c6ca8f5ba3d141a51207f06
+EBUILD wine-1.2.2.ebuild 5620 RMD160 031c8d826487064275df2e869fc1b47b6c28a91d SHA1 79859bcda5833a5cf14fcaecc8900cff8c74dc83 SHA256 2e2a8f354fef4c1faec5bfaab2ddf79c0cc6cea5c5927c71fac3ab61bee8b458
+EBUILD wine-1.2.3.ebuild 5620 RMD160 57b3c3f094ceb8ebd10b5e748f529d7059826ea9 SHA1 accecdccd8b6ad8a98f4b4383186901c64d75e4b SHA256 32883be5cd164679f0b18b522a406aaa634502e1e62341cdb7fad259610ab40b
+EBUILD wine-1.2.ebuild 5081 RMD160 2cdb65fca86f93e64b0ad37f22ab1ef31025383c SHA1 a7b4eb106f9e24fb82cd039bf6b86e732f2d3ac5 SHA256 e4edb1065f18de81c02476af4c90204859f446442010e86fbd8d8ee2318f786b
+EBUILD wine-1.3.0.ebuild 5623 RMD160 5ab0eb5cd9e2f212e8eca6c4475abb57f75daf66 SHA1 a0c908f8eb1e3db724eba80181262cb5c772926c SHA256 8bbdad2a60c949a717d365ca60de2aa75cd49aaf507bfef5a42313a3a344ac65
+EBUILD wine-1.3.1.ebuild 5622 RMD160 8a67edb2213ed0e4f428ed2bfa2e6f76e0fb8a7f SHA1 e15605df54fc9f17eae2ae5d997d2b04b90f140c SHA256 c88435985bc555137d1147e3fc4637a8630292a2dec1edb4ec44430fe8be68d5
+EBUILD wine-1.3.10.ebuild 5945 RMD160 6730fe246283dd535cb5609f12dbdc7f1e8980ab SHA1 577fcfaa8b138269ab81fd9641c63c619bec6e46 SHA256 588cce98c6bf2097b6c77893a65251660f54ab16ab004a6c2e57999b3bbffe9d
+EBUILD wine-1.3.11.ebuild 6007 RMD160 44b8fa7f79813d9d68ff61eba32d0a5b7ea24a0d SHA1 82fe6e2791b1019ca0bc91f1cacbc41b4c827aa4 SHA256 aab0b194aff5204c8e7afb98204f856df50be53a9cbcc9b504fbb5a68bc97bfd
+EBUILD wine-1.3.12.ebuild 6009 RMD160 7e562d6c3145c6c771c378eee3497e67100053db SHA1 7c5303b492066fddd6a97b210c1147f52d668d96 SHA256 75c73b0a1ba358dbcc042e615c8f53c26b52942b3fee06edab3599dcc14b56ee
+EBUILD wine-1.3.13.ebuild 6009 RMD160 eef2ce7612059d7e1360a7c8359bf51ba18f64ca SHA1 a294c576a228659be748ebf6e97ce867e8b56fa2 SHA256 cc0b4f7d09843bc6b87adbf0d355773de6944237adbb866236f31a178195dc4c
+EBUILD wine-1.3.14.ebuild 6088 RMD160 e4fe3bd9988eb52e6c0608dc8bc7a424ea4e1623 SHA1 fb5c5430626b109ca8c7ec270d31bbb7eabfab27 SHA256 3ac563ec70f2eba5e312b2279603aba76733293a9e1f6b33b5fb5b507eba0185
+EBUILD wine-1.3.15.ebuild 6088 RMD160 7908d5a6707603fb56bbc83bd86517631061b38c SHA1 0f22c1ff6b1d6e3acbf2f0cf490083e885bf1711 SHA256 737a6df7e08190f8d1336af9796c55aaaf55f87db9df086f02c2e9e376f2877d
+EBUILD wine-1.3.16.ebuild 6088 RMD160 12dd8de4166028e8e1adfd0e60640127b1ac65d6 SHA1 ac4b81be3dc1e0bacc112248b680a6783d61b249 SHA256 ed9caa8e7a267c1121f9845fe6940990a6389ac86496f83be136f9b0cdfe1a55
+EBUILD wine-1.3.17.ebuild 6088 RMD160 67e55ea5fe3d7c8cdaef95c40825cd99384ebf44 SHA1 3241603758179686d1d2d390cb93e355fdf9075b SHA256 eaf909f0543f517c5fb05585b412f9dc18732a848f444b8a77a77eba8a9fb16d
+EBUILD wine-1.3.18.ebuild 6009 RMD160 332318faced53bc2f79628da7e15c45bba77f541 SHA1 fc7dbd027beb181989bc5aea0e59e3f504311dab SHA256 a482deca2d864f3193ae8fea26d57ea31b64002d72434d5654dfc6c9df78cf7c
+EBUILD wine-1.3.19.ebuild 6009 RMD160 056743fefac22f8303b2bf85d214e26adf76b0a9 SHA1 2283313b56964c3f2f2ba248c77d4db10d219f6b SHA256 0fb87288e9e16b002a99856dcaa9a341757e43b9fee9d85525cb8ab61ead3124
+EBUILD wine-1.3.2.ebuild 5772 RMD160 a5d8f8e0431449aa66a08fb9e94e4daff70b188e SHA1 bdb7f05cc02aa0afe3a46cfcc161d77920d74e1a SHA256 5c4579e00e91ff81fcfb83efa507e647e6f4515d8548f4cf4d7e129152f2873a
+EBUILD wine-1.3.20.ebuild 6009 RMD160 1c1eef97124ba3780d8fb4daf3b668e6b2569039 SHA1 e78923a681497b6cc1b64d718be864ccabe01499 SHA256 6c235960b97b3a779e46917da4e8bac284c465a207f9eb0b72ab9fcbaeff4dc8
+EBUILD wine-1.3.21.ebuild 6009 RMD160 fd84a483500d9a54d03af540b1038b40c97b10dd SHA1 b959c766975555f4e563eab5998de39fc4e839af SHA256 8bb1a40e53ee97d19b054337fd92a4a5c470036ee6072c7feef09131fe7e7f5b
+EBUILD wine-1.3.22.ebuild 6009 RMD160 8ebd02b78a128edc29bfbcc26d54a61da4e0c60c SHA1 5ce68ed734fdcd6e7832e7405fc48349ae3010c2 SHA256 be642275604e2ce363c6ce4a2a6bc3f7958c470b11acfc06480612c4986d5739
+EBUILD wine-1.3.23.ebuild 6009 RMD160 f193fcf8b853c17b13ca2ff087a3491aeaafd23d SHA1 7f48ad2c2d3cc21709a24e677c2ae2badc015801 SHA256 a338fb0aa43ffa34263c290ff271b98a9a60b9636e6618365d5676caf687dd20
+EBUILD wine-1.3.3.ebuild 5771 RMD160 190a64bf2a0b2617857eb9244cca8a384fae8a4a SHA1 2c83fde71ec18824ecabec09d119c45b2c524d57 SHA256 15e2a7913d27404e9e3f50f6407c2bcba3327996f65615f7982478d44fd918a3
+EBUILD wine-1.3.4.ebuild 5771 RMD160 f9b2e9f752009e18fed320be390951ede1321d75 SHA1 fc5852c4239c5ff85edf881077660fd094768be5 SHA256 7f39ced747ddfd9d63f7ee77e200644e5daddf11e3d4213fa828c613cf38bc18
+EBUILD wine-1.3.5.ebuild 5771 RMD160 13b73b0739630a6d5721957a665712185a1fb235 SHA1 589192d69f66808a957fe86fd589572561f352e9 SHA256 1c71ee4aa3af22e5ecd4d277b19f91738787a5507ba02df2bfbbce08c3a4b8c9
+EBUILD wine-1.3.6.ebuild 5872 RMD160 87a1e4caf2e8028ce6a290181c65166ebb97a69b SHA1 35c7a725077c0cee05ddda4e2415e148d98018c7 SHA256 f4026604961776e4e981865dc03198f077bc768455f1fe7e9cc529df7b5652a9
+EBUILD wine-1.3.7.ebuild 5872 RMD160 03c7037be0663f49b8844dc471c294ad462d64a3 SHA1 316bc709d4dcb93fa128fc2d9168a06b0fe2ddb2 SHA256 ef76163aa190225df8fb0c07bc0a15fff69629b1e81e4e1b1e6c99d39b2db0ee
+EBUILD wine-1.3.8.ebuild 5872 RMD160 463f379f80813d2e2964f5ef5e64bb9e9fd438f1 SHA1 c7e8f3ca00eba6e7a3ad08bb71819bec6a6dbe42 SHA256 4859254307f864ef5d160ad358da1a8d366e96836e26baacb49bd4c3d2a80ac4
+EBUILD wine-1.3.9.ebuild 5942 RMD160 f7bf688e4954e5c61f718db17b795bffd380bf41 SHA1 01b88472c24172b823222944ada99560666a55d4 SHA256 f15815ab2282bf21c120fa2ee9c56281febba6e99abfc6e8e02190b516de3216
+EBUILD wine-9999.ebuild 6008 RMD160 5863a68f410dc3ea09cc127fd9ded05f2ec2ee25 SHA1 8c2a94a043b8068f6fd70f21307ee5e779eb2d0e SHA256 0db719edc3affdb26955c9d843d73a839efca31fbe2fb6d2d71845b863fc3269
+MISC ChangeLog 71728 RMD160 8489d9f0bc3631bf2aba90730c78db3c39205b3f SHA1 4e76a2cf0e06a61e67a72286830b2d4e7faaa0b0 SHA256 cbbe8d53a71afa0cf75f5eeef7a674dd9c8cd99f814d13a56a36ebcf025c5d6c
 MISC metadata.xml 1681 RMD160 9c7ce105ac87de7a09f92cbb6a797f5f60576014 SHA1 80d03dc33ad3e8d1e73e8b02ff8b84f61df40912 SHA256 48a829d453b2910192cbd399a8a0ac6bb2354ec54bd0cdd6a8072d0b215aa85a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4SWG0ACgkQaC/OocHi7JY0kAD/UIyBA7adLeNA4bPwnazJxGwb
+usFP9+GpRUiLQhdc0eAA/0owIJwjt3Q2hHc3MwZ7iPR4higm6QgYTdcJz+JxqD4Q
+=63xL
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.2.1.ebuild b/app-emulation/wine/wine-1.2.1.ebuild
index 80256322241c..3ea2e188f2e0 100644
--- a/app-emulation/wine/wine-1.2.1.ebuild
+++ b/app-emulation/wine/wine-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.1.ebuild,v 1.5 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.1.ebuild,v 1.6 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -102,7 +102,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.2.2.ebuild b/app-emulation/wine/wine-1.2.2.ebuild
index 135c73591ee8..5b9ad2db3768 100644
--- a/app-emulation/wine/wine-1.2.2.ebuild
+++ b/app-emulation/wine/wine-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.2.ebuild,v 1.5 2011/06/29 04:56:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.2.ebuild,v 1.6 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -102,7 +102,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild
index 08505378bb29..9c14aff52ea9 100644
--- a/app-emulation/wine/wine-1.2.3.ebuild
+++ b/app-emulation/wine/wine-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.3 2011/06/29 04:56:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.4 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -102,7 +102,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.2.ebuild b/app-emulation/wine/wine-1.2.ebuild
index 7e3c72d9c682..e0f9101ddedc 100644
--- a/app-emulation/wine/wine-1.2.ebuild
+++ b/app-emulation/wine/wine-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.9 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.10 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ inherit eutils flag-o-matic multilib autotools
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git
+	inherit git-2
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -98,7 +98,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.0.ebuild b/app-emulation/wine/wine-1.3.0.ebuild
index 3e2fcd6f02aa..939304b5fe6d 100644
--- a/app-emulation/wine/wine-1.3.0.ebuild
+++ b/app-emulation/wine/wine-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.10 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.11 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -102,7 +102,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.1.ebuild b/app-emulation/wine/wine-1.3.1.ebuild
index 742c73da4ac0..54f2d227774f 100644
--- a/app-emulation/wine/wine-1.3.1.ebuild
+++ b/app-emulation/wine/wine-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.8 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.9 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -102,7 +102,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.10.ebuild b/app-emulation/wine/wine-1.3.10.ebuild
index 2de5e9afe72f..dcbd18d7f9cb 100644
--- a/app-emulation/wine/wine-1.3.10.ebuild
+++ b/app-emulation/wine/wine-1.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.10.ebuild,v 1.6 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.10.ebuild,v 1.7 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -107,7 +107,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.11.ebuild b/app-emulation/wine/wine-1.3.11.ebuild
index 2dc5f6a21f6c..86be09f2e165 100644
--- a/app-emulation/wine/wine-1.3.11.ebuild
+++ b/app-emulation/wine/wine-1.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.11.ebuild,v 1.5 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.11.ebuild,v 1.6 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.12.ebuild b/app-emulation/wine/wine-1.3.12.ebuild
index 43e1b8828d32..dbde5082f372 100644
--- a/app-emulation/wine/wine-1.3.12.ebuild
+++ b/app-emulation/wine/wine-1.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.12.ebuild,v 1.3 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.12.ebuild,v 1.4 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.13.ebuild b/app-emulation/wine/wine-1.3.13.ebuild
index f96b774800ef..fe8a51c52409 100644
--- a/app-emulation/wine/wine-1.3.13.ebuild
+++ b/app-emulation/wine/wine-1.3.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.13.ebuild,v 1.3 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.13.ebuild,v 1.4 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.14.ebuild b/app-emulation/wine/wine-1.3.14.ebuild
index 7dd5f046388d..edb282b60417 100644
--- a/app-emulation/wine/wine-1.3.14.ebuild
+++ b/app-emulation/wine/wine-1.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.14.ebuild,v 1.4 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.14.ebuild,v 1.5 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.15.ebuild b/app-emulation/wine/wine-1.3.15.ebuild
index 8b00afcff9a4..e2a01f7d7ece 100644
--- a/app-emulation/wine/wine-1.3.15.ebuild
+++ b/app-emulation/wine/wine-1.3.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.15.ebuild,v 1.3 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.15.ebuild,v 1.4 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.16.ebuild b/app-emulation/wine/wine-1.3.16.ebuild
index 92263c95bb23..07d4efaed161 100644
--- a/app-emulation/wine/wine-1.3.16.ebuild
+++ b/app-emulation/wine/wine-1.3.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild,v 1.4 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild,v 1.5 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.17.ebuild b/app-emulation/wine/wine-1.3.17.ebuild
index 31109e6b60a0..75071d3aa6fb 100644
--- a/app-emulation/wine/wine-1.3.17.ebuild
+++ b/app-emulation/wine/wine-1.3.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild,v 1.4 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild,v 1.5 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.18.ebuild b/app-emulation/wine/wine-1.3.18.ebuild
index ab144c861e4c..dbf0b9df9f70 100644
--- a/app-emulation/wine/wine-1.3.18.ebuild
+++ b/app-emulation/wine/wine-1.3.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.18.ebuild,v 1.4 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.18.ebuild,v 1.5 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.19.ebuild b/app-emulation/wine/wine-1.3.19.ebuild
index f403bc48b910..41ddf6fe2247 100644
--- a/app-emulation/wine/wine-1.3.19.ebuild
+++ b/app-emulation/wine/wine-1.3.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.19.ebuild,v 1.3 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.19.ebuild,v 1.4 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.2.ebuild b/app-emulation/wine/wine-1.3.2.ebuild
index 24a052ebdb1b..ad5eed38beaf 100644
--- a/app-emulation/wine/wine-1.3.2.ebuild
+++ b/app-emulation/wine/wine-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.10 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.11 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -105,7 +105,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.20.ebuild b/app-emulation/wine/wine-1.3.20.ebuild
index 666b728d5186..0a7e7af70a52 100644
--- a/app-emulation/wine/wine-1.3.20.ebuild
+++ b/app-emulation/wine/wine-1.3.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.20.ebuild,v 1.2 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.20.ebuild,v 1.3 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.21.ebuild b/app-emulation/wine/wine-1.3.21.ebuild
index 91aca248aa67..8ff5eabd0920 100644
--- a/app-emulation/wine/wine-1.3.21.ebuild
+++ b/app-emulation/wine/wine-1.3.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.21.ebuild,v 1.2 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.21.ebuild,v 1.3 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.22.ebuild b/app-emulation/wine/wine-1.3.22.ebuild
index b1cfcb0d0446..409eb0364f82 100644
--- a/app-emulation/wine/wine-1.3.22.ebuild
+++ b/app-emulation/wine/wine-1.3.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild,v 1.2 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild,v 1.3 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.23.ebuild b/app-emulation/wine/wine-1.3.23.ebuild
index b5e54ad25766..a3684bb7ea71 100644
--- a/app-emulation/wine/wine-1.3.23.ebuild
+++ b/app-emulation/wine/wine-1.3.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.23.ebuild,v 1.2 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.23.ebuild,v 1.3 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.3.ebuild b/app-emulation/wine/wine-1.3.3.ebuild
index 749ee8e57887..aa3c428d3395 100644
--- a/app-emulation/wine/wine-1.3.3.ebuild
+++ b/app-emulation/wine/wine-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.3.ebuild,v 1.7 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.3.ebuild,v 1.8 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -105,7 +105,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.4.ebuild b/app-emulation/wine/wine-1.3.4.ebuild
index 03c9a3ffac2f..d9f1ed3d791a 100644
--- a/app-emulation/wine/wine-1.3.4.ebuild
+++ b/app-emulation/wine/wine-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.4.ebuild,v 1.6 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.4.ebuild,v 1.7 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -105,7 +105,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.5.ebuild b/app-emulation/wine/wine-1.3.5.ebuild
index 7509ea03fb44..41c829e110a9 100644
--- a/app-emulation/wine/wine-1.3.5.ebuild
+++ b/app-emulation/wine/wine-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.5.ebuild,v 1.5 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.5.ebuild,v 1.6 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -105,7 +105,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.6.ebuild b/app-emulation/wine/wine-1.3.6.ebuild
index 29b6693f5b58..21f6d020a17a 100644
--- a/app-emulation/wine/wine-1.3.6.ebuild
+++ b/app-emulation/wine/wine-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.6.ebuild,v 1.5 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.6.ebuild,v 1.6 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -106,7 +106,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.7.ebuild b/app-emulation/wine/wine-1.3.7.ebuild
index 27cec3551bce..adcffc539a55 100644
--- a/app-emulation/wine/wine-1.3.7.ebuild
+++ b/app-emulation/wine/wine-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.7.ebuild,v 1.4 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.7.ebuild,v 1.5 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -106,7 +106,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.8.ebuild b/app-emulation/wine/wine-1.3.8.ebuild
index 544024b9a1c6..18d0e1a1a2fc 100644
--- a/app-emulation/wine/wine-1.3.8.ebuild
+++ b/app-emulation/wine/wine-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.8.ebuild,v 1.4 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.8.ebuild,v 1.5 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -106,7 +106,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-1.3.9.ebuild b/app-emulation/wine/wine-1.3.9.ebuild
index 9ac6e6cc2e53..3c39d33b85a8 100644
--- a/app-emulation/wine/wine-1.3.9.ebuild
+++ b/app-emulation/wine/wine-1.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.9.ebuild,v 1.5 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.9.ebuild,v 1.6 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -107,7 +107,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index b1f0accca427..67a1ab83322a 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.81 2011/07/05 00:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.82 2011/07/05 00:18:26 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git autotools
+	inherit git-2 autotools
 	SRC_URI=""
 	#KEYWORDS=""
 else
@@ -108,7 +108,7 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${MY_P}.tar.bz2
 	fi