Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass mysql-multilib.eclass mysql-v2.eclass
Date: Tue, 29 Jul 2014 20:24:09
Message-Id: 20140729202401.CDD1A2004E@flycatcher.gentoo.org
1 robbat2 14/07/29 20:24:00
2
3 Modified: mysql.eclass mysql-multilib.eclass mysql-v2.eclass
4 Log:
5 Convert mysql eclasses to git-r3 eclass, so we can remove RESTRICT=userpriv for live copies of the patches.
6
7 Revision Changes Path
8 1.181 eclass/mysql.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.181&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.181&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.180&r2=1.181
13
14 Index: mysql.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
17 retrieving revision 1.180
18 retrieving revision 1.181
19 diff -p -w -b -B -u -u -r1.180 -r1.181
20 --- mysql.eclass 29 Jul 2014 17:59:21 -0000 1.180
21 +++ mysql.eclass 29 Jul 2014 20:24:00 -0000 1.181
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2014 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.180 2014/07/29 17:59:21 robbat2 Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.181 2014/07/29 20:24:00 robbat2 Exp $
27
28 # @ECLASS: mysql.eclass
29 # @MAINTAINER:
30 @@ -27,9 +27,10 @@ S="${WORKDIR}/mysql"
31
32 [[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
33 if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
34 - EGIT_PROJECT=mysql-extras
35 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
36 - inherit git-2
37 + EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
38 + EGIT_CLONE_TYPE=shallow
39 + inherit git-r3
40 fi
41
42 case "${EAPI:-0}" in
43 @@ -878,7 +879,7 @@ mysql_src_unpack() {
44
45 unpack ${A}
46 # Grab the patches
47 - [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
48 + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
49
50 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
51
52
53
54
55 1.2 eclass/mysql-multilib.eclass
56
57 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.2&view=markup
58 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.2&content-type=text/plain
59 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.1&r2=1.2
60
61 Index: mysql-multilib.eclass
62 ===================================================================
63 RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
64 retrieving revision 1.1
65 retrieving revision 1.2
66 diff -p -w -b -B -u -u -r1.1 -r1.2
67 --- mysql-multilib.eclass 29 Jul 2014 17:59:21 -0000 1.1
68 +++ mysql-multilib.eclass 29 Jul 2014 20:24:00 -0000 1.2
69 @@ -1,6 +1,6 @@
70 # Copyright 1999-2014 Gentoo Foundation
71 # Distributed under the terms of the GNU General Public License v2
72 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.1 2014/07/29 17:59:21 robbat2 Exp $
73 +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.2 2014/07/29 20:24:00 robbat2 Exp $
74
75 # @ECLASS: mysql-multilib.eclass
76 # @MAINTAINER:
77 @@ -24,7 +24,7 @@ MYSQL_EXTRAS=""
78 # @DESCRIPTION:
79 # The version of the MYSQL_EXTRAS repo to use to build mysql
80 # Use "none" to disable it's use
81 -[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
82 +[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
83
84 inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
85 toolchain-funcs user cmake-utils multilib-minimal
86 @@ -50,9 +50,9 @@ S="${WORKDIR}/mysql"
87
88 [[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
89 if [[ ${MY_EXTRAS_VER} == "live" ]]; then
90 - EGIT_PROJECT=mysql-extras
91 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
92 - RESTRICT="userpriv"
93 + EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
94 + EGIT_CLONE_TYPE=shallow
95 fi
96
97 # @ECLASS-VARIABLE: MYSQL_PV_MAJOR
98 @@ -385,7 +385,7 @@ mysql-multilib_src_unpack() {
99
100 unpack ${A}
101 # Grab the patches
102 - [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
103 + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
104
105 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
106 }
107
108
109
110 1.34 eclass/mysql-v2.eclass
111
112 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.34&view=markup
113 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.34&content-type=text/plain
114 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.33&r2=1.34
115
116 Index: mysql-v2.eclass
117 ===================================================================
118 RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
119 retrieving revision 1.33
120 retrieving revision 1.34
121 diff -p -w -b -B -u -u -r1.33 -r1.34
122 --- mysql-v2.eclass 29 Jul 2014 17:59:21 -0000 1.33
123 +++ mysql-v2.eclass 29 Jul 2014 20:24:00 -0000 1.34
124 @@ -1,6 +1,6 @@
125 # Copyright 1999-2014 Gentoo Foundation
126 # Distributed under the terms of the GNU General Public License v2
127 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.33 2014/07/29 17:59:21 robbat2 Exp $
128 +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.34 2014/07/29 20:24:00 robbat2 Exp $
129
130 # @ECLASS: mysql-v2.eclass
131 # @MAINTAINER:
132 @@ -45,7 +45,7 @@ MYSQL_EXTRAS=""
133 # @DESCRIPTION:
134 # The version of the MYSQL_EXTRAS repo to use to build mysql
135 # Use "none" to disable it's use
136 -[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
137 +[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
138
139 inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
140
141 @@ -70,9 +70,9 @@ S="${WORKDIR}/mysql"
142
143 [[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
144 if [[ ${MY_EXTRAS_VER} == "live" ]]; then
145 - EGIT_PROJECT=mysql-extras
146 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
147 - RESTRICT="userpriv"
148 + EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
149 + EGIT_CLONE_TYPE=shallow
150 fi
151
152 # @ECLASS-VARIABLE: MYSQL_PV_MAJOR
153 @@ -525,7 +525,7 @@ mysql-v2_src_unpack() {
154
155 unpack ${A}
156 # Grab the patches
157 - [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
158 + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
159
160 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
161 }
Report Message
Find on MARC Find on Google Groups