robbat2 14/07/29 20:24:00 Modified: mysql.eclass mysql-multilib.eclass mysql-v2.eclass Log: Convert mysql eclasses to git-r3 eclass, so we can remove RESTRICT=userpriv for live copies of the patches.
Revision Changes Path 1.181 eclass/mysql.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.181&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.181&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.180&r2=1.181 Index: mysql.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v retrieving revision 1.180 retrieving revision 1.181 diff -p -w -b -B -u -u -r1.180 -r1.181 --- mysql.eclass 29 Jul 2014 17:59:21 -0000 1.180 +++ mysql.eclass 29 Jul 2014 20:24:00 -0000 1.181 @@ -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}" 1.2 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.1&r2=1.2 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.1 retrieving revision 1.2 diff -p -w -b -B -u -u -r1.1 -r1.2 --- mysql-multilib.eclass 29 Jul 2014 17:59:21 -0000 1.1 +++ mysql-multilib.eclass 29 Jul 2014 20:24:00 -0000 1.2 @@ -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}" } 1.34 eclass/mysql-v2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.34&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.34&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.33&r2=1.34 Index: mysql-v2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v retrieving revision 1.33 retrieving revision 1.34 diff -p -w -b -B -u -u -r1.33 -r1.34 --- mysql-v2.eclass 29 Jul 2014 17:59:21 -0000 1.33 +++ mysql-v2.eclass 29 Jul 2014 20:24:00 -0000 1.34 @@ -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}" }
