Migrate to git-2. Localize git variables.

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

diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index 938e3738c26c9c4fd0b39114dc714f0c384319f0..c8539bdcfe262d81cd384f1bc7c4550bbbad692f 100644 (file)
--- a/app-emulation/xen-pvgrub/ChangeLog
+++ b/app-emulation/xen-pvgrub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/xen-pvgrub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.4 2011/09/17 17:52:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.5 2011/09/21 07:55:04 mgorny Exp $
+
+  21 Sep 2011; Michał Górny <mgorny@gentoo.org> xen-pvgrub-9999.ebuild:
+  Migrate to git-2. Localize git variables.
 
 *xen-pvgrub-4.1.1-r1 (17 Sep 2011)
 

diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index abef78b082ddf7a295eb2413428705ed40ec6e08..01a00978612992b7bd8a0a36384ade88989c07ca 100644 (file)
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -9,23 +9,15 @@ DIST pciutils-2.2.9.tar.bz2 212265 RMD160 781a3d30c5c429a0d92110a46711144f74acde
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
 DIST zlib-1.2.3.tar.gz 496597 RMD160 89a57e336c24f7f6eebda3a1724e14b71187e117 SHA1 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e
 EBUILD xen-pvgrub-4.1.1-r1.ebuild 4235 RMD160 092068be61e450e0d2188e9542ff829f45cf46bf SHA1 1d7aede23c56ad6ec8c672dc8e02df26f5562721 SHA256 1969c06c643c410d7443ac11e360c392b690fd1bfd70daccc0b1cb04e24f2a43
-EBUILD xen-pvgrub-9999.ebuild 3482 RMD160 c7718b9ffe371ae8a75ced194d444450b35c07f2 SHA1 2e49d359f6e57a080e6a969b7cff4c3a4a43cb0a SHA256 f8f435063366693f1db3ae4dad2520e1b3572050582a24623dbd68776dd73e48
-MISC ChangeLog 1119 RMD160 2c858756bb77d51a1a4f67fd6a137cc88bfe59f6 SHA1 18567af2d15605f0c7c9aa155638970a7b9aadbf SHA256 037497619dfeba6dbf654c25d5afddc9f0e3aea35679a2a4f1230866b751fd88
+EBUILD xen-pvgrub-9999.ebuild 3466 RMD160 68770effb33a802ee204b3f4f05316a2b104435a SHA1 c93c306847180ae3ad1ac1dade6323519e12faf0 SHA256 4e41e7a47c381e9dc11800bfa9838f45432efafd6dbc1d482810d17830eaf888
+MISC ChangeLog 1238 RMD160 961535d8a1c0aa825a7146f210adb3f0216d406b SHA1 7335313c2ae72d537fc9d0077f4b7843b69d5392 SHA256 b1b85799e60a2a3e39ea1251414096691e9a3f8c6611e96ad7fa7ce079aaf639
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOdN4+AAoJEOf+E+/4L5LmYgQP/RhyY/GaP6EIYNp/ahx635yN
-ZjMU/syVDYxE5lHE+T5VfYTHZ0Smvq61Nq11NPaMbWdmcmuvcRfY5cwUYveeCkK3
-LRbALDfGCiX3t/HhBlawYSws/tk0JLe5/y2/NwZ3JqwMHyul4mpSzfDXN32a0P+e
-H0v+BL8ulDxszpUpXv6QpB+7HMiJhKgL+V92d6rIdFW70Lt6DjRn8xjj+CVgEvuk
-kIOEHLFnFKRGE1aq3pOqN3PIZ9NZcghh/+HdESorlfDGuFT+OOT6do7RFIp8GVd/
-G93ZxNr876wqJfoWEHkWdxHYiiVIO4pdYSeW4DOfXizgNsE0xH8XoyQ09XY5WHiH
-oJ1f75Z1VZqsnmpGFHy3BTuJqjK7puzM1uIXcPfS2zhGDfbyA5t2QbSXVZwhr5KW
-SJuJ+vD7pmgYb8gmiqFiH/zqYwc2hapP7pWfksrT6LIKppzcbcEMvPyaRAnStSly
-9JzE8L8mVEm0Z5oPBmzqV5rD+7uehejbg+F6H/lYcDZSBC9jT84BpQ1IW3oxm21Z
-LqV3mW5QlXPc7VvWmqFGdGtBzxLbPyqLFCSBh/NKhLZ1MW91/7wPCCScjGTDrQxP
-xVzIf32Hrq5+llkxZD0xA8/eZMXBmiN154pUPbAcO2SHBtCZ3QB5QuH381lEccn2
-9BGI0WIqf3gAkjv0OX6/
-=Zn65
+iJwEAQEIAAYFAk55mOIACgkQfXuS5UK5QB0kjQQArV+7jNP5HswLkz1bDTkWPc+A
+jpt0/fXzl4xbLKWHQSp/WuNDn6RDTV4KgEzVaOSYsZD0pyqGi0z56A4fVvBwqCI1
+u7JxKOY2R+U67HS3my4lbm+XhFhiIZ6VJHnduyWBV5oEQNWMnWVHFgov7lAyoSic
+8dHzyGDBKH734O3nPVU=
+=O6z0
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild
index 7a725b17473d127a1b72ea8a6f05199091ec55cb..c505281b263c352b4d2f1a0806e005baa69dc2a2 100644 (file)
--- a/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild,v 1.3 2011/08/09 17:35:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild,v 1.4 2011/09/21 07:55:04 mgorny Exp $
 
 EAPI="2"
 
-inherit flag-o-matic eutils multilib mercurial git
+inherit flag-o-matic eutils multilib mercurial git-2
 
 DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
 HOMEPAGE="http://xen.org/"
@@ -21,7 +21,6 @@ GIT_REPO="qemu-xen-unstable.git"
 
 EHG_REPO_URI="http://xenbits.xensource.com/${MERC_REPO}"
 EGIT_REPO_URI="git://xenbits.xensource.com/${GIT_REPO}"
-EGIT_PROJECT="${GIT_REPO}"
 
 S="${WORKDIR}/${MERC_REPO}"
 
@@ -46,13 +45,12 @@ src_unpack() {
        # unpack xen
        mercurial_src_unpack
 
-       EGIT_COMMIT=$(sed -n -e "s/QEMU_TAG := \(.*\)/\1/p" "${S}"/Config.mk)
+       local EGIT_COMMIT=$(sed -n -e "s/QEMU_TAG := \(.*\)/\1/p" "${S}"/Config.mk)
 
        # unpack ioemu repos
-       S=${WORKDIR}/${GIT_REPO}
-       git_src_unpack
-
-       S=${WORKDIR}/${MERC_REPO}
+       local S=${WORKDIR}/${GIT_REPO}
+       local EGIT_NOUNPACK=1
+       git-2_src_unpack
 }
 
 src_prepare() {