summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2011-09-21 07:55:04 +0000
committerMichał Górny <mgorny@gentoo.org>2011-09-21 07:55:04 +0000
commitb0870ea632a1568fb20a57ef04fb2f276af45b77 (patch)
treed170a6e2cfa7ca3c3e0017edba302a0767599560 /app-emulation
parentMigrate to git-2. (diff)
downloadgentoo-2-b0870ea632a1568fb20a57ef04fb2f276af45b77.tar.gz
gentoo-2-b0870ea632a1568fb20a57ef04fb2f276af45b77.tar.bz2
gentoo-2-b0870ea632a1568fb20a57ef04fb2f276af45b77.zip
Migrate to git-2. Localize git variables.
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/xen-pvgrub/ChangeLog5
-rw-r--r--app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild14
2 files changed, 10 insertions, 9 deletions
diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index 938e3738c26c..c8539bdcfe26 100644
--- 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/xen-pvgrub-9999.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild
index 7a725b17473d..c505281b263c 100644
--- 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() {