[gentoo-commits] proj/x11:master commit in: x11-libs/cairo/, x11-apps/mesa-progs/, media-libs/glu/, media-libs/mesa/, ...

[Michał Górny]

commit:     5578864a849f28ef786f65133373c03b27ec0fff
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  2 15:36:22 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar  2 15:36:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5578864a

Switch ebuilds to use git-r3.

---
 dev-libs/libclc/libclc-9999.ebuild                 | 4 ++--
 media-libs/glu/glu-9999.ebuild                     | 4 ++--
 media-libs/mesa/mesa-9999.ebuild                   | 5 +++--
 x11-apps/mesa-progs/mesa-progs-9999.ebuild         | 5 +++--
 x11-apps/radeontop/radeontop-9999.ebuild           | 2 +-
 x11-libs/cairo/cairo-1.12.14-r3.ebuild             | 2 +-
 x11-libs/libvdpau-va-gl/libvdpau-va-gl-9999.ebuild | 2 +-
 x11-misc/envytools/envytools-9999.ebuild           | 2 +-
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/dev-libs/libclc/libclc-9999.ebuild b/dev-libs/libclc/libclc-9999.ebuild
index 3df9a4c..d1a376b 100644
--- a/dev-libs/libclc/libclc-9999.ebuild
+++ b/dev-libs/libclc/libclc-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 EGIT_REPO_URI="http://llvm.org/git/${PN}.git"
 
 if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	if [[ $PV = 9999* ]]; then
-		git-2_src_unpack
+		git-r3_src_unpack
 	else
 		default
 		mv ${PN}-*/ ${P} || die

diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index a130bae..65c3a2c 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -8,7 +8,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/glu"
 
 if [[ ${PV} = 9999* ]]; then
 	AUTOTOOLS_AUTORECONF=1
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
@@ -35,7 +35,7 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
+	[[ $PV = 9999* ]] && git-r3_src_unpack
 }
 
 src_test() {

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 895117d..8c9f066 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
 
 if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
@@ -170,6 +170,7 @@ python_check_deps() {
 }
 
 S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
 
 # It is slow without texrels, if someone wants slow
 # mesa without texrels +pic use is worth the shot
@@ -193,7 +194,7 @@ pkg_setup() {
 
 src_unpack() {
 	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
+	[[ $PV = 9999* ]] && git-r3_src_unpack
 }
 
 src_prepare() {

diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 5d62a00..01439f9 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//}"
 EGIT_PROJECT="mesa-progs"
 
 if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
@@ -41,10 +41,11 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
 S=${WORKDIR}/${MY_P}
+EGIT_CHECKOUT_DIR=${S}
 
 src_unpack() {
 	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
+	[[ $PV = 9999* ]] && git-r3_src_unpack
 }
 
 src_prepare() {

diff --git a/x11-apps/radeontop/radeontop-9999.ebuild b/x11-apps/radeontop/radeontop-9999.ebuild
index 97c4be2..0df11b7 100644
--- a/x11-apps/radeontop/radeontop-9999.ebuild
+++ b/x11-apps/radeontop/radeontop-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-inherit eutils toolchain-funcs git-2
+inherit eutils toolchain-funcs git-r3
 
 DESCRIPTION="Utility to view Radeon GPU utilization"
 HOMEPAGE="https://github.com/clbr/radeontop"

diff --git a/x11-libs/cairo/cairo-1.12.14-r3.ebuild b/x11-libs/cairo/cairo-1.12.14-r3.ebuild
index b778fc1..5b30422 100644
--- a/x11-libs/cairo/cairo-1.12.14-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.12.14-r3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit eutils flag-o-matic autotools
 
 if [[ ${PV} == *9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
 	SRC_URI=""
 	KEYWORDS=""

diff --git a/x11-libs/libvdpau-va-gl/libvdpau-va-gl-9999.ebuild b/x11-libs/libvdpau-va-gl/libvdpau-va-gl-9999.ebuild
index 3497274..a8d2840 100644
--- a/x11-libs/libvdpau-va-gl/libvdpau-va-gl-9999.ebuild
+++ b/x11-libs/libvdpau-va-gl/libvdpau-va-gl-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit cmake-utils git-2
+inherit cmake-utils git-r3
 
 DESCRIPTION="VDPAU driver with VA-API/OpenGL backend."
 HOMEPAGE="https://github.com/i-rinat/libvdpau-va-gl/"

diff --git a/x11-misc/envytools/envytools-9999.ebuild b/x11-misc/envytools/envytools-9999.ebuild
index 9964ba7..a777def 100644
--- a/x11-misc/envytools/envytools-9999.ebuild
+++ b/x11-misc/envytools/envytools-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit cmake-utils git-2
+inherit cmake-utils git-r3
 
 DESCRIPTION="Tools for people envious of nvidia's blob driver."
 HOMEPAGE="https://github.com/envytools/envytools"