diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2014-07-29 20:24:00 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-07-29 20:24:00 +0000 |
| commit | 94a43a3102d1388f9aaa610b6d88c6e21672204f (patch) | |
| tree | f5ff3c07bbb685d356387b235800160c0ba5b319 /eclass/mysql-v2.eclass | |
| parent | amd64 stable wrt bug #518488 (diff) | |
| download | gentoo-2-94a43a3102d1388f9aaa610b6d88c6e21672204f.tar.gz gentoo-2-94a43a3102d1388f9aaa610b6d88c6e21672204f.tar.bz2 gentoo-2-94a43a3102d1388f9aaa610b6d88c6e21672204f.zip | |
Convert mysql eclasses to git-r3 eclass, so we can remove RESTRICT=userpriv for live copies of the patches.
Diffstat (limited to 'eclass/mysql-v2.eclass')
| -rw-r--r-- | eclass/mysql-v2.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 1b316c22e8fb..fb0c3c3f9c78 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}" } |