[gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass mysql-multilib.eclass mysql-v2.eclass
vapier 15/05/24 04:35:49
Modified: mysql.eclass mysql-multilib.eclass mysql-v2.eclass
Log:
pkg_config: tweak user messages
Revision ChangesPath
1.183eclass/mysql.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.183view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.183content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.182r2=1.183
Index: mysql.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- mysql.eclass1 May 2015 12:34:31 - 1.182
+++ mysql.eclass24 May 2015 04:35:49 - 1.183
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.182 2015/05/01
12:34:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.183 2015/05/24
04:35:49 vapier Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -1461,8 +1461,7 @@
fi
fi
- einfo Creating the mysql database and setting proper
- einfo permissions on it ...
+ einfo Creating the mysql database and setting proper permissions on it
...
local socket=${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock
local pidfile=${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid
@@ -1502,7 +1501,7 @@
-e ${sql}
eend $?
- ebegin Loading \zoneinfo\, this step may require a few seconds ...
+ ebegin Loading \zoneinfo\, this step may require a few seconds
${EROOT}/usr/bin/mysql \
--socket=${socket} \
-hlocalhost \
1.20 eclass/mysql-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.20view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.20content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.19r2=1.20
Index: mysql-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mysql-multilib.eclass 1 May 2015 12:34:31 - 1.19
+++ mysql-multilib.eclass 24 May 2015 04:35:49 - 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.19
2015/05/01 12:34:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.20
2015/05/24 04:35:49 vapier Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -879,8 +879,7 @@
mysql_version_is_at_least 5.6 || options=${options}
--loose-skip-innodb
fi
- einfo Creating the mysql database and setting proper
- einfo permissions on it ...
+ einfo Creating the mysql database and setting proper permissions on it
...
# Now that /var/run is a tmpfs mount point, we need to ensure it exists
before using it
PID_DIR=${EROOT}/var/run/mysqld
@@ -955,7 +954,7 @@
-e ${sql}
eend $?
- ebegin Loading \zoneinfo\, this step may require a few seconds ...
+ ebegin Loading \zoneinfo\, this step may require a few seconds
${EROOT}/usr/bin/mysql \
--socket=${socket} \
-hlocalhost \
1.39 eclass/mysql-v2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.39view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.39content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.38r2=1.39
Index: mysql-v2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mysql-v2.eclass 1 May 2015 12:34:31 - 1.38
+++ mysql-v2.eclass 24 May 2015 04:35:49 - 1.39
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.38 2015/05/01
12:34:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.39 2015/05/24
04:35:49 vapier Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -818,8 +818,7 @@
mysql_version_is_at_least 5.6 || options=${options}
--loose-skip-innodb
fi
-
[gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass mysql-multilib.eclass mysql-v2.eclass
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 ChangesPath
1.181eclass/mysql.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.181view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.181content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.180r2=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.eclass29 Jul 2014 17:59:21 - 1.180
+++ mysql.eclass29 Jul 2014 20:24:00 - 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.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.1r2=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 - 1.1
+++ mysql-multilib.eclass 29 Jul 2014 20:24:00 - 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.34view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.34content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.33r2=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 - 1.33
+++ mysql-v2.eclass 29 Jul 2014 20:24:00 - 1.34
