diff --git a/app-i18n/ibus-t9/ibus-t9-2.1.0.20100601.ebuild b/app-i18n/ibus-t9/ibus-t9-2.1.0.20100601.ebuild
index a80ba77391c..42066fb7d76 100644
--- a/app-i18n/ibus-t9/ibus-t9-2.1.0.20100601.ebuild
+++ b/app-i18n/ibus-t9/ibus-t9-2.1.0.20100601.ebuild
@@ -9,7 +9,7 @@ TAR_SUFFIX="tar.gz"
 inherit eutils autotools googlecode
 
 if [ "${PV##*.}" = "9999" ]; then
-	inherit git
+	inherit git-2
 fi
 
 DESCRIPTION="T9 input engine using ibus"
diff --git a/app-i18n/scim-googlepinyin/scim-googlepinyin-9999.ebuild b/app-i18n/scim-googlepinyin/scim-googlepinyin-9999.ebuild
index b0ddb1ed066..61204bc968d 100644
--- a/app-i18n/scim-googlepinyin/scim-googlepinyin-9999.ebuild
+++ b/app-i18n/scim-googlepinyin/scim-googlepinyin-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit autotools git
+inherit autotools git-2
 
 DESCRIPTION="An SCIM port of android Google Pinyin IME"
 HOMEPAGE="http://code.google.com/p/scim-googlepinyin/"
diff --git a/dev-dotnet/gio-sharp/gio-sharp-9999.ebuild b/dev-dotnet/gio-sharp/gio-sharp-9999.ebuild
index ef82342fed4..0d5ce21dcd5 100644
--- a/dev-dotnet/gio-sharp/gio-sharp-9999.ebuild
+++ b/dev-dotnet/gio-sharp/gio-sharp-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit git mono
+inherit git-2 mono
 
 EGIT_BOOTSTRAP="autogen-2.22.sh"
 
diff --git a/dev-libs/dbus-c++/dbus-c++-9999.ebuild b/dev-libs/dbus-c++/dbus-c++-9999.ebuild
index 021728c42fb..4511bfeff9f 100644
--- a/dev-libs/dbus-c++/dbus-c++-9999.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit git autotools 
+inherit git-2 autotools
 
 DESCRIPTION="dbus-c++ attempts to provide a C++ API for D-BUS."
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/dbus-c++"
diff --git a/media-libs/libppswrapper/libppswrapper-9999.ebuild b/media-libs/libppswrapper/libppswrapper-9999.ebuild
index 9910b21817c..436391f38e8 100644
--- a/media-libs/libppswrapper/libppswrapper-9999.ebuild
+++ b/media-libs/libppswrapper/libppswrapper-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit autotools flag-o-matic base git
+inherit autotools flag-o-matic base git-2
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/~jinghua/libppswrapper"
 
diff --git a/media-plugins/gst-plugins-pps/gst-plugins-pps-9999.ebuild b/media-plugins/gst-plugins-pps/gst-plugins-pps-9999.ebuild
index 9f02af4e17e..2020a4bcd62 100644
--- a/media-plugins/gst-plugins-pps/gst-plugins-pps-9999.ebuild
+++ b/media-plugins/gst-plugins-pps/gst-plugins-pps-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit autotools base git
+inherit autotools base git-2
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/~jinghua/gst-plugins-pps"
 
diff --git a/media-plugins/totem-pps/totem-pps-9999.ebuild b/media-plugins/totem-pps/totem-pps-9999.ebuild
index 9bc3fe82bf5..22ca94d9e2f 100644
--- a/media-plugins/totem-pps/totem-pps-9999.ebuild
+++ b/media-plugins/totem-pps/totem-pps-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit autotools base git
+inherit autotools base git-2
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/~jinghua/totem-pps"
 
diff --git a/media-sound/deadbeef/deadbeef-9999.ebuild b/media-sound/deadbeef/deadbeef-9999.ebuild
index 3e283e7cdb9..f3f4892e40a 100644
--- a/media-sound/deadbeef/deadbeef-9999.ebuild
+++ b/media-sound/deadbeef/deadbeef-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 
-inherit autotools git
+inherit autotools git-2
 
 DESCRIPTION="mp3/ogg/flac/sid/mod/nsf music player based on GTK2"
 HOMEPAGE="http://deadbeef.sourceforge.net/"
diff --git a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
index f53954bd4b2..d43639929d1 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit autotools git
+inherit autotools git-2
 
 DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
 HOMEPAGE="http://sourceforge.net/projects/f2fs-tools/"