[gentoo-commits] proj/mysql:master commit in: eclass/

[Thomas Deutschmann]

commit: 9133c827163ccb5ca724df2ca77d85a626daa88e
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun 10 09:10:49 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jun 22 13:22:04 2018 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=9133c827

eclass/mysql-v2: use HTTPs, fix HOMEPAGE Link

 eclass/mysql-v2.eclass | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3734e19..9c61dae 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -188,17 +188,17 @@ if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != 
"none" ]]; then
 fi
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/;
+HOMEPAGE="https://www.mysql.com/;
 if [[ ${PN} == "mariadb" ]]; then
-   HOMEPAGE="http://mariadb.org/;
+   HOMEPAGE="https://mariadb.org/;
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 fi
 if [[ ${PN} == "mariadb-galera" ]]; then
-   HOMEPAGE="http://mariadb.org/;
+   HOMEPAGE="https://mariadb.org/;
DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera 
Replication"
 fi
 if [[ ${PN} == "percona-server" ]]; then
-   HOMEPAGE="http://www.percona.com/software/percona-server;
+   
HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server;
DESCRIPTION="An enhanced, drop-in replacement for MySQL from the 
Percona team"
 fi
 LICENSE="GPL-2"

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 3007cfdf814727b90978e91991c0ad26f2ad4a74
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov 15 14:26:59 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Nov 15 14:26:59 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3007cfdf

mysql-multilib.eclass: Update security changes from Gentoo repo

