Migrate to git-2.

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

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 66f7b3e97ca34fe34bce2e4d05be9af8860f8bb9..f969f4a03592fb71f98382ff63d4bf249bb56143 100644 (file)
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.261 2011/09/17 18:17:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.262 2011/09/21 09:04:41 mgorny Exp $
+
+  21 Sep 2011; Michał Górny <mgorny@gentoo.org> genkernel-9999.ebuild:
+  Migrate to git-2.
 
   17 Sep 2011; Raúl Porcel <armin76@gentoo.org> genkernel-3.4.16.ebuild:
   ia64/s390/sparc stable wrt #369409

diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index a0732f39ab1b1cc4e82cb4df48ce97f3e6399d46..9a310614a9c4ec309fd038a97e356a900e16d34b 100644 (file)
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-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/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.27 2011/04/25 21:10:28 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.28 2011/09/21 09:04:41 mgorny Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -37,9 +37,9 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-       EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/genkernel.git"
-       EGIT_BRANCH=master
-       inherit git bash-completion eutils
+       EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
+               http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+       inherit git-2 bash-completion eutils
        S="${WORKDIR}/${PN}"
        SRC_URI="${COMMON_URI}"
        KEYWORDS=""
@@ -71,7 +71,7 @@ fi
 
 src_unpack() {
        if [[ ${PV} == 9999* ]] ; then
-               git_src_unpack
+               git-2_src_unpack
        else
                unpack ${P}.tar.bz2
        fi

diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog
index 0a79cef190d4b1308293bcd4cf4ad9071ce01100..b43f28bdd30aa78fe8e2e9384819ad54096715e3 100644 (file)
--- a/sys-kernel/zen-sources/ChangeLog
+++ b/sys-kernel/zen-sources/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-kernel/zen-sources
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.51 2011/05/10 15:17:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.52 2011/09/21 09:02:49 mgorny Exp $
+
+  21 Sep 2011; Michał Górny <mgorny@gentoo.org> zen-sources-9999.ebuild:
+  Migrate to git-2.
 
 *zen-sources-2.6.38_p20110510 (10 May 2011)
 

diff --git a/sys-kernel/zen-sources/zen-sources-9999.ebuild b/sys-kernel/zen-sources/zen-sources-9999.ebuild
index 3b85defb85de54d56838b3c6113ef301c0e69d5a..abdb730eb91976669e79cf028dcb73af0abb6915 100644 (file)
--- a/sys-kernel/zen-sources/zen-sources-9999.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-9999.ebuild,v 1.3 2010/04/26 07:46:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-9999.ebuild,v 1.4 2011/09/21 09:02:49 mgorny Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ ETYPE="sources"
 
 IUSE="+stable"
 
-inherit kernel-2 git
+inherit kernel-2 git-2
 detect_version
 
 K_NOSETEXTRAVERSION="don't_set_it"
@@ -25,9 +25,11 @@ DESCRIPTION="The Zen Kernel Live Sources"
 HOMEPAGE="http://zen-kernel.org"
 
 if use stable; then
-       EGIT_REPO_URI="git://zen-kernel.org/kernel/zen-stable.git"
+       EGIT_REPO_URI="git://zen-kernel.org/kernel/zen-stable.git
+               http://git.zen-kernel.org/zen-stable/"
 else
-       EGIT_REPO_URI="git://zen-kernel.org/kernel/zen.git"
+       EGIT_REPO_URI="git://zen-kernel.org/kernel/zen.git
+               http://git.zen-kernel.org/zen/"
 fi
 
 KEYWORDS=""