commit: 699db4cdb4f9c194f59e0d53611155243af26a24
Author: Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Tue Jul 29 20:24:41 2014 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 20:24:41 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=699db4cd
sync from portage tree: git-r3 eclass support
---
eclass/mysql-multilib.eclass | 10 +++++-----
eclass/mysql-v2.eclass | 10 +++++-----
eclass/mysql.eclass | 9 +++++----
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 439b4d7..c79571c 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.1
2014/07/29 17:59:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.2
2014/07/29 20:24:00 robbat2 Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -24,7 +24,7 @@ MYSQL_EXTRAS=""
# @DESCRIPTION:
# The version of the MYSQL_EXTRAS repo to use to build mysql
# Use "none" to disable it's use
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
+[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
toolchain-funcs user cmake-utils multilib-minimal
@@ -50,9 +50,9 @@ S="${WORKDIR}/mysql"
[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
if [[ ${MY_EXTRAS_VER} == "live" ]]; then
- EGIT_PROJECT=mysql-extras
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
- RESTRICT="userpriv"
+ EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
+ EGIT_CLONE_TYPE=shallow
fi
# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
@@ -385,7 +385,7 @@ mysql-multilib_src_unpack() {
unpack ${A}
# Grab the patches
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras"
git-2_src_unpack
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras"
git-r3_src_unpack
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
}
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 1b316c2..fb0c3c3 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.33 2014/07/29
17:59:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.34 2014/07/29
20:24:00 robbat2 Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -45,7 +45,7 @@ MYSQL_EXTRAS=""
# @DESCRIPTION:
# The version of the MYSQL_EXTRAS repo to use to build mysql
# Use "none" to disable it's use
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
+[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT}
mysql_fx versionator toolchain-funcs user
@@ -70,9 +70,9 @@ S="${WORKDIR}/mysql"
[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
if [[ ${MY_EXTRAS_VER} == "live" ]]; then
- EGIT_PROJECT=mysql-extras
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
- RESTRICT="userpriv"
+ EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
+ EGIT_CLONE_TYPE=shallow
fi
# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
@@ -525,7 +525,7 @@ mysql-v2_src_unpack() {
unpack ${A}
# Grab the patches
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras"
git-2_src_unpack
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras"
git-r3_src_unpack
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
}
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index c949e27..cfad07e 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.180 2014/07/29
17:59:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.181 2014/07/29
20:24:00 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -27,9 +27,10 @@ S="${WORKDIR}/mysql"
[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
- EGIT_PROJECT=mysql-extras
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
- inherit git-2
+ EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
+ EGIT_CLONE_TYPE=shallow
+ inherit git-r3
fi
case "${EAPI:-0}" in
@@ -878,7 +879,7 @@ mysql_src_unpack() {
unpack ${A}
# Grab the patches
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras"
git-2_src_unpack
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras"
git-r3_src_unpack
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