Before removing from the Gentoo repo, update this overlay copy in case
we need it again.

 eclass/mysql-multilib.eclass | 35 ++-
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 14e1913..3cfdb81 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -843,14 +843,9 @@ mysql-multilib_pkg_postinst() {
# Make sure the vars are correctly initialized
mysql_init_vars
 
-   # Check FEATURES="collision-protect" before removing this
+   # Create log directory securely if it does not exist
[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql 
"${ROOT}${MY_LOGDIR}"
 
-   # Secure the logfiles
-   touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
-   chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
-   chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
-
# Minimal builds don't have the MySQL server
if use_if_iuse minimal ; then
:
@@ -1049,7 +1044,7 @@ mysql-multilib_pkg_config() {
${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
for opt in grant-tables host-cache name-resolve networking slave-start \
federated ssl log-bin relay-log slow-query-log external-locking 
\
-   ndbcluster log-slave-updates \
+   ndbcluster log-slave-updates wsrep-on \
; do
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
egrep -sq -- "${optexp}" "${helpfile}" && options="${options} 
${optfull}"
@@ -1058,8 +1053,6 @@ mysql-multilib_pkg_config() {
egrep -sq external-locking "${helpfile}" && \
options="${options/skip-locking/skip-external-locking}"
 
-   use prefix || options="${options} --user=mysql"
-
# MySQL 5.6+ needs InnoDB
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
mysql_version_is_at_least "5.6" || options="${options} 
--loose-skip-innodb"
@@ -1068,18 +1061,16 @@ mysql-multilib_pkg_config() {
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"
+   local PID_DIR="${EROOT}/var/run/mysqld"
if [[ ! -d "${PID_DIR}" ]]; then
-   mkdir -p "${PID_DIR}" || die "Could not create pid directory"
-   chown mysql:mysql "${PID_DIR}" || die "Could not set ownership 
on pid directory"
-   chmod 755 "${PID_DIR}" || die "Could not set permissions on pid 
directory"
+   install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could 
not create pid directory"
fi
 
-   pushd "${TMPDIR}" &>/dev/null
+   if [[ ! -d "${MY_DATADIR}" ]]; then
+   install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die 
"Could not create data directory"
+   fi
 
-   # Filling timezones, see
-   # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-   "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
+   pushd "${TMPDIR}" &>/dev/null || die
 
local cmd
local initialize_options
@@ -1098,17 +1089,19 @@ mysql-multilib_pkg_config() {
fi
cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}' 
${initialize_options}"
einfo "Command: $cmd"
-   eval $cmd \
+   su -s /bin/sh -c "${cmd}" mysql \
>"${TMPDIR}"/mysql_install_db.log 2>&1
if [ $? -ne 0 ]; then
grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
die "Failed to initialize mysqld. Please review 
${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
fi
-   popd &>/dev/null
+   popd &>/dev/null || die
[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
|| die "MySQL databases not installed"
-   chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
-   chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
+
+   # Filling timezones, see
+   # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+   "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
 
local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 80ff75dfa87fdd93388b18c56b92584f3d29b5cf
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jul 17 19:05:09 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jul 17 19:23:51 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=80ff75df

Update eclasses for GLEP73 and other bugs

 eclass/mysql-multilib-r1.eclass |  1 +
 eclass/mysql-multilib.eclass| 19 ++-
 eclass/mysql-v2.eclass  | 16 +---
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 44eb631..930411d 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -450,6 +450,7 @@ multilib_src_configure() {
 
if multilib_is_native_abi && use server ; then
 
+   # systemd is only linked to for server notification
if in_iuse systemd ; then
mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
fi

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index c3f4299..14e1913 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -228,9 +227,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; 
then
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or 
perfomance suffers
mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml"
if [[ ${HAS_TOOLS_PATCH} ]] ; then
-   REQUIRED_USE="${REQUIRED_USE} !server? ( !oqgraph !sphinx ) 
tokudb? ( jemalloc )"
+   REQUIRED_USE="${REQUIRED_USE} !server? ( !oqgraph !sphinx ) 
tokudb? ( jemalloc !tcmalloc )"
else
-   REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) 
tokudb? ( jemalloc )"
+   REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) 
tokudb? ( jemalloc !tcmalloc )"
fi
# MariaDB 10.1 introduces InnoDB/XtraDB compression with external 
libraries
# Choices are bzip2, lz4, lzma, lzo.  bzip2 and lzma enabled by default 
as they are system libraries
@@ -266,7 +265,7 @@ fi
 
 REQUIRED_USE="
${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
-static? ( yassl )"
+static? ( yassl !openssl !libressl )"
 
 #
 # DEPENDENCIES:
@@ -943,14 +942,8 @@ mysql-multilib_pkg_config() {
mysql_init_vars
 
[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-   if [[ ${HAS_TOOLS_PATCH} ]] ; then
-   if ! built_with_use ${CATEGORY}/${PN} server ; then
-   die "Minimal builds do NOT include the MySQL server"
-   fi
-   else
-   if built_with_use ${CATEGORY}/${PN} minimal ; then
-   die "Minimal builds do NOT include the MySQL server"
-   fi
+   if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+   die "Minimal builds do NOT include the MySQL server"
fi
 
if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != 
"${old_MY_DATADIR}" ) ]]; then

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index dda63c3..3734e19 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,5 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -183,7 +182,6 @@ SRC_URI="${SERVER_URI}"
 if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
SRC_URI="${SRC_URI}
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2

https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2

https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2

https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
@@ -242,9 +240,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; 
then
mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or 
perfomance suffers
mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb odbc xml" && 
\
-   REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( 
extraengine ) tokudb? ( jemalloc )"
+   REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( 
extraengine ) tokudb? ( jemalloc !tcmalloc )"
mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" 
&& \
-   REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc )"
+   

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 3e550e892fb47294b31cb31e05583fe12550a627
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Jul  9 02:42:18 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Jul  9 02:42:18 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3e550e89

mysql-multilib-r1.eclass: Make pkg-config path absolute

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 8b604f2..44eb631 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -411,7 +411,7 @@ multilib_src_configure() {
# The build forces this to be defined when cross-compiling.  We 
pass it
# all the time for simplicity and to make sure it is actually 
correct.
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-   -DPKG_CONFIG_EXECUTABLE="$(tc-getPKG_CONFIG)"
+   -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
)
 
if use test ; then

[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/mariadb/

[Brian Evans]

commit: 37df9dff3c8bdd99ec577220d564e24b56ab206d
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Jul  9 02:01:11 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Jul  9 02:01:11 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=37df9dff

Fix systemd detection in 10.2.6

 dev-db/mariadb/mariadb-10.2.6.ebuild |  2 +-
 eclass/mysql-multilib-r1.eclass  | 10 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild 
b/dev-db/mariadb/mariadb-10.2.6.ebuild
index d719edc..e09b344 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -42,7 +42,6 @@ PATCHES=(
 COMMON_DEPEND="
mroonga? ( app-text/groonga-normalizer-mysql )
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-   systemd? ( sys-apps/systemd:= )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -59,6 +58,7 @@ COMMON_DEPEND="
innodb-snappy? ( app-arch/snappy )
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
pam? ( virtual/pam:0= )
+   systemd? ( sys-apps/systemd:= )
tokudb? ( app-arch/snappy )
)
>=dev-libs/libpcre-8.35:3=

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index c6ac253..8b604f2 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -420,10 +420,6 @@ multilib_src_configure() {
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
fi
 
-   if in_iuse systemd ; then
-   mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
-   fi
-
if use openssl || use libressl ; then
mycmakeargs+=( -DWITH_SSL=system )
else
@@ -453,6 +449,11 @@ multilib_src_configure() {
mycmakeargs+=( -DWITH_EDITLINE=bundled )
 
if multilib_is_native_abi && use server ; then
+
+   if in_iuse systemd ; then
+   mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
+   fi
+
if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n 
${MYSQL_DEFAULT_COLLATION} ) ]]; then
ewarn "You are using a custom charset of 
${MYSQL_DEFAULT_CHARSET}"
ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
@@ -511,6 +512,7 @@ multilib_src_configure() {
-DWITHOUT_EMBEDDED_SERVER=1
-DEXTRA_CHARSETS=none
-DINSTALL_SQLBENCHDIR=
+   -DWITH_SYSTEMD=NO
)
fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 96d0e4e1a3b07d3b15891c002860f35087fc9869
Author: Brian Evans  gentoo  org>
AuthorDate: Fri May 19 12:51:17 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri May 19 12:51:17 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=96d0e4e1

mysql-multilib-r1.eclass: fix @ECLASS documentation wrt bug 618912

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 12bfe45..c6ac253 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# @ECLASS: mysql-multilib.eclass
+# @ECLASS: mysql-multilib-r1.eclass
 # @MAINTAINER:
 # Maintainers:
 #  - MySQL Team 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 7b3271b8f3747a83e9696193c804346ff2b9ea7c
Author: Brian Evans  gentoo  org>
AuthorDate: Tue May  2 17:15:46 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue May  2 17:15:46 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=7b3271b8

mysql-multilib-r1.eclass: Add additional path for mysql_install_db for 
pkg_config

 eclass/mysql-multilib-r1.eclass | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index c38e5fd..12bfe45 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -944,7 +944,7 @@ mysql-multilib-r1_pkg_config() {
# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
 
-   local cmd
+   local cmd cmdtest
local initialize_options
 if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
version_is_at_least "5.7.6" ; then
# --initialize-insecure will not set root password
@@ -953,8 +953,14 @@ mysql-multilib-r1_pkg_config() {
initialize_options="--initialize-insecure  
--init-file='${sqltmp}'"
sqltmp="" # the initialize will take care of it
else
-   cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
-   [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+   for cmdtest in  
"${EROOT}usr/share/mariadb/scripts/mysql_install_db" \
+   
"${EROOT}usr/share/mysql/scripts/mysql_install_db" \
+   "${EROOT}usr/bin/mysql_install_db" ; do
+   if [[ -x "${cmdtest}" ]] ; then
+   cmd=( "${cmdtest}" )
+   break
+   fi
+   done
if [[ -r "${help_tables}" ]] ; then
cat "${help_tables}" >> "${sqltmp}"
fi

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: b08acd1f575ac0fc07235798f28ae27d24506a63
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Mar 28 14:41:08 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Mar 28 14:41:08 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=b08acd1f

eclass/mysql-multilib-r1: Fix PDEPEND so servers can build correctly

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index b783705..c38e5fd 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -211,7 +211,7 @@ DEPEND="${DEPEND}
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 )
-~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=]
+server? ( ~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=] )
 
virtual/libmysqlclient:${MYSLOT:-${SLOT}}[${MULTILIB_USEDEP},static-libs=]"
 
 # my_config.h includes ABI specific data

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: f6991af2a166e3adb9420be99d68499a066a2b3b
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Mar 28 14:36:14 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Mar 28 14:36:14 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f6991af2

eclass/mysql-multilib-r1: Fix quoting in initial config

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 1726c14..b783705 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -950,7 +950,7 @@ mysql-multilib-r1_pkg_config() {
# --initialize-insecure will not set root password
# --initialize would set a random one in the log which we don't 
need as we set it ourselves
cmd=( "${EROOT}usr/sbin/mysqld" )
-   initialize_options="--initialize-insecure  
'--init-file=${sqltmp}'"
+   initialize_options="--initialize-insecure  
--init-file='${sqltmp}'"
sqltmp="" # the initialize will take care of it
else
cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: aee6312b4652e1bde78a9e91b0bc86744d73d4f2
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Mar 17 17:53:42 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Mar 17 17:53:42 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=aee6312b

Update changes committed in Portage

 eclass/mysql-multilib-r1.eclass | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index f8d348b..1726c14 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -398,7 +397,7 @@ multilib_src_configure() {
-DINSTALL_SQLBENCHDIR=share/mysql
-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-DWITH_COMMENT="Gentoo Linux ${PF}"
-   -DWITH_UNIT_TESTS=$(usex test)
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
-DWITH_LIBEDIT=0
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
@@ -408,7 +407,7 @@ multilib_src_configure() {
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-   -DENABLE_STATIC_LIBS=$(usex static-libs)
+   -DENABLE_STATIC_LIBS=$(usex static-libs ON OFF)
# The build forces this to be defined when cross-compiling.  We 
pass it
# all the time for simplicity and to make sure it is actually 
correct.
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
@@ -793,7 +792,7 @@ mysql-multilib-r1_pkg_config() {
mysql_init_vars
 
[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-   if ! built_with_use ${CATEGORY}/${PN} server ; then
+   if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
die "Minimal builds do NOT include the MySQL server"
fi
 
@@ -950,19 +949,19 @@ mysql-multilib-r1_pkg_config() {
 if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
version_is_at_least "5.7.6" ; then
# --initialize-insecure will not set root password
# --initialize would set a random one in the log which we don't 
need as we set it ourselves
-   cmd="${EROOT}usr/sbin/mysqld"
+   cmd=( "${EROOT}usr/sbin/mysqld" )
initialize_options="--initialize-insecure  
'--init-file=${sqltmp}'"
sqltmp="" # the initialize will take care of it
else
-   cmd="${EROOT}usr/share/mysql/scripts/mysql_install_db"
-   [[ -f "${cmd}" ]] || cmd="${EROOT}usr/bin/mysql_install_db"
+   cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
+   [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
if [[ -r "${help_tables}" ]] ; then
cat "${help_tables}" >> "${sqltmp}"
fi
fi
-   cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}' 
${initialize_options}"
-   einfo "Command: $cmd"
-   eval $cmd \
+   cmd+=( "--basedir=${EPREFIX}/usr" ${options} 
"--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" 
${initialize_options} )
+   einfo "Command: ${cmd[*]}"
+   "${cmd[@]}" \
>"${TMPDIR}"/mysql_install_db.log 2>&1
if [ $? -ne 0 ]; then
grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: d2542647b05af87035eba75c1736f6c79e54a31b
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Feb  1 18:35:07 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Feb  1 18:37:02 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=d2542647

eclass/mysql-multilib-r1: Ignore building SELinux policies for mysqld_safe wrt 
#607928

 eclass/mysql-multilib-r1.eclass | 35 +++
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index ebf89f2..f8d348b 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -213,7 +213,7 @@ DEPEND="${DEPEND}
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 )
 ~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=]
-virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]"
+
virtual/libmysqlclient:${MYSLOT:-${SLOT}}[${MULTILIB_USEDEP},static-libs=]"
 
 # my_config.h includes ABI specific data
 MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h 
/usr/include/mysql/private/embedded_priv.h )
@@ -229,12 +229,6 @@ mysql-multilib-r1_pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]] ; then
local GCC_MAJOR_SET=$(gcc-major-version)
local GCC_MINOR_SET=$(gcc-minor-version)
-   if in_iuse tokudb && use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || 
\
-   ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
-   eerror "${PN} with tokudb needs to be built with 
gcc-4.7 or later."
-   eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
-   die
-   fi
# Bug 565584.  InnoDB now requires atomic functions introduced 
with gcc-4.7 on
# non x86{,_64} arches
if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
@@ -319,12 +313,10 @@ mysql-multilib-r1_src_prepare() {
if in_iuse tokudb ; then
# Don't build bundled xz-utils
if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
-   rm -f 
"${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-   touch 
"${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+   echo > 
"${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
sed -i 's/ build_lzma//' 
"${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
-   rm 
"${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-   touch 
"${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+   echo > 
"${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' 
"${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
sed -i -e 
's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' 
"${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
fi
@@ -340,6 +332,11 @@ mysql-multilib-r1_src_prepare() {
rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not 
remove packaged groonga"
fi
 
+   # Remove the centos and rhel selinux policies to support mysqld_safe 
under SELinux
+   if [[ -d "${S}/support-files/SELinux" ]] ; then
+   echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+   fi
+
if [[ "${EAPI}x" == "5x" ]] ; then
epatch_user
else
@@ -359,6 +356,17 @@ mysql-multilib-r1_src_configure() {
# bug #283926, with GCC4.4, this is required to get correct behavior.
append-flags -fno-strict-aliasing
 
+   if in_iuse tokudb && use tokudb; then
+   echo "int main(void) { return 0; }" | \
+   $(tc-getCC) -x c -o /dev/null ${CFLAGS} ${LDFLAGS} 
-flto -fuse-linker-plugin -
+   if [[ $? -ne 0 ]] ; then
+   eerror "${PN} with tokudb needs to be built with a 
compiler which supports -flto."
+   eerror "Please use gcc-config to switch to gcc-4.7 or 
later"
+   eerror "or another compatible compiler."
+   die "unsupported compiler"
+   fi
+   fi
+
multilib-minimal_src_configure
 }
 
@@ -404,6 +412,7 @@ multilib_src_configure() {
# The build forces this to be defined when cross-compiling.  We 
pass it
# all the time for simplicity and to make sure it is actually 
correct.
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: b225c397c78dc425644d9a4d76344a517ee7f106
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sun Jun 12 03:09:25 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Sep 27 16:44:00 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=b225c397

mysql-cmake/mysql-multilib eclasses: set STACK_DIRECTION to fix cross-compiles

 eclass/mysql-multilib-r1.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 40ef8f5..858b9b6 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -401,6 +401,9 @@ multilib_src_configure() {
-DWITH_DEFAULT_FEATURE_SET=0
-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-DENABLE_STATIC_LIBS=$(usex static-libs)
+   # The build forces this to be defined when cross-compiling.  We 
pass it
+   # all the time for simplicity and to make sure it is actually 
correct.
+   -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
)
 
if use test ; then

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 0fc8e4b963a0c1a2df778b426a479093c398679c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Sep 26 18:48:50 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Sep 27 16:44:03 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=0fc8e4b9

mysql-multilib-r1.eclass: Fix password reading from my.cnf

We are reading multiple sections from my.cnf at once from my.cnf when
looking for the password for the mysql root user in
mysql-multilib-r1_pkg_config().

If each section has set a password option this will result in the following
invalid password value (with "set -x"):

 ++ local extra_options=
 ++ //usr/bin/my_print_defaults client mysql
 ++ sed -n '/^--password=/s,--password=,,gp'
 + MYSQL_ROOT_PASSWORD='*
 *'
 + [[ *
 * == \*\*\*\*\* ]]
 + set +x

Like you can see the two passwords are concatenated via newline in one
string which is not what we want.

With this commit we will no longer read all sections at once instead we
read section per section. We are now also telling the user where we are
looking for the password and where we found one. In addition this commit
adds a sanity check for newline to catch scenarios where the user for
example has inadvertently set multiple password options in one section
which we can't handle: In that case it is better to prompt for a password
like no password was set in my.cnf instead of initializing mysqld with a
mysql root password the user is not expecting.

Gentoo-Bug: https://bugs.gentoo.org/510724

 eclass/mysql-multilib-r1.eclass | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 3f7372c..ebf89f2 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -817,11 +817,29 @@ mysql-multilib-r1_pkg_config() {
local maxtry=15
 
if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-   MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval 'client 
mysql' password)"
+   local tmp_mysqld_password_source=
+
+   for tmp_mysqld_password_source in mysql client; do
+   einfo "Trying to get password for mysql 'root' user 
from '${tmp_mysqld_password_source}' section ..."
+   MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval 
"${tmp_mysqld_password_source}" password)"
+   if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+   if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+   ewarn "Ignoring password from 
'${tmp_mysqld_password_source}' section due to newline character (do you have 
multiple password options set?)!"
+   MYSQL_ROOT_PASSWORD=
+   continue
+   fi
+
+   einfo "Found password in 
'${tmp_mysqld_password_source}' section!"
+   break
+   fi
+   done
+
# Sometimes --show is required to display passwords in some 
implementations of my_print_defaults
if [[ "${MYSQL_ROOT_PASSWORD}" == '*' ]]; then
-   MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval 
'client mysql' password --show)"
+   MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval 
"${tmp_mysqld_password_source}" password --show)"
fi
+
+   unset tmp_mysqld_password_source
fi
MYSQL_TMPDIR="$(mysql-multilib-r1_getoptval mysqld tmpdir)"
# These are dir+prefix

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: ef63412e7200ee99e779b9187293da57a229121b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Sep 26 18:46:34 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Sep 27 16:44:03 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ef63412e

mysql-multilib-r1.eclass: Use *_is_at_least from versionator eclass

Since dev-db/percona-server was bumped to EAPI=6 usage mysql_fx eclass is
no longer inherited [Link1] which results in an error like

 > # emerge --config dev-db/percona-server
 >
 >   Configuring pkg...
 >
 >   * Creating the mysql database and setting proper permissions on it ...
 >   /var/tmp/portage/dev-db/percona-server-5.6.32.78.0/temp/environment: line 
 > 4697: mysql_version_is_at_least: command not found

To fix this problem I replaced the call to "mysql_version_is_at_least"
function from mysql_fx eclass with a call to "version_is_at_least" function
from versionator eclass we are already inheriting [Link2].

Link1: 
https://gitweb.gentoo.org/repo/gentoo.git/tree/eclass/mysql-multilib-r1.eclass?id=b3ae687988d49123628757aa8c5422bdd3b444fb#n46

Link2: 
https://gitweb.gentoo.org/repo/gentoo.git/tree/eclass/mysql-multilib-r1.eclass?id=b3ae687988d49123628757aa8c5422bdd3b444fb#n43

Gentoo-Bug: https://bugs.gentoo.org/594298

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 858b9b6..3f7372c 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -918,7 +918,7 @@ mysql-multilib-r1_pkg_config() {
 
local cmd
local initialize_options
-if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
mysql_version_is_at_least "5.7.6" ; then
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
version_is_at_least "5.7.6" ; then
# --initialize-insecure will not set root password
# --initialize would set a random one in the log which we don't 
need as we set it ourselves
cmd="${EROOT}usr/sbin/mysqld"

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 3fe58ecd995db0c53fbcc56c124966a9363126f9
Author: Brian Evans  gentoo  org>
AuthorDate: Wed May 11 18:54:49 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed May 11 18:54:49 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3fe58ecd

mysql-multilib-r1.eclass:  Remove private header and don't install tests wrt 
bug 582738

 eclass/mysql-multilib-r1.eclass | 21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index b18ebd0..40ef8f5 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -384,7 +384,6 @@ multilib_src_configure() {
-DINSTALL_MANDIR=share/man
-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
-DINSTALL_MYSQLSHAREDIR=share/mysql
-   -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-DINSTALL_SBINDIR=sbin
-DINSTALL_SCRIPTDIR=share/mysql/scripts
@@ -404,6 +403,12 @@ multilib_src_configure() {
-DENABLE_STATIC_LIBS=$(usex static-libs)
)
 
+   if use test ; then
+   mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+   else
+   mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+   fi
+
if in_iuse systemd ; then
mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
fi
@@ -537,11 +542,16 @@ mysql-multilib-r1_src_install() {
 multilib_src_install() {
debug-print-function ${FUNCNAME} "$@"
 
-   if multilib_is_native_abi; then
-   # Make sure the vars are correctly initialized
-   mysql_init_vars
+   cmake-utils_src_install
+   # Make sure the vars are correctly initialized
+   mysql_init_vars
+
+   # Remove an unnecessary, private config header which will never match 
between ABIs and is not meant to be used
+   if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then
+   rm "${D}${MY_INCLUDEDIR}/private/config.h" || die
+   fi
 
-   cmake-utils_src_install
+   if multilib_is_native_abi; then
 
# Convenience links
einfo "Making Convenience links for mysqlcheck multi-call 
binary"
@@ -627,7 +637,6 @@ multilib_src_install() {
fi
done
else
-   cmake-utils_src_install
if [[ "${PN}" == "mariadb" ]] && use server ; then
insinto /usr/include/mysql/private
doins "${S}"/sql/*.h

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 5a1dc50695c4c58f4a7cd9a7c211199d13932ef4
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Mar 24 14:31:48 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Mar 24 14:31:48 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=5a1dc506

Add missing ENABLE_STATIC_LIBS to install static libraries

 eclass/mysql-multilib-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 0a99102..b18ebd0 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -401,6 +401,7 @@ multilib_src_configure() {
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+   -DENABLE_STATIC_LIBS=$(usex static-libs)
)
 
if in_iuse systemd ; then

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: d08d64cf16700b01a91fbc152b8aaed6ccdd792f
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Mar 10 01:24:43 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Mar 10 01:24:43 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=d08d64cf

mysql-multilib-r1.eclass: Fix virtual/mysql USE dependency

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 7355a36..0a99102 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -212,7 +212,7 @@ DEPEND="${DEPEND}
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 )
-~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=,static-libs=]
+~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=]
 virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]"
 
 # my_config.h includes ABI specific data

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 5ccfa79991dabaee7cfd091f060c26792ebe68a2
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Mar  9 20:18:22 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Mar  9 20:18:22 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=5ccfa799

Fix PDEPEND on virtual/libmysqlclient in mysql-multilib-r1

 eclass/mysql-multilib-r1.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 65ebe85..7355a36 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -212,7 +212,8 @@ DEPEND="${DEPEND}
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 )
-~virtual/mysql-${MYSQL_PV_MAJOR}"
+~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=,static-libs=]
+virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]"
 
 # my_config.h includes ABI specific data
 MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h 
/usr/include/mysql/private/embedded_priv.h )

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 272d86839db2042ebe26dd2193850e018c737eb4
Author: Brian Evans  gentoo  org>
AuthorDate: Sat Feb 27 02:56:17 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sat Feb 27 02:56:17 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=272d8683

mysql-multilib-r1.eclass: Further refinement for EAPI=6

Use the default functions for patching and deprecate mysql_fx.eclass
PATCHES=() is now set in ebuilds instead of using the move functions

 eclass/mysql-multilib-r1.eclass | 114 
 1 file changed, 92 insertions(+), 22 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 60340d7..65ebe85 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -38,8 +38,14 @@ MYSQL_EXTRAS=""
 # @DESCRIPTION:
 # An array of CMake arguments added to native and non-native
 
-inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} mysql_fx versionator \
-   multilib prefix toolchain-funcs user cmake-utils multilib-minimal
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} versionator \
+   prefix toolchain-funcs user cmake-utils multilib-minimal
+
+if [[ "${EAPI}x" == "5x" ]]; then
+   inherit multilib mysql_fx
+fi
 
 #
 # Supported EAPI versions and export functions
@@ -82,19 +88,18 @@ if [[ -z ${MYSQL_PV_MAJOR} ]] ; then 
MYSQL_PV_MAJOR="$(get_version_component_ran
 # depend on this variable.
 # In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
 # We also strip off upstream's trailing letter that they use to respin tarballs
-MYSQL_VERSION_ID=""
-tpv="${PV%[a-z]}"
-tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3 ; do
-   # pad to length 2
-   tpv[${vatom}]="00${tpv[${vatom}]}"
-   MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number by BASH)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# This eclass should only be used with at least mysql-5.5.35
-mysql_version_is_at_least "5.5.35" || die "This eclass should only be used 
with >=mysql-5.5.35"
+if [[ "${EAPI}x" == "5x" ]]; then
+   MYSQL_VERSION_ID=""
+   tpv="${PV%[a-z]}"
+   tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; 
tpv[3]="${tpv[3]##*-r}"
+   for vatom in 0 1 2 3 ; do
+   # pad to length 2
+   tpv[${vatom}]="00${tpv[${vatom}]}"
+   MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+   done
+   # strip leading "0" (otherwise it's considered an octal number by BASH)
+   MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+fi
 
 # Work out the default SERVER_URI correctly
 if [[ -z ${SERVER_URI} ]]; then
@@ -294,12 +299,6 @@ mysql-multilib-r1_src_prepare() {
mysql_mv_patches
# And apply
epatch
-   else
-   mkdir -p "${WORKDIR}/patch" || die "Unable to create 
epatch directory"
-   # Clean out old items
-   rm -f "${WORKDIR}"/patch/*
-   EPATCH_SOURCE="${WORKDIR}/patch" mysql_mv_patches
-   eapply "${WORKDIR}/patch"
fi
fi
 
@@ -343,7 +342,7 @@ mysql-multilib-r1_src_prepare() {
if [[ "${EAPI}x" == "5x" ]] ; then
epatch_user
else
-   eapply_user
+   default
fi
 }
 
@@ -1056,3 +1055,74 @@ mysql-cmake_use_plugin() {
echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO"
fi
 }
+
+# @FUNCTION: mysql_init_vars
+# @DESCRIPTION:
+# void mysql_init_vars()
+# Initialize global variables
+# 2005-11-19 
+if [[ "${EAPI}x" != "5x" ]]; then
+
+mysql_init_vars() {
+   MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+   MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+   MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+   MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+   MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
+   MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
+
+   if [[ -z "${MY_DATADIR}" ]] ; then
+   MY_DATADIR=""
+   if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+   MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+   | sed -ne '/datadir/s|^--datadir=||p' \
+   | tail -n1`
+   if [[ -z "${MY_DATADIR}" ]] ; then
+   MY_DATADIR=`grep ^datadir 
"${MY_SYSCONFDIR}/my.cnf" \
+   | sed -e 's/.*=\s*//' \
+   | tail -n1`
+   fi
+   fi
+   if [[ -z "${MY_DATADIR}" ]] ; then
+   

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 0ad5f2b290c38ec5620e00ee86dbf392488b78b2
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Feb 17 03:27:34 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Feb 17 03:27:34 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=0ad5f2b2

mysql-multilib-r1: Update to EAPI6

 eclass/mysql-multilib-r1.eclass | 42 ++---
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 68e7126..60340d7 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -46,7 +46,7 @@ inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} mysql_fx 
versionator \
 #
 
 case "${EAPI:-0}" in
-   5) ;;
+   5|6) ;;
*) die "Unsupported EAPI: ${EAPI}" ;;
 esac
 
@@ -223,7 +223,7 @@ mysql-multilib-r1_pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]] ; then
local GCC_MAJOR_SET=$(gcc-major-version)
local GCC_MINOR_SET=$(gcc-minor-version)
-   if use_if_iuse tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+   if in_iuse tokudb && use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || 
\
${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
eerror "${PN} with tokudb needs to be built with 
gcc-4.7 or later."
eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
@@ -285,14 +285,22 @@ mysql-multilib-r1_src_prepare() {
if [[ ${MY_EXTRAS_VER} != none ]]; then
 
# Apply the patches for this MySQL version
-   EPATCH_SUFFIX="patch"
-   mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch 
directory"
-   # Clean out old items
-   rm -f "${EPATCH_SOURCE}"/*
-   # Now link in right patches
-   mysql_mv_patches
-   # And apply
-   epatch
+   if [[ "${EAPI}x" == "5x" ]]; then
+   EPATCH_SUFFIX="patch"
+   mkdir -p "${EPATCH_SOURCE}" || die "Unable to create 
epatch directory"
+   # Clean out old items
+   rm -f "${EPATCH_SOURCE}"/*
+   # Now link in right patches
+   mysql_mv_patches
+   # And apply
+   epatch
+   else
+   mkdir -p "${WORKDIR}/patch" || die "Unable to create 
epatch directory"
+   # Clean out old items
+   rm -f "${WORKDIR}"/patch/*
+   EPATCH_SOURCE="${WORKDIR}/patch" mysql_mv_patches
+   eapply "${WORKDIR}/patch"
+   fi
fi
 
# last -fPIC fixup, per bug #305873
@@ -332,7 +340,11 @@ mysql-multilib-r1_src_prepare() {
rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not 
remove packaged groonga"
fi
 
-   epatch_user
+   if [[ "${EAPI}x" == "5x" ]] ; then
+   epatch_user
+   else
+   eapply_user
+   fi
 }
 
 # @FUNCTION: mysql-multilib-r1_src_configure
@@ -388,7 +400,7 @@ multilib_src_configure() {
-DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
-   -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_unitdir)"
+   -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
)
 
if in_iuse systemd ; then
@@ -680,7 +692,7 @@ mysql-multilib-r1_pkg_postinst() {
fi
done
 
-   if use_if_iuse pam ; then
+   if in_iuse pam && use pam; then
einfo
elog "This install includes the PAM authentication 
plugin."
elog "To activate and configure the PAM plugin, please 
read:"
@@ -708,7 +720,7 @@ mysql-multilib-r1_pkg_postinst() {
einfo
fi
 
-   if use_if_iuse galera ; then
+   if in_iuse galera && use galera ; then
einfo
elog "Be sure to edit the my.cnf file to activate your 
cluster settings."
elog "This should be done after running \"emerge 
--config =${CATEGORY}/${PF}\""
@@ -1038,7 +1050,7 @@ mysql-multilib-r1_disable_test() {
 # and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
 mysql-cmake_use_plugin() {
[[ -z $2 ]] && die "mysql-cmake_use_plugin  "
-   if use_if_iuse $1 ; then
+   if in_iuse $1 && use $1 ; then
echo "-DWITH_$2=1 -DPLUGIN_$2=YES"
else
echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO"

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: b1c6beb73bed558dd857ab79ff6df4edb2fcf575
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Feb 10 02:19:52 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Feb 10 02:19:52 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=b1c6beb7

mysql-multilib-r1: Drop no-rtti CXXFLAG

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 1512b21..68e7126 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -342,7 +342,7 @@ mysql-multilib-r1_src_configure() {
# Bug #114895, bug #110149
filter-flags "-O" "-O[01]"
 
-   append-cxxflags -felide-constructors -fno-rtti
+   append-cxxflags -felide-constructors
 
# bug #283926, with GCC4.4, this is required to get correct behavior.
append-flags -fno-strict-aliasing

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 8c240ee6acb0a20ebb9bea19548c42f18d2ded55
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Feb  7 20:29:36 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Feb  7 20:29:36 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=8c240ee6

Add FLUSH PRIVILEGES to the pkg_config after setting the root password

 eclass/mysql-multilib-r1.eclass | 2 +-
 eclass/mysql-multilib.eclass| 2 +-
 eclass/mysql-v2.eclass  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index e14a2a8..1512b21 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -952,7 +952,7 @@ mysql-multilib-r1_pkg_config() {
 
ebegin "Setting root password"
# Do this from memory, as we don't want clear text passwords in temp 
files
-   local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
+   local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
"${EROOT}/usr/bin/mysql" \
--socket=${socket} \
-hlocalhost \

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 0016e76..a8cac37 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1144,7 +1144,7 @@ mysql-multilib_pkg_config() {
 
ebegin "Setting root password"
# Do this from memory, as we don't want clear text passwords in temp 
files
-   local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
+   local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
"${EROOT}/usr/bin/mysql" \
--socket=${socket} \
-hlocalhost \

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index c654374..2ca4f7f 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -895,7 +895,7 @@ mysql-v2_pkg_config() {
 
ebegin "Setting root password"
# Do this from memory, as we don't want clear text passwords in temp 
files
-   local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
+   local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
"${EROOT}/usr/bin/mysql" \
--socket=${socket} \
-hlocalhost \

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 36ca198c6dda326d1ad13d83328ce75d5f5d5a21
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Feb  7 20:41:14 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Feb  7 20:41:14 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=36ca198c

Update minor changes from the main portage tree to older eclasses

 eclass/mysql-multilib.eclass |  5 +
 eclass/mysql-v2.eclass   | 15 +--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a8cac37..c3f4299 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1067,6 +1067,11 @@ mysql-multilib_pkg_config() {
 
use prefix || options="${options} --user=mysql"
 
+   # MySQL 5.6+ needs InnoDB
+   if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
+   mysql_version_is_at_least "5.6" || options="${options} 
--loose-skip-innodb"
+   fi
+
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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 2ca4f7f..dda63c3 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -47,7 +47,7 @@ MYSQL_EXTRAS=""
 # Use "none" to disable it's use
 [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
 
-inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} 
mysql_fx versionator toolchain-funcs user
+inherit eutils flag-o-matic ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx 
versionator toolchain-funcs user
 
 #
 # Supported EAPI versions and export functions
@@ -184,9 +184,9 @@ if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != 
"none" ]]; then
SRC_URI="${SRC_URI}
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
 fi
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
@@ -293,10 +293,6 @@ else
fi
 fi
 
-if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
-   mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost"
-fi
-
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} 
libevent? ( >=dev-libs/libevent-1.4 )"
mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( 
>=dev-libs/boost-1.40.0 )"
@@ -826,8 +822,7 @@ mysql-v2_pkg_config() {
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"

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 546326e3c1847d6a93425e3c22cc3981bb36d816
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Dec 31 18:33:48 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Dec 31 18:33:48 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=546326e3

mysql-multilib-r1.eclass: Add missing REQUIRED_USE which caused a block on 
~arch packages

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 87bcec0..e14a2a8 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -153,7 +153,7 @@ REQUIRED_USE="^^ ( yassl openssl libressl )"
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
 RESTRICT="libressl? ( test )"
 
-REQUIRED_USE="!server? ( !extraengine !embedded )
+REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded )
 ?? ( tcmalloc jemalloc )
 static? ( !libressl !openssl yassl )"
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 653fb8eb186372b414c54d5bcf84e8bc41e2
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Dec 23 15:07:07 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Dec 23 15:07:07 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=653fb8eb

Add gitweb snapshot for extras file to SRC_URI

 eclass/mysql-multilib-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 0cd841a..87bcec0 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -134,6 +134,7 @@ SRC_URI="${SERVER_URI}"
 if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
SRC_URI="${SRC_URI}
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2

https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2

https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2

https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 9aaf18966bccd86b6b01e8480b2ec52f6d66cdc5
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Nov 12 15:14:12 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Nov 12 15:14:12 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=9aaf1896

mysql-multilib.eclass: Require gcc-4.7 to be active on non-x86{,_64} platforms

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 23683f5..0016e76 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -192,7 +192,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0/${SUBSLOT:-0}"
 
-IUSE="cluster debug embedded extraengine jemalloc latin1 libressl +openssl
+IUSE="debug embedded extraengine jemalloc latin1 libressl +openssl
+perl profiling selinux systemtap static static-libs tcmalloc test 
yassl"
 
 REQUIRED_USE="^^ ( yassl openssl libressl )"
@@ -503,15 +503,22 @@ mysql-multilib_disable_test() {
 # Perform some basic tests and tasks during pkg_pretend phase:
 mysql-multilib_pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]] ; then
-   if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || \
-   $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 
7 ]] ; then
+   local GCC_MAJOR_SET=$(gcc-major-version)
+   local GCC_MINOR_SET=$(gcc-minor-version)
+   if use_if_iuse tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+   ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
eerror "${PN} with tokudb needs to be built with 
gcc-4.7 or later."
eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
die
fi
-   fi
-   if use_if_iuse cluster && [[ "${PN}" != "mysql-cluster" ]]; then
-   die "NDB Cluster support has been removed from all packages 
except mysql-cluster"
+   # Bug 565584.  InnoDB now requires atomic functions introduced 
with gcc-4.7 on
+   # non x86{,_64} arches
+   if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+   ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
+   eerror "${PN} needs to be built with gcc-4.7 or later."
+   eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
+   die
+   fi
fi
 }
 
@@ -887,7 +894,7 @@ mysql-multilib_pkg_postinst() {
elog "mysql_upgrade tool."
einfo
 
-   if [[ ${PN} == "mariadb-galera" ]] ; then
+   if [[ ${PN} == "mariadb-galera" ]] || use_if_iuse galera ; then
einfo
elog "Be sure to edit the my.cnf file to activate your 
cluster settings."
elog "This should be done after running \"emerge 
--config =${CATEGORY}/${PF}\""

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 7556dd45f579a57c8fd2944b865f938fb6f07c07
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Nov  2 21:50:48 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Nov  2 21:50:48 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=7556dd45

mysql-multilib.eclass: Add the --show option to my_print_defaults when it 
originally returns a default string for a password

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 7cdda22..23683f5 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -914,9 +914,10 @@ mysql-multilib_getopt() {
 # Use my_print_defaults to extract specific config options
 mysql-multilib_getoptval() {
local mypd="${EROOT}"/usr/bin/my_print_defaults
-   section="$1"
-   flag="--${2}="
-   "${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
+   local section="$1"
+   local flag="--${2}="
+   local extra_options="${3}"
+   "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
 }
 
 # @FUNCTION: mysql-multilib_pkg_config
@@ -977,6 +978,10 @@ mysql-multilib_pkg_config() {
 
if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' 
password)"
+   # Sometimes --show is required to display passwords in some 
implementations of my_print_defaults
+   if [[ "${MYSQL_ROOT_PASSWORD}" == '*' ]]; then
+   MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client 
mysql' password --show)"
+   fi
fi
MYSQL_TMPDIR="$(mysql-multilib_getoptval mysqld tmpdir)"
# These are dir+prefix

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: f14a3555383c2bb5693caa243e055ec4f114ca75
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct 30 18:33:28 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Oct 30 18:33:28 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f14a3555

mysql-multilib.eclass: Reduce the output of skipping multilib when -client-libs

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 864c71b..7cdda22 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -608,7 +608,7 @@ multilib_src_configure() {
 
if ! multilib_is_native_abi && in_iuse client-libs ; then
if ! use client-libs ; then
-   ewarn "Skipping multilib build due to client-libs USE 
disabled"
+   einfo "Skipping multilib build due to client-libs USE 
disabled"
return 0
fi
fi
@@ -743,7 +743,6 @@ mysql-multilib_src_compile() {
 multilib_src_compile() {
if ! multilib_is_native_abi && in_iuse client-libs ; then
if ! use client-libs ; then
-   ewarn "Skipping multilib build due to client-libs USE 
disabled"
return 0
fi
fi
@@ -773,7 +772,6 @@ multilib_src_install() {
 
if ! multilib_is_native_abi && in_iuse client-libs ; then
if ! use client-libs ; then
-   ewarn "Skipping multilib build due to client-libs USE 
disabled"
return 0
fi
fi

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: f97cb627515bce1b163b5f7b434b458e955f4913
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct 30 18:29:47 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Oct 30 18:29:47 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f97cb627

mysql-multilib.eclass: Adjust elog URL for PAM plugin

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 26e494a..864c71b 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -873,7 +873,7 @@ mysql-multilib_pkg_postinst() {
einfo
elog "This install includes the PAM 
authentication plugin."
elog "To activate and configure the PAM plugin, 
please read:"
-   elog 
"https://kb.askmonty.org/en/pam-authentication-plugin/;
+   elog 
"https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/;
einfo
fi
fi

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 615f93f211a038110fc840203a68d66c31c3d249
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 26 16:54:11 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Oct 26 16:54:11 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=615f93f2

Remove the community USE which no longer has any effect

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 9f17095..26e494a 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -192,7 +192,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0/${SUBSLOT:-0}"
 
-IUSE="+community cluster debug embedded extraengine jemalloc latin1 libressl 
+openssl
+IUSE="cluster debug embedded extraengine jemalloc latin1 libressl +openssl
+perl profiling selinux systemtap static static-libs tcmalloc test 
yassl"
 
 REQUIRED_USE="^^ ( yassl openssl libressl )"

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 575e5ab98beafd988af73a49c43fdf36872ac6bc
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 26 16:48:00 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Oct 26 16:48:00 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=575e5ab9

Add in minor fixes from portage tree

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 10444a1..8810a04 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -273,8 +273,6 @@ REQUIRED_USE="
 # These are used for both runtime and compiletime
 # MULTILIB_USEDEP only set for libraries used by the client library
 DEPEND="
-   openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] 
)
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
kernel_linux? (
sys-process/procps:0=
dev-libs/libaio:0=
@@ -645,7 +643,7 @@ multilib_src_configure() {
-DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
-   -DINSTALL_SYSTEMD_UNITDIR=$(systemd_get_unitdir)
+   -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_unitdir)"
)
 
if in_iuse systemd ; then

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 968ec8e3261cc3f9013ddb26a3f2c9968ed45e5e
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 26 16:52:32 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Oct 26 16:52:32 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=968ec8e3

Restrict tests when libressl is enabled

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 8810a04..9f17095 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -213,6 +213,9 @@ REQUIRED_USE="^^ ( yassl openssl libressl )"
 #  IUSE="bindist ${IUSE}"
 #fi
 
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
+RESTRICT="libressl? ( test )"
+
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
IUSE="bindist ${IUSE}"
RESTRICT="${RESTRICT} !bindist? ( bindist )"

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 23968ae490e2680f0f2d5c9177166fba9063564f
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Oct 20 14:05:08 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Oct 20 14:05:08 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=23968ae4

mysql-multilib.eclass: use https URLs for patches

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 8c52657..10444a1 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -170,9 +170,9 @@ SRC_URI="${SERVER_URI}"
 if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
SRC_URI="${SRC_URI}
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
 fi
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: e5fa46171e5636a6f3d74f2fdb3615394501a00f
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 19 18:48:09 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Oct 19 18:48:09 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=e5fa4617

mysql-multilib.eclass: Use systemd eclass to point to the right unit directory

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 0cbbf8e..8c52657 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -27,7 +27,7 @@ MYSQL_EXTRAS=""
 # Use "none" to disable it's use
 [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
 
-inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
+inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx 
versionator \
toolchain-funcs user cmake-utils multilib-minimal
 
 #
@@ -645,6 +645,7 @@ multilib_src_configure() {
-DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
+   -DINSTALL_SYSTEMD_UNITDIR=$(systemd_get_unitdir)
)
 
if in_iuse systemd ; then

[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/percona-server/, dev-db/mysql/, dev-db/mariadb-galera/, ...

[Brian Evans]

commit: 58e3ed850452e08c68d0209c0528ed49b20fe0ee
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Oct 11 02:19:06 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Oct 11 02:19:06 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=58e3ed85

Initial support for libressl

Needs testing and patches to dev-db/mysql and possibly dev-db/percona-server
before committing to the main tree.

Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb-galera/metadata.xml |  7 +++
 dev-db/mariadb/metadata.xml|  7 +++
 dev-db/mysql-cluster/metadata.xml  |  7 +++
 dev-db/mysql/metadata.xml  |  7 +++
 dev-db/percona-server/Manifest |  1 -
 dev-db/percona-server/metadata.xml | 10 +-
 eclass/mysql-multilib.eclass   | 27 +++
 7 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/dev-db/mariadb-galera/metadata.xml 
b/dev-db/mariadb-galera/metadata.xml
index e0a0598..6803a9e 100644
--- a/dev-db/mariadb-galera/metadata.xml
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -2,6 +2,10 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
 mysql
+  
+hasuf...@gentoo.org
+Libressl issues. Only assign if it's a direct Libressl issue. 
Do not directly assign for anything else.
+  
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: bc5a6b4582e762b4999356033e7f68749b7a215f
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Sep 23 02:51:46 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Sep 23 02:51:46 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=bc5a6b45

Test a more standard way to display the ABI message

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 17206cf..5f84d88 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -795,7 +795,7 @@ mysql-multilib_pkg_preinst() {
if [[ -z ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
SHOW_ABI_MESSAGE=1
elif [[ ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] && \
-   in_iuse client-libs && ! built_with_use --missing true 
${CATEGORY}/${PN} client-libs ; then
+   in_iuse client-libs && has_version 
"${CATEGORY}/${PN}[-client-libs(+)]" ; then
SHOW_ABI_MESSAGE=1
fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 542753bbbe878dea1192c9d0c96586c0a1f0e038
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 18 18:45:19 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Sep 18 18:45:19 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=542753bb

More config cleanup; fix variables

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 16c320f..17206cf 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1025,7 +1025,7 @@ mysql-multilib_pkg_config() {
help_tables="${TMPDIR}/fill_help_tables.sql"
 
# Figure out which options we need to disable to do the setup
-   helpfile="${TMPDIR}/mysqld-help"
+   local helpfile="${TMPDIR}/mysqld-help"
${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
for opt in grant-tables host-cache name-resolve networking slave-start \
federated ssl log-bin relay-log slow-query-log external-locking 
\
@@ -1040,11 +1040,6 @@ mysql-multilib_pkg_config() {
 
use prefix || options="${options} --user=mysql"
 
-   # MySQL 5.6+ needs InnoDB
-   if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
-   mysql_version_is_at_least "5.6" || options="${options} 
--loose-skip-innodb"
-   fi
-
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
@@ -1062,11 +1057,12 @@ mysql-multilib_pkg_config() {
"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
 
local cmd
+   local initialize_options
 if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
mysql_version_is_at_least "5.7.6" ; then
# --initialize-insecure will not set root password
# --initialize would set a random one in the log which we don't 
need as we set it ourselves
cmd="${EROOT}usr/sbin/mysqld"
-   options="${options}  --initialize-insecure  
'--init-file=${sqltmp}'"
+   initialize_options="--initialize-insecure  
'--init-file=${sqltmp}'"
sqltmp="" # the initialize will take care of it
else
cmd="${EROOT}usr/share/mysql/scripts/mysql_install_db"
@@ -1075,7 +1071,7 @@ mysql-multilib_pkg_config() {
cat "${help_tables}" >> "${sqltmp}"
fi
fi
-   cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}'"
+   cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}' 
${initialize_options}"
einfo "Command: $cmd"
eval $cmd \
>"${TMPDIR}"/mysql_install_db.log 2>&1

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: a232fdf242b8ce0353bb03600148c44f0356bd1f
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 18 15:06:47 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Sep 18 15:06:47 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=a232fdf2

mysql-multilib.eclass: Fix syntax of previous commit removing the equals sign

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 2e73ccf..ff701df 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -795,7 +795,7 @@ mysql-multilib_pkg_preinst() {
if [[ -z ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
SHOW_ABI_MESSAGE=1
elif [[ ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] && \
-   in_iuse client-libs && ! built_with_use --missing=true 
${CATEGORY}/${PN} client-libs ; then
+   in_iuse client-libs && ! built_with_use --missing true 
${CATEGORY}/${PN} client-libs ; then
SHOW_ABI_MESSAGE=1
fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: cf9f250ef4b95510b52e6e9fe96796294509260b
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 18 15:01:40 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Sep 18 15:01:40 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=cf9f250e

Add --missing=true to built_with_use wrt bug 560732

This fixes the case of upgrading from a version without the flag to
a version with the flag.

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index d880267..2e73ccf 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -795,7 +795,7 @@ mysql-multilib_pkg_preinst() {
if [[ -z ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
SHOW_ABI_MESSAGE=1
elif [[ ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] && \
-   in_iuse client-libs && ! built_with_use 
${CATEGORY}/${PN} client-libs ; then
+   in_iuse client-libs && ! built_with_use --missing=true 
${CATEGORY}/${PN} client-libs ; then
SHOW_ABI_MESSAGE=1
fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 230727ca970a327e9338829cdff30c98973e8928
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 18 17:32:46 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Sep 18 17:32:46 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=230727ca

Update initialization for MySQL 5.7 now that mysql_install_db is gone

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 54 ++--
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index ff701df..16c320f 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1056,16 +1056,32 @@ mysql-multilib_pkg_config() {
fi
 
pushd "${TMPDIR}" &>/dev/null
-   #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' 
'--basedir=${EPREFIX}/usr' ${options}"
-   cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
-   [[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
+
+   # Filling timezones, see
+   # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+   "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
+
+   local cmd
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
mysql_version_is_at_least "5.7.6" ; then
+   # --initialize-insecure will not set root password
+   # --initialize would set a random one in the log which we don't 
need as we set it ourselves
+   cmd="${EROOT}usr/sbin/mysqld"
+   options="${options}  --initialize-insecure  
'--init-file=${sqltmp}'"
+   sqltmp="" # the initialize will take care of it
+   else
+   cmd="${EROOT}usr/share/mysql/scripts/mysql_install_db"
+   [[ -f "${cmd}" ]] || cmd="${EROOT}usr/bin/mysql_install_db"
+   if [[ -r "${help_tables}" ]] ; then
+   cat "${help_tables}" >> "${sqltmp}"
+   fi
+   fi
cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}'"
einfo "Command: $cmd"
eval $cmd \
>"${TMPDIR}"/mysql_install_db.log 2>&1
if [ $? -ne 0 ]; then
grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-   die "Failed to run mysql_install_db. Please review 
${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+   die "Failed to initialize mysqld. Please review 
${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
fi
popd &>/dev/null
[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
@@ -1073,14 +1089,6 @@ mysql-multilib_pkg_config() {
chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
 
-   # Filling timezones, see
-   # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-   "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
-
-   if [[ -r "${help_tables}" ]] ; then
-   cat "${help_tables}" >> "${sqltmp}"
-   fi
-
local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
local mysqld="${EROOT}/usr/sbin/mysqld \
@@ -1120,16 +1128,18 @@ mysql-multilib_pkg_config() {
-e "${sql}"
eend $?
 
-   ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-   "${EROOT}/usr/bin/mysql" \
-   --socket=${socket} \
-   -hlocalhost \
-   -uroot \
-   --password="${MYSQL_ROOT_PASSWORD}" \
-   mysql < "${sqltmp}"
-   rc=$?
-   eend $?
-   [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+   if [[ -n "${sqltmp}" ]] ; then
+   ebegin "Loading \"zoneinfo\", this step may require a few 
seconds"
+   "${EROOT}/usr/bin/mysql" \
+   --socket=${socket} \
+   -hlocalhost \
+   -uroot \
+   --password="${MYSQL_ROOT_PASSWORD}" \
+   mysql < "${sqltmp}"
+   rc=$?
+   eend $?
+   [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+   fi
 
# Stop the server and cleanup
einfo "Stopping the server ..."

[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Brian Evans]

commit: cedf64ba91607985f9e5dd2faf314afbe20b6f67
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Sep 16 20:55:34 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Sep 16 20:55:34 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=cedf64ba

mysql-connector-c: Revbump with preinst message

Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mysql-connector-c/files/mysql_com.patch | 31 +
 .../mysql-connector-c-6.1.6-r2.ebuild  | 80 ++
 eclass/mysql-multilib.eclass   | 10 +++
 3 files changed, 121 insertions(+)

diff --git a/dev-db/mysql-connector-c/files/mysql_com.patch 
b/dev-db/mysql-connector-c/files/mysql_com.patch
new file mode 100644
index 000..36a7d5a
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql_com.patch
@@ -0,0 +1,31 @@
+--- a/include/mysql_com.h  2014-06-10 23:10:43.0 -0400
 b/include/mysql_com.h  2015-08-11 15:20:54.487091000 -0400
+@@ -179,7 +171,7 @@
+ #define CLIENT_IGNORE_SIGPIPE   4096/* IGNORE sigpipes */
+ #define CLIENT_TRANSACTIONS   8192/* Client knows about transactions */
+ #define CLIENT_RESERVED 16384   /* Old flag for 4.1 protocol  */
+-#define CLIENT_RESERVED232768   /* Old flag for 4.1 authentication */
++#define CLIENT_SECURE_CONNECTION 32768  /* New 4.1 authentication */
+ #define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt 
support */
+ #define CLIENT_MULTI_RESULTS(1UL << 17) /* Enable/disable multi-results */
+ #define CLIENT_PS_MULTI_RESULTS (1UL << 18) /* Multi-results in PS-protocol */
+@@ -226,7 +216,7 @@
+| CLIENT_IGNORE_SIGPIPE \
+| CLIENT_TRANSACTIONS \
+| CLIENT_RESERVED \
+-   | CLIENT_RESERVED2 \
++   | CLIENT_SECURE_CONNECTION \
+| CLIENT_MULTI_STATEMENTS \
+| CLIENT_MULTI_RESULTS \
+| CLIENT_PS_MULTI_RESULTS \
+--- a/libmysql/client_settings.h   2015-02-25 16:09:49.0 -0500
 b/libmysql/client_settings.h   2015-08-11 15:44:10.804091000 -0400
+@@ -31,7 +31,7 @@
+  CLIENT_LONG_FLAG | \
+  CLIENT_TRANSACTIONS |  \
+  CLIENT_PROTOCOL_41 | \
+- CLIENT_RESERVED2 | \
++ CLIENT_SECURE_CONNECTION | \
+  CLIENT_MULTI_RESULTS | \
+  CLIENT_PS_MULTI_RESULTS | \
+  CLIENT_PLUGIN_AUTH | \

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
new file mode 100644
index 000..f77fcf5
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CMAKE_MIN_VERSION="2.8.12"
+
+inherit cmake-multilib eutils multilib
+
+MULTILIB_WRAPPED_HEADERS+=(
+   /usr/include/mysql/my_config.h
+)
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/c/;
+LICENSE="GPL-2"
+
+SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+
+SUBSLOT="18"
+SLOT="0/${SUBSLOT}"
+IUSE="+ssl static-libs"
+
+CDEPEND="
+   sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   "
+RDEPEND="${CDEPEND}
+   !dev-db/mysql[client-libs(+)]
+   !dev-db/mysql-cluster[client-libs(+)]
+   !dev-db/mariadb[client-libs(+)]
+   !dev-db/mariadb-connector-c[mysqlcompat]
+   !dev-db/mariadb-galera[client-libs(+)]
+   !dev-db/percona-server[client-libs(+)]
+   "
+DEPEND="${CDEPEND}"
+
+DOCS=( README Docs/ChangeLog )
+
+src_prepare() {
+   epatch "${FILESDIR}/openssl-cmake-detection.patch" \
+   "${FILESDIR}/conn-c-includes.patch" \
+   "${FILESDIR}/mysql_com.patch"
+   epatch_user
+}
+
+multilib_src_configure() {
+   mycmakeargs+=(
+   -DINSTALL_LAYOUT=RPM
+   -DINSTALL_LIBDIR=$(get_libdir)
+   -DWITH_DEFAULT_COMPILER_OPTIONS=OFF
+   -DWITH_DEFAULT_FEATURE_SET=OFF
+   -DENABLED_LOCAL_INFILE=ON
+   -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DWITH_ZLIB=system
+   -DENABLE_DTRACE=OFF
+   -DWITH_SSL=$(usex ssl system bundled)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+   if ! use static-libs ; then
+   find "${ED}" -name "*.a" -delete || die
+   fi
+}
+

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 6e2be137829438864279bd17f959b443235dcedc
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Sep 17 01:41:41 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Sep 17 01:41:41 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=6e2be137

mysql-multilib eclass: Update when to show the ABI rebuild message

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-multilib.eclass | 21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 74c47bf..d880267 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -190,7 +190,7 @@ if [[ ${PN} == "percona-server" ]]; then
DESCRIPTION="An enhanced, drop-in replacement for MySQL from the 
Percona team"
 fi
 LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:=0}"
+SLOT="0/${SUBSLOT:-0}"
 
 IUSE="+community cluster debug embedded extraengine jemalloc latin1
+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
@@ -785,14 +785,25 @@ mysql-multilib_pkg_preinst() {
if [[ ${PN} == "mysql-cluster" ]] ; then
mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
fi
-   local CHECK_REPLACING
+   # Here we need to see if the implementation switched client libraries
+   # First, we check if this is a new instance of the package and a client 
library already exists
+   # Then, we check if this package is rebuilt but the previous instance 
did not
+   # have the client-libs USE set.
+   # Instances which do not have a client-libs USE can only be replaced by 
a different provider
+   local SHOW_ABI_MESSAGE
if ! in_iuse client-libs || use_if_iuse client-libs ; then
-   CHECK_REPLACING=1
+   if [[ -z ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+   SHOW_ABI_MESSAGE=1
+   elif [[ ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] && \
+   in_iuse client-libs && ! built_with_use 
${CATEGORY}/${PN} client-libs ; then
+   SHOW_ABI_MESSAGE=1
+   fi
+
fi
-if [[ ${CHECK_REPLACING} &&  -z ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+   if [[ ${SHOW_ABI_MESSAGE} ]] ; then
 elog "Due to ABI changes when switching between different 
client libraries,"
 elog "revdep-rebuild must find and rebuild all packages 
linking to libmysqlclient."
-elog "Please run: revdep-rebuild --library 
libmysqlclient.so.${SUBSLOT}"
+elog "Please run: revdep-rebuild --library 
libmysqlclient.so.${SUBSLOT:-18}"
 ewarn "Failure to run revdep-rebuild may cause issues with 
other programs or libraries"
 fi
 }

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 9203d0799f02f999ff8f8f8f697ce80df1382df3
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Sep 15 13:00:28 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Sep 15 13:00:28 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=9203d079

mysql-cmake.eclass: Fix tightened syntax of PLUGIN_X wrt bug 560504

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-cmake.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index a105672..5429f22 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -195,9 +195,9 @@ configure_cmake_standard() {
if ! use extraengine ; then
mycmakeargs+=(
-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-   -DPLUGIN_FEDERATED=0
+   -DPLUGIN_FEDERATED=NO
-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1
-   -DPLUGIN_FEDERATEDX=0 )
+   -DPLUGIN_FEDERATEDX=NO )
fi
 
mycmakeargs+=(

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: ddbb447439c29bd1d9a64f362e51ffcff3249cf3
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Sep 14 19:17:42 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Sep 14 19:17:42 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ddbb4474

Update copyright year on mysql-cmake.eclass

Signed-off-by: Brian Evans  gentoo.org>

 eclass/mysql-cmake.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 675a986..a105672 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: ba5c1a689a4981e20cf0b58734353c8bc8064899
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 27 13:30:05 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Aug 27 13:30:05 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ba5c1a68

Adjust slot for ncurses

Signed-off-by: Brian Evans grknight AT gentoo.org

 eclass/mysql-multilib.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 008b066..6f7b583 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -291,13 +291,13 @@ if [[ ${HAS_TOOLS_PATCH} ]] ; then
ssl? ( =dev-libs/openssl-1.0.0:0=[static-libs?] )
=sys-libs/zlib-1.2.3:0=[static-libs?]
)
-   tools? ( sys-libs/ncurses:= ) embedded? ( sys-libs/ncurses:= )
+   tools? ( sys-libs/ncurses:0= ) embedded? ( sys-libs/ncurses:0= )

 else
DEPEND+=
ssl? ( 
=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-   sys-libs/ncurses:=[${MULTILIB_USEDEP}]
+   sys-libs/ncurses:0=[${MULTILIB_USEDEP}]

 fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: c8da824625d6763c6a0e69e172a36b869113f5f6
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 13 13:53:52 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Aug 13 13:53:52 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=c8da8246

mysql-multilib.eclass: Add subslot rebuild to ncurses

Signed-off-by: Brian Evans grknight AT gentoo.org

 eclass/mysql-multilib.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 9765aac..008b066 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -291,13 +291,13 @@ if [[ ${HAS_TOOLS_PATCH} ]] ; then
ssl? ( =dev-libs/openssl-1.0.0:0=[static-libs?] )
=sys-libs/zlib-1.2.3:0=[static-libs?]
)
-   tools? ( sys-libs/ncurses ) embedded? ( sys-libs/ncurses )
+   tools? ( sys-libs/ncurses:= ) embedded? ( sys-libs/ncurses:= )

 else
DEPEND+=
ssl? ( 
=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-   sys-libs/ncurses[${MULTILIB_USEDEP}]
+   sys-libs/ncurses:=[${MULTILIB_USEDEP}]

 fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/mysql/

[Brian Evans]

commit: c66425b1feb5c5cefdc30ffb515aeb3c28055139
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri Jul 31 02:27:34 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri Jul 31 02:27:34 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=c66425b1

Version bump with eclass additions

 dev-db/mysql/Manifest  |  1 +
 ...sql-5.6.25-r1.ebuild = mysql-5.6.26-r1.ebuild} |  6 +++-
 ...{mysql-5.6.25-r1.ebuild = mysql-5.6.26.ebuild} | 21 ++
 eclass/mysql-multilib.eclass   | 32 --
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8f2737c..692f7a5 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -6,6 +6,7 @@ DIST mysql-5.5.44.tar.gz 21789766 SHA256 
85f05b257db39e63c82ff4b5ce4e0c6d2b07560
 DIST mysql-5.5.45.tar.gz 21832364 SHA256 
744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 
1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8
 WHIRLPOOL 
3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc
 DIST mysql-5.6.24.tar.gz 33178592 SHA256 
37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 
cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee7703c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7
 WHIRLPOOL 
26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011
 DIST mysql-5.6.25.tar.gz 33203321 SHA256 
15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd SHA512 
cd15180281b015a29d5a9f12bafd5878ecb8ca68ada2e0d016916d77f606592b4b9a8e4a3728fc0d90326bcdda26fdd371fc731ca524f06bd06cc3b19ae93243
 WHIRLPOOL 
68932bcbec0e58aade1c00fe00651ecac1003e80e5cd29298c23a79190df76390c7f16a29fcb5bff9ad63e721f53978d5d727a0ae9c5df0eb97a002a4c3e4194
+DIST mysql-5.6.26.tar.gz 33278710 SHA256 
b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 
455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62
 WHIRLPOOL 
e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f
 DIST mysql-5.7.6-m16.tar.gz 47330399 SHA256 
bba884fba916eea6cdaa3880af826c6f3b516f80319f35b1be6d4d3ea9c9d42d SHA512 
1b5cfedc4e18dcc6ca722e6339f593e5d26131c3e582b9b3bc8905bb9e005feb9f5af620e85cf6e57bead07ee306fe490a2d04e7c8e2fa349d947c718776c57e
 WHIRLPOOL 
48a804191825ad2927f99c540d477a71d5882f65e14fafa94cfaffc320a752f81e613ff2b05ebc61a16474e3466b037d79f0ddf57b7ba2afc3a5d9ae7ad345cc
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 
1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 
443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c
 WHIRLPOOL 
29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 
17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 
65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34
 WHIRLPOOL 
3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec

diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild 
b/dev-db/mysql/mysql-5.6.26-r1.ebuild
similarity index 94%
copy from dev-db/mysql/mysql-5.6.25-r1.ebuild
copy to dev-db/mysql/mysql-5.6.26-r1.ebuild
index b0ce8d0..a334c33 100644
--- a/dev-db/mysql/mysql-5.6.25-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.26-r1.ebuild
@@ -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/dev-db/mysql/mysql-5.6.25-r1.ebuild,v 1.1 
2015/07/28 02:26:58 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26-r1.ebuild,v 1.2 
2015/07/30 20:40:19 grknight Exp $
 
 EAPI=5
 
@@ -27,6 +27,10 @@ RDEPEND=${RDEPEND}
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
+# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
+# disable until we see what happens with it
+MYSQL_CMAKE_NATIVE_DEFINES=-DWITHOUT_VALIDATE_PASSWORD=1
+
 # Official test instructions:
 # USE='server embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \

diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild 
b/dev-db/mysql/mysql-5.6.26.ebuild
similarity index 88%
rename from dev-db/mysql/mysql-5.6.25-r1.ebuild
rename to 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 6a73b4acc639a4f07173f8d0342d4a9c2e3e009f
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Jul 30 02:02:45 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Jul 30 02:02:45 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=6a73b4ac

Add minimum virtual/mysql version for split packages to help transition

 eclass/mysql-multilib.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 8002e2e..65422e4 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -385,7 +385,8 @@ RDEPEND=${DEPEND}
 if [[ ${HAS_TOOLS_PATCH} ]] ; then
RDEPEND=${RDEPEND}
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-   !client-libs? ( virtual/libmysqlclient )
+   !client-libs? ( virtual/libmysqlclient )
+   !virtual/mysql-5.6-r4
 else
RDEPEND=${RDEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) 
)
 fi

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: efe3735b38fa72ffeb36385e35e69468d7618e6d
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jul 29 15:05:52 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Jul 29 15:05:52 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=efe3735b

Fix pkg_config function error with non-existant USE flags

 eclass/mysql-multilib.eclass | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a7d3c31..8002e2e 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -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.23 
2015/07/28 20:51:40 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.24 
2015/07/29 15:01:43 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -876,9 +876,14 @@ mysql-multilib_pkg_config() {
mysql_init_vars
 
[[ -z ${MY_DATADIR} ]]  die Sorry, unable to find MY_DATADIR
-
-   if built_with_use ${CATEGORY}/${PN} minimal  ! built_with_use 
${CATEGORY}/${PN} server ; then
-   die Minimal builds do NOT include the MySQL server
+   if [[ ${HAS_TOOLS_PATCH} ]] ; then
+   if ! built_with_use ${CATEGORY}/${PN} server ; then
+   die Minimal builds do NOT include the MySQL server
+   fi
+   else
+   if built_with_use ${CATEGORY}/${PN} minimal ; then
+   die Minimal builds do NOT include the MySQL server
+   fi
fi
 
if [[ ( -n ${MY_DATADIR} )  ( ${MY_DATADIR} != 
${old_MY_DATADIR} ) ]]; then

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 90500da3ac92f0cc99059cb366583f74b5f4f48d
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Jul 28 22:27:52 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Jul 28 22:27:52 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=90500da3

Sync multilib fix and headers from portage

 eclass/mysql-multilib.eclass | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index d8bb0a6..a7d3c31 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -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.21 
2015/06/10 18:08:02 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.23 
2015/07/28 20:51:40 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -679,7 +679,11 @@ multilib_src_configure() {
configure_cmake_minimal
fi
else
-   configure_cmake_standard
+   if multilib_is_native_abi ; then
+   configure_cmake_standard
+   else
+   configure_cmake_minimal
+   fi
fi
 
# Always build NDB with mysql-cluster for libndbclient

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 3011538a85fe4133a9f6747fa4aba3f94743f5b7
Author: layman layman AT localhost
AuthorDate: Fri Jun 12 20:13:17 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri Jun 12 20:13:17 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3011538a

Update archived eclass to match changes made by vapier in portage

 eclass/mysql.eclass | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 7a129fc..b021b8c 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -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 @@ mysql_pkg_config() {
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 @@ mysql_pkg_config() {
-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 \

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 4c924a5eb7f4b1b2a36362266318a83523694f26
Author: layman layman AT localhost
AuthorDate: Wed Jun 10 18:11:32 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Jun 10 18:11:32 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=4c924a5e

Sync portage header; Update mirror order for newer builds; Documentation update

 eclass/mysql-multilib.eclass | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 4b379f9..21ee832 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -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.21 
2015/06/10 18:08:02 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -101,16 +101,6 @@ MYSQL_VERSION_ID=${MYSQL_VERSION_ID##0}
 # This eclass should only be used with at least mysql-5.5.35
 mysql_version_is_at_least 5.5.35 || die This eclass should only be used 
with =mysql-5.5.35
 
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-
 # Work out the default SERVER_URI correctly
 if [[ -z ${SERVER_URI} ]]; then
[[ -z ${MY_PV} ]]  MY_PV=${PV//_/-}
@@ -120,8 +110,13 @@ if [[ -z ${SERVER_URI} ]]; then
MARIA_FULL_PV=$(replace_version_separator 3 '-' 
${MY_PV})
MARIA_FULL_P=${PN}-${MARIA_FULL_PV}
SERVER_URI=
-   
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz

http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+   
http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+   
http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+   
http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+   
http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+   
http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+   
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz

http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz

http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz

http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
@@ -353,6 +348,11 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; 
then
virtual/perl-Time-HiRes ) 
 fi
 
+# @ECLASS-VARIABLE: WSREP_REVISION
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Version of the sys-cluster/galera API (major version in portage) to use for 
galera clustering
+
 if [[ -n ${WSREP_REVISION} ]] ; then
# The wsrep API version must match between the ebuild and 
sys-cluster/galera.
# This will be indicated by WSREP_REVISION in the ebuild and the first 
number
@@ -369,10 +369,11 @@ if [[ -n ${WSREP_REVISION} ]] ; then
RDEPEND=${RDEPEND} ${GALERA_RDEPEND}
sst-rsync? ( sys-process/lsof )
sst-xtrabackup? (
-   =dev-db/xtrabackup-bin-2.2.4
net-misc/socat[ssl]
)

+   # Causes a circular dependency if DBD-mysql is not already installed
+   PDEPEND=${PDEPEND} sst-xtrabackup? ( =dev-db/xtrabackup-bin-2.2.4 )
 fi
 
 if [[ ${PN} == mysql-cluster ]] ; then
@@ -391,7 +392,7 @@ DEPEND=${DEPEND}
 
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND=perl? ( =dev-perl/DBD-mysql-2.9004 )
+PDEPEND=${PDEPEND} perl? ( =dev-perl/DBD-mysql-2.9004 )
 ~virtual/mysql-${MYSQL_PV_MAJOR}
 
 # my_config.h includes ABI specific data
@@ -433,7 +434,7 @@ mysql-multilib_pkg_pretend() {
die
fi
fi
-   if use cluster  [[ ${PN} != mysql-cluster ]]; then
+   if use_if_iuse cluster  [[ ${PN} != mysql-cluster ]]; then
die NDB Cluster support has been removed from all packages 
except mysql-cluster
fi
 }
@@ -883,8 +884,7 @@ mysql-multilib_pkg_config() {
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 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 7bf949f0b287b2b8a7c814705629a306d8acbcc7
Author: layman layman AT localhost
AuthorDate: Fri May  1 18:49:27 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri May  1 18:49:27 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=7bf949f0

Fix multilib builds wrt libbfd

 eclass/mysql-multilib.eclass | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index e6432f7..4b379f9 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -569,11 +569,18 @@ multilib_src_configure() {
fi
 
if in_iuse bindist ; then
-   mycmakeargs+=(
-   -DWITH_READLINE=$(usex bindist 1 0)
-   -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-   $(usex bindist -DHAVE_BFD_H=0 '')
-   )
+   # bfd.h is only used starting with 10.1 and can be controlled 
by NOT_FOR_DISTRIBUTION
+   if multilib_is_native_abi; then
+   mycmakeargs+=(
+   -DWITH_READLINE=$(usex bindist 1 0)
+   -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+   )
+   else
+   mycmakeargs+=(
+   -DWITH_READLINE=1
+   -DNOT_FOR_DISTRIBUTION=0
+   )
+   fi
fi
 
### TODO: make this system but issues with UTF-8 prevent it

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: dd83f2cb3e892a3a03fe1ce35a2140304d5e4cfe
Author: layman layman AT localhost
AuthorDate: Fri May  1 12:29:01 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri May  1 12:29:01 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=dd83f2cb

Update git hostnames for extras

 eclass/mysql-multilib.eclass | 2 +-
 eclass/mysql-v2.eclass   | 4 ++--
 eclass/mysql.eclass  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 3875a54..c7c2696 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -51,7 +51,7 @@ S=${WORKDIR}/mysql
 
 [[ ${MY_EXTRAS_VER} == latest ]]  MY_EXTRAS_VER=20090228-0714Z
 if [[ ${MY_EXTRAS_VER} == live ]]; then
-   EGIT_REPO_URI=git://git.overlays.gentoo.org/proj/mysql-extras.git
+   EGIT_REPO_URI=git://anongit.gentoo.org/proj/mysql-extras.git
EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
EGIT_CLONE_TYPE=shallow
 fi

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 04741ca..f613204 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.36 2015/02/16 
14:37:50 grknight Exp $
 
@@ -70,7 +70,7 @@ S=${WORKDIR}/mysql
 
 [[ ${MY_EXTRAS_VER} == latest ]]  MY_EXTRAS_VER=20090228-0714Z
 if [[ ${MY_EXTRAS_VER} == live ]]; then
-   EGIT_REPO_URI=git://git.overlays.gentoo.org/proj/mysql-extras.git
+   EGIT_REPO_URI=git://anongit.gentoo.org/proj/mysql-extras.git
EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
EGIT_CLONE_TYPE=shallow
 fi

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index cfad07e..4271a6c 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.181 2014/07/29 
20:24:00 robbat2 Exp $
 
@@ -27,7 +27,7 @@ S=${WORKDIR}/mysql
 
 [[ ${MY_EXTRAS_VER} == latest ]]  MY_EXTRAS_VER=20090228-0714Z
 if [[ ${MY_EXTRAS_VER} == live ]]; then
-   EGIT_REPO_URI=git://git.overlays.gentoo.org/proj/mysql-extras.git
+   EGIT_REPO_URI=git://anongit.gentoo.org/proj/mysql-extras.git
EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
EGIT_CLONE_TYPE=shallow
inherit git-r3

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 69cbac782eeef839d3e9e1a219d2edeabd5324fb
Author: layman layman AT localhost
AuthorDate: Fri May  1 12:41:03 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri May  1 12:41:03 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=69cbac78

Sync headers and changes from portage

 eclass/mysql-multilib.eclass | 2 +-
 eclass/mysql-v2.eclass   | 5 -
 eclass/mysql.eclass  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index c7c2696..e6432f7 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -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.18 
2015/03/17 19:39:43 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.19 
2015/05/01 12:34:31 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f613204..9f7b0e7 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -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.36 2015/02/16 
14:37:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.38 2015/05/01 
12:34:31 grknight Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -222,12 +222,15 @@ IUSE=${IUSE} latin1 extraengine cluster max-idx-128 
+community profiling
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
mysql_version_is_at_least 5.5 ; then
IUSE=bindist ${IUSE}
+   RESTRICT=${RESTRICT} !bindist? ( bindist )
 elif [[ ${PN} == mysql || ${PN} == percona-server ]]  \
mysql_check_version_range 5.5.37 to 5.6.11.99 ; then
IUSE=bindist ${IUSE}
+   RESTRICT=${RESTRICT} !bindist? ( bindist )
 elif [[ ${PN} == mysql-cluster ]]  \
mysql_check_version_range 7.2 to 7.2.99.99  ; then
IUSE=bindist ${IUSE}
+   RESTRICT=${RESTRICT} !bindist? ( bindist )
 fi
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 4271a6c..7a129fc 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -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.181 2014/07/29 
20:24:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.182 2015/05/01 
12:34:31 grknight Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 52e244863806a7844ae0fd2042e2d62417ed810b
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Mar 17 16:38:28 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Mar 17 16:38:28 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=52e24486

Fix dep for mysql-5.7.6

 eclass/mysql-multilib.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 839b372..f33da92 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -291,7 +291,9 @@ fi
 ### End readline/libedit
 
 if [[ ${PN} == mysql || ${PN} == percona-server ]] ; then
-   mysql_version_is_at_least 5.7.5  DEPEND=${DEPEND} 
=dev-libs/boost-1.56.0:0=
+   if mysql_version_is_at_least 5.7.6 ; then DEPEND=${DEPEND} 
=dev-libs/boost-1.57.0:0= ; else
+   mysql_version_is_at_least 5.7.5  DEPEND=${DEPEND} 
=dev-libs/boost-1.56.0:0=
+   fi
 fi
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: f253a7a3df0c6429b552e63b41cc661ed0370b00
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Mar 17 19:44:49 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Mar 17 19:44:49 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f253a7a3

Use tc-ld-disable-gold from toolchain-funcs

 eclass/mysql-multilib.eclass | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index f33da92..3875a54 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -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.17 
2015/03/08 09:42:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.18 
2015/03/17 19:39:43 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -426,14 +426,6 @@ mysql-multilib_disable_test() {
 # Perform some basic tests and tasks during pkg_pretend phase:
 mysql-multilib_pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]] ; then
-   # Bug 508724
-   if [[ ${PN} == 'mariadb' || ${PN} == 'mariadb-galera' ]]  \
-  test-flags-CC -fuse-ld=bfd  /dev/null 
-   $(tc-getLD) --version | grep -q GNU gold; then
-   eerror MariaDB will not build with the gold linker.
-   eerror Please select the bfd linker with 
binutils-config.
-   die GNU gold detected
-   fi
if use_if_iuse tokudb  [[ $(gcc-major-version) -lt 4 || \
$(gcc-major-version) -eq 4  $(gcc-minor-version) -lt 
7 ]] ; then
eerror ${PN} with tokudb needs to be built with 
gcc-4.7 or later.
@@ -521,7 +513,7 @@ mysql-multilib_src_configure() {
 
# bug 508724 mariadb cannot use ld.gold
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
-   append-ldflags $(test-flags-CXX -fuse-ld=bfd)
+   tc-ld-disable-gold
fi
 
multilib-minimal_src_configure

[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/mariadb/

[Brian Evans]

commit: 54539886d17960e92f03cc7865feda2965105728
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Mon Mar 16 02:13:13 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Mon Mar 16 02:13:44 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=54539886

[mariadb] Version bump for 10.1 series to beta

 dev-db/mariadb/ChangeLog  |   7 +-
 dev-db/mariadb/Manifest   |  23 ++
 dev-db/mariadb/mariadb-10.1.3_beta.ebuild | 116 ++
 eclass/mysql-cmake.eclass |   1 -
 4 files changed, 145 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index dfc3b0e..58d3c00 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-db/mariadb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mariadb-10.1.3_beta (16 Mar 2015)
+
+  16 Mar 2015; Brian Evans grkni...@gentoo.org +mariadb-10.1.3_beta.ebuild:
+  [mariadb] Version bump for 10.1 series to beta
+
 *mariadb-5.5.39 (05 Aug 2014)
 
   05 Aug 2014;  grkni...@gentoo.org +mariadb-5.5.39.ebuild,

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d3493dc..c2eb76b 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,10 @@
+-BEGIN PGP SIGNED MESSAGE-
+Hash: SHA256
+
 DIST mariadb-10.0.16.tar.gz 55656968 SHA256 
44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512 
8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3
 WHIRLPOOL 
916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
 DIST mariadb-10.1.0.tar.gz 51216842 SHA256 
994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 
479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a
 WHIRLPOOL 
edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
 DIST mariadb-10.1.2.tar.gz 52586559 SHA256 
411ea75cef58ab8fcaee8ec015b709400e5a9fc0dcfa76576044b23d32de1f5e SHA512 
cefbbfb00f1a311a0768282dc9d2085615aa6ea16825253576b9c2c69de8ebe4f1de7424c9573d5cf94c3d088ba0f03f7419d2a4ec71465e9301039b4a117421
 WHIRLPOOL 
67cb8e56cb48bf2b5dad9975068c5bd27d64fdc29e5536518075e6e4f3a23a9a0096de5ab95cec85877856fa48deec55837f6978522749a73a5e41b4efb81cff
+DIST mariadb-10.1.3.tar.gz 52935207 SHA256 
565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512 
c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae
 WHIRLPOOL 
08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
 WHIRLPOOL 
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
 DIST mariadb-5.2.14.tar.gz 25469828 SHA256 
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
 WHIRLPOOL 
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
 DIST mariadb-5.3.12.tar.gz 26880808 SHA256 
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
 WHIRLPOOL 
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
@@ -9,3 +13,22 @@ DIST mariadb-5.5.42.tar.gz 45586372 SHA256 
3c868e768f4c24b4aa2f8f1725460d15a5485
 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
 WHIRLPOOL 
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 
0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 
7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e
 WHIRLPOOL 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 88856ea27eb404cf197226d2bf489ff052b59a9a
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sun Mar  8 23:24:29 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sun Mar  8 23:24:29 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=88856ea2

Sync from portage

 eclass/mysql-multilib.eclass | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index fc82bc6..839b372 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -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.15 
2015/02/16 17:25:14 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.17 
2015/03/08 09:42:19 ulm Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -206,6 +206,7 @@ IUSE=+community cluster debug embedded extraengine 
jemalloc latin1 minimal
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
IUSE=bindist ${IUSE}
+   RESTRICT=${RESTRICT} !bindist? ( bindist )
 fi
 
 ### End readline/libedit
@@ -373,8 +374,8 @@ if [[ -n ${WSREP_REVISION} ]] ; then
 fi
 
 if [[ ${PN} == mysql-cluster ]] ; then
-   mysql_version_is_at_least 7.2.9  RDEPEND=${RDEPEND} java? ( 
=virtual/jre-1.6 )  \
-   DEPEND=${DEPEND} java? ( =virtual/jdk-1.6 )
+   mysql_version_is_at_least 7.2.9  RDEPEND=${RDEPEND} java? ( 
=virtual/jre-1.6 )  \
+   DEPEND=${DEPEND} java? ( =virtual/jdk-1.6 )
 fi
 
 # compile-time-only
@@ -590,7 +591,7 @@ multilib_src_configure() {
)
 
mysql_version_is_at_least 10.0.9  mycmakeargs+=( 
-DWITH_PCRE=system )
-fi
+   fi
 
configure_cmake_locale
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: ff80564e7ad7a200b184c5762fe225e0e95ded57
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Feb 10 18:36:34 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Feb 10 18:36:34 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ff80564e

Sync changes from portage tree for mysql-multilib.eclass

---
 eclass/mysql-multilib.eclass | 26 +++---
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 1749cb2..5312dd2 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.12 
2015/01/28 13:48:58 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.14 
2015/02/10 18:14:23 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -212,8 +212,7 @@ fi
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
IUSE=${IUSE} oqgraph pam sphinx tokudb
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or 
perfomance suffers
-   mysql_version_is_at_least 10.0.5  IUSE=${IUSE} odbc xml  \
-   REQUIRED_USE=odbc? ( extraengine !minimal ) xml? ( extraengine 
!minimal )
+   mysql_version_is_at_least 10.0.5  IUSE=${IUSE} odbc xml
REQUIRED_USE=${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( 
jemalloc )
 
# MariaDB 10.1 introduces InnoDB/XtraDB compression with external 
libraries
@@ -239,7 +238,7 @@ fi
 
 REQUIRED_USE=
${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
-minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
+minimal? ( !extraengine !embedded ) static? ( !ssl )
 
 #
 # DEPENDENCIES:
@@ -254,6 +253,7 @@ DEPEND=
sys-process/procps:0=
dev-libs/libaio:0=
)
+   sys-libs/ncurses
=sys-apps/sed-4
=sys-apps/texinfo-4.7-r1
=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
@@ -300,8 +300,10 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; 
then
perl? ( !dev-db/mytop )
if mysql_version_is_at_least 10.0.5 ; then
DEPEND=${DEPEND}
-   odbc? ( dev-db/unixODBC:0= )
-   xml? ( dev-libs/libxml2:2= )
+   extraengine? (
+   odbc? ( dev-db/unixODBC:0= )
+   xml? ( dev-libs/libxml2:2= )
+   )

fi
mysql_version_is_at_least 10.0.7  DEPEND=${DEPEND} oqgraph? ( 
dev-libs/judy:0= )
@@ -375,10 +377,12 @@ if [[ ${PN} == mysql-cluster ]] ; then
 fi
 
 # compile-time-only
+# ncurses only needs multilib for compile time due to a binary that will be 
not installed
 DEPEND=${DEPEND}
virtual/yacc
static? ( sys-libs/ncurses[static-libs] )
=dev-util/cmake-2.8.9
+   sys-libs/ncurses[${MULTILIB_USEDEP}]
 
 
 # For other stuff to bring us in
@@ -389,6 +393,9 @@ PDEPEND=perl? ( =dev-perl/DBD-mysql-2.9004 )
 # my_config.h includes ABI specific data
 MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h 
/usr/include/mysql/private/embedded_priv.h )
 
+[[ ${PN} == mysql-cluster ]]  \
+   MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/storage/ndb/ndb_types.h )
+
 [[ ${PN} == mariadb ]]  mysql_version_is_at_least 10.1.1  \
MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
 
@@ -592,6 +599,11 @@ multilib_src_configure() {
configure_cmake_minimal
fi
 
+   # Always build NDB with mysql-cluster for libndbclient
+   [[ ${PN} == mysql-cluster ]]  mycmakeargs+=(
+   -DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
+   -DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
+
cmake-utils_src_configure
 }
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: e8c0eadaaec5c5160cff4d8ecc7130f05dd7e39f
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri Jan 30 19:32:16 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri Jan 30 19:32:16 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e8c0eada

Attempt to fix bug 508724 by forcing ld.bfd

---
 eclass/mysql-multilib.eclass | 82 ++--
 1 file changed, 49 insertions(+), 33 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index dc07df7..1749cb2 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -39,7 +39,7 @@ case ${EAPI:-0} in
*) die Unsupported EAPI: ${EAPI} ;;
 esac
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile 
src_install pkg_preinst pkg_postinst pkg_config
+EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure 
src_compile src_install pkg_preinst pkg_postinst pkg_config
 
 #
 # VARIABLES:
@@ -410,6 +410,31 @@ mysql-multilib_disable_test() {
 # EBUILD FUNCTIONS
 #
 
+# @FUNCTION: mysql-multilib_pkg_pretend
+# @DESCRIPTION:
+# Perform some basic tests and tasks during pkg_pretend phase:
+mysql-multilib_pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]] ; then
+   # Bug 508724
+   if [[ ${PN} == 'mariadb' || ${PN} == 'mariadb-galera' ]]  \
+  test-flags-CC -fuse-ld=bfd  /dev/null 
+   $(tc-getLD) --version | grep -q GNU gold; then
+   eerror MariaDB will not build with the gold linker.
+   eerror Please select the bfd linker with 
binutils-config.
+   die GNU gold detected
+   fi
+   if use_if_iuse tokudb  [[ $(gcc-major-version) -lt 4 || \
+   $(gcc-major-version) -eq 4  $(gcc-minor-version) -lt 
7 ]] ; then
+   eerror ${PN} with tokudb needs to be built with 
gcc-4.7 or later.
+   eerror Please use gcc-config to switch to gcc-4.7 or 
later version.
+   die
+   fi
+   fi
+   if use cluster  [[ ${PN} != mysql-cluster ]]; then
+   die NDB Cluster support has been removed from all packages 
except mysql-cluster
+   fi
+}
+
 # @FUNCTION: mysql-multilib_pkg_setup
 # @DESCRIPTION:
 # Perform some basic tests and tasks during pkg_setup phase:
@@ -430,23 +455,9 @@ mysql-multilib_pkg_setup() {
enewgroup mysql 60 || die problem adding 'mysql' group
enewuser mysql 60 -1 /dev/null mysql || die problem adding 'mysql' 
user
 
-   if use cluster  [[ ${PN} != mysql-cluster ]]; then
-   ewarn Upstream has noted that the NDB cluster support in the 
5.0 and
-   ewarn 5.1 series should NOT be put into production. In the 
near
-   ewarn future, it will be disabled from building.
-   fi
-
if [[ ${PN} == mysql-cluster ]] ; then
mysql_version_is_at_least 7.2.9  java-pkg-opt-2_pkg_setup
fi
-
-   if use_if_iuse tokudb  [[ ${MERGE_TYPE} != binary  
$(gcc-major-version) -lt 4 || \
-   $(gcc-major-version) -eq 4  $(gcc-minor-version) -lt 7 ]] ; 
then
-   eerror ${PN} with tokudb needs to be built with gcc-4.7 or 
later.
-   eerror Please use gcc-config to switch to gcc-4.7 or later 
version.
-   die
-   fi
-
 }
 
 # @FUNCTION: mysql-multilib_src_unpack
@@ -479,6 +490,29 @@ mysql-multilib_src_prepare() {
 # @DESCRIPTION:
 # Configure mysql to build the code for Gentoo respecting the use flags.
 mysql-multilib_src_configure() {
+   # Bug #114895, bug #110149
+   filter-flags -O -O[01]
+
+   CXXFLAGS=${CXXFLAGS} -fno-strict-aliasing
+   CXXFLAGS=${CXXFLAGS} -felide-constructors
+   # Causes linkage failures.  Upstream bug #59607 removes it
+   if ! mysql_version_is_at_least 5.6 ; then
+   CXXFLAGS=${CXXFLAGS} -fno-implicit-templates
+   fi
+   # As of 5.7, exceptions are used!
+   if ! mysql_version_is_at_least 5.7 ; then
+   CXXFLAGS=${CXXFLAGS} -fno-exceptions -fno-rtti
+   fi
+   export CXXFLAGS
+
+   # bug #283926, with GCC4.4, this is required to get correct behavior.
+   append-flags -fno-strict-aliasing
+
+   # bug 508724 mariadb cannot use ld.gold
+   if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
+   append-ldflags $(test-flags-CXX -fuse-ld=bfd)
+   fi
+
multilib-minimal_src_configure
 }
 
@@ -558,24 +592,6 @@ multilib_src_configure() {
configure_cmake_minimal
fi
 
-   # Bug #114895, bug #110149
-   filter-flags -O -O[01]
-
-   CXXFLAGS=${CXXFLAGS} -fno-strict-aliasing
-   CXXFLAGS=${CXXFLAGS} -felide-constructors
-   # Causes linkage failures.  Upstream bug #59607 removes it
-   if ! mysql_version_is_at_least 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: a37a0a00392da91158205334ddf0a4a940be6166
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jan 28 15:49:53 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Jan 28 15:49:53 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a37a0a00

Sync headers

---
 eclass/mysql-cmake.eclass| 2 +-
 eclass/mysql-multilib.eclass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 05ff5ed..aa1fabc 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.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-cmake.eclass,v 1.26 2014/11/26 
00:34:41 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.27 2015/01/28 
13:48:58 grknight Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 1b8ead0..dc07df7 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.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-multilib.eclass,v 1.11 
2014/11/26 00:34:41 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.12 
2015/01/28 13:48:58 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 0288c405f5d71a1f77dfa342e8f8cf4bb8dfdc21
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Jan 27 03:41:33 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Jan 27 03:41:33 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0288c405

Use bundled libedit for mysql and readline (bundled or system via bindist) for 
mariadb due to UTF-8 issues

---
 eclass/mysql-multilib.eclass | 57 ++--
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 0755f99..1b8ead0 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -187,18 +187,28 @@ SLOT=0
 IUSE=+community cluster debug embedded extraengine jemalloc latin1 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
 
+### Begin readline/libedit
+### If the world was perfect, we would use external libedit on both to have a 
similar experience
+### However libedit does not seem to support UTF-8 keyboard input
+
 # This probably could be simplified, but the syntax would have to be just right
-if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
-mysql_check_version_range 5.5.37 to 10.0.13.99 ; then
-   IUSE=bindist ${IUSE}
-elif [[ ${PN} == mysql || ${PN} == percona-server ]]  \
-   mysql_check_version_range 5.5.37 to 5.6.11.99 ; then
-   IUSE=bindist ${IUSE}
-elif [[ ${PN} == mysql-cluster ]]  \
-   mysql_check_version_range 7.2 to 7.2.99.99  ; then
+#if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
+#  mysql_check_version_range 5.5.37 to 10.0.13.99 ; then
+#  IUSE=bindist ${IUSE}
+#elif [[ ${PN} == mysql || ${PN} == percona-server ]]  \
+#  mysql_check_version_range 5.5.37 to 5.6.11.99 ; then
+#  IUSE=bindist ${IUSE}
+#elif [[ ${PN} == mysql-cluster ]]  \
+#  mysql_check_version_range 7.2 to 7.2.99.99  ; then
+#  IUSE=bindist ${IUSE}
+#fi
+
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
IUSE=bindist ${IUSE}
 fi
 
+### End readline/libedit
+
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
IUSE=${IUSE} oqgraph pam sphinx tokudb
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or 
perfomance suffers
@@ -253,21 +263,31 @@ DEPEND=
systemtap? ( =dev-util/systemtap-1.3:0= )
 
 
+### Begin readline/libedit
+### If the world was perfect, we would use external libedit on both to have a 
similar experience
+### However libedit does not seem to support UTF-8 keyboard input
+
 # dev-db/mysql-5.6.12+ only works with dev-libs/libedit
 # mariadb 10.0.14 fixes libedit detection. changed to follow mysql
 # This probably could be simplified
-if [[ ${PN} == mysql || ${PN} == percona-server ]]  \
-   mysql_version_is_at_least 5.6.12 ; then
-   DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
-elif [[ ${PN} == mysql-cluster ]]  mysql_version_is_at_least 7.3; then
-   DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
-elif [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
-   mysql_version_is_at_least 10.0.14 ; then
-   DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
-else
+#if [[ ${PN} == mysql || ${PN} == percona-server ]]  \
+#  mysql_version_is_at_least 5.6.12 ; then
+#  DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
+#elif [[ ${PN} == mysql-cluster ]]  mysql_version_is_at_least 7.3; then
+#  DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
+#elif [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
+#  mysql_version_is_at_least 10.0.14 ; then
+#  DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
+#else
+#  DEPEND=${DEPEND} !bindist? ( 
=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )
+#fi
+
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
DEPEND=${DEPEND} !bindist? ( 
=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )
 fi
 
+### End readline/libedit
+
 if [[ ${PN} == mysql || ${PN} == percona-server ]] ; then
mysql_version_is_at_least 5.7.5  DEPEND=${DEPEND} 
=dev-libs/boost-1.56.0:0=
 fi
@@ -519,7 +539,8 @@ multilib_src_configure() {
)
fi
 
-   mycmakeargs+=( -DWITH_EDITLINE=system )
+   ### TODO: make this system but issues with UTF-8 prevent it
+   mycmakeargs+=( -DWITH_EDITLINE=bundled )
 
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
mycmakeargs+=(

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: f44c7967684afe750d487aaf8863dd5abda45301
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Dec 30 15:30:27 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Dec 30 15:30:27 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f44c7967

Remove the old max-idx-128 flag which is no longer used

---
 eclass/mysql-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 387b875..0755f99 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -184,7 +184,7 @@ fi
 LICENSE=GPL-2
 SLOT=0
 
-IUSE=+community cluster debug embedded extraengine jemalloc latin1 
max-idx-128 minimal
+IUSE=+community cluster debug embedded extraengine jemalloc latin1 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
 
 # This probably could be simplified, but the syntax would have to be just right

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 0ef9172664b19b1cf2afe6cf97e85d77b549de95
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Nov 26 00:35:28 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Nov 26 00:35:28 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0ef91726

Header sync

---
 eclass/mysql-cmake.eclass| 11 +++
 eclass/mysql-multilib.eclass |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 85444ee..b7f4799 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.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-cmake.eclass,v 1.25 2014/10/08 
17:25:46 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.26 2014/11/26 
00:34:41 grknight Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
@@ -218,15 +218,10 @@ configure_cmake_standard() {
)
fi
 
-   if mysql_version_is_at_least 10.0.15; then
-   # Disable mroonga until the groonga options can be 
analyzed
-   # Groonga is bundled in and lots of defaults and 
possible dep magic
-   # It can be a package on its own
-   mycmakeargs+=( -DWITHOUT_MROONGA=1 )
-   fi
-
if in_iuse mroonga ; then
use mroonga || mycmakeargs+=( -DWITHOUT_MROONGA=1 )
+   else
+   mycmakeargs+=( -DWITHOUT_MROONGA=1 )
fi
 
if in_iuse galera ; then

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 881cf3e..ba5b299 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.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-multilib.eclass,v 1.10 
2014/10/08 17:25:46 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.11 
2014/11/26 00:34:41 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: b00900f5bf615c2040d714905e766bcd14e98985
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sun Nov 23 19:58:54 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sun Nov 23 19:58:54 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b00900f5

Fix error in eclass from previous commit

---
 eclass/mysql-cmake.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 32caf80..59f1b4b 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -297,7 +297,9 @@ mysql-cmake_src_prepare() {
 
# Remove the bundled groonga if it exists
# There is no CMake flag, it simply checks for existance
-   [[ -d ${S}/storage/mroonga/vendor/groonga ]]  rm -r 
${S}/storage/mroonga/vendor/groonga || die
+   if [[ -d ${S}/storage/mroonga/vendor/groonga ]] ; then
+   rm -r ${S}/storage/mroonga/vendor/groonga || die could not 
remove packaged groonga
+   fi
 
epatch_user
 }

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: b6b2050e05ae634af772043dbc608aa7108c782f
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sun Nov 23 20:12:44 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sun Nov 23 20:12:44 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b6b2050e

Fix multilib bug in eclass where libpcre needs multilib as well.  bug 530206 
Thanks to Gef gef.kornflages AT gmail.com for reporting

---
 eclass/mysql-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 32e0e0d..881cf3e 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -282,7 +282,7 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; 
then

fi
mysql_version_is_at_least 10.0.7  DEPEND=${DEPEND} oqgraph? ( 
dev-libs/judy:0= )
-   mysql_version_is_at_least 10.0.9  DEPEND=${DEPEND} 
=dev-libs/libpcre-8.35:3=
+   mysql_version_is_at_least 10.0.9  DEPEND=${DEPEND} 
=dev-libs/libpcre-8.35:3=[${MULTILIB_USEDEP}]
 
mysql_version_is_at_least 10.1.1  DEPEND=${DEPEND}
innodb-lz4? ( app-arch/lz4 )

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 400d9bb8100719333600105bd46cacb73be02777
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sun Nov 23 01:53:24 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sun Nov 23 01:53:24 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=400d9bb8

USE=systemtap only works on native ABI.  Bug 530132.  Thanks to farmboy0 AT 
googlemail.com for the report

---
 eclass/mysql-multilib.eclass | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 51ab194..32e0e0d 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -497,9 +497,15 @@ multilib_src_configure() {
-DWITH_SSL=$(usex ssl system bundled)
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
-   $(cmake-utils_use_enable systemtap DTRACE)
)
 
+   # systemtap only works on native ABI  bug 530132
+   if multilib_is_native_abi; then
+   mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) )
+   else
+   mycmakeargs+=( -DENABLE_DTRACE=0 )
+   fi
+
if in_iuse bindist ; then
mycmakeargs+=(
-DWITH_READLINE=$(usex bindist 1 0)

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: e408529291501537df6fc54b39f337b054f9e9b3
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sun Nov 23 02:32:22 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sun Nov 23 02:32:22 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e4085292

Add some provisions for mroonga. Still force it disabled until I can work on 
adding groonga and groonga-normalizer-mysql to the tree

---
 eclass/mysql-cmake.eclass | 8 
 1 file changed, 8 insertions(+)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index df21483..32caf80 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -217,6 +217,10 @@ configure_cmake_standard() {
mycmakeargs+=( -DWITHOUT_HA_MROONGA=1 )
fi
 
+   if in_iuse mroonga ; then
+   use mroonga || mycmakeargs+=( -DWITHOUT_HA_MROONGA=1 )
+   fi
+
if in_iuse galera ; then
mycmakeargs+=( $(cmake-utils_use_with galera WSREP) )
fi
@@ -291,6 +295,10 @@ mysql-cmake_src_prepare() {
sed -i 's/ build_lzma//' 
${S}/storage/tokudb/ft-index/ft/CMakeLists.txt || die
fi
 
+   # Remove the bundled groonga if it exists
+   # There is no CMake flag, it simply checks for existance
+   [[ -d ${S}/storage/mroonga/vendor/groonga ]]  rm -r 
${S}/storage/mroonga/vendor/groonga || die
+
epatch_user
 }
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 589b9078fc13b36c13c7469a31920ce58a5eae82
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Nov 18 19:35:10 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Nov 18 19:35:10 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=589b9078

[eclass] Disable mroonga for now.  Need to look into groonga options/deps

---
 eclass/mysql-cmake.eclass | 8 
 1 file changed, 8 insertions(+)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index c57401f..df21483 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -209,6 +209,14 @@ configure_cmake_standard() {
$(cmake-utils_use odbc CONNECT_WITH_ODBC)
)
fi
+
+   if mysql_version_is_at_least 10.0.15; then
+   # Disable mroonga until the groonga options can be 
analyzed
+   # Groonga is bundled in and lots of defaults and 
possible dep magic
+   # It can be a package on its own
+   mycmakeargs+=( -DWITHOUT_HA_MROONGA=1 )
+   fi
+
if in_iuse galera ; then
mycmakeargs+=( $(cmake-utils_use_with galera WSREP) )
fi

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 1447f4e0be5a65b0c61e42b5d2db77578c570b83
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sat Oct 25 02:53:40 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sat Oct 25 02:53:40 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1447f4e0

Add additional socket variable that may be used such as in 10.1.x

---
 eclass/mysql-multilib.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index da47f85..2220101 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -493,6 +493,7 @@ multilib_src_configure() {
-DWITHOUT_LIBWRAP=1
-DENABLED_LOCAL_INFILE=1
-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+   -DINSTALL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_SSL=$(usex ssl system bundled)
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: f573da6a0f15258d2758f9b202a0d66fe34f40f3
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sat Oct 25 03:02:12 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sat Oct 25 03:02:12 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f573da6a

Add additional socket variable that may be used such as in 10.1.x

---
 eclass/mysql-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 2220101..51ab194 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -493,7 +493,7 @@ multilib_src_configure() {
-DWITHOUT_LIBWRAP=1
-DENABLED_LOCAL_INFILE=1
-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-   -DINSTALL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+   -DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_SSL=$(usex ssl system bundled)
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 01bcc9c442f1b13043196d5b1f35fcfa5ee6730a
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Oct 22 17:17:57 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Oct 22 17:17:57 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=01bcc9c4

Add another wrapped header for MariaDB 10.1

---
 eclass/mysql-multilib.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index b7ff8af..da47f85 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -364,6 +364,9 @@ PDEPEND=perl? ( =dev-perl/DBD-mysql-2.9004 )
 # my_config.h includes ABI specific data
 MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h 
/usr/include/mysql/private/embedded_priv.h )
 
+[[ ${PN} == mariadb ]]  mysql_version_is_at_least 10.1.1  \
+   MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+
 # wrap the config script
 MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 3912b1d0557bf1f5ec66ddcb96cb048d08b661d2
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Oct 21 16:37:51 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Oct 21 16:37:51 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3912b1d0

More changes for MariaDB 10.1

---
 eclass/mysql-cmake.eclass|  3 +++
 eclass/mysql-multilib.eclass | 22 --
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 1f38c70..bae11ca 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -209,6 +209,9 @@ configure_cmake_standard() {
$(cmake-utils_use odbc CONNECT_WITH_ODBC)
)
fi
+   if in_iuse galera ; then
+   mycmakeargs+=( $(cmake-utils_use_with galera WSREP) )
+   fi
fi
 
if [[ ${PN} == percona-server ]]; then

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 079c86f..0f3895b 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -207,8 +207,13 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; 
then
REQUIRED_USE=${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( 
jemalloc )
 fi
 
-if [[ ${PN} == mariadb-galera ]]; then
-   IUSE=${IUSE} +sst-rsync sst-xtrabackup
+if [[ -n ${WSREP_REVISION} ]]; then
+   if [[ ${PN} == mariadb ]]; then
+   IUSE=${IUSE} galera sst-rsync sst-xtrabackup
+   REQUIRED_USE=${REQUIRED_USE} sst-rsync? ( galera ) 
sst-xtrabackup? ( galera )
+   else
+   IUSE=${IUSE} +sst-rsync sst-xtrabackup
+   fi
 fi
 
 if [[ ${PN} == percona-server ]]; then
@@ -308,18 +313,23 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] 
; then
virtual/perl-Time-HiRes ) 
 fi
 
-if [[ ${PN} == mariadb-galera ]] ; then
+if [[ -n ${WSREP_REVISION} ]] ; then
# The wsrep API version must match between the ebuild and 
sys-cluster/galera.
# This will be indicated by WSREP_REVISION in the ebuild and the first 
number
# in the version of sys-cluster/galera
#
# lsof is required as of 5.5.38 and 10.0.11 for the rsync sst
-   RDEPEND=${RDEPEND}
-   sys-apps/iproute2
+
+   GALERA_RDEPEND=sys-apps/iproute2
=sys-cluster/galera-${WSREP_REVISION}*
+   
+   if [[ ${PN} == mariadb ]]; then
+   GALERA_RDEPEND=galera? ( ${GALERA_RDEPEND} )
+   fi
+   RDEPEND=${RDEPEND} ${GALERA_RDEPEND}
sst-rsync? ( sys-process/lsof )
sst-xtrabackup? (
-   dev-db/xtrabackup-bin
+   =dev-db/xtrabackup-bin-2.2.4
net-misc/socat[ssl]
)

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: cf4624ec566ad67130b74e1df009068a3e29822b
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Oct  8 19:25:29 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Oct  8 19:25:29 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=cf4624ec

Skip gcc version checks on binary merges

---
 eclass/mysql-multilib.eclass | 3 ++-
 eclass/mysql-v2.eclass   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 5f42d4e..079c86f 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -393,7 +393,8 @@ mysql-multilib_pkg_setup() {
mysql_version_is_at_least 7.2.9  java-pkg-opt-2_pkg_setup
fi
 
-   if use_if_iuse tokudb  [[ $(gcc-major-version) -lt 4 || 
$(gcc-major-version) -eq 4  $(gcc-minor-version) -lt 7 ]] ; then
+   if use_if_iuse tokudb  [[ ${MERGE_TYPE} != binary  
$(gcc-major-version) -lt 4 || \
+   $(gcc-major-version) -eq 4  $(gcc-minor-version) -lt 7 ]] ; 
then
eerror ${PN} with tokudb needs to be built with gcc-4.7 or 
later.
eerror Please use gcc-config to switch to gcc-4.7 or later 
version.
die

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 24e3996..f4a772b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -515,7 +515,8 @@ mysql-v2_pkg_setup() {
mysql_version_is_at_least 7.2.9  java-pkg-opt-2_pkg_setup
fi
 
-   if use_if_iuse tokudb  [[ $(gcc-major-version) -lt 4 || 
$(gcc-major-version) -eq 4  $(gcc-minor-version) -lt 7 ]] ; then
+   if use_if_iuse tokudb  [[ ${MERGE_TYPE} != binary  
$(gcc-major-version) -lt 4 || \
+   $(gcc-major-version) -eq 4  $(gcc-minor-version) -lt 7 ]] ; 
then
eerror ${PN} with tokudb needs to be built with gcc-4.7 or 
later.
eerror Please use gcc-config to switch to gcc-4.7 or later 
version.
die

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 69cb7990b68ccc0cc1209596ac536d6dccd62339
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Oct  8 17:26:58 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Oct  8 17:26:58 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=69cb7990

Sync headers

---
 eclass/mysql-cmake.eclass| 2 +-
 eclass/mysql-multilib.eclass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index da35b2e..1f38c70 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.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-cmake.eclass,v 1.24 2014/07/31 
22:26:07 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.25 2014/10/08 
17:25:46 grknight Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index cbf3fac..5f42d4e 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.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-multilib.eclass,v 1.9 
2014/09/26 17:56:29 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.10 
2014/10/08 17:25:46 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 872c20f33a28f49d485c1d52465d273cdce40858
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Sep 17 20:24:32 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Sep 17 20:24:32 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=872c20f3

Add iproute2 to mariadb-galera RDEPEND to match upstream requirements of other 
distros

---
 eclass/mysql-multilib.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 232e905..80c069b 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -315,6 +315,7 @@ if [[ ${PN} == mariadb-galera ]] ; then
#
# lsof is required as of 5.5.38 and 10.0.11 for the rsync sst
RDEPEND=${RDEPEND}
+   sys-apps/iproute2
=sys-cluster/galera-${WSREP_REVISION}*
sst_rsync? ( sys-process/lsof )
sst_xtrabackup? (

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: f80bcd317e4a94055676f5cec1eb9b1ba2fe6398
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sat Sep 13 14:21:37 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sat Sep 13 14:21:37 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f80bcd31

[eclass] Use libedit for mariadb =10.0.14 since the detection is fixed

Signed-off-by: Brian Evans grknight AT gentoo.org

---
 eclass/mysql-multilib.eclass | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index b529e47..4409f9f 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -188,7 +188,8 @@ IUSE=+community cluster debug embedded extraengine 
jemalloc latin1 max-idx-128
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
 
 # This probably could be simplified, but the syntax would have to be just right
-if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
+mysql_check_version_range 5.5.37 to 10.0.13.99 ; then
IUSE=bindist ${IUSE}
 elif [[ ${PN} == mysql || ${PN} == percona-server ]]  \
mysql_check_version_range 5.5.37 to 5.6.11.99 ; then
@@ -237,12 +238,16 @@ DEPEND=
 
 
 # dev-db/mysql-5.6.12+ only works with dev-libs/libedit
+# mariadb 10.0.14 fixes libedit detection. changed to follow mysql
 # This probably could be simplified
 if [[ ${PN} == mysql || ${PN} == percona-server ]]  \
mysql_version_is_at_least 5.6.12 ; then
DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
 elif [[ ${PN} == mysql-cluster ]]  mysql_version_is_at_least 7.3; then
DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
+elif [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
+   mysql_version_is_at_least 10.0.14 ; then
+   DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
 else
DEPEND=${DEPEND} !bindist? ( 
=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )
 fi

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 27b7d345c61d929086d632ecc3fbcaa10c6db488
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Sep  3 18:10:50 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Sep  3 18:10:50 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=27b7d345

Sync multilib dep change from tree

---
 eclass/mysql-multilib.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index d88d180..b529e47 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.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-multilib.eclass,v 1.6 
2014/08/29 18:50:39 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 
2014/09/03 13:05:50 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -240,9 +240,9 @@ DEPEND=
 # This probably could be simplified
 if [[ ${PN} == mysql || ${PN} == percona-server ]]  \
mysql_version_is_at_least 5.6.12 ; then
-   DEPEND=${DEPEND} dev-libs/libedit
+   DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
 elif [[ ${PN} == mysql-cluster ]]  mysql_version_is_at_least 7.3; then
-   DEPEND=${DEPEND} dev-libs/libedit
+   DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
 else
DEPEND=${DEPEND} !bindist? ( 
=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )
 fi

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: f3026563c50abae2f0a233dfee178c05b0a137e4
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri Aug 29 16:18:45 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri Aug 29 16:18:45 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f3026563

Revert REQUIRED_USE change to pam as it may confuse users

---
 eclass/mysql-multilib.eclass | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a9a3d75..8fe5247 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -203,12 +203,11 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; 
then
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or 
perfomance suffers
mysql_version_is_at_least 10.0.5  IUSE=${IUSE} odbc xml  \
REQUIRED_USE=odbc? ( extraengine !minimal ) xml? ( extraengine 
!minimal )
-   REQUIRED_USE=${REQUIRED_USE} minimal? ( !oqgraph !pam !sphinx ) 
tokudb? ( jemalloc )
+   REQUIRED_USE=${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( 
jemalloc )
 fi
 
 if [[ ${PN} == percona-server ]]; then
IUSE=${IUSE} pam
-   REQUIRED_USE=${REQUIRED_USE} minimal? ( !pam )
 fi
 
 REQUIRED_USE=
@@ -256,7 +255,7 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; 
then
# Bug 441700 MariaDB =5.3 include custom mytop
DEPEND=${DEPEND}
oqgraph? ( =dev-libs/boost-1.40.0:0= )
-   pam? ( virtual/pam:0= )
+   !minimal? ( pam? ( virtual/pam:0= ) )
perl? ( !dev-db/mytop )
if mysql_version_is_at_least 10.0.5 ; then
DEPEND=${DEPEND}
@@ -268,7 +267,7 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; 
then
mysql_version_is_at_least 10.0.9  DEPEND=${DEPEND} 
=dev-libs/libpcre-8.35:3=
 fi
 
-[[ ${PN} == percona-server ]]  DEPEND=${DEPEND} pam? ( virtual/pam:0= )
+[[ ${PN} == percona-server ]]  DEPEND=${DEPEND} !minimal? ( pam? ( 
virtual/pam:0= ) )
 
 # Having different flavours at the same time is not a good idea
 for i in mysql mariadb mariadb-galera percona-server mysql-cluster ; 
do

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: bba09978d54ec670a717091e93ac409e1addb60f
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri Aug 29 19:04:59 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri Aug 29 19:04:59 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=bba09978

Fix percona-server URL in mysql-multilib

---
 eclass/mysql-multilib.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 8fe5247..d88d180 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.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-multilib.eclass,v 1.5 
2014/08/17 22:50:23 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.6 
2014/08/29 18:50:39 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -136,7 +136,7 @@ if [[ -z ${SERVER_URI} ]]; then
MY_PV=$(get_version_component_range 1-3 ${PV})
PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
PERCONA_RC=$(get_version_component_range 6 ${PV})
-   
SERVER_URI=http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz;
+   
SERVER_URI=http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz;
 #  
http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-rel30.2.tar.gz
 #  
http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz
else

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: fe8a357a3ee2336c245d166118d32dc3a64d473c
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri Aug 22 18:14:17 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri Aug 22 18:14:17 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fe8a357a

[eclass] Add mysql_config to MULTILIB_CHOST_TOOLS

---
 eclass/mysql-multilib.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 8b5b75a..a9a3d75 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -332,6 +332,9 @@ PDEPEND=perl? ( =dev-perl/DBD-mysql-2.9004 )
 # my_config.h includes ABI specific data
 MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h 
/usr/include/mysql/private/embedded_priv.h )
 
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
 #
 # HELPER FUNCTIONS:
 #

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: d89c29911d3d8e83d68c3818efd849e76dd6fcee
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 21 17:53:17 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Aug 21 17:53:17 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d89c2991

Add lsof to mariadb-galera in prep of new versions. Clean up pam IUSE and dep 
for percona-server

---
 eclass/mysql-multilib.eclass | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index bdbaf92..8b5b75a 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.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-multilib.eclass,v 1.4 
2014/07/31 22:26:07 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.5 
2014/08/17 22:50:23 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -203,11 +203,12 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; 
then
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or 
perfomance suffers
mysql_version_is_at_least 10.0.5  IUSE=${IUSE} odbc xml  \
REQUIRED_USE=odbc? ( extraengine !minimal ) xml? ( extraengine 
!minimal )
-   REQUIRED_USE=${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( 
jemalloc )
+   REQUIRED_USE=${REQUIRED_USE} minimal? ( !oqgraph !pam !sphinx ) 
tokudb? ( jemalloc )
 fi
 
 if [[ ${PN} == percona-server ]]; then
IUSE=${IUSE} pam
+   REQUIRED_USE=${REQUIRED_USE} minimal? ( !pam )
 fi
 
 REQUIRED_USE=
@@ -255,7 +256,7 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; 
then
# Bug 441700 MariaDB =5.3 include custom mytop
DEPEND=${DEPEND}
oqgraph? ( =dev-libs/boost-1.40.0:0= )
-   !minimal? ( pam? ( virtual/pam:0= ) )
+   pam? ( virtual/pam:0= )
perl? ( !dev-db/mytop )
if mysql_version_is_at_least 10.0.5 ; then
DEPEND=${DEPEND}
@@ -267,6 +268,8 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; 
then
mysql_version_is_at_least 10.0.9  DEPEND=${DEPEND} 
=dev-libs/libpcre-8.35:3=
 fi
 
+[[ ${PN} == percona-server ]]  DEPEND=${DEPEND} pam? ( virtual/pam:0= )
+
 # Having different flavours at the same time is not a good idea
 for i in mysql mariadb mariadb-galera percona-server mysql-cluster ; 
do
[[ ${i} == ${PN} ]] ||
@@ -301,8 +304,11 @@ if [[ ${PN} == mariadb-galera ]] ; then
# The wsrep API version must match between the ebuild and 
sys-cluster/galera.
# This will be indicated by WSREP_REVISION in the ebuild and the first 
number
# in the version of sys-cluster/galera
+   #
+   # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst
RDEPEND=${RDEPEND}
=sys-cluster/galera-${WSREP_REVISION}*
+   sys-process/lsof

 fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 35e3a1055b9a0890b76877be2c99c788e945a60f
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 21 18:25:16 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Aug 21 18:25:16 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=35e3a105

Update v2 eclass as well for galera

---
 eclass/mysql-v2.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 607a2a4..24e3996 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -360,8 +360,11 @@ if [[ ${PN} == mariadb-galera ]] ; then
# The wsrep API version must match between the ebuild and 
sys-cluster/galera.
# This will be indicated by WSREP_REVISION in the ebuild and the first 
number
# in the version of sys-cluster/galera
+   #
+   # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst
RDEPEND=${RDEPEND}
=sys-cluster/galera-${WSREP_REVISION}*
+   sys-process/lsof

 fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: e707d9f15df18f950a340baf9237e71bb07dbe71
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Aug 19 18:40:47 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Aug 19 18:40:47 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e707d9f1

[eclass] Fix typo and systemtap support

---
 eclass/mysql-multilib.eclass | 3 ++-
 eclass/mysql-v2.eclass   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 69bf3b7..bdbaf92 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -248,7 +248,7 @@ else
 fi
 
 if [[ ${PN} == mysql || ${PN} == percona-server ]] ; then
-   mysql_verison_is_at_least 5.7.5  DEPEND=${DEPEND} 
dev-libs/boost:0=
+   mysql_version_is_at_least 5.7.5  DEPEND=${DEPEND} 
dev-libs/boost:0=
 fi
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
@@ -451,6 +451,7 @@ multilib_src_configure() {
-DWITH_SSL=$(usex ssl system bundled)
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
+   $(cmake-utils_use_enable systemtap DTRACE)
)
 
if in_iuse bindist ; then

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index bb5044e..607a2a4 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -291,7 +291,7 @@ else
 fi
 
 if [[ ${PN} == mysql || ${PN} == percona-server ]] ; then
-   mysql_verison_is_at_least 5.7.5  DEPEND=${DEPEND} dev-libs/boost
+   mysql_version_is_at_least 5.7.5  DEPEND=${DEPEND} dev-libs/boost
 fi
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then

[gentoo-commits] proj/mysql:master commit in: eclass/

[Robin H. Johnson]

commit: 86f75190b39855859d637639ce53ec33de1c7756
Author: Robin H. Johnson robbat2 AT orbis-terrarum DOT net
AuthorDate: Sun Aug 10 05:47:54 2014 +
Commit: Robin H. Johnson robbat2 AT gentoo DOT org
CommitDate: Sun Aug 10 05:47:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=86f75190

sync headers.

Signed-off-by: Robin H. Johnson robbat2 AT orbis-terrarum.net

---
 eclass/mysql-cmake.eclass| 2 +-
 eclass/mysql-multilib.eclass | 2 +-
 eclass/mysql-v2.eclass   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 925cdc5..979077d 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.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-cmake.eclass,v 1.23 2014/07/29 
17:59:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.24 2014/07/31 
22:26:07 grknight Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 8b4eb5a..58aba05 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.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-multilib.eclass,v 1.3 
2014/07/31 02:31:09 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.4 
2014/07/31 22:26:07 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index dfdc5c5..dafc0f8 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.34 2014/07/29 
20:24:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.35 2014/08/10 
05:47:24 robbat2 Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 8a8dbdfdaac4233506946089191c2954a3275384
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Jul 31 20:24:25 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Thu Jul 31 20:24:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8a8dbdfd

Remove mysql injected features and C(XX)FLAGS

---
 eclass/mysql-cmake.eclass| 2 ++
 eclass/mysql-multilib.eclass | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 8360ded..925cdc5 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -317,6 +317,8 @@ mysql-cmake_src_configure() {
-DENABLED_LOCAL_INFILE=1
$(cmake-utils_use_enable static-libs STATIC_LIBS)
-DWITH_SSL=$(usex ssl system bundled)
+   -DWITH_DEFAULT_COMPILER_OPTIONS=0
+   -DWITH_DEFAULT_FEATURE_SET=0
)
 
if in_iuse bindist ; then

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 39eed57..8b4eb5a 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -8,6 +8,7 @@
 #  - MySQL Team mysql-b...@gentoo.org
 #  - Robin H. Johnson robb...@gentoo.org
 #  - Jorge Manuel B. S. Vicetto jmbsvice...@gentoo.org
+#  - Brian Evans grkni...@gentoo.org
 # @BLURB: This eclass provides most of the functions for mysql ebuilds
 # @DESCRIPTION:
 # The mysql-multilib.eclass is the base eclass to build the mysql and
@@ -445,6 +446,8 @@ multilib_src_configure() {
-DENABLED_LOCAL_INFILE=1
-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_SSL=$(usex ssl system bundled)
+   -DWITH_DEFAULT_COMPILER_OPTIONS=0
+   -DWITH_DEFAULT_FEATURE_SET=0
)
 
if in_iuse bindist ; then

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 4214e44062954742a089b8fc470c26cc9d67e4c4
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Jul 31 02:33:49 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Thu Jul 31 02:33:49 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4214e440

Update the multilib eclass to match the work done by grobian for mysql-v2 for 
prefix.

---
 eclass/mysql-multilib.eclass | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index c79571c..39eed57 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.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-multilib.eclass,v 1.2 
2014/07/29 20:24:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.3 
2014/07/31 02:31:09 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -641,7 +641,7 @@ mysql-multilib_pkg_config() {
local old_MY_DATADIR=${MY_DATADIR}
local old_HOME=${HOME}
# my_print_defaults needs to read stuff in $HOME/.my.cnf
-   export HOME=/root
+   export HOME=${EPREFIX}/root
 
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -692,11 +692,11 @@ mysql-multilib_pkg_config() {
MYSQL_LOG_BIN=$(mysql-multilib_getoptval mysqld log-bin)
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
-   if [[ ! -d ${EROOT}/$MYSQL_TMPDIR ]]; then
+   if [[ ! -d ${ROOT}/$MYSQL_TMPDIR ]]; then
einfo Creating MySQL tmpdir $MYSQL_TMPDIR
install -d -m 770 -o mysql -g mysql ${EROOT}/$MYSQL_TMPDIR
fi
-   if [[ ! -d ${EROOT}/$MYSQL_LOG_BIN ]]; then
+   if [[ ! -d ${ROOT}/$MYSQL_LOG_BIN ]]; then
einfo Creating MySQL log-bin directory $MYSQL_LOG_BIN
install -d -m 770 -o mysql -g mysql ${EROOT}/$MYSQL_LOG_BIN
fi
@@ -718,8 +718,8 @@ mysql-multilib_pkg_config() {
 
if [ -z ${MYSQL_ROOT_PASSWORD} ]; then
 
-   einfo Please provide a password for the mysql 'root' user now, 
in the
-   einfo MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf 
file.
+   einfo Please provide a password for the mysql 'root' user now
+   einfo or through the ${HOME}/.my.cnf file.
ewarn Avoid [\'\\_%] characters in the password
read -rsp  pwd1 ; echo
 
@@ -733,9 +733,13 @@ mysql-multilib_pkg_config() {
unset pwd1 pwd2
fi
 
-   local options=--log-warnings=0
+   local options
local sqltmp=$(emktemp)
 
+   # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+   # see http://bugs.mysql.com/bug.php?id=31312
+   use prefix  options=${options} 
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'
+
local help_tables=${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql
[[ -r ${help_tables} ]] \
 cp ${help_tables} ${TMPDIR}/fill_help_tables.sql \
@@ -758,10 +762,6 @@ mysql-multilib_pkg_config() {
 
use prefix || options=${options} --user=mysql
 
-   # Fix bug 446200. Don't reference host my.cnf
-   use prefix  [[ -f ${MY_SYSCONFDIR}/my.cnf ]] \
-options=${options} 
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'
-
# MySQL 5.6+ needs InnoDB
if [[ ${PN} == mysql || ${PN} == percona-server ]] ; then
mysql_version_is_at_least 5.6 || options=${options} 
--loose-skip-innodb
@@ -782,7 +782,7 @@ mysql-multilib_pkg_config() {
#cmd='${EROOT}/usr/share/mysql/scripts/mysql_install_db' 
'--basedir=${EPREFIX}/usr' ${options}
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
-   cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'
+   cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}'
einfo Command: $cmd
eval $cmd \
${TMPDIR}/mysql_install_db.log 21
@@ -808,16 +808,16 @@ mysql-multilib_pkg_config() {
local pidfile=${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid
local mysqld=${EROOT}/usr/sbin/mysqld \
${options} \
-   --user=mysql \
+   $(use prefix || echo --user=mysql) \
--log-warnings=0 \
--basedir=${EROOT}/usr \
-   --datadir=${EROOT}/${MY_DATADIR} \
+   --datadir=${ROOT}/${MY_DATADIR} \
--max_allowed_packet=8M \
--net_buffer_length=16K \
--default-storage-engine=MyISAM \
--socket=${socket} \
--pid-file=${pidfile}
-   

[gentoo-commits] proj/mysql:master commit in: eclass/

[Robin H. Johnson]

commit: c69b8b56fcd7fec7fa1dbb50f181a4efbbc59b29
Author: Robin H. Johnson robbat2 AT orbis-terrarum DOT net
AuthorDate: Tue Jul 29 17:59:40 2014 +
Commit: Robin H. Johnson robbat2 AT gentoo DOT org
CommitDate: Tue Jul 29 17:59:40 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c69b8b56

Sync mysql eclass cvs headers from portage tree.

Signed-off-by: Robin H. Johnson robbat2 AT orbis-terrarum.net

---
 eclass/mysql-autotools.eclass | 2 +-
 eclass/mysql-cmake.eclass | 2 +-
 eclass/mysql-multilib.eclass  | 2 +-
 eclass/mysql-v2.eclass| 2 +-
 eclass/mysql.eclass   | 2 +-
 eclass/mysql_fx.eclass| 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 2c6f636..e984938 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.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-autotools.eclass,v 1.19 
2014/07/19 10:18:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.20 
2014/07/29 17:59:21 robbat2 Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index c9bb2ca..8360ded 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.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-cmake.eclass,v 1.22 2014/07/19 
10:18:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.23 2014/07/29 
17:59:21 robbat2 Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 870ba79..439b4d7 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.1 
2014/07/29 17:59:21 robbat2 Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 8c0dc31..1b316c2 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.30 2014/06/04 
01:17:11 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.33 2014/07/29 
17:59:21 robbat2 Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index bd555ce..c949e27 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.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.eclass,v 1.179 2014/07/19 
10:18:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.180 2014/07/29 
17:59:21 robbat2 Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index c62bd8c..5a28589 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.30 2012/01/09 
10:42:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.32 2014/07/29 
17:59:21 robbat2 Exp $
 
 # Author: Francesco Riosa (Retired) v...@gentoo.org
 # Maintainer:

[gentoo-commits] proj/mysql:master commit in: eclass/

[Robin H. Johnson]

commit: 2a6c561576350e048695972e92e7a72a68017b26
Author: Robin H. Johnson robbat2 AT orbis-terrarum DOT net
AuthorDate: Tue Jul 29 17:58:10 2014 +
Commit: Robin H. Johnson robbat2 AT gentoo DOT org
CommitDate: Tue Jul 29 17:58:10 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=2a6c5615

Sync eclass changes from main portage tree back, handled prefix changes.

Signed-off-by: Robin H. Johnson robbat2 AT orbis-terrarum.net

---
 eclass/mysql-autotools.eclass |  7 ---
 eclass/mysql-cmake.eclass |  3 ++-
 eclass/mysql-v2.eclass| 30 +++---
 eclass/mysql.eclass   | 22 +++---
 4 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 2cfa3f2..2c6f636 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.17 
2013/03/16 19:20:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.19 
2014/07/19 10:18:41 grobian Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:
@@ -112,7 +112,7 @@ mysql-autotools_configure_common() {
myconf=${myconf} $(use_with big-tables)
myconf=${myconf} --enable-local-infile
myconf=${myconf} --with-extra-charsets=all
-   myconf=${myconf} --with-mysqld-user=mysql
+   use prefix || myconf=${myconf} --with-mysqld-user=mysql
myconf=${myconf} --with-server
myconf=${myconf} 
--with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock
myconf=${myconf} --without-libwrap
@@ -612,6 +612,7 @@ mysql-autotools_src_install() {
-e s!= /var!= ${EPREFIX}/var! \
${FILESDIR}/${mycnf_src} \
 ${TMPDIR}/my.cnf.ok
+   use prefix  sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' 
${TMPDIR}/my.cnf.ok
if use latin1 ; then
sed -i \
-e /character-set/s|utf8|latin1|g \

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index be564c5..c9bb2ca 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.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-cmake.eclass,v 1.20 2014/05/15 
03:18:47 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.22 2014/07/19 
10:18:41 grobian Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
@@ -421,6 +421,7 @@ mysql-cmake_src_install() {
sed -e s!@DATADIR@!${MY_DATADIR}!g \
${FILESDIR}/${mycnf_src} \
 ${TMPDIR}/my.cnf.ok || die
+   use prefix  sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' 
${TMPDIR}/my.cnf.ok
if use latin1 ; then
sed -i \
-e /character-set/s|utf8|latin1|g \

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index bbbc150..8c0dc31 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -688,7 +688,7 @@ mysql-v2_pkg_config() {
local old_MY_DATADIR=${MY_DATADIR}
local old_HOME=${HOME}
# my_print_defaults needs to read stuff in $HOME/.my.cnf
-   export HOME=/root
+   export HOME=${EPREFIX}/root
 
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -739,13 +739,13 @@ mysql-v2_pkg_config() {
MYSQL_LOG_BIN=$(mysql-v2_getoptval mysqld log-bin)
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
-   if [[ ! -d ${EROOT}/$MYSQL_TMPDIR ]]; then
+   if [[ ! -d ${ROOT}/$MYSQL_TMPDIR ]]; then
einfo Creating MySQL tmpdir $MYSQL_TMPDIR
-   install -d -m 770 -o mysql -g mysql ${EROOT}/$MYSQL_TMPDIR
+   install -d -m 770 -o mysql -g mysql ${ROOT}/$MYSQL_TMPDIR
fi
-   if [[ ! -d ${EROOT}/$MYSQL_LOG_BIN ]]; then
+   if [[ ! -d ${ROOT}/$MYSQL_LOG_BIN ]]; then
einfo Creating MySQL log-bin directory $MYSQL_LOG_BIN
-   install -d -m 770 -o mysql -g mysql ${EROOT}/$MYSQL_LOG_BIN
+   install -d -m 770 -o mysql -g mysql ${ROOT}/$MYSQL_LOG_BIN
fi
if [[ ! -d ${EROOT}/$MYSQL_RELAY_LOG ]]; then
einfo Creating MySQL relay-log directory $MYSQL_RELAY_LOG
@@ -766,7 +766,7 @@ mysql-v2_pkg_config() {
if [ -z ${MYSQL_ROOT_PASSWORD} ]; then
 
einfo Please provide a password for the mysql 'root' user now, 
in the
-   einfo MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf 
file.
+   einfo MYSQL_ROOT_PASSWORD env var or through the 
${HOME}/.my.cnf file.
ewarn Avoid [\'\\_%] characters in the 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Robin H. Johnson]

commit: 699db4cdb4f9c194f59e0d53611155243af26a24
Author: Robin H. Johnson robbat2 AT orbis-terrarum DOT net
AuthorDate: Tue Jul 29 20:24:41 2014 +
Commit: Robin H. Johnson robbat2 AT gentoo DOT org
CommitDate: Tue Jul 29 20:24:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=699db4cd

sync from portage tree: git-r3 eclass support

---
 eclass/mysql-multilib.eclass | 10 +-
 eclass/mysql-v2.eclass   | 10 +-
 eclass/mysql.eclass  |  9 +
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 439b4d7..c79571c 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.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-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}
 }

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 1b316c2..fb0c3c3 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}
 }

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index c949e27..cfad07e 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.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.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 ]]  

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: a2c9bd466dc0002cf2ccdf3dd291e95b7da378b6
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jul  2 01:02:41 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Jul  2 01:02:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a2c9bd46

[eclass] sync multilib eclass

---
 eclass/mysql-multilib.eclass | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 42f965e..1c352aa 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -178,8 +178,14 @@ SLOT=0
 IUSE=+community cluster debug embedded extraengine jemalloc latin1 
max-idx-128 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
 
-if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
-   mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.38 to 
5.6.11.99 ; then
+# This probably could be simplified, but the syntax would have to be just right
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
+   IUSE=bindist ${IUSE}
+elif [[ ${PN} == mysql || ${PN} == percona-server ]]  \
+   mysql_check_version_range 5.5.37 to 5.6.11.99 ; then
+   IUSE=bindist ${IUSE}
+elif [[ ${PN} == mysql-cluster ]]  \
+   mysql_check_version_range 7.2 to 7.2.99.99  ; then
IUSE=bindist ${IUSE}
 fi
 
@@ -222,8 +228,12 @@ DEPEND=
 
 
 # dev-db/mysql-5.6.12+ only works with dev-libs/libedit
-if [[ ${PN} == mysql || ${PN} == percona-server ]]  
mysql_version_is_at_least 5.6.12 ; then
-   DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
+# This probably could be simplified
+if [[ ${PN} == mysql || ${PN} == percona-server ]]  \
+   mysql_version_is_at_least 5.6.12 ; then
+   DEPEND=${DEPEND} dev-libs/libedit
+elif [[ ${PN} == mysql-cluster ]]  mysql_version_is_at_least 7.3; then
+   DEPEND=${DEPEND} dev-libs/libedit
 else
DEPEND=${DEPEND} !bindist? ( 
=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )
 fi

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 198abde0a12843f8ab960d0035dea48601a0abb0
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Jun 19 17:33:24 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu Jun 19 17:33:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=198abde0

[eclass] fix for percona-server

---
 eclass/mysql-v2.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 9c4e8fa..fa28364 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -210,7 +210,7 @@ esac
 IUSE=${IUSE} latin1 extraengine cluster max-idx-128 +community profiling
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
-   mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.38 to 
5.6.11.99 ; then
+   mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.37 to 
5.6.11.99 ; then
IUSE=bindist ${IUSE}
 fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 7f42ea9df4201819e43855eea10fb9ebb15c8649
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jun 18 19:46:07 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Jun 18 19:46:07 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7f42ea9d

[eclass] Add IUSE='bindist' for bug 513710. Needs more testing

---
 eclass/mysql-cmake.eclass| 11 ++-
 eclass/mysql-multilib.eclass | 17 +++--
 eclass/mysql-v2.eclass   | 11 ++-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index a80680a..908e66e 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -301,7 +301,6 @@ mysql-cmake_src_configure() {
-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-DWITH_COMMENT=Gentoo Linux ${PF}
$(cmake-utils_use_with test UNIT_TESTS)
-   -DWITH_READLINE=0
-DWITH_LIBEDIT=0
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
@@ -312,14 +311,16 @@ mysql-cmake_src_configure() {
 
if [[ ${PN} == mysql || ${PN} == percona-server ]]  
mysql_version_is_at_least 5.6.12 ; then
mycmakeargs+=( -DWITH_EDITLINE=system )
+   else
+   mycmakeargs+=(
+   -DWITH_READLINE=$(usex bindist 1 0)
+   -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+   $(usex bindist -DHAVE_BFD_H=0 '')
+   )
fi
 
-   # Bug 412851
-   # MariaDB requires NOT_FOR_DISTRIBUTION set to compile with GPLv3 
readline linked
-   # Adds a warning about redistribution to configure
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
mycmakeargs+=(
-   -DNOT_FOR_DISTRIBUTION=1
-DWITH_JEMALLOC=$(usex jemalloc system)
)
mysql_version_is_at_least 10.0.9  mycmakeargs+=( 
-DWITH_PCRE=system )

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index feb9ba5..fa2ab52 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -178,6 +178,10 @@ SLOT=0
 IUSE=+community cluster debug embedded extraengine jemalloc latin1 
max-idx-128 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
 
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] || 
mysql_check_version_range 5.5.38 to 5.6.11.99 ; then
+   IUSE=bindist ${IUSE}
+fi
+
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
IUSE=${IUSE} oqgraph pam sphinx tokudb
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or 
perfomance suffers
@@ -220,7 +224,7 @@ DEPEND=
 if [[ ${PN} == mysql || ${PN} == percona-server ]]  
mysql_version_is_at_least 5.6.12 ; then
DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
 else
-   DEPEND=${DEPEND} =sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}]
+   DEPEND=${DEPEND} !bindist? ( 
=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )
 fi
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
@@ -417,7 +421,6 @@ multilib_src_configure() {
-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-DWITH_COMMENT=Gentoo Linux ${PF}
$(cmake-utils_use_with test UNIT_TESTS)
-   -DWITH_READLINE=0
-DWITH_LIBEDIT=0
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
@@ -428,15 +431,17 @@ multilib_src_configure() {
 
if [[ ${PN} == mysql || ${PN} == percona-server ]]  
mysql_version_is_at_least 5.6.12 ; then
mycmakeargs+=( -DWITH_EDITLINE=system )
+   else
+   mycmakeargs+=(
+   -DWITH_READLINE=$(usex bindist 1 0)
+   -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+   $(usex bindist -DHAVE_BFD_H=0)
+   )
fi
 
 
-   # Bug 412851
-   # MariaDB requires this flag to compile with GPLv3 readline linked
-   # Adds a warning about redistribution to configure
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
mycmakeargs+=(
-   -DNOT_FOR_DISTRIBUTION=1
-DWITH_JEMALLOC=$(usex jemalloc system)
)
 

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f0c919a..9c4e8fa 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -209,6 +209,11 @@ esac
 # Common IUSE
 IUSE=${IUSE} latin1 extraengine cluster max-idx-128 +community profiling
 
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
+   mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.38 to 
5.6.11.99 ; then
+   IUSE=bindist ${IUSE}
+fi
+
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
mysql_check_version_range 5.1.38 to 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: b1bd20fde61bf8404a259f45413ea4a7eccfc6a5
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Jun 19 01:35:28 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu Jun 19 01:35:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b1bd20fd

[eclass] Fix up missing parameter in multilib

---
 eclass/mysql-multilib.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index fa2ab52..53df055 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -178,7 +178,8 @@ SLOT=0
 IUSE=+community cluster debug embedded extraengine jemalloc latin1 
max-idx-128 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
 
-if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] || 
mysql_check_version_range 5.5.38 to 5.6.11.99 ; then
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  \
+   mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.38 to 
5.6.11.99 ; then
IUSE=bindist ${IUSE}
 fi
 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: 623f3c3838de2dddf7c5949f4e5ec47bd5a083b5
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Mon May 19 16:23:57 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon May 19 17:01:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=623f3c38

[eclass] Force tmpdir to make sure the portage directory is not used

---
 eclass/mysql-multilib.eclass | 7 ---
 eclass/mysql-v2.eclass   | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 9b660d9..1f664cb 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -750,7 +750,7 @@ mysql-multilib_pkg_config() {
#cmd='${EROOT}/usr/share/mysql/scripts/mysql_install_db' 
'--basedir=${EPREFIX}/usr' ${options}
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
-   cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options}
+   cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'
einfo Command: $cmd
eval $cmd \
${TMPDIR}/mysql_install_db.log 21
@@ -779,12 +779,13 @@ mysql-multilib_pkg_config() {
--user=mysql \
--log-warnings=0 \
--basedir=${EROOT}/usr \
-   --datadir=${ROOT}/${MY_DATADIR} \
+   --datadir=${EROOT}/${MY_DATADIR} \
--max_allowed_packet=8M \
--net_buffer_length=16K \
--default-storage-engine=MyISAM \
--socket=${socket} \
-   --pid-file=${pidfile}
+   --pid-file=${pidfile}
+   --tmpdir=${EROOT}/${MYSQL_TMPDIR}
#einfo About to start mysqld: ${mysqld}
ebegin Starting mysqld
einfo Command ${mysqld}

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3a9954a..a1558de 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -802,7 +802,7 @@ mysql-v2_pkg_config() {
#cmd='${EROOT}/usr/share/mysql/scripts/mysql_install_db' 
'--basedir=${EPREFIX}/usr' ${options}
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
-   cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${EROOT}/${MY_DATADIR}'
+   cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options} 
'--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'
einfo Command: $cmd
eval $cmd \
${TMPDIR}/mysql_install_db.log 21
@@ -831,12 +831,13 @@ mysql-v2_pkg_config() {
--user=mysql \
--log-warnings=0 \
--basedir=${EROOT}/usr \
-   --datadir=${ROOT}/${MY_DATADIR} \
+   --datadir=${EROOT}/${MY_DATADIR} \
--max_allowed_packet=8M \
--net_buffer_length=16K \
--default-storage-engine=MyISAM \
--socket=${socket} \
-   --pid-file=${pidfile}
+   --pid-file=${pidfile}
+   --tmpdir=${EROOT}/${MYSQL_TMPDIR}
#einfo About to start mysqld: ${mysqld}
ebegin Starting mysqld
einfo Command ${mysqld}

[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/percona-server/files/

[Brian Evans]

commit: c0234f337290cc18f77137a11bc569e784e260ed
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sat May 17 00:57:27 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Sat May 17 00:57:27 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c0234f33

Updates wrt bug 510518

---
 dev-db/percona-server/files/my.cnf-5.6 | 153 -
 eclass/mysql-cmake.eclass  |   6 +-
 2 files changed, 3 insertions(+), 156 deletions(-)

diff --git a/dev-db/percona-server/files/my.cnf-5.6 
b/dev-db/percona-server/files/my.cnf-5.6
deleted file mode 100644
index f43d535..000
--- a/dev-db/percona-server/files/my.cnf-5.6
+++ /dev/null
@@ -1,153 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration 
file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 
2013/01/20 02:40:02 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password  = your_password
-port   = 3306
-socket = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log= 
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server   = utf8
-user   = mysql
-port   = 3306
-socket = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file   = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error  = 
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir= @DATADIR@
-skip-external-locking
-key_buffer = 16M
-max_allowed_packet = 1M
-table_open_cache   = 64
-sort_buffer_size   = 512K
-net_buffer_length  = 8K
-read_buffer_size   = 256K
-read_rnd_buffer_size   = 512K
-myisam_sort_buffer_size= 8M
-lc_messages_dir= 
@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages= en_US
-
-# security:
-# using localhost in connects uses sockets by default
-# skip-networking
-bind-address   = 127.0.0.1
-
-log-bin
-server-id  = 1
-
-# point the following paths to different dedicated disks
-tmpdir = 
@GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update= 
@GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql 
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log   = 
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug = d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size= 4M
-#bdb_max_lock  = 1
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have 

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: c7af718971fefb74b1622dedf982997622c396b3
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu May 15 18:07:18 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu May 15 18:07:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c7af7189

[eclass] Percona has renamed libmysqlclient to libperconaserverclient.  Use 
symlinks to compensate

---
 eclass/mysql-cmake.eclass | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 2102845..abf0da5 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -458,4 +458,15 @@ mysql-cmake_src_install() {
#Remove mytop if perl is not selected
[[ ${PN} == mariadb || ${PN} == mariadb-galera ]]  ! use perl \
 rm -f ${ED}/usr/bin/mytop
+
+   # Percona has decided to rename libmysqlclient to libperconaserverclient
+   # Use a symlink to preserve linkages for those who don't use 
mysql_config
+   if [[ ${PN} == percona-server ]]  mysql_version_is_at_least 
5.5.36 ; then
+   dosym libperconaserverclient.so 
/usr/$(get_libdir)/libmysqlclient.so
+   dosym libperconaserverclient.so 
/usr/$(get_libdir)/libmysqlclient_r.so
+   if use static-libs ; then
+   dosym libperconaserverclient.a 
/usr/$(get_libdir)/libmysqlclient.a
+   dosym libperconaserverclient.a 
/usr/$(get_libdir)/libmysqlclient_r.a
+   fi
+   fi
 }

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: e0c1f075fa35a2b66d2bdb37ebaa6befdb1c9b47
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri May 16 00:24:48 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Fri May 16 00:24:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e0c1f075

[eclass] Dont block emul-linux-x86-db unless abi_x86_32 is enabled

---
 eclass/mysql-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 10281c4..9b660d9 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -259,7 +259,7 @@ fi
 RDEPEND=${DEPEND}
!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
selinux? ( sec-policy/selinux-mysql )
-   !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+   abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
 
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then

[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit: f4b7a8e89e418911e6af95b06c1139afb10cb0b4
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed May 14 13:36:25 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed May 14 13:36:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f4b7a8e8

[eclass] Rework multilib eclass to use multilib-minimal as a base

---
 eclass/mysql-cmake.eclass|   2 +-
 eclass/mysql-multilib.eclass | 232 +++
 2 files changed, 101 insertions(+), 133 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 4109732..a9c743d 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -415,7 +415,7 @@ mysql-cmake_src_install() {
esac
einfo Building default my.cnf (${mysql_mycnf_version})
insinto ${MY_SYSCONFDIR#${EPREFIX}}
-   doins scripts/mysqlaccess.conf
+   doins ${S}/scripts/mysqlaccess.conf
mycnf_src=my.cnf-${mysql_mycnf_version}
sed -e s!@DATADIR@!${MY_DATADIR}!g \
${FILESDIR}/${mycnf_src} \

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 2bc09b1..b548e40 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -27,7 +27,7 @@ MYSQL_EXTRAS=
 [[ ${MY_EXTRAS_VER} == live ]]  MYSQL_EXTRAS=git-2
 
 inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
-   toolchain-funcs user cmake-utils multilib-build
+   toolchain-funcs user cmake-utils multilib-minimal
 
 #
 # Supported EAPI versions and export functions
@@ -157,7 +157,7 @@ if [[ ${MY_EXTRAS_VER} != live  ${MY_EXTRAS_VER} != 
none ]]; then

http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
 fi
 
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 HOMEPAGE=http://www.mysql.com/;
 if [[ ${PN} == mariadb ]]; then
HOMEPAGE=http://mariadb.org/;
@@ -174,7 +174,7 @@ fi
 LICENSE=GPL-2
 SLOT=0
 
-IUSE=+community cluster debug embedded extraengine jemalloc latin1 
max-idx-128 minimal 
+IUSE=+community cluster debug embedded extraengine jemalloc latin1 
max-idx-128 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
@@ -224,7 +224,7 @@ fi
 
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
# Bug 441700 MariaDB =5.3 include custom mytop
-   DEPEND=${DEPEND} 
+   DEPEND=${DEPEND}
oqgraph? ( =dev-libs/boost-1.40.0:0= )
sphinx? ( app-misc/sphinx:0= )
!minimal? ( pam? ( virtual/pam:0= ) )
@@ -273,7 +273,7 @@ if [[ ${PN} == mariadb-galera ]] ; then
# The wsrep API version must match between the ebuild and 
sys-cluster/galera.
# This will be indicated by WSREP_REVISION in the ebuild and the first 
number
# in the version of sys-cluster/galera
-   RDEPEND=${RDEPEND} 
+   RDEPEND=${RDEPEND}
=sys-cluster/galera-${WSREP_REVISION}*

 fi
@@ -381,157 +381,125 @@ mysql-multilib_src_prepare() {
 # @DESCRIPTION:
 # Configure mysql to build the code for Gentoo respecting the use flags.
 mysql-multilib_src_configure() {
+   multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+
debug-print-function ${FUNCNAME} $@
 
-   _mysql-multilib_src_configure() {
-
-   debug-print-function ${FUNCNAME} $@
-
-   CMAKE_BUILD_TYPE=RelWithDebInfo
-
-   # debug hack wrt #497532
-   mycmakeargs=(
-   -DCMAKE_C_FLAGS_RELWITHDEBINFO=$(usex debug  
-DNDEBUG)
-   -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(usex debug  
-DNDEBUG)
-   -DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-   -DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-   -DSYSCONFDIR=${EPREFIX}/etc/mysql
-   -DINSTALL_BINDIR=bin
-   -DINSTALL_DOCDIR=share/doc/${P}
-   -DINSTALL_DOCREADMEDIR=share/doc/${P}
-   -DINSTALL_INCLUDEDIR=include/mysql
-   -DINSTALL_INFODIR=share/info
-   -DINSTALL_LIBDIR=$(get_libdir)
-   -DINSTALL_ELIBDIR=$(get_libdir)/mysql
-   -DINSTALL_MANDIR=share/man
-   -DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
-   -DINSTALL_MYSQLSHAREDIR=share/mysql
-   -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
-   -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-   -DINSTALL_SBINDIR=sbin
-   -DINSTALL_SCRIPTDIR=share/mysql/scripts
-   -DINSTALL_SQLBENCHDIR=share/mysql
-