| 1 |
commit: 699db4cdb4f9c194f59e0d53611155243af26a24 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net> |
| 3 |
AuthorDate: Tue Jul 29 20:24:41 2014 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 29 20:24:41 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=699db4cd |
| 7 |
|
| 8 |
sync from portage tree: git-r3 eclass support |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-multilib.eclass | 10 +++++----- |
| 12 |
eclass/mysql-v2.eclass | 10 +++++----- |
| 13 |
eclass/mysql.eclass | 9 +++++---- |
| 14 |
3 files changed, 15 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 17 |
index 439b4d7..c79571c 100644 |
| 18 |
--- a/eclass/mysql-multilib.eclass |
| 19 |
+++ b/eclass/mysql-multilib.eclass |
| 20 |
@@ -1,6 +1,6 @@ |
| 21 |
# Copyright 1999-2014 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.1 2014/07/29 17:59:21 robbat2 Exp $ |
| 24 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.2 2014/07/29 20:24:00 robbat2 Exp $ |
| 25 |
|
| 26 |
# @ECLASS: mysql-multilib.eclass |
| 27 |
# @MAINTAINER: |
| 28 |
@@ -24,7 +24,7 @@ MYSQL_EXTRAS="" |
| 29 |
# @DESCRIPTION: |
| 30 |
# The version of the MYSQL_EXTRAS repo to use to build mysql |
| 31 |
# Use "none" to disable it's use |
| 32 |
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2" |
| 33 |
+[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3" |
| 34 |
|
| 35 |
inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \ |
| 36 |
toolchain-funcs user cmake-utils multilib-minimal |
| 37 |
@@ -50,9 +50,9 @@ S="${WORKDIR}/mysql" |
| 38 |
|
| 39 |
[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" |
| 40 |
if [[ ${MY_EXTRAS_VER} == "live" ]]; then |
| 41 |
- EGIT_PROJECT=mysql-extras |
| 42 |
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" |
| 43 |
- RESTRICT="userpriv" |
| 44 |
+ EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras |
| 45 |
+ EGIT_CLONE_TYPE=shallow |
| 46 |
fi |
| 47 |
|
| 48 |
# @ECLASS-VARIABLE: MYSQL_PV_MAJOR |
| 49 |
@@ -385,7 +385,7 @@ mysql-multilib_src_unpack() { |
| 50 |
|
| 51 |
unpack ${A} |
| 52 |
# Grab the patches |
| 53 |
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack |
| 54 |
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack |
| 55 |
|
| 56 |
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" |
| 57 |
} |
| 58 |
|
| 59 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 60 |
index 1b316c2..fb0c3c3 100644 |
| 61 |
--- a/eclass/mysql-v2.eclass |
| 62 |
+++ b/eclass/mysql-v2.eclass |
| 63 |
@@ -1,6 +1,6 @@ |
| 64 |
# Copyright 1999-2014 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.33 2014/07/29 17:59:21 robbat2 Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.34 2014/07/29 20:24:00 robbat2 Exp $ |
| 68 |
|
| 69 |
# @ECLASS: mysql-v2.eclass |
| 70 |
# @MAINTAINER: |
| 71 |
@@ -45,7 +45,7 @@ MYSQL_EXTRAS="" |
| 72 |
# @DESCRIPTION: |
| 73 |
# The version of the MYSQL_EXTRAS repo to use to build mysql |
| 74 |
# Use "none" to disable it's use |
| 75 |
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2" |
| 76 |
+[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3" |
| 77 |
|
| 78 |
inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user |
| 79 |
|
| 80 |
@@ -70,9 +70,9 @@ S="${WORKDIR}/mysql" |
| 81 |
|
| 82 |
[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" |
| 83 |
if [[ ${MY_EXTRAS_VER} == "live" ]]; then |
| 84 |
- EGIT_PROJECT=mysql-extras |
| 85 |
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" |
| 86 |
- RESTRICT="userpriv" |
| 87 |
+ EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras |
| 88 |
+ EGIT_CLONE_TYPE=shallow |
| 89 |
fi |
| 90 |
|
| 91 |
# @ECLASS-VARIABLE: MYSQL_PV_MAJOR |
| 92 |
@@ -525,7 +525,7 @@ mysql-v2_src_unpack() { |
| 93 |
|
| 94 |
unpack ${A} |
| 95 |
# Grab the patches |
| 96 |
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack |
| 97 |
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack |
| 98 |
|
| 99 |
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" |
| 100 |
} |
| 101 |
|
| 102 |
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass |
| 103 |
index c949e27..cfad07e 100644 |
| 104 |
--- a/eclass/mysql.eclass |
| 105 |
+++ b/eclass/mysql.eclass |
| 106 |
@@ -1,6 +1,6 @@ |
| 107 |
# Copyright 1999-2014 Gentoo Foundation |
| 108 |
# Distributed under the terms of the GNU General Public License v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.180 2014/07/29 17:59:21 robbat2 Exp $ |
| 110 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.181 2014/07/29 20:24:00 robbat2 Exp $ |
| 111 |
|
| 112 |
# @ECLASS: mysql.eclass |
| 113 |
# @MAINTAINER: |
| 114 |
@@ -27,9 +27,10 @@ S="${WORKDIR}/mysql" |
| 115 |
|
| 116 |
[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" |
| 117 |
if [[ "${MY_EXTRAS_VER}" == "live" ]]; then |
| 118 |
- EGIT_PROJECT=mysql-extras |
| 119 |
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" |
| 120 |
- inherit git-2 |
| 121 |
+ EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras |
| 122 |
+ EGIT_CLONE_TYPE=shallow |
| 123 |
+ inherit git-r3 |
| 124 |
fi |
| 125 |
|
| 126 |
case "${EAPI:-0}" in |
| 127 |
@@ -878,7 +879,7 @@ mysql_src_unpack() { |
| 128 |
|
| 129 |
unpack ${A} |
| 130 |
# Grab the patches |
| 131 |
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack |
| 132 |
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack |
| 133 |
|
| 134 |
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" |
Archives