5 files changed, 19 insertions, 21 deletions
diff --git a/media-video/snappy/ChangeLog b/media-video/snappy/ChangeLog
index a1be521d08a2..294feaf6174a 100644
--- a/media-video/snappy/ChangeLog
+++ b/media-video/snappy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/snappy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/snappy/ChangeLog,v 1.3 2011/06/20 16:31:09 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/snappy/ChangeLog,v 1.4 2011/09/21 09:01:31 mgorny Exp $
+
+  21 Sep 2011; Michał Górny <mgorny@gentoo.org> snappy-9999.ebuild:
+  Migrate to git-2.
 
 *snappy-0.2 (20 Jun 2011)
 
diff --git a/media-video/snappy/snappy-9999.ebuild b/media-video/snappy/snappy-9999.ebuild
index ff412f93cdd1..9b5754171e6f 100644
--- a/media-video/snappy/snappy-9999.ebuild
+++ b/media-video/snappy/snappy-9999.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/snappy/snappy-9999.ebuild,v 1.2 2011/06/15 04:15:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/snappy/snappy-9999.ebuild,v 1.3 2011/09/21 09:01:31 mgorny Exp $
 
 EAPI="4"
 
 if [[ ${PV} = 9999 ]]; then
-	inherit autotools git
+	inherit autotools git-2
 fi
 
 DESCRIPTION="A simple media player written using GStreamer and Clutter"
 HOMEPAGE="https://github.com/luisbg/snappy"
 
 if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/luisbg/${PN}.git"
+	EGIT_REPO_URI="git://github.com/luisbg/${PN}.git
+		https://github.com/luisbg/${PN}.git"
 	EGIT_BOOTSTRAP="eautoreconf"
 	KEYWORDS=""
 else
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 20ab7db3dc87..903d0d55464a 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.739 2011/09/08 18:57:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.740 2011/09/21 08:58:32 mgorny Exp $
+
+  21 Sep 2011; Michał Górny <mgorny@gentoo.org> vlc-1.1.9999.ebuild,
+  vlc-9999.ebuild:
+  Migrate to git-2.
 
   08 Sep 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
   add libsamplerate useflag
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index 2cf6b5ba5a7f..ca529765d890 100644
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.31 2011/06/22 12:38:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.32 2011/09/21 08:58:32 mgorny Exp $
 
 EAPI="3"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git
+	SCM=git-2
 	EGIT_BOOTSTRAP="bootstrap"
-	EGIT_BRANCH=master
-	EGIT_PROJECT=${P}
 	if [ "${PV%.9999}" != "${PV}" ] ; then
 		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
 	else
@@ -208,14 +206,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	if [ "${PV%9999}" != "${PV}" ] ; then
-		git_src_unpack
+		git-2_src_unpack
 	fi
 }
 
 src_prepare() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git_src_prepare
-	fi
 	# Make it build with libtool 1.5
 	rm -f m4/lt* m4/libtool.m4
 
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 195e9a9253fd..27742639c7f9 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.147 2011/09/08 18:57:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.148 2011/09/21 08:58:32 mgorny Exp $
 
 EAPI="4"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git
+	SCM=git-2
 	EGIT_BOOTSTRAP="bootstrap"
-	EGIT_BRANCH=master
-	EGIT_PROJECT=${P}
 	if [ "${PV%.9999}" != "${PV}" ] ; then
 		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
 	else
@@ -181,14 +179,11 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	if [ "${PV%9999}" != "${PV}" ] ; then
-		git_src_unpack
+		git-2_src_unpack
 	fi
 }
 
 src_prepare() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git_src_prepare
-	fi
 	# Make it build with libtool 1.5
 	rm -f m4/lt* m4/libtool.m4