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

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

[Jorge Manuel B. S. Vicetto]

commit:     ec95b5c4a46af091a74281536472b1985260da66
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 01:05:32 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 01:05:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ec95b5c4

Don't declare MYSQL_ROOT_PASSWORD as a local var and improve the message about how to specify the root password by mentioning the use of /root/.my.cnf.
Fixes bug 356885.

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

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 2800c4c..0589238 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1315,7 +1315,6 @@ mysql_pkg_config() {
 
 	local pwd1="a"
 	local pwd2="b"
-	local MYSQL_ROOT_PASSWORD=''
 	local maxtry=15
 
 	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
@@ -1335,8 +1334,8 @@ mysql_pkg_config() {
 
 	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
 
-		einfo "Please provide a password for the mysql 'root' user now,"
-		einfo "or in the MYSQL_ROOT_PASSWORD env var."
+		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."
 		ewarn "Avoid [\"'\\_%] characters in the password"
 		read -rsp "    >" pwd1 ; echo
 

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

[Jorge Manuel B. S. Vicetto]

commit:     af23826d43e6c46ca842a93fc44808aa1762547b
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 22:07:45 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 22:07:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=af23826d

Fix mysql_lib_symlinks.

---
 eclass/mysql_fx.eclass |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index 25b7da4..7a6792f 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -184,32 +184,41 @@ mysql_version_is_at_least() {
 # library to the best version available.
 #
 mysql_lib_symlinks() {
+
 	local d dirlist maxdots libname libnameln libsuffix reldir
 	libsuffix=$(get_libname)
-	einfo "Updating MySQL ${libsuffix} symlinks"
+
+	ewarn "libsuffix = ${libsuffix}"
+	ewarn "Updating MySQL libraries symlinks"
+
 	reldir="${1}"
 	pushd "${reldir}/usr/$(get_libdir)" &> /dev/null
-		# dirlist must contain the less significative directory left
-		dirlist="mysql"
-
-		# waste some time in removing and recreating symlinks
-		for d in $dirlist ; do
-			for libname in $( find "${d}" -name "*.${libsuffix}*" -and -not -type "l" 2>/dev/null ) ; do
-				# maxdot is a limit versus infinite loop
-				maxdots=0
-				libnameln=${libname##*/}
-				# loop in version of the library to link it, similar to how
-				# libtool works
-				while [[ ${libnameln:0-3} != '${libsuffix}' ]] && [[ ${maxdots} -lt 6 ]] ; do
-					rm -f "${libnameln}"
-					ln -s "${libname}" "${libnameln}"
-					(( ++maxdots ))
-					libnameln="${libnameln%.*}"
-				done
+
+	# dirlist must contain the less significative directory left
+	dirlist="mysql"
+
+	# waste some time in removing and recreating symlinks
+	for d in $dirlist ; do
+		for libname in $( find "${d}" -name "*${libsuffix}*" -and -not -type "l" 2>/dev/null ) ; do
+			# maxdot is a limit versus infinite loop
+			maxdots=0
+			libnameln=${libname##*/}
+			# loop in version of the library to link it, similar to how
+			# libtool works
+			while [[ ${libnameln:0-3} != '${libsuffix}' ]] && [[ ${maxdots} -lt 6 ]] ; do
 				rm -f "${libnameln}"
 				ln -s "${libname}" "${libnameln}"
+				(( ++maxdots ))
+				libnameln="${libnameln%.*}"
 			done
+			rm -f "${libnameln}"
+			ln -s "${libname}" "${libnameln}"
+
+			ewarn "ln -s ${libname} ${libnameln}"
+
 		done
+	done
+
 	popd &> /dev/null
 }
 

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

[Jorge Manuel B. S. Vicetto]

commit:     f0a97e237807ac69adcc63bbea7062b170f17e0e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 22:53:07 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 22:53:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f0a97e23

Apply the fix for bug 356885 again as it was lost during the branch work.
Call mysql_lib_symlinks as we decided to keep the symlinks in place.

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index ea33cb0..4beeee3 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -439,4 +439,6 @@ mysql-cmake_src_install() {
 #		done
 #
 #	fi
+
+	mysql_lib_symlinks "${D}"
 }

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 03ddbd0..f0ad6ad 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -578,7 +578,6 @@ mysql-v2_pkg_config() {
 
 	local pwd1="a"
 	local pwd2="b"
-	local MYSQL_ROOT_PASSWORD=''
 	local maxtry=15
 
 	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
@@ -598,8 +597,8 @@ mysql-v2_pkg_config() {
 
 	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
 
-		einfo "Please provide a password for the mysql 'root' user now,"
-		einfo "or in the MYSQL_ROOT_PASSWORD env var."
+		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."
 		ewarn "Avoid [\"'\\_%] characters in the password"
 		read -rsp "    >" pwd1 ; echo
 

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

[Jorge Manuel B. S. Vicetto]

commit:     800cf55b6ebc50b9f8508072014e5cddf72689ab
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 22:32:11 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 22:32:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=800cf55b

Fix the ncurses dep as the stable versions don't have the static-libs dep.
Revert the change to the ownership and permissions of the log dir - needs upstream work.

---
 eclass/mysql-v2.eclass |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 6e31171..3de544e 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -231,12 +231,14 @@ IUSE="${IUSE} berkdb"
 
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
-		userland_GNU? ( sys-process/procps )
-		>=sys-apps/sed-4
-		>=sys-apps/texinfo-4.7-r1
-		>=sys-libs/readline-4.1
-		>=sys-libs/zlib-1.2.3"
+DEPEND="
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	userland_GNU? ( sys-process/procps )
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	>=sys-libs/readline-4.1
+	>=sys-libs/zlib-1.2.3
+"
 
 [[ "${PN}" == "mariadb" ]] \
 && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
@@ -252,6 +254,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-mysql )
 "
 
+DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
+
 # compile-time-only
 mysql_version_is_at_least "5.1.12" \
 && DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
@@ -491,8 +495,8 @@ mysql-v2_pkg_postinst() {
 
 	# Secure the logfiles
 	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
-	chown root:mysql "${ROOT}${MY_LOGDIR}"/mysql*
-	chmod 0640 "${ROOT}${MY_LOGDIR}"/mysql*
+	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
+	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
 
 	# Minimal builds don't have the MySQL server
 	if ! use minimal ; then

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

[Jorge Manuel B. S. Vicetto]

commit:     6e9267491acc714207ecc9dc2cd89718d440bba0
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 03:53:01 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 03:53:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6e926749

Added eclass support for the patch to fix the hardcoded library paths.

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 0895110..f0ccd66 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -591,6 +591,7 @@ mysql-autotools_src_configure() {
 		--enable-thread-safe-client \
 		--with-comment="Gentoo Linux ${PF}" \
 		--without-docs \
+		--with-LIBDIR="$(get_libdir)" \
 		${myconf} || die "econf failed"
 
 	# TODO: Move this before autoreconf !!!

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 0589238..5cf3bce 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1030,7 +1030,7 @@ mysql_src_configure() {
 
 	# bug #283926, with GCC4.4, this is required to get correct behavior.
 	append-flags -fno-strict-aliasing
-	
+
 	# bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
 	# causes a mis-compile.
 	# Upstream bugs:
@@ -1052,6 +1052,7 @@ mysql_src_configure() {
 		--enable-thread-safe-client \
 		--with-comment="Gentoo Linux ${PF}" \
 		--without-docs \
+		--with-LIBDIR="$(get_libdir)" \
 		${myconf} || die "econf failed"
 
 	# TODO: Move this before autoreconf !!!

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

[Robin H. Johnson]

commit:     eb391f5bed5fd3211dbd255814d158cee3c66fd4
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 05:28:58 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 05:28:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=eb391f5b

Fix argument passing to old functions.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3de544e..8e64608 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -341,18 +341,15 @@ xtradb_patch_available \
 # @DESCRIPTION:
 # Helper function to disable specific tests.
 mysql_disable_test() {
-
-	${BUILD_INHERIT}_disable_test
+	${BUILD_INHERIT}_disable_test "$@"
 }
 
 configure_minimal() {
-
-	${BUILD_INHERIT}_configure_minimal
+	${BUILD_INHERIT}_configure_minimal "$@"
 }
 
 configure_common() {
-
-	${BUILD_INHERIT}_configure_common
+	${BUILD_INHERIT}_configure_common "$@"
 }
 
 #
@@ -441,32 +438,28 @@ mysql-v2_src_unpack() {
 # @DESCRIPTION:
 # Apply patches to the source code and remove unneeded bundled libs.
 mysql-v2_src_prepare() {
-
-	${BUILD_INHERIT}_src_prepare
+	${BUILD_INHERIT}_src_prepare "$@"
 }
 
 # @FUNCTION: mysql-v2_src_configure
 # @DESCRIPTION:
 # Configure mysql to build the code for Gentoo respecting the use flags.
 mysql-v2_src_configure() {
-
-	${BUILD_INHERIT}_src_configure
+	${BUILD_INHERIT}_src_configure "$@"
 }
 
 # @FUNCTION: mysql-v2_src_compile
 # @DESCRIPTION:
 # Compile the mysql code.
 mysql-v2_src_compile() {
-
-	${BUILD_INHERIT}_src_compile
+	${BUILD_INHERIT}_src_compile "$@"
 }
 
 # @FUNCTION: mysql-v2_src_install
 # @DESCRIPTION:
 # Install mysql.
 mysql-v2_src_install() {
-
-	${BUILD_INHERIT}_src_install
+	${BUILD_INHERIT}_src_install "$@"
 }
 
 # @FUNCTION: mysql-v2_pkg_preinst

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

[Robin H. Johnson]

commit:     3570c9b45e392fb1cdb4b22d93ac2695467bbc47
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 17:33:42 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 17:33:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3570c9b4

Fix up function names so that mysql-v2 can find them for correct building.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 eclass/mysql-autotools.eclass |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index f0ccd66..aeda0f6 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -37,7 +37,7 @@ mysql-autotools_disable_test() {
 	testname="${rawtestname/*.}"
 	mysql_disable_file="${S}/mysql-test/t/disabled.def"
 	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-	echo ${testname} : ${reason} >> "${mysql_disable_file}"
+	echo "${testname} : ${reason}" >> "${mysql_disable_file}"
 
 	# ${S}/mysql-tests/t/disabled.def
 	#
@@ -66,7 +66,7 @@ mysql-autotools_disable_test() {
 	fi
 }
 
-configure_minimal() {
+mysql-autotools_configure_minimal() {
 
 	# These are things we exclude from a minimal build, please
 	# note that the server actually does get built and installed,
@@ -95,7 +95,7 @@ configure_minimal() {
 	fi
 }
 
-configure_common() {
+mysql-autotools_configure_common() {
 
 	myconf="${myconf} $(use_with big-tables)"
 	myconf="${myconf} --enable-local-infile"
@@ -146,7 +146,7 @@ configure_common() {
 
 }
 
-configure_40_41_50() {
+mysql-autotools_configure_40_41_50() {
 
 	myconf="${myconf} $(use_with perl bench)"
 	myconf="${myconf} --enable-assembler"
@@ -225,7 +225,7 @@ configure_40_41_50() {
 	&& myconf="${myconf} --with-max-indexes=128"
 }
 
-configure_51() {
+mysql-autotools_configure_51() {
 
 	# TODO: !!!! readd --without-readline
 	# the failure depend upon config/ac-macros/readline.m4 checking into
@@ -539,13 +539,13 @@ mysql-autotools_src_configure() {
 	local myconf=""
 
 	if use minimal ; then
-		configure_minimal
+		mysql-autotools_configure_minimal
 	else
-		configure_common
+		mysql-autotools_configure_common
 		if mysql_version_is_at_least "5.1.10" ; then
-			configure_51
+			mysql-autotools_configure_51
 		else
-			configure_40_41_50
+			mysql-autotools_configure_40_41_50
 		fi
 	fi
 

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

[Jorge Manuel B. S. Vicetto]

commit:     7cd4cedb1dcade2a63018fc82a2622606c524126
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 10:46:49 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 10:46:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7cd4cedb

Updated eclasses following review by Ulrich Mueller in the gentoo-dev ml.

---
 eclass/mysql-autotools.eclass |   26 +++++++---
 eclass/mysql-cmake.eclass     |   17 ++++--
 eclass/mysql-v2.eclass        |  105 +++++++++++++++++++++++-----------------
 3 files changed, 90 insertions(+), 58 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index aeda0f6..d6eb3e1 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# @ECLASS: mysql.eclass
+# @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:
 # Author: Francesco Riosa (Retired) <vivo@gentoo.org>
 # Maintainers:
@@ -10,12 +10,12 @@
 #	- Robin H. Johnson <robbat2@gentoo.org>
 #	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
 #	- Luca Longinotti <chtekk@gentoo.org>
-# @BLURB: This eclass provides most of the functions for mysql ebuilds
+# @BLURB: This eclass provides support for autotools based mysql releases
 # @DESCRIPTION:
-# The mysql.eclass provides almost all the code to build the mysql ebuilds
-# including the src_unpack, src_prepare, src_configure, src_compile,
-# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
+# The mysql-autotools.eclass provides the support to build the mysql
+# ebuilds using the autotools build system. This eclass provides
+# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
+# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
 
 inherit autotools
 
@@ -23,7 +23,7 @@ inherit autotools
 # HELPER FUNCTIONS:
 #
 
-# @FUNCTION: mysql_disable_test
+# @FUNCTION: mysql-autotools_disable_test
 # @DESCRIPTION:
 # Helper function to disable specific tests.
 mysql-autotools_disable_test() {
@@ -66,6 +66,9 @@ mysql-autotools_disable_test() {
 	fi
 }
 
+# @FUNCTION: mysql-autotools_configure_minimal
+# @DESCRIPTION:
+# Helper function to configure a minimal build
 mysql-autotools_configure_minimal() {
 
 	# These are things we exclude from a minimal build, please
@@ -95,6 +98,9 @@ mysql-autotools_configure_minimal() {
 	fi
 }
 
+# @FUNCTION: mysql-autotools_configure_common
+# @DESCRIPTION:
+# Helper function to configure the common builds
 mysql-autotools_configure_common() {
 
 	myconf="${myconf} $(use_with big-tables)"
@@ -146,6 +152,9 @@ mysql-autotools_configure_common() {
 
 }
 
+# @FUNCTION: mysql-autotools_configure_40_41_50
+# @DESCRIPTION:
+# Helper function to configure 4.0, 4.1 and 5.0 builds
 mysql-autotools_configure_40_41_50() {
 
 	myconf="${myconf} $(use_with perl bench)"
@@ -225,6 +234,9 @@ mysql-autotools_configure_40_41_50() {
 	&& myconf="${myconf} --with-max-indexes=128"
 }
 
+# @FUNCTION: mysql-autotools_configure_51
+# @DESCRIPTION:
+# Helper function to configure 5.1 and later builds
 mysql-autotools_configure_51() {
 
 	# TODO: !!!! readd --without-readline

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 4beeee3..97a9a74 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -2,16 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# @ECLASS: mysql.cmake.eclass
+# @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
 # Maintainers:
 #	- MySQL Team <mysql-bugs@gentoo.org>
 #	- Robin H. Johnson <robbat2@gentoo.org>
 #	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-# @BLURB: This eclass provides the cmake supporting functions for mysql ebuilds
+# @BLURB: This eclass provides the support for cmake based mysql releases
 # @DESCRIPTION:
-# The mysql-cmake.eclass provides provides the cmake specific code
-# for mysql ebuilds.
+# The mysql-cmake.eclass provides the support to build the mysql
+# ebuilds using the cmake build system. This eclass provides
+# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
+# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
 
 inherit cmake-utils
 
@@ -92,7 +94,7 @@ configure_cmake_locale() {
 
 # @FUNCTION: configure_cmake_minimal
 # @DESCRIPTION:
-# Helper function to configure minimal install
+# Helper function to configure minimal build
 configure_cmake_minimal() {
 
 	mycmakeargs+=(
@@ -113,7 +115,7 @@ configure_cmake_minimal() {
 
 # @FUNCTION: configure_cmake_standard
 # @DESCRIPTION:
-# Helper function to configure standard install
+# Helper function to configure standard build
 configure_cmake_standard() {
 
 	mycmakeargs+=(
@@ -145,6 +147,9 @@ configure_cmake_standard() {
 	fi
 }
 
+# @FUNCTION: configure_51
+# @DESCRIPTION:
+# Helper function to configure 5.1 and later builds
 configure_51() {
 
 	# This is an explict die here, because if we just forcibly disable it, then the

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 8e64608..6ddb13a 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# @ECLASS: mysql.eclass
+# @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
 # Maintainers:
 #	- MySQL Team <mysql-bugs@gentoo.org>
@@ -10,8 +10,11 @@
 #	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
 # @BLURB: This eclass provides most of the functions for mysql ebuilds
 # @DESCRIPTION:
-# The mysql.eclass provides almost all the code to build the mysql ebuilds
-# including the src_unpack, src_prepare, src_configure, src_compile,
+# The mysql-v2.eclass is the base eclass to build the mysql and
+# alternative projects (mariadb) ebuilds.
+# This eclass uses the mysql-autotools and mysql-cmake eclasses for the
+# specific bits related to the build system.
+# It provides the src_unpack, src_prepare, src_configure, src_compile,
 # scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
 # phase hooks.
 
@@ -36,6 +39,9 @@ case ${BUILD} in
 esac
 
 MYSQL_EXTRAS=""
+
+# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
+# @DESCRIPTION: The version of the MYSQL_EXTRAS repo to use to build mysql
 [[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git"
 
 inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
@@ -44,13 +50,12 @@ inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx
 # Supported EAPI versions and export functions
 #
 
-MYSQL_EXPF="src_unpack src_compile src_install"
 case "${EAPI:-0}" in
-	2|3|4) MYSQL_EXPF+=" src_prepare src_configure" ;;
+	2|3|4) ;;
 	*) die "Unsupported EAPI: ${EAPI}" ;;
 esac
 
-EXPORT_FUNCTIONS ${MYSQL_EXPF}
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
 
 #
 # VARIABLES:
@@ -89,7 +94,6 @@ fi
 # 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}"
@@ -124,14 +128,12 @@ fi
 # @ECLASS-VARIABLE: XTRADB_VER
 # @DESCRIPTION:
 # Version of the XTRADB storage engine
-XTRADB_VER="${XTRADB_VER}"
-
+: ${XTRADB_VER:=}
 
 # @ECLASS-VARIABLE: PERCONA_VER
 # @DESCRIPTION:
 # Designation by PERCONA for a MySQL version to apply an XTRADB release
-PERCONA_VER="${PERCONA_VER}"
-
+: ${PERCONA_VER:=}
 
 # Work out the default SERVER_URI correctly
 if [ -z "${SERVER_URI}" ]; then
@@ -201,7 +203,7 @@ esac
 IUSE="${IUSE} latin1"
 
 IUSE="${IUSE} extraengine"
-if [[ "${PN}" != "mysql-cluster" ]] ; then
+if [[ ${PN} != "mysql-cluster" ]] ; then
 	IUSE="${IUSE} cluster"
 fi
 
@@ -210,17 +212,17 @@ mysql_version_is_at_least "5.0.18" \
 
 IUSE="${IUSE} berkdb"
 
-[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
+[[ ${MYSQL_COMMUNITY_FEATURES} == 1 ]] \
 && IUSE="${IUSE} +community profiling"
 
-[[ "${PN}" == "mariadb" ]] \
+[[ ${PN} == "mariadb" ]] \
 && IUSE="${IUSE} libevent"
 
-[[ "${PN}" == "mariadb" ]] \
+[[ ${PN} == "mariadb" ]] \
 && mysql_version_is_at_least "5.2" \
 && IUSE="${IUSE} oqgraph"
 
-[[ "${PN}" == "mariadb" ]] \
+[[ ${PN} == "mariadb" ]] \
 && mysql_version_is_at_least "5.2.5" \
 && IUSE="${IUSE} sphinx"
 
@@ -240,12 +242,12 @@ DEPEND="
 	>=sys-libs/zlib-1.2.3
 "
 
-[[ "${PN}" == "mariadb" ]] \
+[[ ${PN} == mariadb ]] \
 && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
 
 # Having different flavours at the same time is not a good idea
 for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
-	[[ "${i}" == ${PN} ]] ||
+	[[ ${i} == ${PN} ]] ||
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
 
@@ -287,14 +289,14 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 # PBXT_VERSION means that we have a PBXT patch for this PV
 # PBXT was only introduced after 5.1.12
 pbxt_patch_available() {
-	[[ "${PN}" != "mariadb" ]] \
+	[[ ${PN} != "mariadb" ]] \
 	&& mysql_version_is_at_least "5.1.12" \
 	&& [[ -n "${PBXT_VERSION}" ]]
 	return $?
 }
 
 pbxt_available() {
-	pbxt_patch_available || [[ "${PN}" == "mariadb" ]]
+	pbxt_patch_available || [[ ${PN} == "mariadb" ]]
 	return $?
 }
 
@@ -303,51 +305,64 @@ pbxt_available() {
 # XTRADB_VERS means that we have a XTRADB patch for this PV
 # XTRADB was only introduced after 5.1.26
 xtradb_patch_available() {
-	[[ "${PN}" != "mariadb" ]] \
+	[[ ${PN} != "mariadb" ]] \
 	&& mysql_version_is_at_least "5.1.26" \
 	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
 	return $?
 }
 
 
-pbxt_patch_available \
-&& PBXT_P="pbxt-${PBXT_VERSION}" \
-&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
-&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
-
-# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-# vs. built outside the dir
-pbxt_available \
-&& IUSE="${IUSE} pbxt" \
-&& mysql_version_is_at_least "5.1.40" \
-&& PBXT_NEWSTYLE=1
-
-xtradb_patch_available \
-&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
-&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
-&& XTRADB_SRC_B1="http://www.percona.com/" \
-&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
-&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
-&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
-&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
-&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
-&& IUSE="${IUSE} xtradb"
+if pbxt_patch_available; then
+
+	PBXT_P="pbxt-${PBXT_VERSION}"
+	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
+	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
+
+	# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
+	# vs. built outside the dir
+	if pbxt_available; then
+
+		IUSE="${IUSE} pbxt"
+		if mysql_version_is_at_least "5.1.40"; then
+
+			PBXT_NEWSTYLE=1
+		fi
+	fi
+fi
+
+if xtradb_patch_available; then
+	XTRADB_P="percona-xtradb-${XTRADB_VER}"
+	XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz"
+	XTRADB_SRC_B1="http://www.percona.com/"
+	XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/"
+	XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}"
+	XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}"
+	XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}"
+	SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )"
+	IUSE="${IUSE} xtradb"
+fi
 
 #
 # HELPER FUNCTIONS:
 #
 
-# @FUNCTION: mysql_disable_test
+# @FUNCTION: mysql-v2_disable_test
 # @DESCRIPTION:
 # Helper function to disable specific tests.
 mysql_disable_test() {
 	${BUILD_INHERIT}_disable_test "$@"
 }
 
+# @FUNCTION: mysql-v2_configure_minimal
+# @DESCRIPTION:
+# Helper function to configure minimal build
 configure_minimal() {
 	${BUILD_INHERIT}_configure_minimal "$@"
 }
 
+# @FUNCTION: mysql-v2_configure_common
+# @DESCRIPTION:
+# Helper function to configure common builds
 configure_common() {
 	${BUILD_INHERIT}_configure_common "$@"
 }
@@ -421,7 +436,7 @@ mysql-v2_pkg_setup() {
 
 # @FUNCTION: mysql-v2_src_unpack
 # @DESCRIPTION:
-# Unpack the source code and call mysql_src_prepare for EAPI < 2.
+# Unpack the source code
 mysql-v2_src_unpack() {
 
 	# Initialize the proper variables first

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

[Robin H. Johnson]

commit:     242d717830f89e8b62a5ca7c63614f7731a22661
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 12:13:23 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 12:14:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=242d7178

Match tree copy of main mysql.eclass.

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

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 5cf3bce..dafb1b1 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.158 2011/03/28 22:36:13 jmbsvicetto Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -146,7 +146,7 @@ RDEPEND="${DEPEND}
 		selinux? ( sec-policy/selinux-mysql )"
 
 if [ "${EAPI:-0}" = "2" ]; then
-	DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
+	DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
 fi
 
 # compile-time-only

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

[Robin H. Johnson]

commit:     455643a083aa23947ba9da2497c06775aa233474
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 12:16:16 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 12:16:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=455643a0

Show we are fully in sync.

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

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index dafb1b1..e38f032 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.158 2011/03/28 22:36:13 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.159 2011/04/21 12:15:19 robbat2 Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:

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

[Robin H. Johnson]

commit:     f9298b1ce751783c05b6275fbb1400cc60ccff4b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 19:18:53 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May  7 19:18:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f9298b1c

Bug #366289: some of the docs are removed in newer versions, update dodoc line.

---
 eclass/mysql-autotools.eclass |    4 +++-
 eclass/mysql.eclass           |    6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index d6eb3e1..52bddcc 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -718,7 +718,9 @@ mysql-autotools_src_install() {
 
 	# Docs
 	einfo "Installing docs"
-	dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+	for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
+		[[ -f "$i" ]] && dodoc "$i"
+	done
 	doinfo "${S}"/Docs/mysql.info
 
 	# Minimal builds don't have the MySQL server

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index e38f032..1c712fe 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.159 2011/04/21 12:15:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.160 2011/05/07 19:16:48 robbat2 Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -1171,7 +1171,9 @@ mysql_src_install() {
 
 	# Docs
 	einfo "Installing docs"
-	dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+	for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
+		[[ -f "$i" ]] && dodoc "$i"
+	done
 	doinfo "${S}"/Docs/mysql.info
 
 	# Minimal builds don't have the MySQL server

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

[Jorge Manuel B. S. Vicetto]

commit:     f563066ba5f699b66bfe5c7556a95c6d7bed9bba
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 04:07:39 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu May 19 04:07:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f563066b

Really move to git-2 eclass on mysql-v2 and also do the same for mysql eclasses.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 6ddb13a..0ba74a7 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -42,7 +42,7 @@ MYSQL_EXTRAS=""
 
 # @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
 # @DESCRIPTION: The version of the MYSQL_EXTRAS repo to use to build mysql
-[[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git"
+[[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git-2"
 
 inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
 
@@ -444,7 +444,7 @@ mysql-v2_src_unpack() {
 
 	unpack ${A}
 	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
 
 	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
 }

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 1c712fe..8dd87f7 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -28,7 +28,7 @@ S="${WORKDIR}/mysql"
 if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
 	EGIT_PROJECT=mysql-extras
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-	inherit git
+	inherit git-2
 fi
 
 case "${EAPI:-0}" in

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

[Jorge Manuel B. S. Vicetto]

commit:     610bf9554658abf4d6402687f6d902811454808e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 18:13:29 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 18:13:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=610bf955

Use @DEFAULT_UNSET. Whitespace.

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 97a9a74..438e44e 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -49,6 +49,7 @@ mysql-cmake_disable_test() {
 	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
 	# ${S}/mysql-tests/suite/binlog/t/disabled.def
 	# ${S}/mysql-tests/suite/innodb/t/disabled.def
+
 	if [ -n "${testsuite}" ]; then
 		for mysql_disable_file in \
 			${S}/mysql-test/suite/${testsuite}/disabled.def  \
@@ -361,6 +362,7 @@ mysql-cmake_src_install() {
 
 	# Various junk (my-*.cnf moved elsewhere)
 	einfo "Removing duplicate /usr/share/mysql files"
+
 #	rm -Rf "${D}/usr/share/info"
 #	for removeme in  "mysql-log-rotate" mysql.server* \
 #		binary-configure* my-*.cnf mi_test_all*

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 0ba74a7..3d86a0c 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -126,14 +126,14 @@ fi
 
 
 # @ECLASS-VARIABLE: XTRADB_VER
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Version of the XTRADB storage engine
-: ${XTRADB_VER:=}
 
 # @ECLASS-VARIABLE: PERCONA_VER
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Designation by PERCONA for a MySQL version to apply an XTRADB release
-: ${PERCONA_VER:=}
 
 # Work out the default SERVER_URI correctly
 if [ -z "${SERVER_URI}" ]; then

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

[Jorge Manuel B. S. Vicetto]

commit:     9211a75c51961a0c3d2a906db8d5dc0dd4478b62
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 02:46:33 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 02:46:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9211a75c

More updates to the eclasses. They should now be real close to be complete.
Dropped support for <mysql-5.1.50 on the 3 eclasses and make mysql-v2 eclass die for such ebuilds.
Added storage engine options for mysql-cmake, dropped unused functions and cleaned up most commented code. Need to review some use
minimal blocks yet.
Whitespace.

---
 eclass/mysql-autotools.eclass |  163 +++++--------------------------------
 eclass/mysql-cmake.eclass     |  178 +++++++++--------------------------------
 eclass/mysql-v2.eclass        |   47 ++++-------
 3 files changed, 77 insertions(+), 311 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 52bddcc..fb26632 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -89,7 +89,7 @@ mysql-autotools_configure_minimal() {
 		myconf="${myconf} --enable-shared --enable-static"
 	fi
 
-	if mysql_version_is_at_least "4.1" && ! use latin1 ; then
+	if ! use latin1 ; then
 		myconf="${myconf} --with-charset=utf8"
 		myconf="${myconf} --with-collation=utf8_general_ci"
 	else
@@ -123,9 +123,9 @@ mysql-autotools_configure_common() {
 		myconf="${myconf} --with-debug=full"
 	else
 		myconf="${myconf} --without-debug"
-		mysql_version_is_at_least "4.1.3" \
-		&& ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
-		&& myconf="${myconf} --without-ndb-debug"
+		if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ); then
+			myconf="${myconf} --without-ndb-debug"
+		fi
 	fi
 
 	if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
@@ -134,7 +134,7 @@ mysql-autotools_configure_common() {
 		ewarn "You MUST file bugs without these variables set."
 		myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
 		myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
-	elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
+	elif ! use latin1 ; then
 		myconf="${myconf} --with-charset=utf8"
 		myconf="${myconf} --with-collation=utf8_general_ci"
 	else
@@ -152,88 +152,6 @@ mysql-autotools_configure_common() {
 
 }
 
-# @FUNCTION: mysql-autotools_configure_40_41_50
-# @DESCRIPTION:
-# Helper function to configure 4.0, 4.1 and 5.0 builds
-mysql-autotools_configure_40_41_50() {
-
-	myconf="${myconf} $(use_with perl bench)"
-	myconf="${myconf} --enable-assembler"
-	myconf="${myconf} --with-extra-tools"
-	myconf="${myconf} --with-innodb"
-	myconf="${myconf} --without-readline"
-	myconf="${myconf} $(use_with ssl openssl)"
-	mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
-
-	# --with-vio is not needed anymore, it's on by default and
-	# has been removed from configure
-	#  Apply to 4.x and 5.0.[0-3]
-	if use ssl ; then
-		 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
-	fi
-
-	if mysql_version_is_at_least "5.0.60" ; then
-			if use berkdb ; then
-				elog "Berkeley DB support was disabled due to build failures"
-				elog "on multiple arches, go to a version earlier than 5.0.60"
-				elog "if you want it again. Gentoo bug #224067."
-			fi
-			myconf="${myconf} --without-berkeley-db"
-	elif use berkdb ; then
-		# The following fix is due to a bug with bdb on SPARC's. See:
-		# http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-		# It comes down to non-64-bit safety problems.
-		if use alpha || use amd64 || use hppa || use mips || use sparc ; then
-			elog "Berkeley DB support was disabled due to compatibility issues on this arch"
-			myconf="${myconf} --without-berkeley-db"
-		else
-			myconf="${myconf} --with-berkeley-db=./bdb"
-		fi
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	if mysql_version_is_at_least "4.1.3" ; then
-		myconf="${myconf} --with-geometry"
-		if [[ "${PN}" != "mysql-cluster" ]] ; then
-			myconf="${myconf} $(use_with cluster ndbcluster)"
-		fi
-	fi
-
-	if mysql_version_is_at_least "4.1.3" && use extraengine ; then
-		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
-		myconf="${myconf} --with-archive-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
-		myconf="${myconf} --with-csv-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/blackhole-storage-engine.html
-		myconf="${myconf} --with-blackhole-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
-		# http://dev.mysql.com/doc/mysql/en/federated-description.html
-		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
-		if mysql_version_is_at_least "5.0.3" ; then
-			elog "Before using the Federated storage engine, please be sure to read"
-			elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
-			myconf="${myconf} --with-federated-storage-engine"
-		fi
-	fi
-
-	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
-		myconf="${myconf} `use_enable community community-features`"
-		if use community; then
-			myconf="${myconf} `use_enable profiling`"
-		else
-			myconf="${myconf} --disable-profiling"
-		fi
-	fi
-
-	mysql_version_is_at_least "5.0.18" \
-	&& use max-idx-128 \
-	&& myconf="${myconf} --with-max-indexes=128"
-}
-
 # @FUNCTION: mysql-autotools_configure_51
 # @DESCRIPTION:
 # Helper function to configure 5.1 and later builds
@@ -276,7 +194,7 @@ mysql-autotools_configure_51() {
 	| xargs -0 sed -r -n \
 		-e '/^MYSQL_STORAGE_ENGINE/{
 			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
-			s~^([^ ]+).*~\1~gp; 
+			s~^([^ ]+).*~\1~gp;
 		}' \
 	| tr -s '\n' ' '
 	)"
@@ -291,10 +209,6 @@ mysql-autotools_configure_51() {
 	# These aren't actually required by the base set, but are really useful:
 	plugins_sta="${plugins_sta} archive blackhole"
 
-	# default in 5.5.4
-	if mysql_version_is_at_least "5.5.4" ; then
-		plugins_sta="${plugins_sta} partition"
-	fi
 	# Now the extras
 	if use extraengine ; then
 		# like configuration=max-no-ndb, archive and example removed in 5.1.11
@@ -464,16 +378,14 @@ mysql-autotools_src_prepare() {
 	find . -name 'Makefile.am' \
 		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
 
-	if mysql_version_is_at_least "4.1" ; then
-		# Remove what needs to be recreated, so we're sure it's actually done
-		einfo "Cleaning up old buildscript files"
-		find . -name Makefile \
-			-o -name Makefile.in \
-			-o -name configure \
-			-exec rm -f {} \;
-		rm -f "ltmain.sh"
-		rm -f "scripts/mysqlbug"
-	fi
+	# Remove what needs to be recreated, so we're sure it's actually done
+	einfo "Cleaning up old buildscript files"
+	find . -name Makefile \
+		-o -name Makefile.in \
+		-o -name configure \
+		-exec rm -f {} \;
+	rm -f "ltmain.sh"
+	rm -f "scripts/mysqlbug"
 
 	local rebuilddirlist d
 
@@ -499,18 +411,14 @@ mysql-autotools_src_prepare() {
 		popd >/dev/null
 	fi
 
-	if mysql_version_is_at_least "5.1.12" ; then
-		rebuilddirlist="."
-		# This does not seem to be needed presently. robbat2 2010/02/23
-		#einfo "Updating innobase cmake"
-		## TODO: check this with a cmake expert
-		#cmake \
-		#	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
-		#	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
-		#	"storage/innobase"
-	else
-		rebuilddirlist=". innobase"
-	fi
+	rebuilddirlist="."
+	# This does not seem to be needed presently. robbat2 2010/02/23
+	#einfo "Updating innobase cmake"
+	## TODO: check this with a cmake expert
+	#cmake \
+	#	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
+	#	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
+	#	"storage/innobase"
 
 	for d in ${rebuilddirlist} ; do
 		einfo "Reconfiguring dir '${d}'"
@@ -518,25 +426,6 @@ mysql-autotools_src_prepare() {
 		eautoreconf
 		popd &>/dev/null
 	done
-
-	if mysql_check_version_range "4.1 to 5.0.99.99" \
-	&& use berkdb ; then
-		einfo "Fixing up berkdb buildsystem"
-		[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
-		cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
-		|| die "Could not copy libtool.m4 to bdb/dist/"
-		#These files exist only with libtool-2*, and need to be included.
-		if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
-			cat "/usr/share/aclocal/ltsugar.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "/usr/share/aclocal/ltversion.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "/usr/share/aclocal/lt~obsolete.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "/usr/share/aclocal/ltoptions.m4" >>  "bdb/dist/aclocal/libtool.ac"
-		fi
-		pushd "bdb/dist" &>/dev/null
-		sh s_all \
-		|| die "Failed bdb reconfigure"
-		popd &>/dev/null
-	fi
 }
 
 # @FUNCTION: mysql-autotools_src_configure
@@ -554,11 +443,7 @@ mysql-autotools_src_configure() {
 		mysql-autotools_configure_minimal
 	else
 		mysql-autotools_configure_common
-		if mysql_version_is_at_least "5.1.10" ; then
-			mysql-autotools_configure_51
-		else
-			mysql-autotools_configure_40_41_50
-		fi
+		mysql-autotools_configure_51
 	fi
 
 	# Bug #114895, bug #110149
@@ -679,8 +564,6 @@ mysql-autotools_src_install() {
 
 	# Configuration stuff
 	case ${MYSQL_PV_MAJOR} in
-		3*|4.0) mysql_mycnf_version="4.0" ;;
-		4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
 		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
 	esac
 	einfo "Building default my.cnf (${mysql_mycnf_version})"

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 438e44e..7e80ae7 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -37,19 +37,6 @@ mysql-cmake_disable_test() {
 	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
 	echo ${testname} : ${reason} >> "${mysql_disable_file}"
 
-	# ${S}/mysql-tests/t/disabled.def
-	#
-	# ${S}/mysql-tests/suite/federated/disabled.def
-	#
-	# ${S}/mysql-tests/suite/jp/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl/t/disabled.def
-	# ${S}/mysql-tests/suite/parts/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
-	# ${S}/mysql-tests/suite/binlog/t/disabled.def
-	# ${S}/mysql-tests/suite/innodb/t/disabled.def
-
 	if [ -n "${testsuite}" ]; then
 		for mysql_disable_file in \
 			${S}/mysql-test/suite/${testsuite}/disabled.def  \
@@ -108,9 +95,16 @@ configure_cmake_minimal() {
 		-DWITH_ZLIB=system
 		-DWITHOUT_LIBWRAP=1
 		-DWITHOUT_READLINE=1
-		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
 		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
 		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITHOUT_CSV_STORAGE_ENGINE=1
+		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+		-DWITHOUT_HEAP_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
+		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
 	)
 }
 
@@ -146,107 +140,21 @@ configure_cmake_standard() {
 	else
 		mycmakeargs+=( -DWITH_SSL=0 )
 	fi
-}
-
-# @FUNCTION: configure_51
-# @DESCRIPTION:
-# Helper function to configure 5.1 and later builds
-configure_51() {
-
-	# This is an explict die here, because if we just forcibly disable it, then the
-	# user's data is not accessible.
-	use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
-	#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
-
-	# Scan for all available plugins
-	local plugins_avail="$(
-	LANG=C \
-	find "${S}" \
-		\( \
-		-name 'plug.in' \
-		-o -iname 'configure.in' \
-		-o -iname 'configure.ac' \
-		\) \
-		-print0 \
-	| xargs -0 sed -r -n \
-		-e '/^MYSQL_STORAGE_ENGINE/{
-			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
-			s~^([^ ]+).*~\1~gp;
-		}' \
-	| tr -s '\n' ' '
-	)"
-
-	# 5.1 introduces a new way to manage storage engines (plugins)
-	# like configuration=none
-	# This base set are required, and will always be statically built.
-	local plugins_sta="csv myisam myisammrg heap"
-	local plugins_dyn=""
-	local plugins_dis="example ibmdb2i"
-
-	# These aren't actually required by the base set, but are really useful:
-	plugins_sta="${plugins_sta} archive blackhole"
-
-	# default in 5.5.4
-	if mysql_version_is_at_least "5.5.4" ; then
-		plugins_sta="${plugins_sta} partition"
-	fi
-	# Now the extras
-	if use extraengine ; then
-		# like configuration=max-no-ndb, archive and example removed in 5.1.11
-		# not added yet: ibmdb2i
-		# Not supporting as examples: example,daemon_example,ftexample
-		plugins_sta="${plugins_sta} partition"
-
-		if [[ "${PN}" != "mariadb" ]] ; then
-			elog "Before using the Federated storage engine, please be sure to read"
-			elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
-			plugins_dyn="${plugins_sta} federatedx"
-		else
-			elog "MariaDB includes the FederatedX engine. Be sure to read"
-			elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
-			plugins_dyn="${plugins_sta} federated"
-		fi
-	else
-		plugins_dis="${plugins_dis} partition federated"
-	fi
-
-	# Upstream specifically requests that InnoDB always be built:
-	# - innobase, innodb_plugin
-	# Build falcon if available for 6.x series.
-	for i in innobase falcon ; do
-		[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
-	done
-	for i in innodb_plugin ; do
-		[ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
-	done
-
-	# like configuration=max-no-ndb
-	if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
-		plugins_sta="${plugins_sta} ndbcluster partition"
-		plugins_dis="${plugins_dis//partition}"
-		myconf="${myconf} --with-ndb-binlog"
-	else
-		plugins_dis="${plugins_dis} ndbcluster"
-	fi
 
-	use static && \
-	plugins_sta="${plugins_sta} ${plugins_dyn}" && \
-	plugins_dyn=""
-
-	einfo "Available plugins: ${plugins_avail}"
-	einfo "Dynamic plugins: ${plugins_dyn}"
-	einfo "Static plugins: ${plugins_sta}"
-	einfo "Disabled plugins: ${plugins_dis}"
-
-	# These are the static plugins
-	myconf="${myconf} --with-plugins=${plugins_sta// /,}"
-	# And the disabled ones
-	for i in ${plugins_dis} ; do
-		myconf="${myconf} --without-plugin-${i}"
-	done
+	# Storage engines
+	mycmakeargs+=(
+		-DWITH_ARCHIVE_STORAGE_ENGINE=1
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITH_CSV_STORAGE_ENGINE=1
+		-DWITH_HEAP_STORAGE_ENGINE=1
+		-DWITH_INNOBASE_STORAGE_ENGINE=1
+		-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITH_MYISAM_STORAGE_ENGINE=1
+		-DWITH_PARTITION_STORAGE_ENGINE=1
+		$(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE)
+	)
 }
 
-
 #
 # EBUILD FUNCTIONS
 #
@@ -363,13 +271,6 @@ mysql-cmake_src_install() {
 	# Various junk (my-*.cnf moved elsewhere)
 	einfo "Removing duplicate /usr/share/mysql files"
 
-#	rm -Rf "${D}/usr/share/info"
-#	for removeme in  "mysql-log-rotate" mysql.server* \
-#		binary-configure* my-*.cnf mi_test_all*
-#	do
-#		rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
-#	done
-
 	# Clean up stuff for a minimal build
 #	if use minimal ; then
 #		einfo "Remove all extra content for minimal build"
@@ -423,29 +324,24 @@ mysql-cmake_src_install() {
 		done
 	fi
 
-	# Docs
-#	einfo "Installing docs"
-#	dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
-#	doinfo "${S}"/Docs/mysql.info
-
 	# Minimal builds don't have the MySQL server
-#	if ! use minimal ; then
-#		einfo "Including support files and sample configurations"
-#		docinto "support-files"
-#		for script in \
-#			"${S}"/support-files/my-*.cnf \
-#			"${S}"/support-files/magic \
-#			"${S}"/support-files/ndb-config-2-node.ini
-#		do
-#			[[ -f "$script" ]] && dodoc "${script}"
-#		done
-#
-#		docinto "scripts"
-#		for script in "${S}"/scripts/mysql* ; do
-#			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
-#		done
-#
-#	fi
+	if ! use minimal ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		for script in \
+			"${S}"/support-files/my-*.cnf.sh \
+			"${S}"/support-files/magic \
+			"${S}"/support-files/ndb-config-2-node.ini.sh
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
+		done
+
+	fi
 
 	mysql_lib_symlinks "${D}"
 }

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3d86a0c..8b2bfd5 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -105,6 +105,8 @@ 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.1.50
+mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50"
 
 # @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
 # @DESCRIPTION:
@@ -114,9 +116,7 @@ MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
 # AND in the re-merged mysql-5.0.82 and newer
 if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
 	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${MYSQL_PV_MAJOR}" == "5.0" ] && mysql_version_is_at_least "5.0.82"; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${MYSQL_PV_MAJOR}" == "5.1" ] && mysql_version_is_at_least "5.1.28"; then
+elif [ "${MYSQL_PV_MAJOR}" == "5.1" ]; then
 	MYSQL_COMMUNITY_FEATURES=1
 elif mysql_version_is_at_least "5.4.0"; then
 	MYSQL_COMMUNITY_FEATURES=1
@@ -207,9 +207,7 @@ if [[ ${PN} != "mysql-cluster" ]] ; then
 	IUSE="${IUSE} cluster"
 fi
 
-mysql_version_is_at_least "5.0.18" \
-&& IUSE="${IUSE} max-idx-128"
-
+IUSE="${IUSE} max-idx-128"
 IUSE="${IUSE} berkdb"
 
 [[ ${MYSQL_COMMUNITY_FEATURES} == 1 ]] \
@@ -259,8 +257,7 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
 
 # compile-time-only
-mysql_version_is_at_least "5.1.12" \
-&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
+DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
 
 # compile-time-only
 mysql_version_is_at_least "5.5.8" \
@@ -290,7 +287,6 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 # PBXT was only introduced after 5.1.12
 pbxt_patch_available() {
 	[[ ${PN} != "mariadb" ]] \
-	&& mysql_version_is_at_least "5.1.12" \
 	&& [[ -n "${PBXT_VERSION}" ]]
 	return $?
 }
@@ -306,7 +302,6 @@ pbxt_available() {
 # XTRADB was only introduced after 5.1.26
 xtradb_patch_available() {
 	[[ ${PN} != "mariadb" ]] \
-	&& mysql_version_is_at_least "5.1.26" \
 	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
 	return $?
 }
@@ -323,10 +318,7 @@ if pbxt_patch_available; then
 	if pbxt_available; then
 
 		IUSE="${IUSE} pbxt"
-		if mysql_version_is_at_least "5.1.40"; then
-
-			PBXT_NEWSTYLE=1
-		fi
+		PBXT_NEWSTYLE=1
 	fi
 fi
 
@@ -395,23 +387,20 @@ mysql-v2_pkg_setup() {
 		die "${M}"
 	fi
 
-	if mysql_version_is_at_least "5.1.51" \
-	   && ! mysql_version_is_at_least "5.2" \
-	   && use debug ; then
-	   # Also in package.use.mask
-	   die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
+	if ! mysql_version_is_at_least "5.2" \
+		&& use debug ; then
+		# Also in package.use.mask
+		die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
 	fi
 
-	if mysql_version_is_at_least "4.1.3" \
-	&& ( use cluster || use extraengine || use embedded ) \
+	if ( use cluster || use extraengine || use embedded ) \
 	&& use minimal ; then
 		M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
 		eerror "${M}"
 		die "${M}"
 	fi
 
-	if mysql_version_is_at_least "5.1" \
-	&& xtradb_patch_available \
+	if xtradb_patch_available \
 	&& use xtradb \
 	&& use embedded ; then
 		M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
@@ -668,14 +657,12 @@ mysql-v2_pkg_config() {
 	egrep -sq external-locking "${helpfile}" && \
 	options="${options/skip-locking/skip-external-locking}"
 
-	if mysql_version_is_at_least "4.1.3" ; then
-		# Filling timezones, see
-		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-		"${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	"${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
 
-		if [[ -r "${help_tables}" ]] ; then
-			cat "${help_tables}" >> "${sqltmp}"
-		fi
+	if [[ -r "${help_tables}" ]] ; then
+		cat "${help_tables}" >> "${sqltmp}"
 	fi
 
 	einfo "Creating the mysql database and setting proper"

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

[Robin H. Johnson]

commit:     b4d568159e32c663a587506d7543c8ffbc667c7b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 06:59:25 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 06:59:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b4d56815

Port hasq->has change to mysql-v2 eclass.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 89ce954..7e55dc0 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -372,7 +372,7 @@ configure_common() {
 #   warn about deprecated features
 mysql-v2_pkg_setup() {
 
-	if hasq test ${FEATURES} ; then
+	if has test ${FEATURES} ; then
 		if ! use minimal ; then
 			if [[ $UID -eq 0 ]]; then
 				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."

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

[Robin H. Johnson]

commit:     424f3d70ef01082f2080c79b68009203b2ef3a0d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 06:58:54 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 06:58:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=424f3d70

Import v1.161 change for git-2.

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

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 8dd87f7..d41a064 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.160 2011/05/07 19:16:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.161 2011/07/08 11:35:01 ssuominen Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -28,7 +28,7 @@ S="${WORKDIR}/mysql"
 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
+	inherit git
 fi
 
 case "${EAPI:-0}" in
@@ -773,7 +773,7 @@ pbxt_src_install() {
 #   create new user and group for mysql
 #   warn about deprecated features
 mysql_pkg_setup() {
-	if hasq test ${FEATURES} ; then
+	if has test ${FEATURES} ; then
 		if ! use minimal ; then
 			if [[ $UID -eq 0 ]]; then
 				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."

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

[Jorge Manuel B. S. Vicetto]

commit:     11a56eab2c09e38d4313e19dd4d904119ec4aabd
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 16:03:17 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 16:04:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=11a56eab

Set includedir appropriately for mariadb and mysql - fixes bug 375063.

---
 eclass/mysql_fx.eclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index a2a4b50..047b208 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -230,7 +230,11 @@ mysql_init_vars() {
 	MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
 	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
 	MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
-	MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
+	if [[ ${PN} == "mariadb" ]]; then
+		MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
+	else
+		MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include"}
+	fi
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""

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

[Jorge Manuel B. S. Vicetto]

commit:     d55918c0b1b6fc4cf45f25df1e410a43c62f4a86
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 02:05:46 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 02:05:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d55918c0

Complete previous commit by setting libdir appropriately for mariadb and mysql - fixes bug 375063

---
 eclass/mysql_fx.eclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index 047b208..c3d7c09 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -227,13 +227,14 @@ mysql_lib_symlinks() {
 mysql_init_vars() {
 	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
 	MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
-	MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
 	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
 	MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
 	if [[ ${PN} == "mariadb" ]]; then
 		MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
+		MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
 	else
 		MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include"}
+		MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)"}
 	fi
 
 	if [[ -z "${MY_DATADIR}" ]] ; then

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

[Jorge Manuel B. S. Vicetto]

commit:     d40384f347504384311a7cac3a36a7eb98405240
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 12:44:29 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 12:44:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d40384f3

[eclass/mysql-v2] Add pkg_setup to the list of exported functions.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 7e55dc0..b5faeac 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 	*) die "Unsupported EAPI: ${EAPI}" ;;
 esac
 
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install
 
 #
 # VARIABLES:

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

[Jorge Manuel B. S. Vicetto]

commit:     53ca22d123b29d4c102331844ea82fe02cdfb86e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 17:05:19 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 17:05:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=53ca22d1

Added missing pkg* functions to EXPORT_FUNCTIONS - fixes bug 375765.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index b5faeac..e884253 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 	*) die "Unsupported EAPI: ${EAPI}" ;;
 esac
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config pkg_postrm
 
 #
 # VARIABLES:

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

[Jorge Manuel B. S. Vicetto]

commit:     adb6016c114b4bd8a79bb9657cbcbc41935a3ea4
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 05:50:47 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 05:50:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=adb6016c

[eclass/mysql-v2] Add my local space as an alternative SRC_URI.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index e884253..d05bb6d 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -177,7 +177,8 @@ SRC_URI="${SERVER_URI}"
 && 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/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
 HOMEPAGE="http://www.mysql.com/"

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

[Jorge Manuel B. S. Vicetto]

commit:     8d3e6216d5a32a14c0fe5618b1cf6c8c2d499a0d
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 02:24:13 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 02:24:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8d3e6216

[eclass/mysql_fx] Set include and lib dirs to usr/*/mysql - new break reported on bug 375063.

---
 eclass/mysql_fx.eclass |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index c3d7c09..fa7376c 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -229,13 +229,8 @@ mysql_init_vars() {
 	MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
 	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
 	MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
-	if [[ ${PN} == "mariadb" ]]; then
-		MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
-		MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
-	else
-		MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include"}
-		MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)"}
-	fi
+	MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
+	MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""

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

[Jorge Manuel B. S. Vicetto]

commit:     35c3366d6681e6126e97baee89e9f48e8ea4b5ad
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 20:01:29 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 20:01:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=35c3366d

[eclass] Added virtual/yacc dependency - fixes bug 376773.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index d05bb6d..797e819 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -239,6 +239,7 @@ DEPEND="
 	>=sys-apps/texinfo-4.7-r1
 	>=sys-libs/readline-4.1
 	>=sys-libs/zlib-1.2.3
+	virtual/yacc
 "
 
 [[ ${PN} == mariadb ]] \

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index d41a064..48eadfa 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -130,7 +130,8 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
 		>=sys-apps/sed-4
 		>=sys-apps/texinfo-4.7-r1
 		>=sys-libs/readline-4.1
-		>=sys-libs/zlib-1.2.3"
+		>=sys-libs/zlib-1.2.3
+		virtual/yacc"
 
 [[ "${PN}" == "mariadb" ]] \
 && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"

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

[Jorge Manuel B. S. Vicetto]

commit:     bda1868799dad534e702ed8ff007f6b0e92d8376
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 16:12:02 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 16:12:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=bda18687

[eclass] Move virtual/yacc dependency so that it's not added to RDEPEND.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 797e819..dadcba7 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -239,7 +239,6 @@ DEPEND="
 	>=sys-apps/texinfo-4.7-r1
 	>=sys-libs/readline-4.1
 	>=sys-libs/zlib-1.2.3
-	virtual/yacc
 "
 
 [[ ${PN} == mariadb ]] \
@@ -256,6 +255,10 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-mysql )
 "
 
+DEPEND="${DEPEND}
+	virtual/yacc
+"
+
 DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
 
 # compile-time-only

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 48eadfa..391351b 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -130,8 +130,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
 		>=sys-apps/sed-4
 		>=sys-apps/texinfo-4.7-r1
 		>=sys-libs/readline-4.1
-		>=sys-libs/zlib-1.2.3
-		virtual/yacc"
+		>=sys-libs/zlib-1.2.3"
 
 [[ "${PN}" == "mariadb" ]] \
 && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
@@ -146,6 +145,9 @@ RDEPEND="${DEPEND}
 		!minimal? ( dev-db/mysql-init-scripts )
 		selinux? ( sec-policy/selinux-mysql )"
 
+DEPEND="${DEPEND}
+		virtual/yacc"
+
 if [ "${EAPI:-0}" = "2" ]; then
 	DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
 fi

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

[Jorge Manuel B. S. Vicetto]

commit:     022f6621a3406400a6d1144e2cb179a3ae835f6c
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 01:53:20 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 01:53:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=022f6621

Add CMAKE_BUILD_TYPE to mysql-cmake eclass so the binaries aren't built with debug.
Thanks to Greg M.

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7e80ae7..331d93d 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -192,6 +192,8 @@ mysql-cmake_src_configure() {
 
 	debug-print-function ${FUNCNAME} "$@"
 
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
 	mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX=/usr
 		-DMYSQL_DATADIR=/var/lib/mysql

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

[Jorge Manuel B. S. Vicetto]

commit:     88f67b31b60d1eade24534d908c4b7d384a8fe76
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 09:44:08 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 09:44:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=88f67b31

Limit the creation of symlinks to the libdir so not to link to plugins.

---
 eclass/mysql_fx.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index fa7376c..afadab1 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -199,7 +199,7 @@ mysql_lib_symlinks() {
 
 	# waste some time in removing and recreating symlinks
 	for d in $dirlist ; do
-		for libname in $( find "${d}" -name "*${libsuffix}*" -and -not -type "l" 2>/dev/null ) ; do
+		for libname in $( find "${d}" -mindepth 1 -maxdepth 1 -name "*${libsuffix}*" -and -not -type "l" 2>/dev/null ) ; do
 			# maxdot is a limit versus infinite loop
 			maxdots=0
 			libnameln=${libname##*/}

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

[Jorge Manuel B. S. Vicetto]

commit:     4f8dc640ce2f94c8878349e1f9cf28a9ecf663f3
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 02:06:36 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 02:07:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4f8dc640

[mysql.eclass] Sync with tree eclass.

---
 eclass/mysql.eclass |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 391351b..78b482b 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,13 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.161 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.166 2011/09/25 12:43:28 grobian Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
-# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
-# Maintainers: MySQL Team <mysql-bugs@gentoo.org>
-#		- Luca Longinotti <chtekk@gentoo.org>
-#		- Robin H. Johnson <robbat2@gentoo.org>
+# MySQL Team <mysql-bugs@gentoo.org>
+# Luca Longinotti <chtekk@gentoo.org>
+# Robin H. Johnson <robbat2@gentoo.org>
+# @AUTHOR:
+# Francesco Riosa (Retired) <vivo@gentoo.org>
 # @BLURB: This eclass provides most of the functions for mysql ebuilds
 # @DESCRIPTION:
 # The mysql.eclass provides almost all the code to build the mysql ebuilds
@@ -141,8 +142,9 @@ for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
 
+# prefix: first need to implement something for #196294
 RDEPEND="${DEPEND}
-		!minimal? ( dev-db/mysql-init-scripts )
+		!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
 		selinux? ( sec-policy/selinux-mysql )"
 
 DEPEND="${DEPEND}
@@ -618,7 +620,7 @@ configure_51() {
 	| xargs -0 sed -r -n \
 		-e '/^MYSQL_STORAGE_ENGINE/{
 			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
-			s~^([^ ]+).*~\1~gp; 
+			s~^([^ ]+).*~\1~gp;
 		}' \
 	| tr -s '\n' ' '
 	)"

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

[Jorge Manuel B. S. Vicetto]

commit:     8c9b069c8f0c053c02f607084c8c1f692157068f
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 02:50:24 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 02:50:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8c9b069c

[mysql-v2.eclass] Sync eclass from tree.

---
 eclass/mysql-v2.eclass |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index dadcba7..d50c9c2 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.8 2011/09/25 12:43:28 grobian Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -19,8 +19,8 @@
 # phase hooks.
 
 # @ECLASS-VARIABLE: BUILD
-# @DESCRIPTION: Build type of the mysql version
-# The default value is autotools
+# @DESCRIPTION:
+# Build type of the mysql version
 : ${BUILD:=autotools}
 
 case ${BUILD} in
@@ -41,7 +41,8 @@ esac
 MYSQL_EXTRAS=""
 
 # @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
-# @DESCRIPTION: The version of the MYSQL_EXTRAS repo to use to build mysql
+# @DESCRIPTION:
+# The version of the MYSQL_EXTRAS repo to use to build mysql
 [[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git-2"
 
 inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
@@ -250,8 +251,9 @@ for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
 
+# prefix: first need to implement something for #196294
 RDEPEND="${DEPEND}
-	!minimal? ( dev-db/mysql-init-scripts )
+	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
 	selinux? ( sec-policy/selinux-mysql )
 "
 

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

[Jorge Manuel B. S. Vicetto]

commit:     059c16c1e9069bddccb0d7f2daedd851e93e54de
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 02:51:48 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 02:51:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=059c16c1

[mysql-autotools.eclass] Sync eclass from tree.

---
 eclass/mysql-autotools.eclass |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index fb26632..cf710f9 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.2 2011/08/22 04:46:32 vapier Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:
-# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
-# Maintainers:
-#	- MySQL Team <mysql-bugs@gentoo.org>
-#	- Robin H. Johnson <robbat2@gentoo.org>
-#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-#	- Luca Longinotti <chtekk@gentoo.org>
+# MySQL Team <mysql-bugs@gentoo.org>
+# Robin H. Johnson <robbat2@gentoo.org>
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# Luca Longinotti <chtekk@gentoo.org>
+# @AUTHOR:
+# Francesco Riosa <vivo@gentoo.org> (retired)
 # @BLURB: This eclass provides support for autotools based mysql releases
 # @DESCRIPTION:
 # The mysql-autotools.eclass provides the support to build the mysql

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

[Jorge Manuel B. S. Vicetto]

commit:     953c6a749837de2e68eceb7f5abcf28f84d6bb14
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 04:30:39 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 04:30:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=953c6a74

[mysql-v2.eclass] Add some fixes from tree.
Allow setting MY_EXTRAS_VER="none" to disable it - bug 360731.
Use --basedir in the mysql_install_db call - fixes bug 377707.
Review procps dep - fixes bug 385001.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index d50c9c2..5b41d12 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.8 2011/09/25 12:43:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.9 2011/10/07 04:30:18 jmbsvicetto Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -43,6 +43,7 @@ MYSQL_EXTRAS=""
 # @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
 # @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"
 
 inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
@@ -174,7 +175,7 @@ fi
 SRC_URI="${SERVER_URI}"
 
 # Gentoo patches to MySQL
-[[ ${MY_EXTRAS_VER} != live ]] \
+[[ ${MY_EXTRAS_VER} != live ]] && [[ ${MY_EXTRAS_VER} != none ]] \
 && SRC_URI="${SRC_URI}
 		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
 		http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
@@ -235,7 +236,7 @@ IUSE="${IUSE} berkdb"
 # These are used for both runtime and compiletime
 DEPEND="
 	ssl? ( >=dev-libs/openssl-0.9.6d )
-	userland_GNU? ( sys-process/procps )
+	kernel_linux? ( sys-process/procps )
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
 	>=sys-libs/readline-4.1
@@ -639,7 +640,7 @@ mysql-v2_pkg_config() {
 	help_tables="${TMPDIR}/fill_help_tables.sql"
 
 	pushd "${TMPDIR}" &>/dev/null
-	"${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
+	"${ROOT}/usr/bin/mysql_install_db --basedir=/usr" >"${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 /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"

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

[Jorge Manuel B. S. Vicetto]

commit:     4f7e634dfd1adf02f80dd19e386cc4e5db462927
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 00:30:47 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 00:30:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4f7e634d

Update mysql-v2 and related eclasses to support Prefix installs - bug 388125.

---
 eclass/mysql-autotools.eclass |   33 +++++++++++++++------------
 eclass/mysql-cmake.eclass     |   12 +++++-----
 eclass/mysql-v2.eclass        |   48 ++++++++++++++++++++--------------------
 eclass/mysql_fx.eclass        |   16 ++++++++-----
 4 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index cf710f9..bf0b0b5 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -108,7 +108,7 @@ mysql-autotools_configure_common() {
 	myconf="${myconf} --with-extra-charsets=all"
 	myconf="${myconf} --with-mysqld-user=mysql"
 	myconf="${myconf} --with-server"
-	myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
+	myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
 	myconf="${myconf} --without-libwrap"
 
 	if use static ; then
@@ -160,13 +160,13 @@ mysql-autotools_configure_51() {
 	# TODO: !!!! readd --without-readline
 	# the failure depend upon config/ac-macros/readline.m4 checking into
 	# readline.h instead of history.h
-	myconf="${myconf} $(use_with ssl ssl /usr)"
+	myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
 	myconf="${myconf} --enable-assembler"
 	myconf="${myconf} --with-geometry"
 	myconf="${myconf} --with-readline"
-	myconf="${myconf} --with-zlib-dir=/usr/"
+	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
 	myconf="${myconf} --without-pstack"
-	myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
+	myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
 
 	# This is an explict die here, because if we just forcibly disable it, then the
 	# user's data is not accessible.
@@ -320,7 +320,7 @@ pbxt_src_configure() {
 	eautoreconf
 
 	local myconf=""
-	myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
+	myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
 	use debug && myconf="${myconf} --with-debug=full"
 	econf ${myconf} || die "Problem configuring PBXT storage engine"
 }
@@ -376,7 +376,7 @@ mysql-autotools_src_prepare() {
 
 	# Make charsets install in the right place
 	find . -name 'Makefile.am' \
-		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
+		-exec sed --in-place -e 's!$(pkgdatadir)!'"${EPREFIX}"${MY_SHAREDSTATEDIR}'!g' {} \;
 
 	# Remove what needs to be recreated, so we're sure it's actually done
 	einfo "Cleaning up old buildscript files"
@@ -477,12 +477,12 @@ mysql-autotools_src_configure() {
 		filter-flags -fomit-frame-pointer
 
 	econf \
-		--libexecdir="/usr/sbin" \
-		--sysconfdir="${MY_SYSCONFDIR}" \
-		--localstatedir="${MY_LOCALSTATEDIR}" \
-		--sharedstatedir="${MY_SHAREDSTATEDIR}" \
-		--libdir="${MY_LIBDIR}" \
-		--includedir="${MY_INCLUDEDIR}" \
+		--libexecdir="${EPREFIX}/usr/sbin" \
+		--sysconfdir="${EPREFIX}${MY_SYSCONFDIR}" \
+		--localstatedir="${EPREFIX}${MY_LOCALSTATEDIR}" \
+		--sharedstatedir="${EPREFIX}${MY_SHAREDSTATEDIR}" \
+		--libdir="${EPREFIX}${MY_LIBDIR}" \
+		--includedir="${EPREFIX}${MY_INCLUDEDIR}" \
 		--with-low-memory \
 		--with-client-ldflags=-lstdc++ \
 		--enable-thread-safe-client \
@@ -523,8 +523,8 @@ mysql-autotools_src_install() {
 
 	emake install \
 		DESTDIR="${D}" \
-		benchdir_root="${MY_SHAREDSTATEDIR}" \
-		testroot="${MY_SHAREDSTATEDIR}" \
+		benchdir_root="${EPREFIX}${MY_SHAREDSTATEDIR}" \
+		testroot="${EPREFIX}${MY_SHAREDSTATEDIR}" \
 		|| die "emake install failed"
 
 	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
@@ -570,7 +570,10 @@ mysql-autotools_src_install() {
 	insinto "${MY_SYSCONFDIR}"
 	doins scripts/mysqlaccess.conf
 	mycnf_src="my.cnf-${mysql_mycnf_version}"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+	sed -e "s!@DATADIR@!${EPREFIX}${MY_DATADIR}!g" \
+		-e "s!/tmp!${EPREFIX}/tmp!" \
+		-e "s!/usr!${EPREFIX}/usr!" \
+		-e "s!= /var!= ${EPREFIX}/var!" \
 		"${FILESDIR}/${mycnf_src}" \
 		> "${TMPDIR}/my.cnf.ok"
 	if use latin1 ; then

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 331d93d..c74f056 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -117,7 +117,7 @@ configure_cmake_standard() {
 		-DENABLED_LOCAL_INFILE=1
 		-DEXTRA_CHARSETS=all
 		-DMYSQL_USER=mysql
-		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock
+		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
 		-DWITHOUT_READLINE=1
 		-DWITH_ZLIB=system
 		-DWITHOUT_LIBWRAP=1
@@ -195,9 +195,9 @@ mysql-cmake_src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DMYSQL_DATADIR=/var/lib/mysql
-		-DSYSCONFDIR=/etc/mysql
+		-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}
@@ -205,14 +205,14 @@ mysql-cmake_src_configure() {
 		-DINSTALL_INFODIR=share/info
 		-DINSTALL_LIBDIR=$(get_libdir)/mysql
 		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLDATADIR=/var/lib/mysql
+		-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
-		-DINSTALL_SUPPORTFILESDIR=/usr/share/mysql
+		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
 		-DWITH_COMMENT="Gentoo Linux ${PF}"
 		-DWITHOUT_UNIT_TESTS=1
 	)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 5b41d12..d556230 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -496,12 +496,12 @@ mysql-v2_pkg_postinst() {
 	mysql_init_vars
 
 	# Check FEATURES="collision-protect" before removing this
-	[[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+	[[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${EROOT}${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*
+	touch "${EROOT}${MY_LOGDIR}"/mysql.{log,err}
+	chown mysql:mysql "${EROOT}${MY_LOGDIR}"/mysql*
+	chmod 0660 "${EROOT}${MY_LOGDIR}"/mysql*
 
 	# Minimal builds don't have the MySQL server
 	if ! use minimal ; then
@@ -571,8 +571,8 @@ mysql-v2_pkg_config() {
 	fi
 
 	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
-		local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
+		local MY_DATADIR_s="$(strip_duplicate_slashes ${EROOT}/${MY_DATADIR})"
+		local old_MY_DATADIR_s="$(strip_duplicate_slashes ${EROOT}/${old_MY_DATADIR})"
 
 		if [[ -d "${old_MY_DATADIR_s}" ]]; then
 			if [[ -d "${MY_DATADIR_s}" ]]; then
@@ -598,13 +598,13 @@ mysql-v2_pkg_config() {
 	local pwd2="b"
 	local maxtry=15
 
-	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
-		MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
+	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${EROOT}/root/.my.cnf" ]; then
+		MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
 	fi
 
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+	if [[ -d "${EROOT}/${MY_DATADIR}/mysql" ]] ; then
 		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "(${EROOT}/${MY_DATADIR}/*)"
 		ewarn "Please rename or delete it if you wish to replace it."
 		die "MySQL database already exists!"
 	fi
@@ -633,27 +633,27 @@ mysql-v2_pkg_config() {
 	local options=""
 	local sqltmp="$(emktemp)"
 
-	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
+	local help_tables="${EROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
 	[[ -r "${help_tables}" ]] \
 	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
 	|| touch "${TMPDIR}/fill_help_tables.sql"
 	help_tables="${TMPDIR}/fill_help_tables.sql"
 
 	pushd "${TMPDIR}" &>/dev/null
-	"${ROOT}/usr/bin/mysql_install_db --basedir=/usr" >"${TMPDIR}"/mysql_install_db.log 2>&1
+	"${EROOT}/usr/bin/mysql_install_db --basedir=/usr" >"${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 /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
 	fi
 	popd &>/dev/null
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	[[ -f "${EROOT}/${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
+	chown -R mysql:mysql "${EROOT}/${MY_DATADIR}" 2>/dev/null
+	chmod 0750 "${EROOT}/${MY_DATADIR}" 2>/dev/null
 
 	# Figure out which options we need to disable to do the setup
 	helpfile="${TMPDIR}/mysqld-help"
-	${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
+	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
 	for opt in grant-tables host-cache name-resolve networking slave-start bdb \
 		federated innodb ssl log-bin relay-log slow-query-log external-locking \
 		ndbcluster \
@@ -667,7 +667,7 @@ mysql-v2_pkg_config() {
 
 	# Filling timezones, see
 	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
 
 	if [[ -r "${help_tables}" ]] ; then
 		cat "${help_tables}" >> "${sqltmp}"
@@ -676,13 +676,13 @@ mysql-v2_pkg_config() {
 	einfo "Creating the mysql database and setting proper"
 	einfo "permissions on it ..."
 
-	local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${ROOT}/usr/sbin/mysqld \
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
 		${options} \
 		--user=mysql \
-		--basedir=${ROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
+		--basedir=${EROOT}/usr \
+		--datadir=${EROOT}/${MY_DATADIR} \
 		--max_allowed_packet=8M \
 		--net_buffer_length=16K \
 		--default-storage-engine=MyISAM \
@@ -706,14 +706,14 @@ 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'"
-	"${ROOT}/usr/bin/mysql" \
+	"${EROOT}/usr/bin/mysql" \
 		--socket=${socket} \
 		-hlocalhost \
 		-e "${sql}"
 	eend $?
 
 	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
-	"${ROOT}/usr/bin/mysql" \
+	"${EROOT}/usr/bin/mysql" \
 		--socket=${socket} \
 		-hlocalhost \
 		-uroot \

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index afadab1..cad3114 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -234,12 +234,12 @@ mysql_init_vars() {
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+		if [[ -f "${EPREFIX}${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" \
+				MY_DATADIR=`grep ^datadir "${EPREFIX}${MY_SYSCONFDIR}/my.cnf" \
 				| sed -e 's/.*=\s*//' \
 				| tail -n1`
 			fi
@@ -247,13 +247,16 @@ mysql_init_vars() {
 		if [[ -z "${MY_DATADIR}" ]] ; then
 			MY_DATADIR="${MY_LOCALSTATEDIR}"
 			einfo "Using default MY_DATADIR"
+		else
+			# strip leading EPREFIX returned by already installed mysql
+			MY_DATADIR="${MY_DATADIR#${EPREFIX}}"
 		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+		elog "MySQL MY_DATADIR is ${EPREFIX}${MY_DATADIR}"
 
 		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
+			if [[ -e "${EPREFIX}${MY_DATADIR}" ]] ; then
 				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "MySQL datadir found in ${EPREFIX}${MY_DATADIR}"
 				elog "A new one will not be created."
 				PREVIOUS_DATADIR="yes"
 			else
@@ -272,7 +275,8 @@ mysql_init_vars() {
 				ewarn "MySQL MY_DATADIR has changed"
 				ewarn "from ${MY_DATADIR}"
 				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
+				# strip leading EPREFIX returned by already installed mysql
+				MY_DATADIR="${new_MY_DATADIR#${EPREFIX}}"
 			fi
 		fi
 	fi

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

[Robin H. Johnson]

commit:     6299b59049946059e63fa02c74edb2547a063b48
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Thu Nov 17 21:43:28 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 21:43:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6299b590

Port in fix by dev-zero from tree for bug #388673, so that emerge --config mysql works properly again.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index d556230..de9a79e 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -640,7 +640,7 @@ mysql-v2_pkg_config() {
 	help_tables="${TMPDIR}/fill_help_tables.sql"
 
 	pushd "${TMPDIR}" &>/dev/null
-	"${EROOT}/usr/bin/mysql_install_db --basedir=/usr" >"${TMPDIR}"/mysql_install_db.log 2>&1
+	"${EROOT}/usr/bin/mysql_install_db" --basedir=/usr >"${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 /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"

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

[Jorge Manuel B. S. Vicetto]

commit:     e421b62e55d37e926aa8f681f6f19b260c9d6cbf
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 00:18:26 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 00:18:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e421b62e

Apply prefix patch.

---
 eclass/mysql-autotools.eclass |   48 +++++++++---------
 eclass/mysql-cmake.eclass     |   24 +++++-----
 eclass/mysql-v2.eclass        |   32 ++++++------
 eclass/mysql.eclass           |  110 ++++++++++++++++++++++-------------------
 eclass/mysql_fx.eclass        |   54 ++++++++++++--------
 5 files changed, 143 insertions(+), 125 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index bf0b0b5..06f4979 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -337,7 +337,7 @@ pbxt_src_compile() {
 pbxt_src_install() {
 
 	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
-		emake install DESTDIR="${D}" || die "Failed to install PBXT"
+		emake install DESTDIR="${ED}" || die "Failed to install PBXT"
 	popd
 }
 
@@ -376,7 +376,7 @@ mysql-autotools_src_prepare() {
 
 	# Make charsets install in the right place
 	find . -name 'Makefile.am' \
-		-exec sed --in-place -e 's!$(pkgdatadir)!'"${EPREFIX}"${MY_SHAREDSTATEDIR}'!g' {} \;
+		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
 
 	# Remove what needs to be recreated, so we're sure it's actually done
 	einfo "Cleaning up old buildscript files"
@@ -478,11 +478,11 @@ mysql-autotools_src_configure() {
 
 	econf \
 		--libexecdir="${EPREFIX}/usr/sbin" \
-		--sysconfdir="${EPREFIX}${MY_SYSCONFDIR}" \
-		--localstatedir="${EPREFIX}${MY_LOCALSTATEDIR}" \
-		--sharedstatedir="${EPREFIX}${MY_SHAREDSTATEDIR}" \
-		--libdir="${EPREFIX}${MY_LIBDIR}" \
-		--includedir="${EPREFIX}${MY_INCLUDEDIR}" \
+		--sysconfdir="${MY_SYSCONFDIR}" \
+		--localstatedir="${MY_LOCALSTATEDIR}" \
+		--sharedstatedir="${MY_SHAREDSTATEDIR}" \
+		--libdir="${MY_LIBDIR}" \
+		--includedir="${MY_INCLUDEDIR}" \
 		--with-low-memory \
 		--with-client-ldflags=-lstdc++ \
 		--enable-thread-safe-client \
@@ -522,9 +522,9 @@ mysql-autotools_src_install() {
 	mysql_init_vars
 
 	emake install \
-		DESTDIR="${D}" \
-		benchdir_root="${EPREFIX}${MY_SHAREDSTATEDIR}" \
-		testroot="${EPREFIX}${MY_SHAREDSTATEDIR}" \
+		DESTDIR="${ED}" \
+		benchdir_root="${MY_SHAREDSTATEDIR}" \
+		testroot="${MY_SHAREDSTATEDIR}" \
 		|| die "emake install failed"
 
 	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
@@ -539,27 +539,27 @@ mysql-autotools_src_install() {
 
 	# Various junk (my-*.cnf moved elsewhere)
 	einfo "Removing duplicate /usr/share/mysql files"
-	rm -Rf "${D}/usr/share/info"
+	rm -Rf "${ED}/usr/share/info"
 	for removeme in  "mysql-log-rotate" mysql.server* \
 		binary-configure* my-*.cnf mi_test_all*
 	do
-		rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
+		rm -f "${ED}"/${MY_SHAREDSTATEDIR}/${removeme}
 	done
 
 	# Clean up stuff for a minimal build
 	if use minimal ; then
 		einfo "Remove all extra content for minimal build"
-		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
-		rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-		rm -f "${D}/usr/sbin/mysqld"
-		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+		rm -Rf "${ED}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+		rm -f "${ED}/usr/sbin/mysqld"
+		rm -f "${ED}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
 	fi
 
 	# Unless they explicitly specific USE=test, then do not install the
 	# testsuite. It DOES have a use to be installed, esp. when you want to do a
 	# validation of your database configuration after tuning it.
 	if use !test ; then
-		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+		rm -rf "${ED}"/${MY_SHAREDSTATEDIR}/mysql-test
 	fi
 
 	# Configuration stuff
@@ -567,10 +567,10 @@ mysql-autotools_src_install() {
 		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
 	esac
 	einfo "Building default my.cnf (${mysql_mycnf_version})"
-	insinto "${MY_SYSCONFDIR}"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
 	doins scripts/mysqlaccess.conf
 	mycnf_src="my.cnf-${mysql_mycnf_version}"
-	sed -e "s!@DATADIR@!${EPREFIX}${MY_DATADIR}!g" \
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
 		-e "s!/tmp!${EPREFIX}/tmp!" \
 		-e "s!/usr!${EPREFIX}/usr!" \
 		-e "s!= /var!= ${EPREFIX}/var!" \
@@ -589,16 +589,16 @@ mysql-autotools_src_install() {
 		# Empty directories ...
 		diropts "-m0750"
 		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-			dodir "${MY_DATADIR}"
-			keepdir "${MY_DATADIR}"
+			dodir "${MY_DATADIR#${EPREFIX}}"
+			keepdir "${MY_DATADIR#${EPREFIX}}"
 			chown -R mysql:mysql "${D}/${MY_DATADIR}"
 		fi
 
 		diropts "-m0755"
-		for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+		for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
 			dodir "${folder}"
 			keepdir "${folder}"
-			chown -R mysql:mysql "${D}/${folder}"
+			chown -R mysql:mysql "${ED}/${folder}"
 		done
 	fi
 
@@ -628,5 +628,5 @@ mysql-autotools_src_install() {
 
 	fi
 
-	mysql_lib_symlinks "${D}"
+	mysql_lib_symlinks "${ED}"
 }

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index c74f056..d792cf9 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -268,7 +268,7 @@ mysql-cmake_src_install() {
 	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
 
 	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	rm -Rf "${D}/usr/data"
+	rm -Rf "${ED}/usr/data"
 
 	# Various junk (my-*.cnf moved elsewhere)
 	einfo "Removing duplicate /usr/share/mysql files"
@@ -276,17 +276,17 @@ mysql-cmake_src_install() {
 	# Clean up stuff for a minimal build
 #	if use minimal ; then
 #		einfo "Remove all extra content for minimal build"
-#		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
-#		rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-#		rm -f "${D}/usr/sbin/mysqld"
-#		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+#		rm -Rf "${ED}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+#		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+#		rm -f "${ED}/usr/sbin/mysqld"
+#		rm -f "${ED}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
 #	fi
 
 	# Unless they explicitly specific USE=test, then do not install the
 	# testsuite. It DOES have a use to be installed, esp. when you want to do a
 	# validation of your database configuration after tuning it.
 	if ! use test ; then
-		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+		rm -rf "${ED}"/${MY_SHAREDSTATEDIR}/mysql-test
 	fi
 
 	# Configuration stuff
@@ -313,16 +313,16 @@ mysql-cmake_src_install() {
 		# Empty directories ...
 		diropts "-m0750"
 		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-			dodir "${MY_DATADIR}"
-			keepdir "${MY_DATADIR}"
-			chown -R mysql:mysql "${D}/${MY_DATADIR}"
+			dodir "${MY_DATADIR#${EPREFIX}}"
+			keepdir "${MY_DATADIR#${EPREFIX}}"
+			chown -R mysql:mysql "${ED}/${MY_DATADIR}"
 		fi
 
 		diropts "-m0755"
-		for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+		for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
 			dodir "${folder}"
 			keepdir "${folder}"
-			chown -R mysql:mysql "${D}/${folder}"
+			chown -R mysql:mysql "${ED}/${folder}"
 		done
 	fi
 
@@ -345,5 +345,5 @@ mysql-cmake_src_install() {
 
 	fi
 
-	mysql_lib_symlinks "${D}"
+	mysql_lib_symlinks "${ED}"
 }

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index de9a79e..41233e0 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -496,12 +496,12 @@ mysql-v2_pkg_postinst() {
 	mysql_init_vars
 
 	# Check FEATURES="collision-protect" before removing this
-	[[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${EROOT}${MY_LOGDIR}"
+	[[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
 
 	# Secure the logfiles
-	touch "${EROOT}${MY_LOGDIR}"/mysql.{log,err}
-	chown mysql:mysql "${EROOT}${MY_LOGDIR}"/mysql*
-	chmod 0660 "${EROOT}${MY_LOGDIR}"/mysql*
+	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 minimal ; then
@@ -571,8 +571,8 @@ mysql-v2_pkg_config() {
 	fi
 
 	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="$(strip_duplicate_slashes ${EROOT}/${MY_DATADIR})"
-		local old_MY_DATADIR_s="$(strip_duplicate_slashes ${EROOT}/${old_MY_DATADIR})"
+		local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
+		local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
 
 		if [[ -d "${old_MY_DATADIR_s}" ]]; then
 			if [[ -d "${MY_DATADIR_s}" ]]; then
@@ -602,9 +602,9 @@ mysql-v2_pkg_config() {
 		MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
 	fi
 
-	if [[ -d "${EROOT}/${MY_DATADIR}/mysql" ]] ; then
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
 		ewarn "You have already a MySQL database in place."
-		ewarn "(${EROOT}/${MY_DATADIR}/*)"
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
 		ewarn "Please rename or delete it if you wish to replace it."
 		die "MySQL database already exists!"
 	fi
@@ -633,23 +633,23 @@ mysql-v2_pkg_config() {
 	local options=""
 	local sqltmp="$(emktemp)"
 
-	local help_tables="${EROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
+	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
 	[[ -r "${help_tables}" ]] \
 	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
 	|| touch "${TMPDIR}/fill_help_tables.sql"
 	help_tables="${TMPDIR}/fill_help_tables.sql"
 
 	pushd "${TMPDIR}" &>/dev/null
-	"${EROOT}/usr/bin/mysql_install_db" --basedir=/usr >"${TMPDIR}"/mysql_install_db.log 2>&1
+	"${EROOT}/usr/bin/mysql_install_db" "--basedir=${EPREFIX}/usr" >"${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 /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+		die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
 	fi
 	popd &>/dev/null
-	[[ -f "${EROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
 	|| die "MySQL databases not installed"
-	chown -R mysql:mysql "${EROOT}/${MY_DATADIR}" 2>/dev/null
-	chmod 0750 "${EROOT}/${MY_DATADIR}" 2>/dev/null
+	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
+	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
 
 	# Figure out which options we need to disable to do the setup
 	helpfile="${TMPDIR}/mysqld-help"
@@ -682,7 +682,7 @@ mysql-v2_pkg_config() {
 		${options} \
 		--user=mysql \
 		--basedir=${EROOT}/usr \
-		--datadir=${EROOT}/${MY_DATADIR} \
+		--datadir=${ROOT}/${MY_DATADIR} \
 		--max_allowed_packet=8M \
 		--net_buffer_length=16K \
 		--default-storage-engine=MyISAM \
@@ -736,5 +736,5 @@ mysql-v2_pkg_config() {
 # Remove mysql symlinks.
 mysql-v2_pkg_postrm() {
 
-	: # mysql_lib_symlinks "${D}"
+	: # mysql_lib_symlinks "${ED}"
 }

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 78b482b..6b8a2cd 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -127,7 +127,7 @@ PERCONA_VER="${PERCONA_VER}"
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
-		userland_GNU? ( sys-process/procps )
+		kernel_linux? ( sys-process/procps )
 		>=sys-apps/sed-4
 		>=sys-apps/texinfo-4.7-r1
 		>=sys-libs/readline-4.1
@@ -364,21 +364,21 @@ mysql_disable_test() {
 # Initialize global variables
 # 2005-11-19 <vivo@gentoo.org>
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
-	MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
-	MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/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"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+		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" \
+				MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
 				| sed -e 's/.*=\s*//' \
 				| tail -n1`
 			fi
@@ -460,7 +460,7 @@ configure_common() {
 	myconf="${myconf} --with-extra-charsets=all"
 	myconf="${myconf} --with-mysqld-user=mysql"
 	myconf="${myconf} --with-server"
-	myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
+	myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
 	myconf="${myconf} --without-libwrap"
 
 	if use static ; then
@@ -505,12 +505,13 @@ configure_common() {
 }
 
 configure_40_41_50() {
+	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
 	myconf="${myconf} $(use_with perl bench)"
 	myconf="${myconf} --enable-assembler"
 	myconf="${myconf} --with-extra-tools"
 	myconf="${myconf} --with-innodb"
 	myconf="${myconf} --without-readline"
-	myconf="${myconf} $(use_with ssl openssl)"
+	myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
 	mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
 
 	# --with-vio is not needed anymore, it's on by default and
@@ -586,13 +587,13 @@ configure_51() {
 	# TODO: !!!! readd --without-readline
 	# the failure depend upon config/ac-macros/readline.m4 checking into
 	# readline.h instead of history.h
-	myconf="${myconf} $(use_with ssl ssl /usr)"
+	myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
 	myconf="${myconf} --enable-assembler"
 	myconf="${myconf} --with-geometry"
 	myconf="${myconf} --with-readline"
-	myconf="${myconf} --with-zlib-dir=/usr/"
+	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
 	myconf="${myconf} --without-pstack"
-	myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
+	myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
 
 	# This is an explict die here, because if we just forcibly disable it, then the
 	# user's data is not accessible.
@@ -743,7 +744,7 @@ pbxt_src_configure() {
 	eautoreconf
 
 	local myconf=""
-	myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
+	myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
 	use debug && myconf="${myconf} --with-debug=full"
 	econf ${myconf} || die "Problem configuring PBXT storage engine"
 }
@@ -839,8 +840,9 @@ mysql_pkg_setup() {
 	# But only for 5.0.8[3-6]!
 	if mysql_version_is_at_least "5.0.83"  && ! mysql_version_is_at_least 5.0.87 ; then
 		GCC_VER=$(gcc-version)
-		case ${GCC_VER} in
-			2*|3*|4.0|4.1|4.2)
+		case ${CHOST}:${GCC_VER} in
+			*-darwin*:4.*) : ;; # bug #310615
+			*:2*|*:3*|*:4.0|*:4.1|*:4.2)
 			eerror "Some releases of MySQL required a very new GCC, and then"
 			eerror "later release relaxed that requirement again. Either pick a"
 			eerror "MySQL >=5.0.87, or use a newer GCC."
@@ -978,14 +980,14 @@ mysql_src_prepare() {
 	&& use berkdb ; then
 		einfo "Fixing up berkdb buildsystem"
 		[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
-		cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
+		cp -f "${EPREFIX}/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
 		|| die "Could not copy libtool.m4 to bdb/dist/"
 		#These files exist only with libtool-2*, and need to be included.
-		if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
-			cat "/usr/share/aclocal/ltsugar.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "/usr/share/aclocal/ltversion.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "/usr/share/aclocal/lt~obsolete.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "/usr/share/aclocal/ltoptions.m4" >>  "bdb/dist/aclocal/libtool.ac"
+		if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
+			cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >>  "bdb/dist/aclocal/libtool.ac"
+			cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >>  "bdb/dist/aclocal/libtool.ac"
+			cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >>  "bdb/dist/aclocal/libtool.ac"
+			cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >>  "bdb/dist/aclocal/libtool.ac"
 		fi
 		pushd "bdb/dist" &>/dev/null
 		sh s_all \
@@ -1046,12 +1048,12 @@ mysql_src_configure() {
 		filter-flags -fomit-frame-pointer
 
 	econf \
-		--libexecdir="/usr/sbin" \
-		--sysconfdir="${MY_SYSCONFDIR}" \
-		--localstatedir="${MY_LOCALSTATEDIR}" \
-		--sharedstatedir="${MY_SHAREDSTATEDIR}" \
-		--libdir="${MY_LIBDIR}" \
-		--includedir="${MY_INCLUDEDIR}" \
+		--libexecdir="${EPREFIX}"/usr/sbin \
+		--sysconfdir=${MY_SYSCONFDIR} \
+		--localstatedir=${MY_LOCALSTATEDIR} \
+		--sharedstatedir=${MY_SHAREDSTATEDIR} \
+		--libdir=${MY_LIBDIR} \
+		--includedir=${MY_INCLUDEDIR} \
 		--with-low-memory \
 		--with-client-ldflags=-lstdc++ \
 		--enable-thread-safe-client \
@@ -1096,7 +1098,7 @@ mysql_src_install() {
 
 	emake install \
 		DESTDIR="${D}" \
-		benchdir_root="${MY_SHAREDSTATEDIR}" \
+		benchdir_root=${MY_SHAREDSTATEDIR} \
 		testroot="${MY_SHAREDSTATEDIR}" \
 		|| die "emake install failed"
 
@@ -1112,7 +1114,7 @@ mysql_src_install() {
 
 	# Various junk (my-*.cnf moved elsewhere)
 	einfo "Removing duplicate /usr/share/mysql files"
-	rm -Rf "${D}/usr/share/info"
+	rm -Rf "${ED}/usr/share/info"
 	for removeme in  "mysql-log-rotate" mysql.server* \
 		binary-configure* my-*.cnf mi_test_all*
 	do
@@ -1123,8 +1125,8 @@ mysql_src_install() {
 	if use minimal ; then
 		einfo "Remove all extra content for minimal build"
 		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
-		rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-		rm -f "${D}/usr/sbin/mysqld"
+		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+		rm -f "${ED}/usr/sbin/mysqld"
 		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
 	fi
 
@@ -1142,12 +1144,16 @@ mysql_src_install() {
 		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
 	esac
 	einfo "Building default my.cnf (${mysql_mycnf_version})"
-	insinto "${MY_SYSCONFDIR}"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
 	doins scripts/mysqlaccess.conf
 	mycnf_src="my.cnf-${mysql_mycnf_version}"
 	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		-e "s!/tmp!${EPREFIX}/tmp!" \
+		-e "s!/usr!${EPREFIX}/usr!" \
+		-e "s!= /var!= ${EPREFIX}/var!" \
 		"${FILESDIR}/${mycnf_src}" \
 		> "${TMPDIR}/my.cnf.ok"
+	use prefix && sed -i -e '/^user[ 	]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
 	if use latin1 ; then
 		sed -i \
 			-e "/character-set/s|utf8|latin1|g" \
@@ -1161,16 +1167,16 @@ mysql_src_install() {
 		# Empty directories ...
 		diropts "-m0750"
 		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-			dodir "${MY_DATADIR}"
-			keepdir "${MY_DATADIR}"
+			dodir "${MY_DATADIR#${EPREFIX}}"
+			keepdir "${MY_DATADIR#${EPREFIX}}"
 			chown -R mysql:mysql "${D}/${MY_DATADIR}"
 		fi
 
 		diropts "-m0755"
-		for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+		for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
 			dodir "${folder}"
 			keepdir "${folder}"
-			chown -R mysql:mysql "${D}/${folder}"
+			chown -R mysql:mysql "${ED}/${folder}"
 		done
 	fi
 
@@ -1200,7 +1206,7 @@ mysql_src_install() {
 
 	fi
 
-	mysql_lib_symlinks "${D}"
+	mysql_lib_symlinks "${ED}"
 }
 
 # @FUNCTION: mysql_pkg_preinst
@@ -1224,7 +1230,7 @@ mysql_pkg_postinst() {
 	mysql_init_vars
 
 	# Check FEATURES="collision-protect" before removing this
-	[[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+	[[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
 
 	# Secure the logfiles
 	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
@@ -1325,8 +1331,8 @@ mysql_pkg_config() {
 	local pwd2="b"
 	local maxtry=15
 
-	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
-		MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
+	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${EROOT}/root/.my.cnf" ]; then
+		MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
 	fi
 
 	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
@@ -1367,7 +1373,7 @@ mysql_pkg_config() {
 	help_tables="${TMPDIR}/fill_help_tables.sql"
 
 	pushd "${TMPDIR}" &>/dev/null
-	"${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
+	"${EROOT}/usr/bin/mysql_install_db" >"${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 /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
@@ -1395,7 +1401,7 @@ mysql_pkg_config() {
 	if mysql_version_is_at_least "4.1.3" ; then
 		# Filling timezones, see
 		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-		"${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+		"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
 
 		if [[ -r "${help_tables}" ]] ; then
 			cat "${help_tables}" >> "${sqltmp}"
@@ -1405,12 +1411,14 @@ mysql_pkg_config() {
 	einfo "Creating the mysql database and setting proper"
 	einfo "permissions on it ..."
 
-	local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${ROOT}/usr/sbin/mysqld \
+	use prefix || options="${options} --user=mysql"
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
 		${options} \
 		--user=mysql \
-		--basedir=${ROOT}/usr \
+		--basedir=${EROOT}/usr \
 		--datadir=${ROOT}/${MY_DATADIR} \
 		--max_allowed_packet=8M \
 		--net_buffer_length=16K \
@@ -1435,14 +1443,14 @@ mysql_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'"
-	"${ROOT}/usr/bin/mysql" \
+	"${EROOT}/usr/bin/mysql" \
 		--socket=${socket} \
 		-hlocalhost \
 		-e "${sql}"
 	eend $?
 
 	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
-	"${ROOT}/usr/bin/mysql" \
+	"${EROOT}/usr/bin/mysql" \
 		--socket=${socket} \
 		-hlocalhost \
 		-uroot \
@@ -1464,5 +1472,5 @@ mysql_pkg_config() {
 # @DESCRIPTION:
 # Remove mysql symlinks.
 mysql_pkg_postrm() {
-	: # mysql_lib_symlinks "${D}"
+	: # mysql_lib_symlinks "${ED}"
 }

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index cad3114..c7c624f 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -205,14 +205,29 @@ mysql_lib_symlinks() {
 			libnameln=${libname##*/}
 			# loop in version of the library to link it, similar to how
 			# libtool works
-			while [[ ${libnameln:0-3} != '${libsuffix}' ]] && [[ ${maxdots} -lt 6 ]] ; do
+			if [[ ${CHOST} == *-darwin* ]] ; then
+				# macho: libname.x.y.z.dylib
+				local libbasename=${libnameln%%.*}       # libname
+				local libver=${libnameln#${libbasename}} # .x.y.z.dylib
+				libver=${libver%${libsuffix}}            # .x.y.z
+				while [[ -n ${libver} ]] && [[ ${maxdots} -lt 6 ]] ; do
+					libnameln="${libbasename}${libver}${libsuffix}"
+					rm -f "${libnameln}"
+					ln -s "${libname}" "${libnameln}"
+					(( ++maxdots ))
+					libver=${libver%.*}
+				done
+			else
+				# elf: libname.so.x.y.z
+				while [[ ${libnameln:0-3} != '${libsuffix}' ]] && [[ ${maxdots} -lt 6 ]] ; do
+					rm -f "${libnameln}"
+					ln -s "${libname}" "${libnameln}"
+					(( ++maxdots ))
+					libnameln="${libnameln%.*}"
+				done
 				rm -f "${libnameln}"
 				ln -s "${libname}" "${libnameln}"
-				(( ++maxdots ))
-				libnameln="${libnameln%.*}"
-			done
-			rm -f "${libnameln}"
-			ln -s "${libname}" "${libnameln}"
+			fi
 		done
 	done
 
@@ -225,21 +240,21 @@ mysql_lib_symlinks() {
 # Initialize global variables
 # 2005-11-19 <vivo@gentoo.org>
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
-	MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
-	MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
+	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 "${EPREFIX}${MY_SYSCONFDIR}/my.cnf" ]] ; then
+		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 "${EPREFIX}${MY_SYSCONFDIR}/my.cnf" \
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
 				| sed -e 's/.*=\s*//' \
 				| tail -n1`
 			fi
@@ -247,16 +262,13 @@ mysql_init_vars() {
 		if [[ -z "${MY_DATADIR}" ]] ; then
 			MY_DATADIR="${MY_LOCALSTATEDIR}"
 			einfo "Using default MY_DATADIR"
-		else
-			# strip leading EPREFIX returned by already installed mysql
-			MY_DATADIR="${MY_DATADIR#${EPREFIX}}"
 		fi
-		elog "MySQL MY_DATADIR is ${EPREFIX}${MY_DATADIR}"
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
 
 		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${EPREFIX}${MY_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
 				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${EPREFIX}${MY_DATADIR}"
+				elog "MySQL datadir found in ${MY_DATADIR}"
 				elog "A new one will not be created."
 				PREVIOUS_DATADIR="yes"
 			else
@@ -275,8 +287,6 @@ mysql_init_vars() {
 				ewarn "MySQL MY_DATADIR has changed"
 				ewarn "from ${MY_DATADIR}"
 				ewarn "to ${new_MY_DATADIR}"
-				# strip leading EPREFIX returned by already installed mysql
-				MY_DATADIR="${new_MY_DATADIR#${EPREFIX}}"
 			fi
 		fi
 	fi

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

[Jorge Manuel B. S. Vicetto]

commit:     a66af21cdba895cc4e6bb3993549cc9efe780a68
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 07:44:17 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 07:44:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a66af21c

Drop support for EAPI-2 (use only EAPI versions with support for prefix).
Don't hardcode the log dir path, but use LOGDIR.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 41233e0..1dab7fc 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -53,7 +53,7 @@ inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx
 #
 
 case "${EAPI:-0}" in
-	2|3|4) ;;
+	3|4) ;;
 	*) die "Unsupported EAPI: ${EAPI}" ;;
 esac
 
@@ -496,7 +496,7 @@ mysql-v2_pkg_postinst() {
 	mysql_init_vars
 
 	# Check FEATURES="collision-protect" before removing this
-	[[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
 
 	# Secure the logfiles
 	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}

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

[Jorge Manuel B. S. Vicetto]

commit:     3e6ef2b221ea60a78d4144a98fc71c28af46d91f
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 08:35:02 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 08:35:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3e6ef2b2

Apply another "hunk" from Fabian's patch to fix prefix support in the eclasses.

---
 eclass/mysql_fx.eclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index c7c624f..8cfb079 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -217,6 +217,9 @@ mysql_lib_symlinks() {
 					(( ++maxdots ))
 					libver=${libver%.*}
 				done
+				libnameln="${libbasename}${libsuffix}"
+				rm -f "${libnameln}"
+				ln -s "${libname}" "${libnameln}"
 			else
 				# elf: libname.so.x.y.z
 				while [[ ${libnameln:0-3} != '${libsuffix}' ]] && [[ ${maxdots} -lt 6 ]] ; do

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

[Jorge Manuel B. S. Vicetto]

commit:     22e60b022f999916be66cb51599b80fbc6ca8c02
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 08:37:39 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 08:37:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=22e60b02

Use ${D} and not ${ED} with ${MY_DATADIR}.

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 63aae6c..0e8e415 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -315,7 +315,7 @@ mysql-cmake_src_install() {
 		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
 			dodir "${MY_DATADIR#${EPREFIX}}"
 			keepdir "${MY_DATADIR#${EPREFIX}}"
-			chown -R mysql:mysql "${ED}/${MY_DATADIR}"
+			chown -R mysql:mysql "${D}/${MY_DATADIR}"
 		fi
 
 		diropts "-m0755"

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

[Jorge Manuel B. S. Vicetto]

commit:     373056ea9d69dc829703e89bf73f77f94f94e8f0
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 07:51:18 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 07:51:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=373056ea

Use ${D} and not ${ED} with make install.

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 06f4979..f2a7747 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -337,7 +337,7 @@ pbxt_src_compile() {
 pbxt_src_install() {
 
 	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
-		emake install DESTDIR="${ED}" || die "Failed to install PBXT"
+		emake install DESTDIR="${D}" || die "Failed to install PBXT"
 	popd
 }
 
@@ -522,7 +522,7 @@ mysql-autotools_src_install() {
 	mysql_init_vars
 
 	emake install \
-		DESTDIR="${ED}" \
+		DESTDIR="${D}" \
 		benchdir_root="${MY_SHAREDSTATEDIR}" \
 		testroot="${MY_SHAREDSTATEDIR}" \
 		|| die "emake install failed"

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

[Jorge Manuel B. S. Vicetto]

commit:     d5df6ff8a13bf996a0b4779609f692e94bfa0b5b
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 08:15:59 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 08:15:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d5df6ff8

Use ${D} and not ${ED} with the mysql variables as they already have ${EPREFIX}.

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index f2a7747..fb40456 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -543,23 +543,23 @@ mysql-autotools_src_install() {
 	for removeme in  "mysql-log-rotate" mysql.server* \
 		binary-configure* my-*.cnf mi_test_all*
 	do
-		rm -f "${ED}"/${MY_SHAREDSTATEDIR}/${removeme}
+		rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
 	done
 
 	# Clean up stuff for a minimal build
 	if use minimal ; then
 		einfo "Remove all extra content for minimal build"
-		rm -Rf "${ED}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
 		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
 		rm -f "${ED}/usr/sbin/mysqld"
-		rm -f "${ED}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
 	fi
 
 	# Unless they explicitly specific USE=test, then do not install the
 	# testsuite. It DOES have a use to be installed, esp. when you want to do a
 	# validation of your database configuration after tuning it.
 	if use !test ; then
-		rm -rf "${ED}"/${MY_SHAREDSTATEDIR}/mysql-test
+		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
 	fi
 
 	# Configuration stuff

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index d792cf9..63aae6c 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -276,17 +276,17 @@ mysql-cmake_src_install() {
 	# Clean up stuff for a minimal build
 #	if use minimal ; then
 #		einfo "Remove all extra content for minimal build"
-#		rm -Rf "${ED}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+#		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
 #		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
 #		rm -f "${ED}/usr/sbin/mysqld"
-#		rm -f "${ED}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+#		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
 #	fi
 
 	# Unless they explicitly specific USE=test, then do not install the
 	# testsuite. It DOES have a use to be installed, esp. when you want to do a
 	# validation of your database configuration after tuning it.
 	if ! use test ; then
-		rm -rf "${ED}"/${MY_SHAREDSTATEDIR}/mysql-test
+		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
 	fi
 
 	# Configuration stuff

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

[Jorge Manuel B. S. Vicetto]

commit:     f1ba194112511b8e7acbe55d56fd2af046ba78b8
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 09:03:20 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 09:03:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f1ba1941

Use ${EROOT} and not ${ROOT} with absolute installed paths.

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

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 6b8a2cd..eb66e66 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1386,7 +1386,7 @@ mysql_pkg_config() {
 
 	# Figure out which options we need to disable to do the setup
 	helpfile="${TMPDIR}/mysqld-help"
-	${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
+	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
 	for opt in grant-tables host-cache name-resolve networking slave-start bdb \
 		federated innodb ssl log-bin relay-log slow-query-log external-locking \
 		ndbcluster \

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

[Jorge Manuel B. S. Vicetto]

commit:     6293a42a24cdf94936a87c1c9b26b699ac8c9157
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 15:20:58 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 15:23:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6293a42a

Fix test of -userpriv in the mysql eclass - fixes bug 312809.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 1dab7fc..a8d9f5f 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -382,7 +382,7 @@ mysql-v2_pkg_setup() {
 
 	if has test ${FEATURES} ; then
 		if ! use minimal ; then
-			if [[ $UID -eq 0 ]]; then
+			if ! has userpriv ${FEATURES} ; then
 				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
 			fi
 		fi

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

[Robin H. Johnson]

commit:     45ca5ae4f59b9e368fbfdd7b11109aaef420f1d3
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 07:39:18 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 19:50:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=45ca5ae4

Refactor USE=static cmake code.

---
 eclass/mysql-cmake.eclass |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 0e8e415..f64f9e5 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -123,13 +123,8 @@ configure_cmake_standard() {
 		-DWITHOUT_LIBWRAP=1
 	)
 
-	if use static ; then
-		mycmakeargs+=( -DDISABLE_SHARED=1 )
-	else
-		mycmakeargs+=( -DDISABLED_SHARED=0 )
-	fi
-
 	mycmakeargs+=(
+		$(cmake-utils_use_disable !static SHARED)
 		$(cmake-utils_use_with debug)
 		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
 		$(cmake-utils_use_with profiling)

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

[Robin H. Johnson]

commit:     0eb934edadc37ac2dabfe7a006c0e0d5cc4f1125
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 19:50:06 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 19:50:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0eb934ed

systemtap eclass changes.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 eclass/mysql-cmake.eclass |    1 +
 eclass/mysql-v2.eclass    |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index f64f9e5..51e18f0 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -128,6 +128,7 @@ configure_cmake_standard() {
 		$(cmake-utils_use_with debug)
 		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
 		$(cmake-utils_use_with profiling)
+		$(cmake-utils_use_enable systemtap DTRACE)
 	)
 
 	if use ssl; then

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index a8d9f5f..586a6aa 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -227,6 +227,8 @@ IUSE="${IUSE} berkdb"
 && mysql_version_is_at_least "5.2.5" \
 && IUSE="${IUSE} sphinx"
 
+mysql_version_is_at_least "5.5.7" \
+&& IUSE="${IUSE} systemtap"
 
 #
 # DEPENDENCIES:
@@ -279,6 +281,9 @@ mysql_version_is_at_least "5.5.8" \
 && mysql_version_is_at_least "5.2.5" \
 && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
 
+mysql_version_is_at_least "5.5.7" \
+&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )"
+
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 

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

[Jorge Manuel B. S. Vicetto]

commit:     86ac0f0297371eafc4c1f7e7c0341fa8c0d28431
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 03:20:42 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 03:20:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=86ac0f02

Fix some issues with the federated and pbxt engines.

---
 eclass/mysql-autotools.eclass |    8 ++++----
 eclass/mysql-v2.eclass        |   13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index bf0b0b5..d32f1c1 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -219,11 +219,11 @@ mysql-autotools_configure_51() {
 		if [[ "${PN}" != "mariadb" ]] ; then
 			elog "Before using the Federated storage engine, please be sure to read"
 			elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
-			plugins_dyn="${plugins_sta} federatedx"
+			plugins_dyn="${plugins_dyn} federated"
 		else
 			elog "MariaDB includes the FederatedX engine. Be sure to read"
 			elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
-			plugins_dyn="${plugins_sta} federated"
+			plugins_dyn="${plugins_dyn} federatedx"
 		fi
 	else
 		plugins_dis="${plugins_dis} partition federated"
@@ -289,7 +289,7 @@ mysql-autotools_configure_51() {
 
 	if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
 		use pbxt \
-		&& plugins_dyn="${plugins_dyn} pbxt" \
+		&& plugins_sta="${plugins_sta} pbxt" \
 		|| plugins_dis="${plugins_dis} pbxt"
 	fi
 
@@ -402,7 +402,7 @@ mysql-autotools_src_prepare() {
 		popd >/dev/null
 	fi
 
-	if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
+	if pbxt_available && [[ "${PBXT_NEWSTYLE}" != "1" ]] && use pbxt ; then
 		einfo "Adding storage engine: PBXT"
 		pushd "${S}"/storage >/dev/null
 		i='pbxt'

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index de9a79e..ed40160 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -321,13 +321,14 @@ if pbxt_patch_available; then
 	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
 	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
 
-	# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-	# vs. built outside the dir
-	if pbxt_available; then
+fi
 
-		IUSE="${IUSE} pbxt"
-		PBXT_NEWSTYLE=1
-	fi
+# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
+# vs. built outside the dir
+if pbxt_available; then
+
+	IUSE="${IUSE} pbxt"
+	PBXT_NEWSTYLE=1
 fi
 
 if xtradb_patch_available; then

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

[Robin H. Johnson]

commit:     851a54be8a1d3c91aa1382fa91ea11519d96bdc6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 02:50:43 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 02:50:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=851a54be

Move pbxt block checking.

---
 eclass/mysql-v2.eclass |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 52ed606..fa5c7e3 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.9 2011/10/07 04:30:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.14 2012/01/09 10:42:19 grobian Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -326,14 +326,13 @@ if pbxt_patch_available; then
 	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
 	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
 
-fi
-
-# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-# vs. built outside the dir
-if pbxt_available; then
+	# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
+	# vs. built outside the dir
+	if pbxt_available; then
 
-	IUSE="${IUSE} pbxt"
-	PBXT_NEWSTYLE=1
+		IUSE="${IUSE} pbxt"
+		PBXT_NEWSTYLE=1
+	fi
 fi
 
 if xtradb_patch_available; then

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

[Jorge Manuel B. S. Vicetto]

commit:     c710dd7637d375706ce7dce9ffe399e0e2742dbd
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 02:41:50 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 02:41:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c710dd76

Revert "Move pbxt block checking."
Fix bug 364623 again.
This reverts commit 851a54be8a1d3c91aa1382fa91ea11519d96bdc6.

---
 eclass/mysql-v2.eclass |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index fa5c7e3..52ed606 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.14 2012/01/09 10:42:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.9 2011/10/07 04:30:18 jmbsvicetto Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -326,13 +326,14 @@ if pbxt_patch_available; then
 	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
 	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
 
-	# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-	# vs. built outside the dir
-	if pbxt_available; then
+fi
 
-		IUSE="${IUSE} pbxt"
-		PBXT_NEWSTYLE=1
-	fi
+# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
+# vs. built outside the dir
+if pbxt_available; then
+
+	IUSE="${IUSE} pbxt"
+	PBXT_NEWSTYLE=1
 fi
 
 if xtradb_patch_available; then

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

[Jorge Manuel B. S. Vicetto]

commit:     1ecca12f62c722873c0c766fd4b0500c11b08f51
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 04:24:44 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 04:24:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1ecca12f

Drop support for mysql-cluster from the eclasses.

---
 eclass/mysql-autotools.eclass |   13 +++++--------
 eclass/mysql-v2.eclass        |   33 ++++++---------------------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index b336c5b..4b5b124 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -123,7 +123,7 @@ mysql-autotools_configure_common() {
 		myconf="${myconf} --with-debug=full"
 	else
 		myconf="${myconf} --without-debug"
-		if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ); then
+		if ( use cluster ); then
 			myconf="${myconf} --without-ndb-debug"
 		fi
 	fi
@@ -238,7 +238,7 @@ mysql-autotools_configure_51() {
 	done
 
 	# like configuration=max-no-ndb
-	if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
+	if ( use cluster ) ; then
 		plugins_sta="${plugins_sta} ndbcluster partition"
 		plugins_dis="${plugins_dis//partition}"
 		myconf="${myconf} --with-ndb-binlog"
@@ -364,12 +364,9 @@ mysql-autotools_src_prepare() {
 	i="${S}"/storage/innodb_plugin/plug.in
 	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
 
-	# Additional checks, remove bundled zlib (Cluster needs this, for static
-	# memory management in zlib, leave available for Cluster)
-	if [[ "${PN}" != "mysql-cluster" ]] ; then
-		rm -f "${S}/zlib/"*.[ch]
-		sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
-	fi
+	# Additional checks, remove bundled zlib
+	rm -f "${S}/zlib/"*.[ch]
+	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 	rm -f "scripts/mysqlbug"
 
 	# Make charsets install in the right place

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 213735d..9f6f75e 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -80,14 +80,6 @@ fi
 # mysql_upgrade.
 MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
 
-# Cluster is a special case...
-if [[ "${PN}" == "mysql-cluster" ]]; then
-	case $PV in
-		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
-	esac
-fi
-
-
 # @ECLASS-VARIABLE: MYSQL_VERSION_ID
 # @DESCRIPTION:
 # MYSQL_VERSION_ID will be:
@@ -134,21 +126,14 @@ if [ -z "${SERVER_URI}" ]; then
 		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		"
-	# The cluster builds are on the mirrors
-	elif [[ ${PN} == "mysql-cluster" ]] ; then
-		if [[ "${PN}" == "mysql-cluster" ]] ; then
-			URI_DIR="MySQL-Cluster"
-			URI_FILE="mysql-cluster-gpl"
-		fi
+	else
+		URI_DIR="MySQL"
+		URI_FILE="mysql"
 		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
 		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
 		# Recently upstream switched to an archive site, and not on mirrors
 		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
 					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
-	# The (old) enterprise source is on the primary site only
-	elif [ "${PN}" == "mysql" ]; then
-		SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
-	fi
 fi
 
 # Define correct SRC_URIs
@@ -183,9 +168,7 @@ esac
 IUSE="${IUSE} latin1"
 
 IUSE="${IUSE} extraengine"
-if [[ ${PN} != "mysql-cluster" ]] ; then
-	IUSE="${IUSE} cluster"
-fi
+IUSE="${IUSE} cluster"
 
 IUSE="${IUSE} max-idx-128"
 IUSE="${IUSE} berkdb"
@@ -224,7 +207,7 @@ DEPEND="
 && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
 
 # Having different flavours at the same time is not a good idea
-for i in "mysql" "mysql-cluster" "mariadb" ; do
+for i in "mysql" "mariadb" ; do
 	[[ ${i} == ${PN} ]] ||
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
@@ -401,14 +384,10 @@ mysql-v2_pkg_setup() {
 	enewgroup mysql 60 || die "problem adding 'mysql' group"
 	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
 
-	if [ "${PN}" != "mysql-cluster" ] && use cluster; then
+	if use 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."
-		ewarn ""
-		ewarn "If you need NDB support, you should instead move to the new"
-		ewarn "mysql-cluster package that represents that upstream NDB"
-		ewarn "development."
 	fi
 }
 

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

[Jorge Manuel B. S. Vicetto]

commit:     dfdcaacc4ec8eaa6e02b55307f86d7be442691cd
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 04:23:02 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 04:23:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=dfdcaacc

Drop support for mysql-community from the eclasses.

---
 eclass/mysql-autotools.eclass |   12 +++++-------
 eclass/mysql-v2.eclass        |   33 ++++-----------------------------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 4bfaec9..b336c5b 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -172,13 +172,11 @@ mysql-autotools_configure_51() {
 	# user's data is not accessible.
 	use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
 	#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
-	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
-		myconf="${myconf} $(use_enable community community-features)"
-		if use community; then
-			myconf="${myconf} $(use_enable profiling)"
-		else
-			myconf="${myconf} --disable-profiling"
-		fi
+	myconf="${myconf} $(use_enable community community-features)"
+	if use community; then
+		myconf="${myconf} $(use_enable profiling)"
+	else
+		myconf="${myconf} --disable-profiling"
 	fi
 
 	# Scan for all available plugins

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 52ed606..213735d 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -110,23 +110,6 @@ MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
 # This eclass should only be used with at least mysql-5.1.50
 mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50"
 
-# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
-# @DESCRIPTION:
-# Specifiy if community features are available. Possible values are 1 (yes)
-# and 0 (no).
-# Community features are available in mysql-community
-# AND in the re-merged mysql-5.0.82 and newer
-if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${MYSQL_PV_MAJOR}" == "5.1" ]; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif mysql_version_is_at_least "5.4.0"; then
-	MYSQL_COMMUNITY_FEATURES=1
-else
-	MYSQL_COMMUNITY_FEATURES=0
-fi
-
-
 # @ECLASS-VARIABLE: XTRADB_VER
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -151,14 +134,11 @@ if [ -z "${SERVER_URI}" ]; then
 		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		"
-	# The community and cluster builds are on the mirrors
-	elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
+	# The cluster builds are on the mirrors
+	elif [[ ${PN} == "mysql-cluster" ]] ; then
 		if [[ "${PN}" == "mysql-cluster" ]] ; then
 			URI_DIR="MySQL-Cluster"
 			URI_FILE="mysql-cluster-gpl"
-		else
-			URI_DIR="MySQL"
-			URI_FILE="mysql"
 		fi
 		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
 		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
@@ -188,9 +168,6 @@ if [[ "${PN}" == "mariadb" ]]; then
 	HOMEPAGE="http://mariadb.org/"
 	DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
 fi
-if [[ "${PN}" == "mysql-community" ]]; then
-	DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
-fi
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -212,9 +189,7 @@ fi
 
 IUSE="${IUSE} max-idx-128"
 IUSE="${IUSE} berkdb"
-
-[[ ${MYSQL_COMMUNITY_FEATURES} == 1 ]] \
-&& IUSE="${IUSE} +community profiling"
+IUSE="${IUSE} +community profiling"
 
 [[ ${PN} == "mariadb" ]] \
 && IUSE="${IUSE} libevent"
@@ -249,7 +224,7 @@ DEPEND="
 && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
 
 # Having different flavours at the same time is not a good idea
-for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
+for i in "mysql" "mysql-cluster" "mariadb" ; do
 	[[ ${i} == ${PN} ]] ||
 	DEPEND="${DEPEND} !dev-db/${i}"
 done

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

[Jorge Manuel B. S. Vicetto]

commit:     b7dc87adfa88898e9a0d220ee6c8365c1d252394
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 19:18:22 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 19:18:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b7dc87ad

Add missing fi that broke eclass.

---
 eclass/mysql-v2.eclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 9f6f75e..9948a78 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -134,6 +134,7 @@ if [ -z "${SERVER_URI}" ]; then
 		# Recently upstream switched to an archive site, and not on mirrors
 		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
 					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
+	fi
 fi
 
 # Define correct SRC_URIs

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

[Robin H. Johnson]

commit:     ca3832115c80837688f078c52bf27bf652800713
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Sun Apr  1 21:37:35 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr  1 21:37:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ca383211

Add in EAPI support from main tree.

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

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index eb66e66..0b56ea4 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.166 2011/09/25 12:43:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.170 2012/01/09 10:42:19 grobian Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -33,7 +33,7 @@ if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
 fi
 
 case "${EAPI:-0}" in
-	2)
+	2 | 3 | 4)
 		EXPORT_FUNCTIONS pkg_setup \
 					src_unpack src_prepare \
 					src_configure src_compile \

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

[Robin H. Johnson]

commit:     68edbb87a52a8667cbcd20ad9021b34c3bf7682d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 09:04:20 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 09:04:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=68edbb87

Support MY_PV for MariaDB.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 9948a78..9a4f5c5 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -116,7 +116,7 @@ mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with
 if [ -z "${SERVER_URI}" ]; then
 	[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
 	if [ "${PN}" == "mariadb" ]; then
-		MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
+		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

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

[Robin H. Johnson]

commit:     3cb35570138084ef8ce037b97dd099d843acf557
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Mon Apr 16 23:45:14 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 23:46:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3cb35570

Port changes from main tree mysql-v2.eclass rev 1.9-1.14.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 9a4f5c5..60549a7 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.9 2011/10/07 04:30:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.14 2012/01/09 10:42:19 grobian Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -249,7 +249,6 @@ PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 # For other stuff to bring us in
 PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 
-
 #
 # External patches
 #

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

[Robin H. Johnson]

commit:     f3e9df08958b3f9ff2fa93832bc107791438f2a1
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Wed Apr 18 02:12:06 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 02:12:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f3e9df08

Sync headers with main tree versions of eclass.

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 4b5b124..297a66e 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.2 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.6 2012/04/18 02:08:34 robbat2 Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 51e18f0..7e2e0ea 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.7 2012/01/09 10:42:19 grobian Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 60549a7..634d534 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.14 2012/01/09 10:42:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.15 2012/04/18 02:08:34 robbat2 Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index 8cfb079..2e56fba 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.22 2009/02/12 05:05:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.30 2012/01/09 10:42:19 grobian Exp $
 
 # Author: Francesco Riosa (Retired) <vivo@gentoo.org>
 # Maintainer:

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

[Robin H. Johnson]

commit:     a52cebf68588f13ecff226f3205b930fd31893ae
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue May 15 22:50:29 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue May 15 22:50:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a52cebf6

Fix pbxt build.

---
 eclass/mysql-autotools.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 297a66e..6934abc 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -397,7 +397,7 @@ mysql-autotools_src_prepare() {
 		popd >/dev/null
 	fi
 
-	if pbxt_available && [[ "${PBXT_NEWSTYLE}" != "1" ]] && use pbxt ; then
+	if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
 		einfo "Adding storage engine: PBXT"
 		pushd "${S}"/storage >/dev/null
 		i='pbxt'

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

[Jorge Manuel B. S. Vicetto]

commit:     0d4ca59b09e6d9e9c0683e5aecf6b6c8aa9cbd62
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 12:05:39 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue May 22 12:05:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0d4ca59b

Move mysql dep to git-2 and simplify ncurses dep as 5.7-r3 and earlier were dropped more than 6 months ago.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 634d534..7864f8a 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -223,7 +223,7 @@ DEPEND="${DEPEND}
 	virtual/yacc
 "
 
-DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
+DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
 
 # compile-time-only
 DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 0b56ea4..a008f1c 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -29,7 +29,7 @@ S="${WORKDIR}/mysql"
 if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
 	EGIT_PROJECT=mysql-extras
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-	inherit git
+	inherit git-2
 fi
 
 case "${EAPI:-0}" in
@@ -151,7 +151,7 @@ DEPEND="${DEPEND}
 		virtual/yacc"
 
 if [ "${EAPI:-0}" = "2" ]; then
-	DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
+	DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
 fi
 
 # compile-time-only

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

[Jorge Manuel B. S. Vicetto]

commit:     4b5ad6794de063a0d71fa17e25ce06163a37c773
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 10:11:25 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 10:11:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4b5ad679

Add missing eclasses to inherit and fix typo on mysql-v2 eclass.

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 6934abc..fb89a5d 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -17,7 +17,7 @@
 # the src_unpack, src_prepare, src_configure, src_compile, scr_install,
 # pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
 
-inherit autotools
+inherit autotools flag-o-matic multilib
 
 #
 # HELPER FUNCTIONS:

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7e2e0ea..d90ab77 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -15,7 +15,7 @@
 # the src_unpack, src_prepare, src_configure, src_compile, scr_install,
 # pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
 
-inherit cmake-utils
+inherit autotools flag-o-matic multilib
 
 #
 # HELPER FUNCTIONS:

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 7864f8a..052c7ba 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -15,7 +15,7 @@
 # This eclass uses the mysql-autotools and mysql-cmake eclasses for the
 # specific bits related to the build system.
 # It provides the src_unpack, src_prepare, src_configure, src_compile,
-# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
+# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
 # phase hooks.
 
 # @ECLASS-VARIABLE: BUILD

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index a008f1c..62ec1ef 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -19,7 +19,7 @@
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs
+inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase

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

[Jorge Manuel B. S. Vicetto]

commit:     3cb37b4e84ac85049c3884180eab76cbe2ca7354
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 10:13:19 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 10:13:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3cb37b4e

Fix inherit (bad copy and paste).

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index d90ab77..6e79beb 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -15,7 +15,7 @@
 # the src_unpack, src_prepare, src_configure, src_compile, scr_install,
 # pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
 
-inherit autotools flag-o-matic multilib
+inherit cmake-utils flag-o-matic multilib
 
 #
 # HELPER FUNCTIONS:

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

[Robin H. Johnson]

commit:     e1e1915858aa4c167a8b301c81e846e02bce4ad1
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 26 04:51:12 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 26 04:51:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e1e19158

Modify tcalloc check slightly.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index fb57250..dae7448 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -137,7 +137,7 @@ configure_cmake_standard() {
 		mycmakeargs+=( -DWITH_SSL=0 )
 	fi
 
-	if use tcmalloc; then
+	if mysql_version_is_at_least "5.5" && use tcmalloc; then
 		mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ltcmalloc' -DWITH_SAFEMALLOC=OFF )
 	fi
 

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

[Robin H. Johnson]

commit:     3f6c535d4b19eb6f1b4a0f3e8cd7d59b6a1bf557
Author:     jbergstroem <bugs <AT> bergstroem <DOT> nu>
AuthorDate: Thu Jul 26 03:36:14 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 26 03:36:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3f6c535d

Introduce IUSE=tcmalloc for mysql/mariadb builds

Signed-off-by: jbergstroem <bugs <AT> bergstroem.nu>

---
 eclass/mysql-cmake.eclass |    4 ++++
 eclass/mysql-v2.eclass    |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 6e79beb..fb57250 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -137,6 +137,10 @@ configure_cmake_standard() {
 		mycmakeargs+=( -DWITH_SSL=0 )
 	fi
 
+	if use tcmalloc; then
+		mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ltcmalloc' -DWITH_SAFEMALLOC=OFF )
+	fi
+
 	# Storage engines
 	mycmakeargs+=(
 		-DWITH_ARCHIVE_STORAGE_ENGINE=1

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 052c7ba..c4decea 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -186,6 +186,9 @@ IUSE="${IUSE} +community profiling"
 && mysql_version_is_at_least "5.2.5" \
 && IUSE="${IUSE} sphinx"
 
+mysql_version_is_at_least "5.5" \
+&& IUSE="${IUSE} tcmalloc"
+
 mysql_version_is_at_least "5.5.7" \
 && IUSE="${IUSE} systemtap"
 
@@ -243,6 +246,9 @@ mysql_version_is_at_least "5.5.8" \
 mysql_version_is_at_least "5.5.7" \
 && DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )"
 
+mysql_version_is_at_least "5.5" \
+&& DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )"
+
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 

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

[Robin H. Johnson]

commit:     32d263b1b2e11caf7003b7f50eab1e4fe971b6b5
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Apr  4 18:55:52 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr  4 18:55:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=32d263b1

Missed one typo from disable test fix

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7b79d91..d625eec 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -37,7 +37,7 @@ mysql-cmake_disable_test() {
 	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
 	echo ${testname} : ${reason} >> "${mysql_disable_file}"
 
-	if [ -n "${testsuite}" ]; then
+	if [ -n "${testsuite}" ] && [ "${testsuite}" != "main" ]; then
 		for mysql_disabled_file in \
 			${S}/mysql-test/suite/${testsuite}/disabled.def  \
 			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
@@ -45,7 +45,7 @@ mysql-cmake_disable_test() {
 			[ -f "${mysql_disabled_file}" ] && break
 		done
 		if [ "${mysql_disabled_file}" != "FAILED" ]; then
-			echo "${testname} : ${reason}" >> "${mysql_disable_file}"
+			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
 		else
 			for mysql_disabled_dir in \
 				${S}/mysql-test/suite/${testsuite} \

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

[Robin H. Johnson]

commit:     603771c6667a29fb1df1cf6570154a4d9570e571
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Apr 26 17:00:28 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 17:00:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=603771c6

Add in dependancy dev-libs/libaio for Linux kernels on MySQL/MariaDB 5.5
This matches binary builds by both upstreams.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 72867da..a05e695 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -243,7 +243,8 @@ mysql_version_is_at_least "5.5.8" \
 && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
 
 mysql_version_is_at_least "5.5.7" \
-&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )"
+&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \
+&& DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
 
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"

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

[Robin H. Johnson]

commit:     af51ce3147a053847d8831e796fb65b1931ee6f4
Author:     jbergstroem <bugs <AT> bergstroem <DOT> nu>
AuthorDate: Fri Jul 27 00:37:24 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 00:38:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=af51ce31

Make sure that we only choose one optional memory allocator

Signed-off-by: jbergstroem <bugs <AT> bergstroem.nu>

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index fdf682b..13bdd9b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -187,6 +187,10 @@ IUSE="${IUSE} +community profiling"
 && IUSE="${IUSE} sphinx"
 
 mysql_version_is_at_least "5.5" \
+&& REQUIRED_USE="tcmalloc? ( !jemalloc )
+    jemalloc? ( !tcmalloc )"
+
+mysql_version_is_at_least "5.5" \
 && IUSE="${IUSE} jemalloc"
 
 mysql_version_is_at_least "5.5" \

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

[Robin H. Johnson]

commit:     ebb55ab1c0c5729ef905d13253e7c9f2ddb663ad
Author:     jbergstroem <bugs <AT> bergstroem <DOT> nu>
AuthorDate: Fri Jul 27 00:15:40 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 00:15:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ebb55ab1

Add IUSE=jemalloc in addition to tcmalloc

Signed-off-by: jbergstroem <bugs <AT> bergstroem.nu>

---
 eclass/mysql-cmake.eclass |    4 ++++
 eclass/mysql-v2.eclass    |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index dae7448..321c626 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -137,6 +137,10 @@ configure_cmake_standard() {
 		mycmakeargs+=( -DWITH_SSL=0 )
 	fi
 
+	if mysql_version_is_at_least "5.5" && use jemalloc; then
+		mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' -DWITH_SAFEMALLOC=OFF )
+	fi
+
 	if mysql_version_is_at_least "5.5" && use tcmalloc; then
 		mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ltcmalloc' -DWITH_SAFEMALLOC=OFF )
 	fi

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index c4decea..fdf682b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -187,6 +187,9 @@ IUSE="${IUSE} +community profiling"
 && IUSE="${IUSE} sphinx"
 
 mysql_version_is_at_least "5.5" \
+&& IUSE="${IUSE} jemalloc"
+
+mysql_version_is_at_least "5.5" \
 && IUSE="${IUSE} tcmalloc"
 
 mysql_version_is_at_least "5.5.7" \
@@ -247,6 +250,9 @@ mysql_version_is_at_least "5.5.7" \
 && DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )"
 
 mysql_version_is_at_least "5.5" \
+&& DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )"
+
+mysql_version_is_at_least "5.5" \
 && DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )"
 
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL

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

[Robin H. Johnson]

commit:     9c8ca870148de9d9aec2ba8dd8b26c0c978f28ee
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Jul 27 13:45:06 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 13:45:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9c8ca870

Fix typos

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f63b8c2..6ef1606 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -507,7 +507,7 @@ mysql-v2_pkg_postinst() {
 		elog "Note: PBXT is now statically built when enabled."
 		elog ""
 		elog "If, you previously installed as a plugin and "
-		elot "you cannot start the MySQL server,"
+		elog "you cannot start the MySQL server,"
 		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
 		elog "use the MySQL upgrade script to restore the table"
 		elog "or execute the following SQL command:"

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 2a29918..b883ace 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1272,7 +1272,7 @@ mysql_pkg_postinst() {
                 elog "Note: PBXT is now statically built when enabled."
                 elog ""
                 elog "If, you previously installed as a plugin and "
-                elot "you cannot start the MySQL server,"
+                elog "you cannot start the MySQL server,"
 		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
 		elog "use the MySQL upgrade script to restore the table"
 		elog "or execute the following SQL command:"

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

[Robin H. Johnson]

commit:     6da661c4f751c1337b516f4f91de99dd9c6ebcae
Author:     jbergstroem <bugs <AT> bergstroem <DOT> nu>
AuthorDate: Fri Jul 27 00:40:43 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 00:40:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6da661c4

Simplify logic for allocators

Signed-off-by: jbergstroem <bugs <AT> bergstroem.nu>

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 13bdd9b..df795cb 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -186,15 +186,10 @@ IUSE="${IUSE} +community profiling"
 && mysql_version_is_at_least "5.2.5" \
 && IUSE="${IUSE} sphinx"
 
-mysql_version_is_at_least "5.5" \
-&& REQUIRED_USE="tcmalloc? ( !jemalloc )
-    jemalloc? ( !tcmalloc )"
-
-mysql_version_is_at_least "5.5" \
-&& IUSE="${IUSE} jemalloc"
-
-mysql_version_is_at_least "5.5" \
-&& IUSE="${IUSE} tcmalloc"
+if mysql_version_is_at_least "5.5"; then
+	REQUIRED_USE="tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
+	IUSE="${IUSE} jemalloc tcmalloc"
+fi
 
 mysql_version_is_at_least "5.5.7" \
 && IUSE="${IUSE} systemtap"

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

[Robin H. Johnson]

commit:     d625e1a53f6063f96b0ebe6858765358fc52b13c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 31 17:01:13 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 31 17:01:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d625e1a5

Bug #428742: missing whitespace.

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

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index b883ace..731e231 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -790,7 +790,7 @@ mysql_pkg_setup() {
 	# bug 350844
 	case "${EAPI:-0}" in
 		0 | 1)
-			if use static && !built_with_use sys-libs/ncurses static-libs; then
+			if use static && ! built_with_use sys-libs/ncurses static-libs; then
 				die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
 			fi
 			;;

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

[Robin H. Johnson]

commit:     18be22bfd6eb70ca4ece6e74d0ecde3c0fa120dd
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Aug  3 15:19:43 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Aug  3 17:23:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=18be22bf

Fix readline detection in MariaDB. Bug #412851
Starting with releases after 2011-12-12,
MariaDB requires --disable-distribution flag to be set in order
to link with GPLv3 readline version 6 or greater

---
 eclass/mysql-autotools.eclass |    6 ++++++
 eclass/mysql-cmake.eclass     |    7 +++++++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 35232b0..bed1254 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -96,6 +96,12 @@ mysql-autotools_configure_minimal() {
 		myconf="${myconf} --with-charset=latin1"
 		myconf="${myconf} --with-collation=latin1_swedish_ci"
 	fi
+
+	# MariaDB requires this flag in order to link to GPLv3 readline v6 or greater
+	# A note is added to the configure output
+	if [[ "${PN}" == "mariadb" ]]  && mysql_version_is_at_least "5.1.61" ; then
+		myconf="${myconf} --disable-distribution"
+	fi
 }
 
 # @FUNCTION: mysql-autotools_configure_common

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index cc427c7..897e170 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -248,6 +248,13 @@ mysql-cmake_src_configure() {
 		-DWITHOUT_UNIT_TESTS=1
 	)
 
+	# Bug 412851
+	# MariaDB requires this flag to compile with GPLv3 readline linked
+	# Adds a warning about redistribution to configure
+	if [[ "${PN}" == "mariadb" ]] ; then
+		mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
+	fi
+
 	configure_cmake_locale
 
 	if use minimal ; then

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

[Robin H. Johnson]

commit:     c918372a1a510bb66f5e4ce110cbdcfc7434790b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 20:07:24 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 20:07:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c918372a

Import v1.19 of mysql-v2.eclass.

---
 eclass/mysql-v2.eclass |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index b515a06..4c8d635 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.15 2012/04/18 02:08:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.19 2012/09/27 16:35:41 axs Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -53,7 +53,7 @@ inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx
 #
 
 case "${EAPI:-0}" in
-	3|4) ;;
+	3|4|5) ;;
 	*) die "Unsupported EAPI: ${EAPI}" ;;
 esac
 
@@ -545,8 +545,10 @@ mysql-v2_pkg_config() {
 	fi
 
 	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
-		local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
 
 		if [[ -d "${old_MY_DATADIR_s}" ]]; then
 			if [[ -d "${MY_DATADIR_s}" ]]; then

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

[Robin H. Johnson]

commit:     b382de87fe6b3b2ea179e0924beabda13f82a2d5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 20:09:48 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 20:09:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b382de87

Import v1.175 of mysql.eclass.

---
 eclass/mysql.eclass |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 731e231..f14023a 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.170 2012/01/09 10:42:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.175 2012/09/27 16:35:41 axs Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -33,7 +33,7 @@ if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
 fi
 
 case "${EAPI:-0}" in
-	2 | 3 | 4)
+	2|3|4|5)
 		EXPORT_FUNCTIONS pkg_setup \
 					src_unpack src_prepare \
 					src_configure src_compile \
@@ -1304,8 +1304,10 @@ mysql_pkg_config() {
 	fi
 
 	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
-		local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
 
 		if [[ -d "${old_MY_DATADIR_s}" ]]; then
 			if [[ -d "${MY_DATADIR_s}" ]]; then

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

[Robin H. Johnson]

commit:     f73d71536e2fa0c17c523b3b57c4dfe488b63ad5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 20:13:25 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 20:19:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f73d7153

Bring in improved pkg_config block to fix bug #392361.

---
 eclass/mysql-v2.eclass |   94 +++++++++++++++++++++++++++++++++++++-----------
 eclass/mysql.eclass    |   92 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 144 insertions(+), 42 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 4c8d635..685b444 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -528,12 +528,35 @@ mysql-v2_pkg_postinst() {
 	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
 }
 
+# @FUNCTION: mysql-v2_getopt
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql-v2_getopt() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/p"
+}
+
+# @FUNCTION: mysql-v2_getoptval
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql-v2_getoptval() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
+}
+
 # @FUNCTION: mysql-v2_pkg_config
 # @DESCRIPTION:
 # Configure mysql environment.
 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
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -547,10 +570,10 @@ mysql-v2_pkg_config() {
 	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
 		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
 		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/old_MY_DATADIR}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
 		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
 
-		if [[ -d "${old_MY_DATADIR_s}" ]]; then
+		if [[ -d "${old_MY_DATADIR_s}" ]] && [[ "${old_MY_DATADIR_s}" != / ]]; then
 			if [[ -d "${MY_DATADIR_s}" ]]; then
 				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
 				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
@@ -574,8 +597,27 @@ mysql-v2_pkg_config() {
 	local pwd2="b"
 	local maxtry=15
 
-	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${EROOT}/root/.my.cnf" ]; then
-		MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		MYSQL_ROOT_PASSWORD="$(mysql-v2_getoptval 'client mysql' password)"
+	fi
+	MYSQL_TMPDIR="$(mysql-v2_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(mysql-v2_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(mysql-v2_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT}"/$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
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
+	fi
+	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
 	fi
 
 	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
@@ -606,7 +648,7 @@ mysql-v2_pkg_config() {
 		unset pwd1 pwd2
 	fi
 
-	local options=""
+	local options="--log-warnings=0"
 	local sqltmp="$(emktemp)"
 
 	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
@@ -614,33 +656,41 @@ mysql-v2_pkg_config() {
 	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
 	|| touch "${TMPDIR}/fill_help_tables.sql"
 	help_tables="${TMPDIR}/fill_help_tables.sql"
-
-	pushd "${TMPDIR}" &>/dev/null
-	"${EROOT}/usr/bin/mysql_install_db" "--basedir=${EPREFIX}/usr" >"${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"
-	fi
-	popd &>/dev/null
-	[[ -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
-
+	
 	# Figure out which options we need to disable to do the setup
 	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 bdb \
 		federated innodb ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster \
+		ndbcluster log-slave-updates \
 		; do
-		optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
 		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
 	done
 	# But some options changed names
 	egrep -sq external-locking "${helpfile}" && \
 	options="${options/skip-locking/skip-external-locking}"
 
+	use prefix || options="${options} --user=mysql"
+
+	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
+	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
+	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"
+	fi
+	popd &>/dev/null
+	[[ -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
@@ -657,6 +707,7 @@ mysql-v2_pkg_config() {
 	local mysqld="${EROOT}/usr/sbin/mysqld \
 		${options} \
 		--user=mysql \
+		--log-warnings=0 \
 		--basedir=${EROOT}/usr \
 		--datadir=${ROOT}/${MY_DATADIR} \
 		--max_allowed_packet=8M \
@@ -666,6 +717,7 @@ mysql-v2_pkg_config() {
 		--pid-file=${pidfile}"
 	#einfo "About to start mysqld: ${mysqld}"
 	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
 	${mysqld} &
 	rc=$?
 	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
@@ -693,7 +745,7 @@ mysql-v2_pkg_config() {
 		--socket=${socket} \
 		-hlocalhost \
 		-uroot \
-		-p"${MYSQL_ROOT_PASSWORD}" \
+		--password="${MYSQL_ROOT_PASSWORD}" \
 		mysql < "${sqltmp}"
 	rc=$?
 	eend $?

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index f14023a..9ead224 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1288,11 +1288,34 @@ mysql_pkg_postinst() {
 	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
 }
 
+# @FUNCTION: mysql_getopt
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql_getopt() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/p"
+}
+
+# @FUNCTION: mysql_getoptval
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql_getoptval() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
+}
+
 # @FUNCTION: mysql_pkg_config
 # @DESCRIPTION:
 # Configure mysql environment.
 mysql_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
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -1309,7 +1332,7 @@ mysql_pkg_config() {
 		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
 		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
 
-		if [[ -d "${old_MY_DATADIR_s}" ]]; then
+		if [[ -d "${old_MY_DATADIR_s}" ]]  && [[ "${old_MY_DATADIR_s}" != / ]]; then
 			if [[ -d "${MY_DATADIR_s}" ]]; then
 				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
 				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
@@ -1333,8 +1356,27 @@ mysql_pkg_config() {
 	local pwd2="b"
 	local maxtry=15
 
-	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${EROOT}/root/.my.cnf" ]; then
-		MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		MYSQL_ROOT_PASSWORD="$(mysql_getoptval 'client mysql' password)"
+	fi
+	MYSQL_TMPDIR="$(mysql_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(mysql_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(mysql_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT}"/$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
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
+	fi
+	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
 	fi
 
 	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
@@ -1365,7 +1407,7 @@ mysql_pkg_config() {
 		unset pwd1 pwd2
 	fi
 
-	local options=""
+	local options="--log-warnings=0"
 	local sqltmp="$(emktemp)"
 
 	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
@@ -1374,32 +1416,40 @@ mysql_pkg_config() {
 	|| touch "${TMPDIR}/fill_help_tables.sql"
 	help_tables="${TMPDIR}/fill_help_tables.sql"
 
-	pushd "${TMPDIR}" &>/dev/null
-	"${EROOT}/usr/bin/mysql_install_db" >"${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 /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null
-	[[ -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
-
 	# Figure out which options we need to disable to do the setup
 	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 bdb \
 		federated innodb ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster \
+		ndbcluster log-slave-updates \
 		; do
-		optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
 		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
 	done
 	# But some options changed names
 	egrep -sq external-locking "${helpfile}" && \
 	options="${options/skip-locking/skip-external-locking}"
 
+	use prefix || options="${options} --user=mysql"
+
+	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
+	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
+	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"
+	fi
+	popd &>/dev/null
+	[[ -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
+
 	if mysql_version_is_at_least "4.1.3" ; then
 		# Filling timezones, see
 		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
@@ -1413,13 +1463,12 @@ mysql_pkg_config() {
 	einfo "Creating the mysql database and setting proper"
 	einfo "permissions on it ..."
 
-	use prefix || options="${options} --user=mysql"
-
 	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
 	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
 	local mysqld="${EROOT}/usr/sbin/mysqld \
 		${options} \
 		--user=mysql \
+		--log-warnings=0 \
 		--basedir=${EROOT}/usr \
 		--datadir=${ROOT}/${MY_DATADIR} \
 		--max_allowed_packet=8M \
@@ -1429,6 +1478,7 @@ mysql_pkg_config() {
 		--pid-file=${pidfile}"
 	#einfo "About to start mysqld: ${mysqld}"
 	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
 	${mysqld} &
 	rc=$?
 	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
@@ -1456,7 +1506,7 @@ mysql_pkg_config() {
 		--socket=${socket} \
 		-hlocalhost \
 		-uroot \
-		-p"${MYSQL_ROOT_PASSWORD}" \
+		--password="${MYSQL_ROOT_PASSWORD}" \
 		mysql < "${sqltmp}"
 	rc=$?
 	eend $?

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

[Robin H. Johnson]

commit:     5acbf7bb0df2b6e3956609dc643686722292c27e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 00:00:51 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 00:00:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5acbf7bb

Resync $Header$ blocks.

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index bed1254..f3aa85e 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.6 2012/04/18 02:08:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.10 2012/11/01 23:57:50 robbat2 Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 897e170..f634c7f 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.7 2012/01/09 10:42:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.10 2012/11/01 23:57:50 robbat2 Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 685b444..ac20d17 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.19 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.21 2012/11/01 23:57:50 robbat2 Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 9ead224..1836762 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.175 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.176 2012/11/01 20:22:57 robbat2 Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:

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

[Robin H. Johnson]

commit:     5858151f49c03555f4befbb3dd29ac357dd01abe
Author:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 24 19:39:13 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 24 19:39:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5858151f

mysql-autotools: google-mysql configure

The Google builds of MySQL are very specific about which MySQL should be
used, as well as needing to use the system copies of perftools & lzo2.

Also these builds need C++ implicit templates, so ensure that we don't
pass -fno-implicit-templates to the compiler.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 eclass/mysql-autotools.eclass |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index f3aa85e..822ae9d 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -301,6 +301,18 @@ mysql-autotools_configure_51() {
 	plugins_sta="${plugins_sta} ${plugins_dyn}" && \
 	plugins_dyn=""
 
+	# Google MySQL, bundle what upstream supports
+	if [[ "${PN}" == "google-mysql" ]]; then
+		for x in innobase innodb_plugin innodb ; do
+			plugins_sta="${plugins_sta//$x}"
+			plugins_dyn="${plugins_dyn//$x}"
+		done
+		plugins_sta="${plugins_sta} innodb_plugin googlestats"
+		myconf="${myconf} --with-perftools-dir=/usr --enable-perftools-tcmalloc"
+		# use system lzo for google-mysql
+		myconf="${myconf} --with-lzo2-dir=/usr"
+	fi
+
 	einfo "Available plugins: ${plugins_avail}"
 	einfo "Dynamic plugins: ${plugins_dyn}"
 	einfo "Static plugins: ${plugins_sta}"
@@ -461,7 +473,11 @@ mysql-autotools_src_configure() {
 
 	CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
 	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+	# storage/googlestats, sql/ in google-mysql are using C++ templates
+	# implicitly. Upstream might be interested in this, exclude
+	# -fno-implicit-templates for google-mysql for now.
 	mysql_version_is_at_least "5.0" \
+	&& [[ "${PN}" != "google-mysql" ]] \
 	&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
 	export CXXFLAGS
 

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

[Robin H. Johnson]

commit:     ac8864d8d7c986644a14525f922cb35e84d3cd5a
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Mon Sep 10 15:19:06 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 17:29:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ac8864d8

Fix readline detection for MySQL clients. Bug 434552

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index f634c7f..225c3b7 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -109,7 +109,8 @@ configure_cmake_minimal() {
 		-DWITH_SSL=system
 		-DWITH_ZLIB=system
 		-DWITHOUT_LIBWRAP=1
-		-DWITHOUT_READLINE=1
+		-DWITH_READLINE=0
+		-DWITH_LIBEDIT=0
 		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
 		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
 		-DWITHOUT_CSV_STORAGE_ENGINE=1
@@ -133,7 +134,8 @@ configure_cmake_standard() {
 		-DEXTRA_CHARSETS=all
 		-DMYSQL_USER=mysql
 		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		-DWITHOUT_READLINE=1
+		-DWITH_READLINE=0
+		-DWITH_LIBEDIT=0
 		-DWITH_ZLIB=system
 		-DWITHOUT_LIBWRAP=1
 	)

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

[Robin H. Johnson]

commit:     abf3f16cdd9f4f48ea566d2c3e022a9de5d347ce
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Sat Dec 29 03:36:46 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 03:36:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=abf3f16c

Move DEPEND variables before RDEPEND which dynamically link runtime
libraries

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index ac20d17..59d3223 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -220,6 +220,24 @@ for i in "mysql" "mariadb" ; do
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
 
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2" \
+&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
+
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2.5" \
+&& DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
+
+mysql_version_is_at_least "5.5.7" \
+&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \
+&& DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
+
+mysql_version_is_at_least "5.5" \
+&& DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )"
+
+mysql_version_is_at_least "5.5" \
+&& DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )"
+
 # prefix: first need to implement something for #196294
 RDEPEND="${DEPEND}
 	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
@@ -239,24 +257,6 @@ DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
 mysql_version_is_at_least "5.5.8" \
 && DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
 
-[[ "${PN}" == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2" \
-&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
-
-[[ "${PN}" == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2.5" \
-&& DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
-
-mysql_version_is_at_least "5.5.7" \
-&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \
-&& DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
-
-mysql_version_is_at_least "5.5" \
-&& DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )"
-
-mysql_version_is_at_least "5.5" \
-&& DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )"
-
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 

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

[Robin H. Johnson]

commit:     c600855fd520b807093cab99050ee67340104adc
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 18 02:23:07 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 02:23:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c600855f

Ensure cmake config still usable for 5.1-5.4.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 eclass/mysql-cmake.eclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 4092c9b..560167b 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -331,6 +331,7 @@ mysql-cmake_src_install() {
 
 	# Configuration stuff
 	case ${MYSQL_PV_MAJOR} in
+		5.[1-4]*) mysql_mycnf_version="5.1" ;;
 		5.[5-9]|6*|7*) mysql_mycnf_version="5.5" ;;
 	esac
 	einfo "Building default my.cnf (${mysql_mycnf_version})"

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

[Robin H. Johnson]

commit:     04e481c3eb67228aee6a2886721f0dc74c591476
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Sun Jan 20 20:46:19 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 20:50:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=04e481c3

Bug 430836: Fix autotools prefix support on my.cnf

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 822ae9d..62129f0 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -17,7 +17,7 @@
 # the src_unpack, src_prepare, src_configure, src_compile, scr_install,
 # pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
 
-inherit autotools flag-o-matic multilib
+inherit autotools flag-o-matic multilib prefix
 
 #
 # HELPER FUNCTIONS:
@@ -598,6 +598,7 @@ mysql-autotools_src_install() {
 			-e "/character-set/s|utf8|latin1|g" \
 			"${TMPDIR}/my.cnf.ok"
 	fi
+	eprefixify "${TMPDIR}/my.cnf.ok"
 	newins "${TMPDIR}/my.cnf.ok" my.cnf
 
 	# Minimal builds don't have the MySQL server

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

[Robin H. Johnson]

commit:     ce009d738e6887c7b5f9053e9681041e338b9404
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 23:01:45 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 23:01:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ce009d73

Sync from gentoo-x86.

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 822ae9d..71dba31 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.10 2012/11/01 23:57:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.12 2013/01/20 02:41:59 robbat2 Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:
@@ -605,9 +605,8 @@ mysql-autotools_src_install() {
 		einfo "Creating initial directories"
 		# Empty directories ...
 		diropts "-m0750"
+		keepdir "${MY_DATADIR#${EPREFIX}}"
 		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-			dodir "${MY_DATADIR#${EPREFIX}}"
-			keepdir "${MY_DATADIR#${EPREFIX}}"
 			chown -R mysql:mysql "${D}/${MY_DATADIR}"
 		fi
 

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 560167b..06124b3 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.10 2012/11/01 23:57:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.13 2013/01/20 02:37:51 robbat2 Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
@@ -15,7 +15,7 @@
 # the src_unpack, src_prepare, src_configure, src_compile, scr_install,
 # pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
 
-inherit cmake-utils flag-o-matic multilib
+inherit cmake-utils flag-o-matic multilib prefix
 
 #
 # HELPER FUNCTIONS:
@@ -335,7 +335,7 @@ mysql-cmake_src_install() {
 		5.[5-9]|6*|7*) mysql_mycnf_version="5.5" ;;
 	esac
 	einfo "Building default my.cnf (${mysql_mycnf_version})"
-	insinto "${MY_SYSCONFDIR}"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
 	doins scripts/mysqlaccess.conf
 	mycnf_src="my.cnf-${mysql_mycnf_version}"
 	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
@@ -346,6 +346,7 @@ mysql-cmake_src_install() {
 			-e "/character-set/s|utf8|latin1|g" \
 			"${TMPDIR}/my.cnf.ok"
 	fi
+	eprefixify "${TMPDIR}/my.cnf.ok"
 	newins "${TMPDIR}/my.cnf.ok" my.cnf
 
 	# Minimal builds don't have the MySQL server

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 59d3223..221ed61 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.21 2012/11/01 23:57:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.22 2013/01/20 02:23:10 robbat2 Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:

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

[Robin H. Johnson]

commit:     ba1ebcdfb6593bd6d60ef713e5476254688edf44
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Tue Jan 22 03:31:35 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 22 03:33:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ba1ebcdf

Move USE conflicts to REQUIRED_USE and fix bug 441700

---
 eclass/mysql-v2.eclass |   30 +++++++++---------------------
 1 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 221ed61..faa482b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -192,6 +192,8 @@ if mysql_version_is_at_least "5.5"; then
 	IUSE="${IUSE} jemalloc tcmalloc"
 fi
 
+REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
+
 mysql_version_is_at_least "5.5.7" \
 && IUSE="${IUSE} systemtap"
 
@@ -228,6 +230,11 @@ done
 && mysql_version_is_at_least "5.2.5" \
 && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
 
+# Bug 441700 MariaDB >=5.3 include custom mytop
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.3" \
+&& DEPEND="${DEPEND} !dev-db/mytop"
+
 mysql_version_is_at_least "5.5.7" \
 && DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \
 && DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
@@ -306,6 +313,7 @@ if pbxt_available; then
 
 	IUSE="${IUSE} pbxt"
 	PBXT_NEWSTYLE=1
+	REQUIRED_USE="${REQUIRED_USE} pbxt? ( !embedded ) "
 fi
 
 if xtradb_patch_available; then
@@ -318,6 +326,7 @@ if xtradb_patch_available; then
 	XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}"
 	SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )"
 	IUSE="${IUSE} xtradb"
+	REQUIRED_USE="${REQUIRED_USE} xtradb? ( !embedded ) "
 fi
 
 #
@@ -367,33 +376,12 @@ mysql-v2_pkg_setup() {
 	fi
 
 	# Check for USE flag problems in pkg_setup
-	if use static && use ssl ; then
-		M="MySQL does not support being built statically with SSL support enabled!"
-		eerror "${M}"
-		die "${M}"
-	fi
-
 	if ! mysql_version_is_at_least "5.2" \
 		&& use debug ; then
 		# Also in package.use.mask
 		die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
 	fi
 
-	if ( use cluster || use extraengine || use embedded ) \
-	&& use minimal ; then
-		M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	if xtradb_patch_available \
-	&& use xtradb \
-	&& use embedded ; then
-		M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
-		eerror "${M}"
-		die "${M}"
-	fi
-
 	# This should come after all of the die statements
 	enewgroup mysql 60 || die "problem adding 'mysql' group"
 	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"

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

[Robin H. Johnson]

commit:     c09724d16634e936406661b338533409109abc55
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Tue Jan 22 04:03:54 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 22 04:03:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c09724d1

Apply PBXT patch for Bug 374349

---
 eclass/mysql-autotools.eclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index e2d52ef..210e988 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -421,6 +421,7 @@ mysql-autotools_src_prepare() {
 		i='pbxt'
 		[ -d "${i}" ] && rm -rf "${i}"
 		cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
+		epatch "${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch"
 		popd >/dev/null
 	fi
 

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

[Robin H. Johnson]

commit:     857b196abe81c480a821d9691e88881aa03b8dd3
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 00:52:08 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 00:52:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=857b196a

Bump to match gentoo-x86.

---
 eclass/mysql-autotools.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index e2d52ef..d9f2a90 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.12 2013/01/20 02:41:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.13 2013/01/21 00:04:34 robbat2 Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:

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

[Robin H. Johnson]

commit:     970e5b92165dcfa1d40471775173bfd127bda040
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 01:03:34 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 01:03:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=970e5b92

Use upstream description per bug #453934.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index faa482b..bb27c39 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -152,7 +152,7 @@ DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
 HOMEPAGE="http://www.mysql.com/"
 if [[ "${PN}" == "mariadb" ]]; then
 	HOMEPAGE="http://mariadb.org/"
-	DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
+	DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 fi
 LICENSE="GPL-2"
 SLOT="0"

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

[Robin H. Johnson]

commit:     e06df615270f2996cb61c00ed2638a05a74e7c38
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 01:55:26 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 01:55:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e06df615

Ensure old versions still work when patch does not exist.

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index e25035a..fb7ea99 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -421,7 +421,8 @@ mysql-autotools_src_prepare() {
 		i='pbxt'
 		[ -d "${i}" ] && rm -rf "${i}"
 		cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
-		epatch "${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch"
+		f="${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch"
+		[[ -f $f ]] && epatch "$f" 
 		popd >/dev/null
 	fi
 

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

[Robin H. Johnson]

commit:     24dcd7f547496a7f1992803a67864a64342dd1fe
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 02:13:36 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 02:13:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=24dcd7f5

Sync from gentoo-x86.

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index fb7ea99..c342b63 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.13 2013/01/21 00:04:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.14 2013/01/28 02:13:05 robbat2 Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index bb27c39..4ce13a8 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.22 2013/01/20 02:23:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.23 2013/01/28 02:13:05 robbat2 Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:

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

[Robin H. Johnson]

commit:     9be415df77254dc2db8bfef465b7b29662e65b89
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Feb  6 03:51:30 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Feb  6 03:51:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9be415df

Bug 455462 Remove extra libtool files for plugins via prune_libtool_files

---
 eclass/mysql-autotools.eclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 1e41571..34df6d9 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -662,4 +662,7 @@ mysql-autotools_src_install() {
 	[[ "${PN}" == "mariadb" ]] && ! use perl \
 	&& mysql_version_is_at_least "5.3" \
 	&& rm -f "${ED}/usr/bin/mytop"
+
+	#Bug 455462 remove unnecessary libtool files
+	prune_libtool_files --modules
 }

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

[Robin H. Johnson]

commit:     dead2aa64ee85df4f0a4344d43fc14caa35f23b0
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Jan 30 20:51:29 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 20:51:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=dead2aa6

Add USE="pam" for bug 448598

---
 eclass/mysql-autotools.eclass |    9 +++++++++
 eclass/mysql-cmake.eclass     |    5 +++++
 eclass/mysql-v2.eclass        |   17 +++++++++++++++++
 3 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index c342b63..1ea254a 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -289,6 +289,15 @@ mysql-autotools_configure_51() {
 				|| plugins_dis="${plugins_dis} ${i}"
 			done
 		fi
+
+		#Authentication plugins
+		if mysql_version_is_at_least "5.2.11" ; then
+			for i in pam ; do
+				use ${i} \
+				&& plugins_dyn="${plugins_dyn} auth_${i}" \
+				|| plugins_dis="${plugins_dis} auth_${i}"
+			done
+		fi
 	fi
 
 	if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 06124b3..8673691 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -185,6 +185,11 @@ configure_cmake_standard() {
 			$(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE)
 			$(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE)
 		)
+
+		if ! use pam ; then
+			mycmakeargs+=( -DAUTH_PAM_DISABLED=1 )
+		fi
+		
 	fi
 }
 

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 4ce13a8..a3b1dc9 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -187,6 +187,10 @@ IUSE="${IUSE} +community profiling"
 && mysql_version_is_at_least "5.2.5" \
 && IUSE="${IUSE} sphinx"
 
+[[ ${PN} == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2.10" \
+&& IUSE="${IUSE} pam"
+
 if mysql_version_is_at_least "5.5"; then
 	REQUIRED_USE="tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
 	IUSE="${IUSE} jemalloc tcmalloc"
@@ -230,6 +234,10 @@ done
 && mysql_version_is_at_least "5.2.5" \
 && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
 
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2.10" \
+&& DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
+
 # Bug 441700 MariaDB >=5.3 include custom mytop
 [[ "${PN}" == "mariadb" ]] \
 && mysql_version_is_at_least "5.3" \
@@ -484,6 +492,15 @@ mysql-v2_pkg_postinst() {
 			&& dodoc "${script}"
 		done
 
+		if [ ${PN} == "mariadb" ] \
+		&& mysql_version_is_at_least "5.2.10" && use pam ; then
+			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/"
+			einfo
+		fi
+
 		einfo
 		elog "You might want to run:"
 		elog "\"emerge --config =${CATEGORY}/${PF}\""

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

[Robin H. Johnson]

commit:     a6971bac926e46480aa46cbd7e6a06444a1e3702
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Feb  1 20:40:25 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Feb  1 20:40:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a6971bac

Bug 455016 Add deps for mytop and tie it to USE="perl"

---
 eclass/mysql-autotools.eclass |    5 +++++
 eclass/mysql-cmake.eclass     |    4 ++++
 eclass/mysql-v2.eclass        |   11 ++++++++++-
 3 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 1ea254a..1e41571 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -657,4 +657,9 @@ mysql-autotools_src_install() {
 	fi
 
 	mysql_lib_symlinks "${ED}"
+
+	#Remove mytop if perl is not selected
+	[[ "${PN}" == "mariadb" ]] && ! use perl \
+	&& mysql_version_is_at_least "5.3" \
+	&& rm -f "${ED}/usr/bin/mytop"
 }

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 8673691..ffbcbd2 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -393,4 +393,8 @@ mysql-cmake_src_install() {
 	fi
 
 	mysql_lib_symlinks "${ED}"
+
+	#Remove mytop if perl is not selected
+	[[ "${PN}" == "mariadb" ]] && ! use perl \
+	&& rm -f "${ED}/usr/bin/mytop"
 }

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index a3b1dc9..8e5056a 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -241,7 +241,7 @@ done
 # Bug 441700 MariaDB >=5.3 include custom mytop
 [[ "${PN}" == "mariadb" ]] \
 && mysql_version_is_at_least "5.3" \
-&& DEPEND="${DEPEND} !dev-db/mytop"
+&& DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
 
 mysql_version_is_at_least "5.5.7" \
 && DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \
@@ -259,6 +259,15 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-mysql )
 "
 
+# Bug 455016 Add dependancies of mytop
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.3" \
+&& RDEPEND="${RDEPEND} perl? (
+	virtual/perl-Getopt-Long
+	dev-perl/TermReadKey
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Time-HiRes ) "
+
 DEPEND="${DEPEND}
 	virtual/yacc
 "

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

[Robin H. Johnson]

commit:     ff647ae77be9f6c39d33c38b0b27b95eaf3b0c4b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 19:11:43 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 19:11:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ff647ae7

Bump header versions.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 34df6d9..70b5123 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.14 2013/01/28 02:13:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.15 2013/02/13 00:40:57 robbat2 Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 02326f2..f47e5fd 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.13 2013/01/20 02:37:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 8e5056a..b13d226 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.23 2013/01/28 02:13:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.24 2013/02/13 00:40:57 robbat2 Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:

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

[Robin H. Johnson]

commit:     80b8ec28c30a80fc92fc7ecdc3329f3b7f1d1d8f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 19:19:18 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 19:19:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=80b8ec28

Bug #461026: use append-cppflags for preprocessor flags.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index d9ed718..91915d0 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -476,7 +476,7 @@ mysql-autotools_src_configure() {
 	filter-flags "-O" "-O[01]"
 
 	# glib-2.3.2_pre fix, bug #16496
-	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
+	append-cppflags "-DHAVE_ERRNO_AS_DEFINE=1"
 
 	# As discovered by bug #246652, doing a double-level of SSP causes NDB to
 	# fail badly during cluster startup.

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 1836762..1cbde50 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1021,7 +1021,7 @@ mysql_src_configure() {
 	filter-flags "-O" "-O[01]"
 
 	# glib-2.3.2_pre fix, bug #16496
-	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
+	append-cppflags "-DHAVE_ERRNO_AS_DEFINE=1"
 
 	# As discovered by bug #246652, doing a double-level of SSP causes NDB to
 	# fail badly during cluster startup.

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

[Robin H. Johnson]

commit:     884a9bdd0bd03bb8c6a2bdc1b1ef1fccd4380221
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  9 21:34:39 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Mar  9 21:34:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=884a9bdd

Bug #401733: nested configure scripts in MySQL generate unrecognized options false positives when toplevel configure passes downwards.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 eclass/mysql-autotools.eclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 70b5123..d9ed718 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -456,6 +456,8 @@ mysql-autotools_src_prepare() {
 # @DESCRIPTION:
 # Configure mysql to build the code for Gentoo respecting the use flags.
 mysql-autotools_src_configure() {
+	# bug 401733
+	export QA_CONFIGURE_OPTIONS=".*"
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars

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

[Robin H. Johnson]

commit:     1c78d08c3a1d8933dd264f83d166448c6009d087
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 19:20:49 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 19:20:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1c78d08c

Bump headers.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 91915d0..e00906b 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.15 2013/02/13 00:40:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.17 2013/03/16 19:20:34 robbat2 Exp $
 
 # @ECLASS: mysql-autotools.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 1cbde50..3cc5df7 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.176 2012/11/01 20:22:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.177 2013/03/16 19:20:34 robbat2 Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:

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

[Robin H. Johnson]

commit:     4b4958986f665dd9a5dae8958990ca361dbaf961
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 19:35:42 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 19:35:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4b495898

Bug #459568: As of 5.6, SSL support is mandatory. Either OpenSSL or YaSSL. We do not force OpenSSL, as we want static builds to be available still.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index f47e5fd..c5675b5 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -151,7 +151,7 @@ configure_cmake_standard() {
 	if use ssl; then
 		mycmakeargs+=( -DWITH_SSL=system )
 	else
-		mycmakeargs+=( -DWITH_SSL=0 )
+		mycmakeargs+=( -DWITH_SSL=bundled )
 	fi
 
 	if mysql_version_is_at_least "5.5" && use jemalloc; then

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

[Robin H. Johnson]

commit:     e7443e89e0e86eac65410faab138bb775ef485ab
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 19:40:49 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 19:40:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e7443e89

Updates for MariaDB 10.

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index c5675b5..483037b 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -341,7 +341,7 @@ mysql-cmake_src_install() {
 	# Configuration stuff
 	case ${MYSQL_PV_MAJOR} in
 		5.[1-4]*) mysql_mycnf_version="5.1" ;;
-		5.[5-9]|6*|7*) mysql_mycnf_version="5.5" ;;
+		5.[5-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.5" ;;
 	esac
 	einfo "Building default my.cnf (${mysql_mycnf_version})"
 	insinto "${MY_SYSCONFDIR#${EPREFIX}}"

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

[Jorge Manuel B. S. Vicetto]

commit:     76a8059006d5d68d47f7bb4f012d454d28cff6b3
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Apr 12 13:15:25 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 00:41:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=76a80590

Cleanup IUSE="berkdb" and EAPI support.
Drop EAPI 3 as we are now using REQUIRED_USE and all builds are EAPI4+ which use mysql-v2.eclass.
Drop IUSE="berkdb" as only a post-install note affected <5.1 and mysql-v2.eclass only supports 5.1.50+

---
 eclass/mysql-v2.eclass |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index b13d226..7f1ab2e 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -53,7 +53,7 @@ inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx
 #
 
 case "${EAPI:-0}" in
-	3|4|5) ;;
+	4|5) ;;
 	*) die "Unsupported EAPI: ${EAPI}" ;;
 esac
 
@@ -172,7 +172,6 @@ IUSE="${IUSE} extraengine"
 IUSE="${IUSE} cluster"
 
 IUSE="${IUSE} max-idx-128"
-IUSE="${IUSE} berkdb"
 IUSE="${IUSE} +community profiling"
 
 [[ ${PN} == "mariadb" ]] \
@@ -536,10 +535,6 @@ mysql-v2_pkg_postinst() {
 		elog "      PRIMARY KEY (name)"
 		elog "    ) CHARACTER SET utf8 COLLATE utf8_bin;"
 	fi
-
-	mysql_check_version_range "4.0 to 5.0.99.99" \
-	&& use berkdb \
-	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
 }
 
 # @FUNCTION: mysql-v2_getopt
@@ -674,7 +669,7 @@ mysql-v2_pkg_config() {
 	# Figure out which options we need to disable to do the setup
 	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 bdb \
+	for opt in grant-tables host-cache name-resolve networking slave-start \
 		federated innodb ssl log-bin relay-log slow-query-log external-locking \
 		ndbcluster log-slave-updates \
 		; do

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

[Robin H. Johnson]

commit:     4a2efe4ea1c2c1ff681425f2775f84d8cc330982
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Thu Apr 25 17:38:09 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 17:38:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4a2efe4e

Prepwork for MySQL 5.7 release.

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

---
 eclass/mysql-cmake.eclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 483037b..a739caf 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -274,12 +274,16 @@ mysql-cmake_src_configure() {
 	# Bug #114895, bug #110149
 	filter-flags "-O" "-O[01]"
 
-	CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
 	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
 	# 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"
+	fi
 	export CXXFLAGS
 
 	# bug #283926, with GCC4.4, this is required to get correct behavior.

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

[Jorge Manuel B. S. Vicetto]

commit:     c2dc5a624361e97a41d2da73f7ded966327a6339
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 11:01:56 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 16:20:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c2dc5a62

Whitespace.

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 69cc655..43d0221 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -189,7 +189,7 @@ configure_cmake_standard() {
 		if ! use pam ; then
 			mycmakeargs+=( -DAUTH_PAM_DISABLED=1 )
 		fi
-		
+
 	fi
 }
 

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

[Jorge Manuel B. S. Vicetto]

commit:     70ff1d4cb2916df7affc919477e4344f096727b7
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 12:13:55 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 16:20:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=70ff1d4c

Whitespace.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 7f1ab2e..a4c8d8a 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -665,7 +665,7 @@ mysql-v2_pkg_config() {
 	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
 	|| touch "${TMPDIR}/fill_help_tables.sql"
 	help_tables="${TMPDIR}/fill_help_tables.sql"
-	
+
 	# Figure out which options we need to disable to do the setup
 	helpfile="${TMPDIR}/mysqld-help"
 	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null

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

[Jorge Manuel B. S. Vicetto]

commit:     f9a57ec33503693228f0aeb61752023a6f5450db
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 12:41:53 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 16:20:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f9a57ec3

[eclass] Fix mysql-v2.eclass now that /var/run is a tmpfs mount point - fixes bug 465734.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index a4c8d8a..6329684 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -711,6 +711,14 @@ mysql-v2_pkg_config() {
 	einfo "Creating the mysql database and setting proper"
 	einfo "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"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		mkdir "${PID_DIR}"
+		chown mysql:mysql "${PID_DIR}"
+		chmod 755 "${PID_DIR}"
+	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 \

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

[Jorge Manuel B. S. Vicetto]

commit:     4d4c2788193a796cb5a2d9a1e298ffe68b349cbd
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 10:56:21 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 16:20:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4d4c2788

[eclass] Create a mariadb_config symlink - bug 467430.

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index a739caf..65f0370 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -320,6 +320,9 @@ mysql-cmake_src_install() {
 	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
 	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
 
+	# Create a mariadb_config symlink
+	[[ "${PN}" == "mariadb" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
+
 	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
 	rm -Rf "${ED}/usr/data"
 
@@ -397,7 +400,6 @@ mysql-cmake_src_install() {
 		for script in "${S}"/scripts/mysql* ; do
 			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
 		done
-
 	fi
 
 	mysql_lib_symlinks "${ED}"

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

[Jorge Manuel B. S. Vicetto]

commit:     769d80faed0402afa57fd475b15d51dac6ef711b
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 10:57:22 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 16:20:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=769d80fa

[eclass] Drop the call to mysql_lib_symlinks to prevent issues with dangling symlinks - bug 440918.

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 65f0370..69cc655 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -402,8 +402,6 @@ mysql-cmake_src_install() {
 		done
 	fi
 
-	mysql_lib_symlinks "${ED}"
-
 	#Remove mytop if perl is not selected
 	[[ "${PN}" == "mariadb" ]] && ! use perl \
 	&& rm -f "${ED}/usr/bin/mytop"

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

[Jorge Manuel B. S. Vicetto]

commit:     ff42ea3a24aeed2ce21b3afbc58536d0ecab844c
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Mon Apr 29 23:51:20 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 23:51:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ff42ea3a

[eclass/mysql-v2] Update eclass to support mariadb-galera.

---
 eclass/mysql-v2.eclass |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 0f2922e..eda43a4 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -115,7 +115,7 @@ mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with
 # Work out the default SERVER_URI correctly
 if [ -z "${SERVER_URI}" ]; then
 	[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
-	if [ "${PN}" == "mariadb" ]; then
+	if [ "${PN}" == "mariadb" ] || [ "${PN}" == "mariadb-galera" ]; then
 		MARIA_FULL_PV="$(replace_version_separator 3 '-' ${MY_PV})"
 		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
 		SERVER_URI="
@@ -126,6 +126,9 @@ if [ -z "${SERVER_URI}" ]; then
 		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		"
+		if [ "${PN}" == "mariadb-galera" ]; then
+			MY_SOURCEDIR="${PN%%-galera}-${GALERA_FULL_PV}"
+		fi
 	else
 		URI_DIR="MySQL"
 		URI_FILE="mysql"
@@ -154,6 +157,10 @@ if [[ "${PN}" == "mariadb" ]]; then
 	HOMEPAGE="http://mariadb.org/"
 	DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 fi
+if [ "${PN}" == "mariadb-galera" ]; then
+	HOMEPAGE="http://mariadb.org/"
+	DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
+fi
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -178,15 +185,15 @@ IUSE="${IUSE} +community profiling"
 && mysql_check_version_range "5.1.38 to 5.3.99" \
 && IUSE="${IUSE} libevent"
 
-[[ ${PN} == "mariadb" ]] \
+([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
 && mysql_version_is_at_least "5.2" \
 && IUSE="${IUSE} oqgraph"
 
-[[ ${PN} == "mariadb" ]] \
+([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
 && mysql_version_is_at_least "5.2.5" \
 && IUSE="${IUSE} sphinx"
 
-[[ ${PN} == "mariadb" ]] \
+([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
 && mysql_version_is_at_least "5.2.10" \
 && IUSE="${IUSE} pam"
 
@@ -215,7 +222,7 @@ DEPEND="
 	>=sys-libs/zlib-1.2.3
 "
 
-[[ ${PN} == mariadb ]] \
+([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
 && mysql_check_version_range "5.1.38 to 5.3.99" \
 && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
 
@@ -225,20 +232,20 @@ for i in "mysql" "mariadb" "mariadb-galera" ; do
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
 
-[[ "${PN}" == "mariadb" ]] \
+([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
 && mysql_version_is_at_least "5.2" \
 && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
 
-[[ "${PN}" == "mariadb" ]] \
+([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
 && mysql_version_is_at_least "5.2.5" \
 && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
 
-[[ "${PN}" == "mariadb" ]] \
+([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
 && mysql_version_is_at_least "5.2.10" \
 && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
 
 # Bug 441700 MariaDB >=5.3 include custom mytop
-[[ "${PN}" == "mariadb" ]] \
+([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
 && mysql_version_is_at_least "5.3" \
 && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
 
@@ -259,7 +266,7 @@ RDEPEND="${DEPEND}
 "
 
 # Bug 455016 Add dependancies of mytop
-[[ "${PN}" == "mariadb" ]] \
+([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
 && mysql_version_is_at_least "5.3" \
 && RDEPEND="${RDEPEND} perl? (
 	virtual/perl-Getopt-Long
@@ -294,13 +301,13 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 # PBXT_VERSION means that we have a PBXT patch for this PV
 # PBXT was only introduced after 5.1.12
 pbxt_patch_available() {
-	[[ ${PN} != "mariadb" ]] \
+	[[ ${PN} != "mariadb" ]] && [[ ${PN} != "mariadb-galera" ]]\
 	&& [[ -n "${PBXT_VERSION}" ]]
 	return $?
 }
 
 pbxt_available() {
-	pbxt_patch_available || [[ ${PN} == "mariadb" ]]
+	pbxt_patch_available || [[ ${PN} == "mariadb" ]] || [[ ${PN} == "mariadb-galera" ]]
 	return $?
 }
 
@@ -309,7 +316,7 @@ pbxt_available() {
 # XTRADB_VERS means that we have a XTRADB patch for this PV
 # XTRADB was only introduced after 5.1.26
 xtradb_patch_available() {
-	[[ ${PN} != "mariadb" ]] \
+	[[ ${PN} != "mariadb" ]] && [[ ${PN} != "mariadb-galera" ]] \
 	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
 	return $?
 }

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

[Jorge Manuel B. S. Vicetto]

commit:     7880308a3ef25f6e2945dc364fff3cc8a2eb84f4
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 10:13:30 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 10:13:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7880308a

[eclass] Update eclasses to be more consistent with bash notation and more compact.

---
 eclass/mysql-autotools.eclass |   58 ++++++++--------
 eclass/mysql-cmake.eclass     |   28 ++++----
 eclass/mysql-v2.eclass        |  153 +++++++++++++++++------------------------
 3 files changed, 107 insertions(+), 132 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index e00906b..9d1ff91 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -51,14 +51,14 @@ mysql-autotools_disable_test() {
 	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
 	# ${S}/mysql-tests/suite/binlog/t/disabled.def
 	# ${S}/mysql-tests/suite/innodb/t/disabled.def
-	if [ -n "${testsuite}" ]; then
+	if [[ -n ${testsuite} ]]; then
 		for mysql_disable_file in \
 			${S}/mysql-test/suite/${testsuite}/disabled.def  \
 			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
 			FAILED ; do
-			[ -f "${mysql_disable_file}" ] && break
+			[[ -f ${mysql_disable_file} ]] && break
 		done
-		if [ "${mysql_disabled_file}" != "FAILED" ]; then
+		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
 			echo "${testname} : ${reason}" >> "${mysql_disable_file}"
 		else
 			ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
@@ -99,7 +99,7 @@ mysql-autotools_configure_minimal() {
 
 	# MariaDB requires this flag in order to link to GPLv3 readline v6 or greater
 	# A note is added to the configure output
-	if [[ "${PN}" == "mariadb" ]]  && mysql_version_is_at_least "5.1.61" ; then
+	if [[ ${PN} == "mariadb" ]]  && mysql_version_is_at_least "5.1.61" ; then
 		myconf="${myconf} --disable-distribution"
 	fi
 }
@@ -134,7 +134,7 @@ mysql-autotools_configure_common() {
 		fi
 	fi
 
-	if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
+	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}."
 		ewarn "You MUST file bugs without these variables set."
@@ -220,7 +220,7 @@ mysql-autotools_configure_51() {
 		# Not supporting as examples: example,daemon_example,ftexample
 		plugins_sta="${plugins_sta} partition"
 
-		if [[ "${PN}" != "mariadb" ]] ; then
+		if [[ ${PN} != "mariadb" ]] ; then
 			elog "Before using the Federated storage engine, please be sure to read"
 			elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
 			plugins_dyn="${plugins_dyn} federated"
@@ -237,10 +237,10 @@ mysql-autotools_configure_51() {
 	# - innobase, innodb_plugin
 	# Build falcon if available for 6.x series.
 	for i in innobase falcon ; do
-		[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
+		[[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}"
 	done
 	for i in innodb_plugin ; do
-		[ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
+		[[ -e ${S}/storage/${i} ]] && plugins_dyn="${plugins_dyn} ${i}"
 	done
 
 	# like configuration=max-no-ndb
@@ -252,12 +252,12 @@ mysql-autotools_configure_51() {
 		plugins_dis="${plugins_dis} ndbcluster"
 	fi
 
-	if [[ "${PN}" == "mariadb" ]] ; then
+	if [[ ${PN} == "mariadb" ]] ; then
 		# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
 		# caught above.
 		# This is not optional, without it several upstream testcases fail.
 		# Also strongly recommended by upstream.
-		if [[ "${PV}" < "5.2.0" ]] ; then
+		if [[ ${PV} < "5.2.0" ]] ; then
 			myconf="${myconf} --with-maria-tmp-tables"
 			plugins_sta="${plugins_sta} maria"
 		else
@@ -265,11 +265,11 @@ mysql-autotools_configure_51() {
 			plugins_sta="${plugins_sta} aria"
 		fi
 
-		[ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
+		[[ ( -e ${S}/storage/innobase ) || ( -e ${S}/storage/xtradb ) ]] ||
 			die "The ${P} package doesn't provide innobase nor xtradb"
 
 		for i in innobase xtradb ; do
-			[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
+			[[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}"
 		done
 
 		myconf="${myconf} $(use_with libevent)"
@@ -300,7 +300,7 @@ mysql-autotools_configure_51() {
 		fi
 	fi
 
-	if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
+	if pbxt_available && [[ ${PBXT_NEWSTYLE} == "1" ]]; then
 		use pbxt \
 		&& plugins_sta="${plugins_sta} pbxt" \
 		|| plugins_dis="${plugins_dis} pbxt"
@@ -311,7 +311,7 @@ mysql-autotools_configure_51() {
 	plugins_dyn=""
 
 	# Google MySQL, bundle what upstream supports
-	if [[ "${PN}" == "google-mysql" ]]; then
+	if [[ ${PN} == "google-mysql" ]]; then
 		for x in innobase innodb_plugin innodb ; do
 			plugins_sta="${plugins_sta//$x}"
 			plugins_dyn="${plugins_dyn//$x}"
@@ -389,7 +389,7 @@ mysql-autotools_src_prepare() {
 
 	# last -fPIC fixup, per bug #305873
 	i="${S}"/storage/innodb_plugin/plug.in
-	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
+	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
 
 	# Additional checks, remove bundled zlib
 	rm -f "${S}/zlib/"*.[ch]
@@ -417,21 +417,21 @@ mysql-autotools_src_prepare() {
 		i="innobase"
 		o="${WORKDIR}/storage-${i}.mysql-upstream"
 		# Have we been here already?
-		[ -d "${o}" ] && rm -f "${i}"
+		[[ -d ${o} ]] && rm -f "${i}"
 		# Or maybe we haven't
-		[ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
+		[[ ( -d ${i} ) && ! ( -d ${o} ) ]] && mv "${i}" "${o}"
 		cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
 		popd >/dev/null
 	fi
 
-	if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
+	if pbxt_patch_available && [[ ${PBXT_NEWSTYLE} == "1" ]] && use pbxt ; then
 		einfo "Adding storage engine: PBXT"
 		pushd "${S}"/storage >/dev/null
 		i='pbxt'
-		[ -d "${i}" ] && rm -rf "${i}"
+		[[ -d ${i} ]] && rm -rf "${i}"
 		cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
 		f="${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch"
-		[[ -f $f ]] && epatch "$f" 
+		[[ -f $f ]] && epatch "$f"
 		popd >/dev/null
 	fi
 
@@ -490,7 +490,7 @@ mysql-autotools_src_configure() {
 	# implicitly. Upstream might be interested in this, exclude
 	# -fno-implicit-templates for google-mysql for now.
 	mysql_version_is_at_least "5.0" \
-	&& [[ "${PN}" != "google-mysql" ]] \
+	&& [[ ${PN} != "google-mysql" ]] \
 	&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
 	export CXXFLAGS
 
@@ -526,7 +526,7 @@ mysql-autotools_src_configure() {
 	| xargs -0 -n100 sed -i \
 	-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
 
-	if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
+	if [[ $EAPI == 2 ]] && [[ ${PBXT_NEWSTYLE} != "1" ]]; then
 		pbxt_patch_available && use pbxt && pbxt_src_configure
 	fi
 }
@@ -538,7 +538,7 @@ mysql-autotools_src_compile() {
 
 	emake || die "emake failed"
 
-	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
+	if [[ ${PBXT_NEWSTYLE} != "1" ]]; then
 		pbxt_patch_available && use pbxt && pbxt_src_compile
 	fi
 }
@@ -557,7 +557,7 @@ mysql-autotools_src_install() {
 		testroot="${MY_SHAREDSTATEDIR}" \
 		|| die "emake install failed"
 
-	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
+	if [[ ${PBXT_NEWSTYLE} != "1" ]]; then
 		pbxt_patch_available && use pbxt && pbxt_src_install
 	fi
 
@@ -620,7 +620,7 @@ mysql-autotools_src_install() {
 		# Empty directories ...
 		diropts "-m0750"
 		keepdir "${MY_DATADIR#${EPREFIX}}"
-		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+		if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
 			chown -R mysql:mysql "${D}/${MY_DATADIR}"
 		fi
 
@@ -635,7 +635,7 @@ mysql-autotools_src_install() {
 	# Docs
 	einfo "Installing docs"
 	for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
-		[[ -f "$i" ]] && dodoc "$i"
+		[[ -f $i ]] && dodoc "$i"
 	done
 	doinfo "${S}"/Docs/mysql.info
 
@@ -648,12 +648,12 @@ mysql-autotools_src_install() {
 			"${S}"/support-files/magic \
 			"${S}"/support-files/ndb-config-2-node.ini
 		do
-			[[ -f "$script" ]] && dodoc "${script}"
+			[[ -f $script ]] && dodoc "${script}"
 		done
 
 		docinto "scripts"
 		for script in "${S}"/scripts/mysql* ; do
-			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
+			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
 		done
 
 	fi
@@ -661,7 +661,7 @@ mysql-autotools_src_install() {
 	mysql_lib_symlinks "${ED}"
 
 	#Remove mytop if perl is not selected
-	[[ "${PN}" == "mariadb" ]] && ! use perl \
+	[[ ${PN} == "mariadb" ]] && ! use perl \
 	&& mysql_version_is_at_least "5.3" \
 	&& rm -f "${ED}/usr/bin/mytop"
 

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 43d0221..c00ceb2 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -36,29 +36,29 @@ mysql-cmake_disable_test() {
 	for mysql_disabled_file in \
 		${S}/mysql-test/disabled.def  \
 		${S}/mysql-test/t/disabled.def ; do
-		[ -f "${mysql_disabled_file}" ] && break
+		[[ -f ${mysql_disabled_file} ]] && break
 	done
 	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
 	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
 	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
 
-	if [ -n "${testsuite}" ] && [ "${testsuite}" != "main" ]; then
+	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
 		for mysql_disabled_file in \
 			${S}/mysql-test/suite/${testsuite}/disabled.def  \
 			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
 			FAILED ; do
-			[ -f "${mysql_disabled_file}" ] && break
+			[[ -f ${mysql_disabled_file} ]] && break
 		done
-		if [ "${mysql_disabled_file}" != "FAILED" ]; then
+		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
 			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
 		else
 			for mysql_disabled_dir in \
 				${S}/mysql-test/suite/${testsuite} \
 				${S}/mysql-test/suite/${testsuite}/t  \
 				FAILED ; do
-				[ -d "${mysql_disabled_dir}" ] && break
+				[[ -d ${mysql_disabled_dir} ]] && break
 			done
-			if [ "${mysql_disabled_dir}" != "FAILED" ]; then
+			if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
 				echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
 			else
 				ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
@@ -72,7 +72,7 @@ mysql-cmake_disable_test() {
 # Helper function to configure locale cmake options
 configure_cmake_locale() {
 
-	if ! use minimal && [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
+	if ! use minimal && [[ ( -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}."
 		ewarn "You MUST file bugs without these variables set."
@@ -218,7 +218,7 @@ mysql-cmake_src_prepare() {
 
 	# last -fPIC fixup, per bug #305873
 	i="${S}"/storage/innodb_plugin/plug.in
-	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
+	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
 
 	rm -f "scripts/mysqlbug"
 	epatch_user
@@ -259,7 +259,7 @@ mysql-cmake_src_configure() {
 	# Bug 412851
 	# MariaDB requires this flag to compile with GPLv3 readline linked
 	# Adds a warning about redistribution to configure
-	if [[ "${PN}" == "mariadb" ]] ; then
+	if [[ ${PN} == "mariadb" ]] ; then
 		mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
 	fi
 
@@ -321,7 +321,7 @@ mysql-cmake_src_install() {
 	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
 
 	# Create a mariadb_config symlink
-	[[ "${PN}" == "mariadb" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
+	[[ ${PN} == "mariadb" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
 
 	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
 	rm -Rf "${ED}/usr/data"
@@ -370,7 +370,7 @@ mysql-cmake_src_install() {
 		einfo "Creating initial directories"
 		# Empty directories ...
 		diropts "-m0750"
-		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+		if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
 			dodir "${MY_DATADIR#${EPREFIX}}"
 			keepdir "${MY_DATADIR#${EPREFIX}}"
 			chown -R mysql:mysql "${D}/${MY_DATADIR}"
@@ -393,16 +393,16 @@ mysql-cmake_src_install() {
 			"${S}"/support-files/magic \
 			"${S}"/support-files/ndb-config-2-node.ini.sh
 		do
-			[[ -f "$script" ]] && dodoc "${script}"
+			[[ -f $script ]] && dodoc "${script}"
 		done
 
 		docinto "scripts"
 		for script in "${S}"/scripts/mysql* ; do
-			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
+			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
 		done
 	fi
 
 	#Remove mytop if perl is not selected
-	[[ "${PN}" == "mariadb" ]] && ! use perl \
+	[[ ${PN} == "mariadb" ]] && ! use perl \
 	&& rm -f "${ED}/usr/bin/mytop"
 }

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index eda43a4..cca2360 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -44,7 +44,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-2"
 
 inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
 
@@ -67,8 +67,8 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
 # and we will run a mysql server during test phase
 S="${WORKDIR}/mysql"
 
-[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
+[[ ${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"
 fi
@@ -113,9 +113,9 @@ mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with
 # 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//_/-}"
-	if [ "${PN}" == "mariadb" ] || [ "${PN}" == "mariadb-galera" ]; then
+if [[ -z ${SERVER_URI} ]]; then
+	[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 		MARIA_FULL_PV="$(replace_version_separator 3 '-' ${MY_PV})"
 		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
 		SERVER_URI="
@@ -126,8 +126,8 @@ if [ -z "${SERVER_URI}" ]; then
 		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		"
-		if [ "${PN}" == "mariadb-galera" ]; then
-			MY_SOURCEDIR="${PN%%-galera}-${GALERA_FULL_PV}"
+		if [[ ${PN} == "mariadb-galera" ]]; then
+			MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"
 		fi
 	else
 		URI_DIR="MySQL"
@@ -144,20 +144,21 @@ fi
 SRC_URI="${SERVER_URI}"
 
 # Gentoo patches to MySQL
-[[ ${MY_EXTRAS_VER} != live ]] && [[ ${MY_EXTRAS_VER} != none ]] \
-&& SRC_URI="${SRC_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
 		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"
+fi
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
 HOMEPAGE="http://www.mysql.com/"
-if [[ "${PN}" == "mariadb" ]]; then
+if [[ ${PN} == "mariadb" ]]; then
 	HOMEPAGE="http://mariadb.org/"
 	DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 fi
-if [ "${PN}" == "mariadb-galera" ]; then
+if [[ ${PN} == "mariadb-galera" ]]; then
 	HOMEPAGE="http://mariadb.org/"
 	DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
 fi
@@ -181,31 +182,23 @@ IUSE="${IUSE} cluster"
 IUSE="${IUSE} max-idx-128"
 IUSE="${IUSE} +community profiling"
 
-[[ ${PN} == "mariadb" ]] \
-&& mysql_check_version_range "5.1.38 to 5.3.99" \
-&& IUSE="${IUSE} libevent"
-
-([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
-&& mysql_version_is_at_least "5.2" \
-&& IUSE="${IUSE} oqgraph"
-
-([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
-&& mysql_version_is_at_least "5.2.5" \
-&& IUSE="${IUSE} sphinx"
-
-([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
-&& mysql_version_is_at_least "5.2.10" \
-&& IUSE="${IUSE} pam"
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+	mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent"
+	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph"
+	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx"
+	mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
+fi
 
 if mysql_version_is_at_least "5.5"; then
 	REQUIRED_USE="tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
 	IUSE="${IUSE} jemalloc tcmalloc"
 fi
 
-REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
+if mysql_version_is_at_least "5.5.7"; then
+	IUSE="${IUSE} systemtap"
+fi
 
-mysql_version_is_at_least "5.5.7" \
-&& IUSE="${IUSE} systemtap"
+REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
 
 #
 # DEPENDENCIES:
@@ -222,9 +215,23 @@ DEPEND="
 	>=sys-libs/zlib-1.2.3
 "
 
-([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
-&& mysql_check_version_range "5.1.38 to 5.3.99" \
-&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
+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 )"
+	mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
+	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
+	# Bug 441700 MariaDB >=5.3 include custom mytop
+	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
+
+	# Bug 455016 Add dependancies of mytop
+	if mysql_version_is_at_least "5.3" ; then
+		RDEPEND="${RDEPEND} perl? (
+			virtual/perl-Getopt-Long
+			dev-perl/TermReadKey
+			virtual/perl-Term-ANSIColor
+			virtual/perl-Time-HiRes ) "
+	fi
+fi
 
 # Having different flavours at the same time is not a good idea
 for i in "mysql" "mariadb" "mariadb-galera" ; do
@@ -232,32 +239,15 @@ for i in "mysql" "mariadb" "mariadb-galera" ; do
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
 
-([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
-&& mysql_version_is_at_least "5.2" \
-&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
-
-([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
-&& mysql_version_is_at_least "5.2.5" \
-&& DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
-
-([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
-&& mysql_version_is_at_least "5.2.10" \
-&& DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
-
-# Bug 441700 MariaDB >=5.3 include custom mytop
-([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
-&& mysql_version_is_at_least "5.3" \
-&& DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
-
-mysql_version_is_at_least "5.5.7" \
-&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \
-&& DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
-
-mysql_version_is_at_least "5.5" \
-&& DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )"
+if mysql_version_is_at_least "5.5" ; then
+	DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )"
+	DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )"
+fi
 
-mysql_version_is_at_least "5.5" \
-&& DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )"
+if mysql_version_is_at_least "5.5.7" ; then
+	DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )"
+	DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
+fi
 
 # prefix: first need to implement something for #196294
 RDEPEND="${DEPEND}
@@ -265,15 +255,6 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-mysql )
 "
 
-# Bug 455016 Add dependancies of mytop
-([[ ${PN} == "mariadb" ]]  || [[ "${PN}" == "mariadb-galera" ]])\
-&& mysql_version_is_at_least "5.3" \
-&& RDEPEND="${RDEPEND} perl? (
-	virtual/perl-Getopt-Long
-	dev-perl/TermReadKey
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Time-HiRes ) "
-
 DEPEND="${DEPEND}
 	virtual/yacc
 "
@@ -284,8 +265,9 @@ DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
 DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
 
 # compile-time-only
-mysql_version_is_at_least "5.5.8" \
-&& DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
+if mysql_version_is_at_least "5.5.8" ; then
+	DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
+fi
 
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
@@ -301,14 +283,11 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 # PBXT_VERSION means that we have a PBXT patch for this PV
 # PBXT was only introduced after 5.1.12
 pbxt_patch_available() {
-	[[ ${PN} != "mariadb" ]] && [[ ${PN} != "mariadb-galera" ]]\
-	&& [[ -n "${PBXT_VERSION}" ]]
-	return $?
+	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" && ( -n "${PBXT_VERSION}" ) ]]
 }
 
 pbxt_available() {
-	pbxt_patch_available || [[ ${PN} == "mariadb" ]] || [[ ${PN} == "mariadb-galera" ]]
-	return $?
+	pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]
 }
 
 # Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
@@ -316,18 +295,15 @@ pbxt_available() {
 # XTRADB_VERS means that we have a XTRADB patch for this PV
 # XTRADB was only introduced after 5.1.26
 xtradb_patch_available() {
-	[[ ${PN} != "mariadb" ]] && [[ ${PN} != "mariadb-galera" ]] \
-	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
-	return $?
+	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera"
+		&& ( -n "${XTRADB_VER}" ) && ( -n "${PERCONA_VER}" ) ]]
 }
 
-
 if pbxt_patch_available; then
 
 	PBXT_P="pbxt-${PBXT_VERSION}"
 	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
 	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
-
 fi
 
 # PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
@@ -399,8 +375,7 @@ mysql-v2_pkg_setup() {
 	fi
 
 	# Check for USE flag problems in pkg_setup
-	if ! mysql_version_is_at_least "5.2" \
-		&& use debug ; then
+	if ! mysql_version_is_at_least "5.2" && use debug ; then
 		# Also in package.use.mask
 		die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
 	fi
@@ -502,13 +477,13 @@ mysql-v2_pkg_postinst() {
 
 		docinto "scripts"
 		for script in scripts/mysql* ; do
-			[[ -f "${script}" ]] \
-			&& [[ "${script%.sh}" == "${script}" ]] \
-			&& dodoc "${script}"
+			if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then
+				dodoc "${script}"
+			fi
 		done
 
-		if [ ${PN} == "mariadb" ] \
-		&& mysql_version_is_at_least "5.2.10" && use pam ; then
+		if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] \
+			&& mysql_version_is_at_least "5.2.10" && use pam ; then
 			einfo
 			elog "This install includes the PAM authentication plugin."
 			elog "To activate and configure the PAM plugin, please read:"
@@ -589,7 +564,7 @@ mysql-v2_pkg_config() {
 		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
 		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
 
-		if [[ -d "${old_MY_DATADIR_s}" ]] && [[ "${old_MY_DATADIR_s}" != / ]]; then
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
 			if [[ -d "${MY_DATADIR_s}" ]]; then
 				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
 				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
@@ -692,7 +667,7 @@ mysql-v2_pkg_config() {
 	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
+	[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
 	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
 	einfo "Command: $cmd"
 	eval $cmd \
@@ -773,7 +748,7 @@ mysql-v2_pkg_config() {
 		mysql < "${sqltmp}"
 	rc=$?
 	eend $?
-	[ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
+	[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
 
 	# Stop the server and cleanup
 	einfo "Stopping the server ..."

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

[Jorge Manuel B. S. Vicetto]

commit:     98109af658fc7a5947da6ffcdd2b74c938ceff0a
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 01:07:11 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed May  1 01:07:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=98109af6

[eclass] Update eclasses to support percona-server and do some more cleanup.

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index c00ceb2..c4a91ba 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -179,7 +179,7 @@ configure_cmake_standard() {
 		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
 	fi
 
-	if [ "${PN}" == "mariadb" ]; then
+	if [[ ${PN} == "mariadb" ]]; then
 		mycmakeargs+=(
 			$(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE)
 			$(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE)
@@ -189,7 +189,12 @@ configure_cmake_standard() {
 		if ! use pam ; then
 			mycmakeargs+=( -DAUTH_PAM_DISABLED=1 )
 		fi
+	fi
 
+	if [[ ${PN} == "percona-server" ]]; then
+		mycmakeargs+=(
+			$(cmake-utils_use_with pam)
+		)
 	fi
 }
 

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index cca2360..81cd9f2 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -116,7 +116,7 @@ mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with
 if [[ -z ${SERVER_URI} ]]; then
 	[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
 	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-		MARIA_FULL_PV="$(replace_version_separator 3 '-' ${MY_PV})"
+		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
@@ -129,6 +129,13 @@ if [[ -z ${SERVER_URI} ]]; then
 		if [[ ${PN} == "mariadb-galera" ]]; then
 			MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"
 		fi
+	elif [[ ${PN} == "percona-server" ]]; then
+		PERCONA_PN="Percona-Server"
+		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
+		MY_PV=$(get_version_component_range 1-3 ${PV})
+		MY_PATCH=$(get_version_component_range 4 ${PV})
+		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/LATEST/source/${PERCONA_PN}-${MY_PV}-rel30.${MY_PATCH}.tar.gz"
+#		http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/Percona-Server-5.5.30-rel30.2.tar.gz
 	else
 		URI_DIR="MySQL"
 		URI_FILE="mysql"
@@ -162,6 +169,10 @@ if [[ ${PN} == "mariadb-galera" ]]; then
 	HOMEPAGE="http://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"
+	DESCRIPTION="An enhanced, drop-in replacement fro MySQL from the Percona team"
+fi
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -198,6 +209,10 @@ if mysql_version_is_at_least "5.5.7"; then
 	IUSE="${IUSE} systemtap"
 fi
 
+if [[ ${PN} == "percona-server" ]]; then
+	mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam"
+fi
+
 REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
 
 #
@@ -234,7 +249,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 fi
 
 # Having different flavours at the same time is not a good idea
-for i in "mysql" "mariadb" "mariadb-galera" ; do
+for i in "mysql" "mariadb" "mariadb-galera" "percona-server"; do
 	[[ ${i} == ${PN} ]] ||
 	DEPEND="${DEPEND} !dev-db/${i}"
 done

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

[Jorge Manuel B. S. Vicetto]

commit:     9284174708ede26bf3b953f20e2fe10e353b5b7e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 02:01:43 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed May  1 02:01:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=92841747

[eclass] Fix mytop dependencies.
Thanks to Brian Evans <grknight <AT> lavabit.com> for noticing the issue.

---
 eclass/mysql-v2.eclass |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 81cd9f2..4b2aa74 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -237,15 +237,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
-
-	# Bug 455016 Add dependancies of mytop
-	if mysql_version_is_at_least "5.3" ; then
-		RDEPEND="${RDEPEND} perl? (
-			virtual/perl-Getopt-Long
-			dev-perl/TermReadKey
-			virtual/perl-Term-ANSIColor
-			virtual/perl-Time-HiRes ) "
-	fi
 fi
 
 # Having different flavours at the same time is not a good idea
@@ -270,6 +261,17 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-mysql )
 "
 
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+	# Bug 455016 Add dependencies of mytop
+	if mysql_version_is_at_least "5.3" ; then
+		RDEPEND="${RDEPEND} perl? (
+			virtual/perl-Getopt-Long
+			dev-perl/TermReadKey
+			virtual/perl-Term-ANSIColor
+			virtual/perl-Time-HiRes ) "
+	fi
+fi
+
 DEPEND="${DEPEND}
 	virtual/yacc
 "

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

[Robin H. Johnson]

commit:     d43e6d93a9b3422d0d58143423d8120484af9c1c
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Jun 12 17:10:45 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 17:10:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d43e6d93

Correctly set WITH_UNIT_TESTS for bug 472870

---
 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 c4a91ba..1ca8054 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -258,7 +258,7 @@ mysql-cmake_src_configure() {
 		-DINSTALL_SQLBENCHDIR=share/mysql
 		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
 		-DWITH_COMMENT="Gentoo Linux ${PF}"
-		-DWITHOUT_UNIT_TESTS=1
+		$(cmake-utils_use_with test UNIT_TESTS)
 	)
 
 	# Bug 412851

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

[Jorge Manuel B. S. Vicetto]

commit:     86a0814bf9c5dff70451af813c7fde345c7e4f32
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 19:16:12 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 19:16:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=86a0814b

Add explicit return value for pbxt_patch_available, pbxt_available and xtradb_patch_available functions.

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 4b2aa74..e213275 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -301,10 +301,12 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 # PBXT was only introduced after 5.1.12
 pbxt_patch_available() {
 	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" && ( -n "${PBXT_VERSION}" ) ]]
+	return $?
 }
 
 pbxt_available() {
 	pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]
+	return $?
 }
 
 # Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
@@ -314,6 +316,7 @@ pbxt_available() {
 xtradb_patch_available() {
 	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera"
 		&& ( -n "${XTRADB_VER}" ) && ( -n "${PERCONA_VER}" ) ]]
+	return $?
 }
 
 if pbxt_patch_available; then

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

[Brian Evans]

commit:     cab5b1ac1733f24ebb8f04a618c069387294dff2
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Jun 27 13:16:21 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Jun 27 14:17:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=cab5b1ac

[eclass] Add in LDPATH env.d file on install to help packages find libmysqlclient*.  Remove keepdir /var/run/mysql as the --config and stable
init scripts compensate

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 1ca8054..4fb2499 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -382,7 +382,7 @@ mysql-cmake_src_install() {
 		fi
 
 		diropts "-m0755"
-		for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
+		for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
 			dodir "${folder}"
 			keepdir "${folder}"
 			chown -R mysql:mysql "${ED}/${folder}"
@@ -407,6 +407,11 @@ mysql-cmake_src_install() {
 		done
 	fi
 
+	cat <<-EOF > "${T}"/40mysql
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
+	EOF
+	doenvd "${T}"/40mysql
+
 	#Remove mytop if perl is not selected
 	[[ ${PN} == "mariadb" ]] && ! use perl \
 	&& rm -f "${ED}/usr/bin/mytop"

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

[Brian Evans]

commit:     aea7b2f310904cf7c54d7e6942ffb8d4f3c4e89a
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Sun Jul  7 18:55:27 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Jul 16 02:47:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=aea7b2f3

[eclass] Add new deps for mysql-cluster 7.2+ packages

---
 eclass/mysql-cmake.eclass | 11 +++++++++++
 eclass/mysql-v2.eclass    | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index f31e4a6..7325f21 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -196,6 +196,17 @@ configure_cmake_standard() {
 			$(cmake-utils_use_with pam)
 		)
 	fi
+
+	if [[ ${PN} == "mysql-cluster" ]]; then
+		# TODO: This really should include the following options,
+		# but the memcached package doesn't install the files it seeks.
+		# -DWITH_BUNDLED_MEMCACHED=OFF
+		# -DMEMCACHED_HOME=${EPREFIX}/usr
+		mycmakeargs+=(
+			-DWITH_BUNDLED_LIBEVENT=OFF
+			$(cmake-utils_use_with java NDB_JAVA)
+		)
+	fi
 }
 
 #

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 66d3f07..8e6ba99 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -218,6 +218,10 @@ if [[ ${PN} == "percona-server" ]]; then
 	mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam"
 fi
 
+if [[ ${PN} == "mysql-cluster" ]] ; then
+	mysql_version_is_at_least "7.2.9" && IUSE="${IUSE} java"
+fi
+
 REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
 
 #
@@ -261,6 +265,13 @@ if mysql_version_is_at_least "5.5.7" ; then
 	DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
 fi
 
+if [[ ${PN} == "mysql-cluster" ]] ; then
+	# TODO: This really should include net-misc/memcached
+	# but the package does not install the files it seeks.
+	mysql_version_is_at_least "7.2.3" && \
+		DEPEND="${DEPEND} dev-libs/libevent"
+fi
+
 # prefix: first need to implement something for #196294
 RDEPEND="${DEPEND}
 	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
@@ -284,6 +295,11 @@ if [[ ${PN} == "mariadb-galera" ]] ; then
 	"
 fi
 
+if [[ ${PN} == "mysql-cluster" ]] ; then
+	has java ${IUSE} && RDEPEND="${RDEPEND} virtual/jre" && \
+		DEPEND="${DEPEND} virtual/jdk"
+fi
+
 DEPEND="${DEPEND}
 	virtual/yacc
 "

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

[Brian Evans]

commit:     d24fa6c9db443ee1d2e81989b41f85a55e90dbeb
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Jul 18 12:42:44 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Jul 18 12:43:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d24fa6c9

[eclass] Fix jemalloc/tcmalloc dropping other LDFLAGS for bug 462080

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7325f21..f21e855 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -154,12 +154,12 @@ configure_cmake_standard() {
 		mycmakeargs+=( -DWITH_SSL=bundled )
 	fi
 
-	if mysql_version_is_at_least "5.5" && use jemalloc; then
-		mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' -DWITH_SAFEMALLOC=OFF )
+	if use jemalloc; then
+		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
 	fi
 
-	if mysql_version_is_at_least "5.5" && use tcmalloc; then
-		mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ltcmalloc' -DWITH_SAFEMALLOC=OFF )
+	if use tcmalloc; then
+		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
 	fi
 
 	# Storage engines
@@ -237,6 +237,13 @@ mysql-cmake_src_prepare() {
 	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
 
 	rm -f "scripts/mysqlbug"
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
 	epatch_user
 }
 

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

[Brian Evans]

commit:     909ea6f0ee0bb3b54aef62b8bed06798af620e88
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Sat Aug 10 15:02:30 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sat Aug 10 15:02:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=909ea6f0

Initial commit on a multilib eclass based on the cmake builds.
May need some housekeeping but it works.

---
 eclass/mysql-cmake-multilib.eclass | 460 +++++++++++++++++++++++++++++++++++++
 eclass/mysql-v2.eclass             |   5 +-
 2 files changed, 464 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-cmake-multilib.eclass b/eclass/mysql-cmake-multilib.eclass
new file mode 100644
index 0000000..70e7169
--- /dev/null
+++ b/eclass/mysql-cmake-multilib.eclass
@@ -0,0 +1,460 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: mysql-cmake-multilib.eclass
+# @MAINTAINER:
+# Maintainers:
+#	- MySQL Team <mysql-bugs@gentoo.org>
+#	- Robin H. Johnson <robbat2@gentoo.org>
+#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# @BLURB: This eclass provides the support for cmake based mysql releases
+# @DESCRIPTION:
+# The mysql-cmake-multilib.eclass provides the support to build the mysql
+# ebuilds using the cmake build system. This eclass provides
+# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
+# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
+
+inherit cmake-multilib flag-o-matic multilib prefix
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql_cmake_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql-cmake-multilib_disable_test() {
+
+	local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
+	rawtestname="${1}" ; shift
+	reason="${@}"
+	ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+	testsuite="${rawtestname/.*}"
+	testname="${rawtestname/*.}"
+	for mysql_disabled_file in \
+		${S}/mysql-test/disabled.def  \
+		${S}/mysql-test/t/disabled.def ; do
+		[[ -f ${mysql_disabled_file} ]] && break
+	done
+	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
+	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
+
+	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
+		for mysql_disabled_file in \
+			${S}/mysql-test/suite/${testsuite}/disabled.def  \
+			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
+			FAILED ; do
+			[[ -f ${mysql_disabled_file} ]] && break
+		done
+		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
+			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
+		else
+			for mysql_disabled_dir in \
+				${S}/mysql-test/suite/${testsuite} \
+				${S}/mysql-test/suite/${testsuite}/t  \
+				FAILED ; do
+				[[ -d ${mysql_disabled_dir} ]] && break
+			done
+			if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
+				echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
+			else
+				ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+			fi
+		fi
+	fi
+}
+
+# @FUNCTION: configure_cmake_locale
+# @DESCRIPTION:
+# Helper function to configure locale cmake options
+configure_cmake_locale() {
+
+	if ! use minimal && [[ ( -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}."
+		ewarn "You MUST file bugs without these variables set."
+
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+		)
+
+	elif ! use latin1 ; then
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=utf8
+			-DDEFAULT_COLLATION=utf8_general_ci
+		)
+	else
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=latin1
+			-DDEFAULT_COLLATION=latin1_swedish_ci
+		)
+	fi
+}
+
+# @FUNCTION: configure_cmake_minimal
+# @DESCRIPTION:
+# Helper function to configure minimal build
+configure_cmake_minimal() {
+
+	mycmakeargs+=(
+		-DWITHOUT_SERVER=1
+		-DWITHOUT_EMBEDDED_SERVER=1
+		-DENABLED_LOCAL_INFILE=1
+		-DEXTRA_CHARSETS=none
+		-DINSTALL_SQLBENCHDIR=
+		-DWITH_SSL=system
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DWITH_READLINE=0
+		-DWITH_LIBEDIT=0
+		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
+		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITHOUT_CSV_STORAGE_ENGINE=1
+		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+		-DWITHOUT_HEAP_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
+		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+	)
+}
+
+# @FUNCTION: configure_cmake_standard
+# @DESCRIPTION:
+# Helper function to configure standard build
+configure_cmake_standard() {
+
+	mycmakeargs+=(
+		-DENABLED_LOCAL_INFILE=1
+		-DEXTRA_CHARSETS=all
+		-DMYSQL_USER=mysql
+		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+		-DWITH_READLINE=0
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_disable !static SHARED)
+		$(cmake-utils_use_with debug)
+		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
+		$(cmake-utils_use_with profiling)
+		$(cmake-utils_use_enable systemtap DTRACE)
+	)
+
+	if use ssl; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if use jemalloc; then
+		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+	fi
+
+	if use tcmalloc; then
+		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+	fi
+
+	# Storage engines
+	mycmakeargs+=(
+		-DWITH_ARCHIVE_STORAGE_ENGINE=1
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITH_CSV_STORAGE_ENGINE=1
+		-DWITH_HEAP_STORAGE_ENGINE=1
+		-DWITH_INNOBASE_STORAGE_ENGINE=1
+		-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITH_MYISAM_STORAGE_ENGINE=1
+		-DWITH_PARTITION_STORAGE_ENGINE=1
+		$(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE)
+	)
+
+	if pbxt_available ; then
+		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
+	fi
+
+	if [[ ${PN} == "mariadb" ]]; then
+		mycmakeargs+=(
+			$(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE)
+			$(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE)
+			$(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE)
+		)
+
+		if ! use pam ; then
+			mycmakeargs+=( -DAUTH_PAM_DISABLED=1 )
+		fi
+	fi
+
+	if [[ ${PN} == "percona-server" ]]; then
+		mycmakeargs+=(
+			$(cmake-utils_use_with pam)
+		)
+	fi
+
+	if [[ ${PN} == "mysql-cluster" ]]; then
+		# TODO: This really should include the following options,
+		# but the memcached package doesn't install the files it seeks.
+		# -DWITH_BUNDLED_MEMCACHED=OFF
+		# -DMEMCACHED_HOME=${EPREFIX}/usr
+		mycmakeargs+=(
+			-DWITH_BUNDLED_LIBEVENT=OFF
+			$(cmake-utils_use_with java NDB_JAVA)
+		)
+	fi
+}
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-cmake-multilib_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql-cmake-multilib_src_prepare() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	cd "${S}"
+
+	# 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
+
+	# last -fPIC fixup, per bug #305873
+	i="${S}"/storage/innodb_plugin/plug.in
+	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
+
+	rm -f "scripts/mysqlbug"
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+	epatch_user
+}
+
+_cmake-multilib_src_configure() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	mycmakeargs=(
+		-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)/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
+		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		$(cmake-utils_use_with test UNIT_TESTS)
+	)
+
+	# Bug 412851
+	# MariaDB requires this flag to compile with GPLv3 readline linked
+	# Adds a warning about redistribution to configure
+	if [[ ${PN} == "mariadb" ]] ; then
+		mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
+	fi
+
+	configure_cmake_locale
+	
+	if multilib_is_native_abi; then
+		if use minimal ; then
+			configure_cmake_minimal
+		else
+			configure_cmake_standard
+		fi
+	else
+		configure_cmake_minimal
+	fi
+
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+	# 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"
+	fi
+	export CXXFLAGS
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	cmake-utils_src_configure
+}
+
+# @FUNCTION: mysql-cmake-multilib_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-cmake-multilib_src_configure() {
+	multilib_parallel_foreach_abi _cmake-multilib_src_configure "${@}"
+}
+
+_cmake-multilib_src_compile() {
+	if ! multilib_is_native_abi; then
+		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
+	else
+		cmake-utils_src_compile
+	fi
+}
+
+# @FUNCTION: mysql-cmake-multilib_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql-cmake-multilib_src_compile() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	multilib_foreach_abi _cmake-multilib_src_compile "${@}"
+}
+
+_mysql-cmake-multilib_src_install() {
+	
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	if ! multilib_is_native_abi; then
+		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
+		return
+	fi
+	cmake-utils_src_install
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# Create a mariadb_config symlink
+	[[ ${PN} == "mariadb" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	rm -Rf "${ED}/usr/data"
+
+	# Various junk (my-*.cnf moved elsewhere)
+	einfo "Removing duplicate /usr/share/mysql files"
+
+	# Clean up stuff for a minimal build
+#	if use minimal ; then
+#		einfo "Remove all extra content for minimal build"
+#		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+#		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+#		rm -f "${ED}/usr/sbin/mysqld"
+#		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+#	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+	fi
+
+	# Configuration stuff
+	case ${MYSQL_PV_MAJOR} in
+		5.[1-4]*) mysql_mycnf_version="5.1" ;;
+		5.[5-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.5" ;;
+	esac
+	einfo "Building default my.cnf (${mysql_mycnf_version})"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	doins scripts/mysqlaccess.conf
+	mycnf_src="my.cnf-${mysql_mycnf_version}"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR}/my.cnf.ok"
+	fi
+	eprefixify "${TMPDIR}/my.cnf.ok"
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Creating initial directories"
+		# Empty directories ...
+		diropts "-m0750"
+		if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
+			dodir "${MY_DATADIR#${EPREFIX}}"
+			keepdir "${MY_DATADIR#${EPREFIX}}"
+			chown -R mysql:mysql "${D}/${MY_DATADIR}"
+		fi
+
+		diropts "-m0755"
+		for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
+			dodir "${folder}"
+			keepdir "${folder}"
+			chown -R mysql:mysql "${ED}/${folder}"
+		done
+	fi
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		for script in \
+			"${S}"/support-files/my-*.cnf.sh \
+			"${S}"/support-files/magic \
+			"${S}"/support-files/ndb-config-2-node.ini.sh
+		do
+			[[ -f $script ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
+		done
+	fi
+
+	cat <<-EOF > "${T}"/80mysql-libdir
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
+	EOF
+	doenvd "${T}"/80mysql-libdir
+
+	#Remove mytop if perl is not selected
+	[[ ${PN} == "mariadb" ]] && ! use perl \
+	&& rm -f "${ED}/usr/bin/mytop"
+}
+
+# @FUNCTION: mysql-cmake-multilib_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-cmake-multilib_src_install() {
+	multilib_foreach_abi _mysql-cmake-multilib_src_install "${@}"
+}

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 8e6ba99..81e5b56 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -27,6 +27,9 @@ case ${BUILD} in
 	"cmake")
 		BUILD_INHERIT="mysql-cmake"
 		;;
+	"cmake-multilib")
+		BUILD_INHERIT="mysql-cmake-multilib"
+		;;
 	"autotools")
 		BUILD_INHERIT="mysql-autotools"
 
@@ -185,7 +188,7 @@ case "${BUILD}" in
 	"autotools")
 		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
 		;;
-	"cmake")
+	"cmake"*)
 		IUSE="debug embedded minimal +perl selinux ssl static test"
 		;;
 esac

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

[Brian Evans]

commit:     f01e91e34a3f90f811fff493b83dcb0c52aadf8a
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Sep 18 20:31:58 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Sep 18 20:31:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f01e91e3

Eclass changes to support mariadb 5.5.33+

---
 eclass/mysql-cmake.eclass | 39 +++++++++++++++++++++++++++++++++------
 eclass/mysql-v2.eclass    | 14 +++++++++++++-
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index f21e855..5c2a3d3 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -67,6 +67,15 @@ mysql-cmake_disable_test() {
 	fi
 }
 
+mysql-cmake_use_plugin() {
+	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
+	if use $1 ; then
+		echo "-DWITH_$2=1"
+	else
+		echo "-D$2_DISABLED=1"
+	fi
+}
+
 # @FUNCTION: configure_cmake_locale
 # @DESCRIPTION:
 # Helper function to configure locale cmake options
@@ -181,13 +190,17 @@ configure_cmake_standard() {
 
 	if [[ ${PN} == "mariadb" ]]; then
 		mycmakeargs+=(
-			$(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE)
-			$(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE)
-			$(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE)
+			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
+			$(mysql-cmake_use_plugin sphinx SPHINX)
+			$(mysql-cmake_use_plugin extraengine FEDERATEDX)
+			$(mysql-cmake_use_plugin tokudb TOKUDB)
+			$(mysql-cmake_use_plugin pam AUTH_PAM)
 		)
 
-		if ! use pam ; then
-			mycmakeargs+=( -DAUTH_PAM_DISABLED=1 )
+		#Disable bundled copy of jemalloc
+		mycmakeargs+=( -DWITH_JEMALLOC=no )
+		if use jemalloc ; then
+			mycmakeargs+=( -DLIBJEMALLOC="jemalloc" )
 		fi
 	fi
 
@@ -237,13 +250,27 @@ mysql-cmake_src_prepare() {
 	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
 
 	rm -f "scripts/mysqlbug"
-	if use jemalloc; then
+	if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33"  ); then
 		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
 	fi
 
 	if use tcmalloc; then
 		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
 	fi
+
+	if has tokudb ${IUSE} ; then
+		# Don't build TokuDB unless requested in configure
+		# Upstream bug https://mariadb.atlassian.net/browse/MDEV-5021
+		if [[ "${PV}" == "5.5.33" ]] ; then
+			sed -i 's/"x86_64" AND/"x86_64" AND WITH_TOKUDB AND/' \
+				"${S}/storage/tokudb/CMakeLists.txt" || die "sed failed for tokudb CMakeLists.txt"
+		fi
+
+		# Don't build bundled xz-utils
+		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" 
+		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" 
+	fi
+
 	epatch_user
 }
 

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 6147297..3d2f73c 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -214,6 +214,8 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph"
 	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx"
 	mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
+	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb"
+	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb"
 fi
 
 if mysql_version_is_at_least "5.5"; then
@@ -254,6 +256,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
+	has tokudb ${IUSE} && DEPEND="${DEPEND} tokudb? (
+		>=sys-devel/gcc-4.7[lto]
+		app-arch/xz-utils
+	)"
 fi
 
 # Having different flavours at the same time is not a good idea
@@ -340,7 +346,7 @@ pbxt_patch_available() {
 }
 
 pbxt_available() {
-	pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]
+	pbxt_patch_available || ( [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32" )
 	return $?
 }
 
@@ -449,6 +455,12 @@ mysql-v2_pkg_setup() {
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
 	fi
 
+	if has tokudb ${IUSE} && use tokudb && [[ $(gcc-version) < 4.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-v2_src_unpack

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

[Brian Evans]

commit:     6109a7d535cd3a29e56d58e67a0589dd5dc35647
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Sep 20 15:13:22 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Sep 20 15:13:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6109a7d5

Add mysql-galera to checks in mysql-cmake.eclass

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 5c2a3d3..48378bd 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -188,7 +188,7 @@ configure_cmake_standard() {
 		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
 	fi
 
-	if [[ ${PN} == "mariadb" ]]; then
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 		mycmakeargs+=(
 			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
 			$(mysql-cmake_use_plugin sphinx SPHINX)
@@ -309,7 +309,7 @@ mysql-cmake_src_configure() {
 	# Bug 412851
 	# MariaDB requires this flag to compile with GPLv3 readline linked
 	# Adds a warning about redistribution to configure
-	if [[ ${PN} == "mariadb" ]] ; then
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 		mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
 	fi
 
@@ -371,7 +371,7 @@ mysql-cmake_src_install() {
 	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
 
 	# Create a mariadb_config symlink
-	[[ ${PN} == "mariadb" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
+	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
 
 	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
 	rm -Rf "${ED}/usr/data"
@@ -458,6 +458,6 @@ mysql-cmake_src_install() {
 	doenvd "${T}"/80mysql-libdir
 
 	#Remove mytop if perl is not selected
-	[[ ${PN} == "mariadb" ]] && ! use perl \
+	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
 	&& rm -f "${ED}/usr/bin/mytop"
 }

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

[Brian Evans]

commit:     84dfe8d38bc498b062f3d2fd850c6a6a6b8c6ef1
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Sep 20 20:59:06 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Sep 20 20:59:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=84dfe8d3

[eclass] Finish commenting and complete mysql-cmake_use_plugins

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index c45218e..147d8e5 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -67,12 +67,17 @@ mysql-cmake_disable_test() {
 	fi
 }
 
+# @FUNCTION: mysql-cmake_use_plugin
+# @DESCRIPTION:
+# Helper function to enable/disable plugins by use flags
+# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
+# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
 mysql-cmake_use_plugin() {
 	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
 	if use $1 ; then
 		echo "-DWITH_$2=1"
 	else
-		echo "-DWITHOUT_$2=1"
+		echo "-DWITHOUT_$2=1 -DWITH_$2=0"
 	fi
 }
 

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

[Brian Evans]

commit:     6b322d505e544db33c3f8b744f3071667a838f79
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Sep 20 17:42:17 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Sep 20 17:42:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6b322d50

Remove mariadb-5.5.33 specific hacks that were fixed in 5.5.33a

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 48378bd..c45218e 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -72,7 +72,7 @@ mysql-cmake_use_plugin() {
 	if use $1 ; then
 		echo "-DWITH_$2=1"
 	else
-		echo "-D$2_DISABLED=1"
+		echo "-DWITHOUT_$2=1"
 	fi
 }
 
@@ -197,10 +197,10 @@ configure_cmake_standard() {
 			$(mysql-cmake_use_plugin pam AUTH_PAM)
 		)
 
-		#Disable bundled copy of jemalloc
-		mycmakeargs+=( -DWITH_JEMALLOC=no )
 		if use jemalloc ; then
-			mycmakeargs+=( -DLIBJEMALLOC="jemalloc" )
+			mycmakeargs+=( -DWITH_JEMALLOC="system" )
+		else
+			mycmakeargs+=( -DWITH_JEMALLOC=no )
 		fi
 	fi
 
@@ -259,13 +259,6 @@ mysql-cmake_src_prepare() {
 	fi
 
 	if has tokudb ${IUSE} ; then
-		# Don't build TokuDB unless requested in configure
-		# Upstream bug https://mariadb.atlassian.net/browse/MDEV-5021
-		if [[ "${PV}" == "5.5.33" ]] ; then
-			sed -i 's/"x86_64" AND/"x86_64" AND WITH_TOKUDB AND/' \
-				"${S}/storage/tokudb/CMakeLists.txt" || die "sed failed for tokudb CMakeLists.txt"
-		fi
-
 		# Don't build bundled xz-utils
 		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" 
 		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" 

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

[Brian Evans]

commit:     ca2a05c38884eaa7e4dba08dcd40730b784bbce3
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Tue Sep 24 19:14:58 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Sep 24 19:14:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ca2a05c3

[eclass] Fix missing WITH_PIC which was in autotools but not cmake when USE=static

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 147d8e5..04f83ec 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -162,6 +162,10 @@ configure_cmake_standard() {
 		$(cmake-utils_use_enable systemtap DTRACE)
 	)
 
+	if use static; then
+		mycmakeargs+=( -DWITH_PIC=1 )
+	fi
+
 	if use ssl; then
 		mycmakeargs+=( -DWITH_SSL=system )
 	else

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

[Brian Evans]

commit:     3f21b69b87e854e8805eff7b2793e749da63ef53
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Nov  1 13:59:47 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Nov  1 13:59:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3f21b69b

Add RESTRICT='userpriv' when using live patches or emerge fails (normally shouldn't happen in the tree)

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 503e768..dd85b31 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -74,6 +74,7 @@ S="${WORKDIR}/mysql"
 if [[ ${MY_EXTRAS_VER} == "live" ]]; then
 	EGIT_PROJECT=mysql-extras
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+	RESTRICT="userpriv"
 fi
 
 # @ECLASS-VARIABLE: MYSQL_PV_MAJOR

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

[Jorge Manuel B. S. Vicetto]

commit:     42144aa5a266c7afa3a1c81051ba53c2f5245ef9
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  6 23:51:55 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Nov  6 23:51:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=42144aa5

Don't try to apply patches if MY_EXTRAS_VER="none". Fixes bug 490352.

---
 eclass/mysql-autotools.eclass      | 21 ++++++++++++---------
 eclass/mysql-cmake-multilib.eclass | 21 ++++++++++++---------
 eclass/mysql-cmake.eclass          | 25 ++++++++++++++-----------
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index c1af98e..2cfa3f2 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -377,15 +377,18 @@ mysql-autotools_src_prepare() {
 
 	cd "${S}"
 
-	# 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 [[ ${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
+	fi
 
 	# last -fPIC fixup, per bug #305873
 	i="${S}"/storage/innodb_plugin/plug.in

diff --git a/eclass/mysql-cmake-multilib.eclass b/eclass/mysql-cmake-multilib.eclass
index 70e7169..6314193 100644
--- a/eclass/mysql-cmake-multilib.eclass
+++ b/eclass/mysql-cmake-multilib.eclass
@@ -222,15 +222,18 @@ mysql-cmake-multilib_src_prepare() {
 
 	cd "${S}"
 
-	# 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 [[ ${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
+	fi
 
 	# last -fPIC fixup, per bug #305873
 	i="${S}"/storage/innodb_plugin/plug.in

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 04f83ec..1b9985f 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -244,15 +244,18 @@ mysql-cmake_src_prepare() {
 
 	cd "${S}"
 
-	# 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 [[ ${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
+	fi
 
 	# last -fPIC fixup, per bug #305873
 	i="${S}"/storage/innodb_plugin/plug.in
@@ -269,8 +272,8 @@ mysql-cmake_src_prepare() {
 
 	if has tokudb ${IUSE} ; then
 		# Don't build bundled xz-utils
-		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" 
-		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" 
+		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
+		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
 	fi
 
 	epatch_user

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

[Brian Evans]

commit:     0ba7387a2bb4954e38129fa37d107257476066d4
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Nov  7 15:35:28 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Nov  7 17:29:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0ba7387a

Bring cmake-multilib in sync and add MariaDB 10.0.5 options

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

diff --git a/eclass/mysql-cmake-multilib.eclass b/eclass/mysql-cmake-multilib.eclass
index 6314193..8834c37 100644
--- a/eclass/mysql-cmake-multilib.eclass
+++ b/eclass/mysql-cmake-multilib.eclass
@@ -67,6 +67,20 @@ mysql-cmake-multilib_disable_test() {
 	fi
 }
 
+# @FUNCTION: mysql-cmake_use_plugin
+# @DESCRIPTION:
+# Helper function to enable/disable plugins by use flags
+# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
+# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
+mysql-cmake_use_plugin() {
+	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
+	if use $1 ; then
+		echo "-DWITH_$2=1"
+	else
+		echo "-DWITHOUT_$2=1 -DWITH_$2=0"
+	fi
+}
+
 # @FUNCTION: configure_cmake_locale
 # @DESCRIPTION:
 # Helper function to configure locale cmake options
@@ -148,6 +162,10 @@ configure_cmake_standard() {
 		$(cmake-utils_use_enable systemtap DTRACE)
 	)
 
+	if use static; then
+		mycmakeargs+=( -DWITH_PIC=1 )
+	fi
+
 	if use ssl; then
 		mycmakeargs+=( -DWITH_SSL=system )
 	else
@@ -179,15 +197,33 @@ configure_cmake_standard() {
 		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
 	fi
 
-	if [[ ${PN} == "mariadb" ]]; then
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 		mycmakeargs+=(
-			$(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE)
-			$(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE)
-			$(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE)
+			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
+			$(mysql-cmake_use_plugin sphinx SPHINX)
+			$(mysql-cmake_use_plugin extraengine FEDERATEDX)
+			$(mysql-cmake_use_plugin tokudb TOKUDB)
+			$(mysql-cmake_use_plugin pam AUTH_PAM)
 		)
 
-		if ! use pam ; then
-			mycmakeargs+=( -DAUTH_PAM_DISABLED=1 )
+		if use jemalloc ; then
+			mycmakeargs+=( -DWITH_JEMALLOC="system" )
+		else
+			mycmakeargs+=( -DWITH_JEMALLOC=no )
+		fi
+
+		if mysql_version_is_at_least 10.0.5 ; then
+			# CassandraSE needs Apache Thrift which is not in portage
+			# TODO: Add use and deps for Connect SE external deps
+			mycmakeargs+= (
+				-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
+				$(mysql-cmake_use_plugin extraengine SEQUENCE)
+				$(mysql-cmake_use_plugin extraengine SPIDER)
+				$(mysql-cmake_use_plugin extraengine CONNECT)
+				-DCONNECT_WITH_MYSQL=1
+				-DCONNECT_WITH_LIBXML=0
+				-DCONNECT_WITH_ODBC=0
+			)
 		fi
 	fi
 
@@ -240,13 +276,20 @@ mysql-cmake-multilib_src_prepare() {
 	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
 
 	rm -f "scripts/mysqlbug"
-	if use jemalloc; then
+	if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33"  ); then
 		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
 	fi
 
 	if use tcmalloc; then
 		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
 	fi
+
+	if has tokudb ${IUSE} ; then
+		# Don't build bundled xz-utils
+		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
+		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
+	fi
+
 	epatch_user
 }
 
@@ -282,7 +325,7 @@ _cmake-multilib_src_configure() {
 	# Bug 412851
 	# MariaDB requires this flag to compile with GPLv3 readline linked
 	# Adds a warning about redistribution to configure
-	if [[ ${PN} == "mariadb" ]] ; then
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 		mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
 	fi
 
@@ -345,7 +388,7 @@ mysql-cmake-multilib_src_compile() {
 }
 
 _mysql-cmake-multilib_src_install() {
-	
+
 	debug-print-function ${FUNCNAME} "$@"
 
 	# Make sure the vars are correctly initialized
@@ -364,7 +407,7 @@ _mysql-cmake-multilib_src_install() {
 	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
 
 	# Create a mariadb_config symlink
-	[[ ${PN} == "mariadb" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
+	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
 
 	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
 	rm -Rf "${ED}/usr/data"
@@ -451,7 +494,7 @@ _mysql-cmake-multilib_src_install() {
 	doenvd "${T}"/80mysql-libdir
 
 	#Remove mytop if perl is not selected
-	[[ ${PN} == "mariadb" ]] && ! use perl \
+	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
 	&& rm -f "${ED}/usr/bin/mytop"
 }
 

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 1b9985f..d6a965e 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -12,8 +12,8 @@
 # @DESCRIPTION:
 # The mysql-cmake.eclass provides the support to build the mysql
 # ebuilds using the cmake build system. This eclass provides
-# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
-# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
+# the src_prepare, src_configure, src_compile, and src_install
+# phase hooks.
 
 inherit cmake-utils flag-o-matic multilib prefix
 
@@ -211,6 +211,20 @@ configure_cmake_standard() {
 		else
 			mycmakeargs+=( -DWITH_JEMALLOC=no )
 		fi
+
+		if mysql_version_is_at_least 10.0.5 ; then
+			# CassandraSE needs Apache Thrift which is not in portage
+			# TODO: Add use and deps for Connect SE external deps
+			mycmakeargs+=(
+				-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
+				$(mysql-cmake_use_plugin extraengine SEQUENCE)
+				$(mysql-cmake_use_plugin extraengine SPIDER)
+				$(mysql-cmake_use_plugin extraengine CONNECT)
+				-DCONNECT_WITH_MYSQL=1
+				-DCONNECT_WITH_LIBXML=0
+				-DCONNECT_WITH_ODBC=0
+			)
+		fi
 	fi
 
 	if [[ ${PN} == "percona-server" ]]; then

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

[Brian Evans]

commit:     132b9a5b9b01abffd15d12e3d57430a343425a8a
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Nov  7 17:58:34 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Nov  7 17:58:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=132b9a5b

[cmake-multilib] Refactor multilib eclass to remove duplication of code when possible

---
 eclass/mysql-cmake-multilib.eclass | 384 ++-----------------------------------
 1 file changed, 17 insertions(+), 367 deletions(-)

diff --git a/eclass/mysql-cmake-multilib.eclass b/eclass/mysql-cmake-multilib.eclass
index 8834c37..fc4da63 100644
--- a/eclass/mysql-cmake-multilib.eclass
+++ b/eclass/mysql-cmake-multilib.eclass
@@ -12,10 +12,10 @@
 # @DESCRIPTION:
 # The mysql-cmake-multilib.eclass provides the support to build the mysql
 # ebuilds using the cmake build system. This eclass provides
-# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
-# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
+# the src_prepare, src_configure, src_compile and src_install
+# phase hooks.
 
-inherit cmake-multilib flag-o-matic multilib prefix
+inherit cmake-utils multilib-build flag-o-matic mysql-cmake
 
 #
 # HELPER FUNCTIONS:
@@ -25,224 +25,7 @@ inherit cmake-multilib flag-o-matic multilib prefix
 # @DESCRIPTION:
 # Helper function to disable specific tests.
 mysql-cmake-multilib_disable_test() {
-
-	local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
-	rawtestname="${1}" ; shift
-	reason="${@}"
-	ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-	testsuite="${rawtestname/.*}"
-	testname="${rawtestname/*.}"
-	for mysql_disabled_file in \
-		${S}/mysql-test/disabled.def  \
-		${S}/mysql-test/t/disabled.def ; do
-		[[ -f ${mysql_disabled_file} ]] && break
-	done
-	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
-	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
-
-	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
-		for mysql_disabled_file in \
-			${S}/mysql-test/suite/${testsuite}/disabled.def  \
-			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
-			FAILED ; do
-			[[ -f ${mysql_disabled_file} ]] && break
-		done
-		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
-			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
-		else
-			for mysql_disabled_dir in \
-				${S}/mysql-test/suite/${testsuite} \
-				${S}/mysql-test/suite/${testsuite}/t  \
-				FAILED ; do
-				[[ -d ${mysql_disabled_dir} ]] && break
-			done
-			if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
-				echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
-			else
-				ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
-			fi
-		fi
-	fi
-}
-
-# @FUNCTION: mysql-cmake_use_plugin
-# @DESCRIPTION:
-# Helper function to enable/disable plugins by use flags
-# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
-# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
-mysql-cmake_use_plugin() {
-	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
-	if use $1 ; then
-		echo "-DWITH_$2=1"
-	else
-		echo "-DWITHOUT_$2=1 -DWITH_$2=0"
-	fi
-}
-
-# @FUNCTION: configure_cmake_locale
-# @DESCRIPTION:
-# Helper function to configure locale cmake options
-configure_cmake_locale() {
-
-	if ! use minimal && [[ ( -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}."
-		ewarn "You MUST file bugs without these variables set."
-
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
-
-	elif ! use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8
-			-DDEFAULT_COLLATION=utf8_general_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
-	fi
-}
-
-# @FUNCTION: configure_cmake_minimal
-# @DESCRIPTION:
-# Helper function to configure minimal build
-configure_cmake_minimal() {
-
-	mycmakeargs+=(
-		-DWITHOUT_SERVER=1
-		-DWITHOUT_EMBEDDED_SERVER=1
-		-DENABLED_LOCAL_INFILE=1
-		-DEXTRA_CHARSETS=none
-		-DINSTALL_SQLBENCHDIR=
-		-DWITH_SSL=system
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-		-DWITH_READLINE=0
-		-DWITH_LIBEDIT=0
-		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
-		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
-		-DWITHOUT_CSV_STORAGE_ENGINE=1
-		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-		-DWITHOUT_HEAP_STORAGE_ENGINE=1
-		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
-		-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
-		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
-		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
-		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
-	)
-}
-
-# @FUNCTION: configure_cmake_standard
-# @DESCRIPTION:
-# Helper function to configure standard build
-configure_cmake_standard() {
-
-	mycmakeargs+=(
-		-DENABLED_LOCAL_INFILE=1
-		-DEXTRA_CHARSETS=all
-		-DMYSQL_USER=mysql
-		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		-DWITH_READLINE=0
-		-DWITH_LIBEDIT=0
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_disable !static SHARED)
-		$(cmake-utils_use_with debug)
-		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
-		$(cmake-utils_use_with profiling)
-		$(cmake-utils_use_enable systemtap DTRACE)
-	)
-
-	if use static; then
-		mycmakeargs+=( -DWITH_PIC=1 )
-	fi
-
-	if use ssl; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	if use jemalloc; then
-		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-	fi
-
-	if use tcmalloc; then
-		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-	fi
-
-	# Storage engines
-	mycmakeargs+=(
-		-DWITH_ARCHIVE_STORAGE_ENGINE=1
-		-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-		-DWITH_CSV_STORAGE_ENGINE=1
-		-DWITH_HEAP_STORAGE_ENGINE=1
-		-DWITH_INNOBASE_STORAGE_ENGINE=1
-		-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-		-DWITH_MYISAM_STORAGE_ENGINE=1
-		-DWITH_PARTITION_STORAGE_ENGINE=1
-		$(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE)
-	)
-
-	if pbxt_available ; then
-		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
-	fi
-
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-		mycmakeargs+=(
-			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
-			$(mysql-cmake_use_plugin sphinx SPHINX)
-			$(mysql-cmake_use_plugin extraengine FEDERATEDX)
-			$(mysql-cmake_use_plugin tokudb TOKUDB)
-			$(mysql-cmake_use_plugin pam AUTH_PAM)
-		)
-
-		if use jemalloc ; then
-			mycmakeargs+=( -DWITH_JEMALLOC="system" )
-		else
-			mycmakeargs+=( -DWITH_JEMALLOC=no )
-		fi
-
-		if mysql_version_is_at_least 10.0.5 ; then
-			# CassandraSE needs Apache Thrift which is not in portage
-			# TODO: Add use and deps for Connect SE external deps
-			mycmakeargs+= (
-				-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
-				$(mysql-cmake_use_plugin extraengine SEQUENCE)
-				$(mysql-cmake_use_plugin extraengine SPIDER)
-				$(mysql-cmake_use_plugin extraengine CONNECT)
-				-DCONNECT_WITH_MYSQL=1
-				-DCONNECT_WITH_LIBXML=0
-				-DCONNECT_WITH_ODBC=0
-			)
-		fi
-	fi
-
-	if [[ ${PN} == "percona-server" ]]; then
-		mycmakeargs+=(
-			$(cmake-utils_use_with pam)
-		)
-	fi
-
-	if [[ ${PN} == "mysql-cluster" ]]; then
-		# TODO: This really should include the following options,
-		# but the memcached package doesn't install the files it seeks.
-		# -DWITH_BUNDLED_MEMCACHED=OFF
-		# -DMEMCACHED_HOME=${EPREFIX}/usr
-		mycmakeargs+=(
-			-DWITH_BUNDLED_LIBEVENT=OFF
-			$(cmake-utils_use_with java NDB_JAVA)
-		)
-	fi
+	mysql-cmake_disable_test "$@"
 }
 
 #
@@ -256,44 +39,10 @@ mysql-cmake-multilib_src_prepare() {
 
 	debug-print-function ${FUNCNAME} "$@"
 
-	cd "${S}"
-
-	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
-	fi
-
-	# last -fPIC fixup, per bug #305873
-	i="${S}"/storage/innodb_plugin/plug.in
-	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
-
-	rm -f "scripts/mysqlbug"
-	if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33"  ); then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	if has tokudb ${IUSE} ; then
-		# Don't build bundled xz-utils
-		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
-		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
-	fi
-
-	epatch_user
+	mysql-cmake_src_prepare "$@"
 }
 
-_cmake-multilib_src_configure() {
+_mysql-multilib_src_configure() {
 
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -330,7 +79,7 @@ _cmake-multilib_src_configure() {
 	fi
 
 	configure_cmake_locale
-	
+
 	if multilib_is_native_abi; then
 		if use minimal ; then
 			configure_cmake_minimal
@@ -362,14 +111,16 @@ _cmake-multilib_src_configure() {
 	cmake-utils_src_configure
 }
 
+
 # @FUNCTION: mysql-cmake-multilib_src_configure
 # @DESCRIPTION:
 # Configure mysql to build the code for Gentoo respecting the use flags.
 mysql-cmake-multilib_src_configure() {
-	multilib_parallel_foreach_abi _cmake-multilib_src_configure "${@}"
+	multilib_parallel_foreach_abi _mysql-multilib_src_configure "${@}"
 }
 
-_cmake-multilib_src_compile() {
+_mysql-multilib_src_compile() {
+
 	if ! multilib_is_native_abi; then
 		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
 	else
@@ -384,123 +135,22 @@ mysql-cmake-multilib_src_compile() {
 
 	debug-print-function ${FUNCNAME} "$@"
 
-	multilib_foreach_abi _cmake-multilib_src_compile "${@}"
+	multilib_foreach_abi _mysql-multilib_src_compile "${@}"
 }
 
-_mysql-cmake-multilib_src_install() {
-
+_mysql-multilib_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	if ! multilib_is_native_abi; then
+	if multilib_is_native_abi; then
+		mysql-cmake_src_install
+	else
 		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
-		return
-	fi
-	cmake-utils_src_install
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# Create a mariadb_config symlink
-	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	rm -Rf "${ED}/usr/data"
-
-	# Various junk (my-*.cnf moved elsewhere)
-	einfo "Removing duplicate /usr/share/mysql files"
-
-	# Clean up stuff for a minimal build
-#	if use minimal ; then
-#		einfo "Remove all extra content for minimal build"
-#		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
-#		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-#		rm -f "${ED}/usr/sbin/mysqld"
-#		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
-#	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
 	fi
-
-	# Configuration stuff
-	case ${MYSQL_PV_MAJOR} in
-		5.[1-4]*) mysql_mycnf_version="5.1" ;;
-		5.[5-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.5" ;;
-	esac
-	einfo "Building default my.cnf (${mysql_mycnf_version})"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	doins scripts/mysqlaccess.conf
-	mycnf_src="my.cnf-${mysql_mycnf_version}"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR}/my.cnf.ok"
-	fi
-	eprefixify "${TMPDIR}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Creating initial directories"
-		# Empty directories ...
-		diropts "-m0750"
-		if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
-			dodir "${MY_DATADIR#${EPREFIX}}"
-			keepdir "${MY_DATADIR#${EPREFIX}}"
-			chown -R mysql:mysql "${D}/${MY_DATADIR}"
-		fi
-
-		diropts "-m0755"
-		for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
-			dodir "${folder}"
-			keepdir "${folder}"
-			chown -R mysql:mysql "${ED}/${folder}"
-		done
-	fi
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		for script in \
-			"${S}"/support-files/my-*.cnf.sh \
-			"${S}"/support-files/magic \
-			"${S}"/support-files/ndb-config-2-node.ini.sh
-		do
-			[[ -f $script ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
-		done
-	fi
-
-	cat <<-EOF > "${T}"/80mysql-libdir
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
-	EOF
-	doenvd "${T}"/80mysql-libdir
-
-	#Remove mytop if perl is not selected
-	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
-	&& rm -f "${ED}/usr/bin/mytop"
 }
 
 # @FUNCTION: mysql-cmake-multilib_src_install
 # @DESCRIPTION:
 # Install mysql.
 mysql-cmake-multilib_src_install() {
-	multilib_foreach_abi _mysql-cmake-multilib_src_install "${@}"
+	multilib_foreach_abi _mysql-multilib_src_install "${@}"
 }

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

[Brian Evans]

commit:     90a749646efa1d6f1429c086b8281f59dbf7f502
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Nov 12 16:29:33 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Nov 12 16:29:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=90a74964

[eclass] Fix mysql_fx to return the new MY_DATADIR to pkg_config. Fixes bugs #453480 and #491084

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

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index 2e56fba..c62bd8c 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -290,6 +290,7 @@ mysql_init_vars() {
 				ewarn "MySQL MY_DATADIR has changed"
 				ewarn "from ${MY_DATADIR}"
 				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
 			fi
 		fi
 	fi

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

[Brian Evans]

commit:     3dbfadde22858b2e521b62351fa3372a9f481161
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Nov 19 15:12:36 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Nov 19 15:12:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3dbfadde

[eclass] Add support for xml and odbc in the CONNECT engine in MariaDB 10.0.5+

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index d6a965e..4da7ede 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -221,8 +221,8 @@ configure_cmake_standard() {
 				$(mysql-cmake_use_plugin extraengine SPIDER)
 				$(mysql-cmake_use_plugin extraengine CONNECT)
 				-DCONNECT_WITH_MYSQL=1
-				-DCONNECT_WITH_LIBXML=0
-				-DCONNECT_WITH_ODBC=0
+				$(cmake-utils_use xml CONNECT_WITH_LIBXML2)
+				$(cmake-utils_use odbc CONNECT_WITH_ODBC)
 			)
 		fi
 	fi

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index dd85b31..95266d0 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -218,12 +218,13 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph"
 	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx"
 	mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
-	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb"
+	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb odbc xml" && \
+		REQUIRED_USE="odbc? ( extraengine ) xml? ( extraengine )"
 	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb"
 fi
 
 if mysql_version_is_at_least "5.5"; then
-	REQUIRED_USE="tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
+	REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
 	IUSE="${IUSE} jemalloc tcmalloc"
 fi
 
@@ -300,6 +301,13 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 			virtual/perl-Term-ANSIColor
 			virtual/perl-Time-HiRes ) "
 	fi
+
+	if mysql_version_is_at_least "10.0.5" ; then
+		RDEPEND="${RDEPEND}
+			odbc? ( dev-db/unixODBC )
+			xml? ( dev-libs/libxml2 )
+			"
+	fi
 fi
 
 if [[ ${PN} == "mariadb-galera" ]] ; then

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

[Brian Evans]

commit:     0dfcd2b37c6295a8d667a7b40024fe9283c9bc1b
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Nov 22 17:51:39 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Nov 22 17:51:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0dfcd2b3

[eclass] Force jemalloc with tokudb for performance reasons

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 95266d0..3fc297d 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -218,9 +218,11 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph"
 	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx"
 	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="odbc? ( extraengine ) xml? ( extraengine )"
-	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb"
+		REQUIRED_USE="odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc )"
+	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" && \
+		REQUIRED_USE="tokudb? ( jemalloc )"
 fi
 
 if mysql_version_is_at_least "5.5"; then

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

[Brian Evans]

commit:     3b80157a5deb252f38d077a4894db93646a34ff5
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Jan  6 20:21:44 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Jan  6 20:21:44 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3b80157a

[eclass] Change multilib_is_native_abi to multilib_build_binaries

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

diff --git a/eclass/mysql-cmake-multilib.eclass b/eclass/mysql-cmake-multilib.eclass
index fc4da63..4edca87 100644
--- a/eclass/mysql-cmake-multilib.eclass
+++ b/eclass/mysql-cmake-multilib.eclass
@@ -80,7 +80,7 @@ _mysql-multilib_src_configure() {
 
 	configure_cmake_locale
 
-	if multilib_is_native_abi; then
+	if multilib_build_binaries ; then
 		if use minimal ; then
 			configure_cmake_minimal
 		else
@@ -121,7 +121,7 @@ mysql-cmake-multilib_src_configure() {
 
 _mysql-multilib_src_compile() {
 
-	if ! multilib_is_native_abi; then
+	if ! multilib_build_binaries ; then
 		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
 	else
 		cmake-utils_src_compile
@@ -141,7 +141,7 @@ mysql-cmake-multilib_src_compile() {
 _mysql-multilib_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if multilib_is_native_abi; then
+	if multilib_build_binaries; then
 		mysql-cmake_src_install
 	else
 		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install

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

[Brian Evans]

commit:     9df62e5eb03974182c6dd50ac2e6636c908f12fb
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Sun Jan 19 15:33:58 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sun Jan 19 15:33:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9df62e5e

Add user eclass to prevent errors

---
 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 d6ebe6b..1c3eff3 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -49,7 +49,7 @@ MYSQL_EXTRAS=""
 # Use "none" to disable it's use
 [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
 
-inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
+inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
 
 #
 # Supported EAPI versions and export functions

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

[Brian Evans]

commit:     1efb040f0c9c0b0b7759fe2e09c1cb3c853ab7c2
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Jan 20 14:03:27 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Jan 20 14:03:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1efb040f

[eclass] Use more descriptive functions from eutils and fix deps

---
 eclass/mysql-cmake.eclass | 14 +++++++-------
 eclass/mysql-v2.eclass    | 21 ++++++++++-----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 615a579..81f465e 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -15,7 +15,7 @@
 # the src_prepare, src_configure, src_compile, and src_install
 # phase hooks.
 
-inherit cmake-utils flag-o-matic multilib prefix
+inherit cmake-utils flag-o-matic multilib prefix eutils
 
 #
 # HELPER FUNCTIONS:
@@ -74,7 +74,7 @@ mysql-cmake_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 <USE flag> <flag name>"
-	if use $1 ; then
+	if use_if_iuse $1 ; then
 		echo "-DWITH_$2=1"
 	else
 		echo "-DWITHOUT_$2=1 -DWITH_$2=0"
@@ -193,7 +193,7 @@ configure_cmake_standard() {
 		$(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE)
 	)
 
-	if pbxt_available ; then
+	if in_iuse pbxt ; then
 		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
 	fi
 
@@ -284,7 +284,7 @@ mysql-cmake_src_prepare() {
 		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
 	fi
 
-	if has tokudb ${IUSE} ; then
+	if in_iuse tokudb ; then
 		# Don't build bundled xz-utils
 		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
 		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
@@ -345,14 +345,14 @@ mysql-cmake_src_configure() {
 	filter-flags "-O" "-O[01]"
 
 	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+	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!
+	# As of 5.7, exceptions and rtti are used!
 	if ! mysql_version_is_at_least "5.7" ; then
-		CXXFLAGS="${CXXFLAGS} -fno-exceptions"
+		CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
 	fi
 	export CXXFLAGS
 

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 1c3eff3..824158f 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -263,6 +263,12 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
+	if mysql_version_is_at_least "10.0.5" ; then
+		DEPEND="${DEPEND}
+			odbc? ( dev-db/unixODBC )
+			xml? ( dev-libs/libxml2 )
+			"
+	fi
 	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )"
 fi
 
@@ -304,13 +310,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 			virtual/perl-Term-ANSIColor
 			virtual/perl-Time-HiRes ) "
 	fi
-
-	if mysql_version_is_at_least "10.0.5" ; then
-		RDEPEND="${RDEPEND}
-			odbc? ( dev-db/unixODBC )
-			xml? ( dev-libs/libxml2 )
-			"
-	fi
 fi
 
 if [[ ${PN} == "mariadb-galera" ]] ; then
@@ -351,7 +350,7 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 # External patches
 #
 
-# MariaDB has integrated PBXT
+# MariaDB has integrated PBXT until it was dropped in version 5.5.33
 # PBXT_VERSION means that we have a PBXT patch for this PV
 # PBXT was only introduced after 5.1.12
 pbxt_patch_available() {
@@ -469,7 +468,7 @@ mysql-v2_pkg_setup() {
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
 	fi
 
-	if has tokudb ${IUSE} && use tokudb && [[ $(gcc-version) < 4.7 ]] ; then
+	if use_if_iuse tokudb && [[ $(gcc-version) < 4.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
@@ -575,7 +574,7 @@ mysql-v2_pkg_postinst() {
 		done
 
 		if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-			if mysql_version_is_at_least "5.2.10" && use pam ; then
+			if use_if_iuse pam ; then
 				einfo
 				elog "This install includes the PAM authentication plugin."
 				elog "To activate and configure the PAM plugin, please read:"
@@ -603,7 +602,7 @@ mysql-v2_pkg_postinst() {
 		einfo
 	fi
 
-	if pbxt_available && use pbxt ; then
+	if use_if_iuse pbxt ; then
 		elog "Note: PBXT is now statically built when enabled."
 		elog ""
 		elog "If, you previously installed as a plugin and "

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

[Brian Evans]

commit:     344ef59f62b19f9b9d3e3fb683739959ba2ae9d3
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Jan 24 18:54:38 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Jan 24 18:54:38 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=344ef59f

[eclass] Fix libedit dep for mysql/percona 5.6.12+

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 91c8e32..6fb9228 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -125,7 +125,6 @@ configure_cmake_minimal() {
 		-DWITHOUT_LIBWRAP=1
 		-DWITH_READLINE=0
 		-DWITH_LIBEDIT=0
-		-DWITH_EDITLINE=system
 		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
 		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
 		-DWITHOUT_CSV_STORAGE_ENGINE=1
@@ -137,6 +136,10 @@ configure_cmake_minimal() {
 		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
 		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
 	)
+
+	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+		mycmakeargs+=( -DWITH_EDITLINE=system )
+	fi
 }
 
 # @FUNCTION: configure_cmake_standard
@@ -153,9 +156,12 @@ configure_cmake_standard() {
 		-DWITH_LIBEDIT=0
 		-DWITH_ZLIB=system
 		-DWITHOUT_LIBWRAP=1
-		-DWITH_EDITLINE=system
 	)
 
+	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+		mycmakeargs+=( -DWITH_EDITLINE=system )
+	fi
+
 	mycmakeargs+=(
 		$(cmake-utils_use_disable !static SHARED)
 		$(cmake-utils_use_with debug)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f11d660..ddb7e67 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -255,8 +255,8 @@ DEPEND="
 	!dev-db/mariadb-native-client[mysqlcompat]
 "
 
-# dev-db/mysql-5.7.3+ only works with dev-libs/libedit
-if [[ ${PN} == "mysql" ]] && mysql_version_is_at_least "5.7.3" ; then
+# 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"
 else
 	DEPEND="${DEPEND} >=sys-libs/readline-4.1"

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

[Brian Evans]

commit:     a4fe4b9bb99d03493b67f88c47ef50aceab16958
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Feb  4 21:12:55 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Feb  4 21:12:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a4fe4b9b

[eclass] Fix bug 446200 and remove unnecessary ()

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index ddb7e67..39fcbf0 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -365,7 +365,7 @@ pbxt_patch_available() {
 }
 
 pbxt_available() {
-	pbxt_patch_available || ( [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32" )
+	pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32"
 	return $?
 }
 
@@ -769,6 +769,10 @@ mysql-v2_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'"
+
 	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

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

[Brian Evans]

commit:     adf4c7d83fcddc88bb5a933bf4e50242de7b396e
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Mar  4 21:54:17 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Mar  4 21:54:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=adf4c7d8

Move jemalloc block for MariaDB so minimal doesnt build bundled

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index fa991c0..abc2bdc 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -215,12 +215,6 @@ configure_cmake_standard() {
 			$(mysql-cmake_use_plugin pam AUTH_PAM)
 		)
 
-		if use jemalloc ; then
-			mycmakeargs+=( -DWITH_JEMALLOC="system" )
-		else
-			mycmakeargs+=( -DWITH_JEMALLOC=no )
-		fi
-
 		if mysql_version_is_at_least 10.0.5 ; then
 			# CassandraSE needs Apache Thrift which is not in portage
 			# TODO: Add use and deps for Connect SE external deps
@@ -342,6 +336,14 @@ mysql-cmake_src_configure() {
 		mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
 	fi
 
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+		if use jemalloc ; then
+			mycmakeargs+=( -DWITH_JEMALLOC="system" )
+		else
+			mycmakeargs+=( -DWITH_JEMALLOC=no )
+		fi
+	fi
+
 	configure_cmake_locale
 
 	if use minimal ; then

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

[Brian Evans]

commit:     e1bf0417fcfa889cc20a6fc2fc01c1ce4b569b36
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Mar  5 15:36:25 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Mar  5 16:00:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e1bf0417

[eclass] Clean up common options and add more REQUIRED_USE for minimal

---
 eclass/mysql-cmake.eclass | 43 +++++++++++++++----------------------------
 eclass/mysql-v2.eclass    | 19 ++++++++-----------
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index abc2bdc..a568bef 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -117,14 +117,8 @@ configure_cmake_minimal() {
 	mycmakeargs+=(
 		-DWITHOUT_SERVER=1
 		-DWITHOUT_EMBEDDED_SERVER=1
-		-DENABLED_LOCAL_INFILE=1
 		-DEXTRA_CHARSETS=none
 		-DINSTALL_SQLBENCHDIR=
-		-DWITH_SSL=system
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-		-DWITH_READLINE=0
-		-DWITH_LIBEDIT=0
 		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
 		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
 		-DWITHOUT_CSV_STORAGE_ENGINE=1
@@ -136,10 +130,6 @@ configure_cmake_minimal() {
 		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
 		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
 	)
-
-	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
-		mycmakeargs+=( -DWITH_EDITLINE=system )
-	fi
 }
 
 # @FUNCTION: configure_cmake_standard
@@ -148,21 +138,9 @@ configure_cmake_minimal() {
 configure_cmake_standard() {
 
 	mycmakeargs+=(
-		-DENABLED_LOCAL_INFILE=1
 		-DEXTRA_CHARSETS=all
 		-DMYSQL_USER=mysql
 		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		-DWITH_READLINE=0
-		-DWITH_LIBEDIT=0
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-	)
-
-	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
-		mycmakeargs+=( -DWITH_EDITLINE=system )
-	fi
-
-	mycmakeargs+=(
 		$(cmake-utils_use_disable !static SHARED)
 		$(cmake-utils_use_with debug)
 		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
@@ -175,12 +153,6 @@ configure_cmake_standard() {
 		mycmakeargs+=( -DWITH_PIC=1 )
 	fi
 
-	if use ssl; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
 	if use jemalloc; then
 		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
 	fi
@@ -327,8 +299,23 @@ 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
+		-DENABLED_LOCAL_INFILE=1
 	)
 
+	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+		mycmakeargs+=( -DWITH_EDITLINE=system )
+	fi
+
+	if use ssl; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
 	# Bug 412851
 	# MariaDB requires this flag to compile with GPLv3 readline linked
 	# Adds a warning about redistribution to configure

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 6e354da..0b44d19 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -205,24 +205,21 @@ case "${BUILD}" in
 		;;
 esac
 
-IUSE="${IUSE} latin1"
-
-IUSE="${IUSE} extraengine"
-IUSE="${IUSE} cluster"
-
-IUSE="${IUSE} max-idx-128"
-IUSE="${IUSE} +community profiling"
+# Common IUSE
+IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling"
 
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 	mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent"
-	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph"
-	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx"
+	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \
+		REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph )"
+	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" && \
+		REQUIRED_USE="${REQUIRED_USE} minimal? ( !sphinx )"
 	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="odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc )"
+		REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc )"
 	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" && \
-		REQUIRED_USE="tokudb? ( jemalloc )"
+		REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc )"
 fi
 
 if mysql_version_is_at_least "5.5"; then

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

[Brian Evans]

commit:     4a4e3a366991d77e9c4cc00fe2e377acc3880436
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Mar  6 18:10:43 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Mar  6 18:10:43 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4a4e3a36

[eclass] Move mysql-cmake-multilib to mysql-multilib as mysql-v2 could not be used for multilib

---
 eclass/mysql-cmake-multilib.eclass                | 156 --------
 eclass/{mysql-v2.eclass => mysql-multilib.eclass} | 440 +++++++++++-----------
 eclass/mysql-v2.eclass                            |   5 +-
 3 files changed, 216 insertions(+), 385 deletions(-)

diff --git a/eclass/mysql-cmake-multilib.eclass b/eclass/mysql-cmake-multilib.eclass
deleted file mode 100644
index 4edca87..0000000
--- a/eclass/mysql-cmake-multilib.eclass
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: mysql-cmake-multilib.eclass
-# @MAINTAINER:
-# Maintainers:
-#	- MySQL Team <mysql-bugs@gentoo.org>
-#	- Robin H. Johnson <robbat2@gentoo.org>
-#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-# @BLURB: This eclass provides the support for cmake based mysql releases
-# @DESCRIPTION:
-# The mysql-cmake-multilib.eclass provides the support to build the mysql
-# ebuilds using the cmake build system. This eclass provides
-# the src_prepare, src_configure, src_compile and src_install
-# phase hooks.
-
-inherit cmake-utils multilib-build flag-o-matic mysql-cmake
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql_cmake_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-cmake-multilib_disable_test() {
-	mysql-cmake_disable_test "$@"
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-cmake-multilib_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-cmake-multilib_src_prepare() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	mysql-cmake_src_prepare "$@"
-}
-
-_mysql-multilib_src_configure() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	mycmakeargs=(
-		-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)/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
-		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
-		$(cmake-utils_use_with test UNIT_TESTS)
-	)
-
-	# 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 )
-	fi
-
-	configure_cmake_locale
-
-	if multilib_build_binaries ; then
-		if use minimal ; then
-			configure_cmake_minimal
-		else
-			configure_cmake_standard
-		fi
-	else
-		configure_cmake_minimal
-	fi
-
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
-	# 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"
-	fi
-	export CXXFLAGS
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	cmake-utils_src_configure
-}
-
-
-# @FUNCTION: mysql-cmake-multilib_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-cmake-multilib_src_configure() {
-	multilib_parallel_foreach_abi _mysql-multilib_src_configure "${@}"
-}
-
-_mysql-multilib_src_compile() {
-
-	if ! multilib_build_binaries ; then
-		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
-	else
-		cmake-utils_src_compile
-	fi
-}
-
-# @FUNCTION: mysql-cmake-multilib_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-cmake-multilib_src_compile() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	multilib_foreach_abi _mysql-multilib_src_compile "${@}"
-}
-
-_mysql-multilib_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if multilib_build_binaries; then
-		mysql-cmake_src_install
-	else
-		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
-	fi
-}
-
-# @FUNCTION: mysql-cmake-multilib_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-cmake-multilib_src_install() {
-	multilib_foreach_abi _mysql-multilib_src_install "${@}"
-}

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-multilib.eclass
similarity index 72%
copy from eclass/mysql-v2.eclass
copy to eclass/mysql-multilib.eclass
index 0b44d19..a606766 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,8 +1,8 @@
-# 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-v2.eclass,v 1.24 2013/02/13 00:40:57 robbat2 Exp $
+# $Header: $
 
-# @ECLASS: mysql-v2.eclass
+# @ECLASS: mysql-v3.eclass
 # @MAINTAINER:
 # Maintainers:
 #	- MySQL Team <mysql-bugs@gentoo.org>
@@ -10,37 +10,14 @@
 #	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
 # @BLURB: This eclass provides most of the functions for mysql ebuilds
 # @DESCRIPTION:
-# The mysql-v2.eclass is the base eclass to build the mysql and
+# The mysql-v3.eclass is the base eclass to build the mysql and
 # alternative projects (mariadb and percona) ebuilds.
-# This eclass uses the mysql-autotools and mysql-cmake eclasses for the
+# This eclass uses the mysql-cmake eclass for the
 # specific bits related to the build system.
 # It provides the src_unpack, src_prepare, src_configure, src_compile,
 # src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
 # phase hooks.
 
-# @ECLASS-VARIABLE: BUILD
-# @DESCRIPTION:
-# Build type of the mysql version
-: ${BUILD:=autotools}
-
-case ${BUILD} in
-	"cmake")
-		BUILD_INHERIT="mysql-cmake"
-		;;
-	"cmake-multilib")
-		BUILD_INHERIT="mysql-cmake-multilib"
-		;;
-	"autotools")
-		BUILD_INHERIT="mysql-autotools"
-
-		WANT_AUTOCONF="latest"
-		WANT_AUTOMAKE="latest"
-		;;
-	*)
-		die "${BUILD} is not a valid build system for mysql"
-		;;
-esac
-
 MYSQL_EXTRAS=""
 
 # @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
@@ -49,18 +26,19 @@ MYSQL_EXTRAS=""
 # Use "none" to disable it's use
 [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
 
-inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
+inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
+	toolchain-funcs user cmake-utils multilib-build
 
 #
 # Supported EAPI versions and export functions
 #
 
 case "${EAPI:-0}" in
-	4|5) ;;
+	5) ;;
 	*) 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 pkg_postrm
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config
 
 #
 # VARIABLES:
@@ -87,7 +65,6 @@ MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
 # Cluster is a special case...
 if [[ "${PN}" == "mysql-cluster" ]]; then
 	case $PV in
-		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
 		7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;;
 	esac
 fi
@@ -111,8 +88,8 @@ 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.1.50
-mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50"
+# 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
@@ -147,7 +124,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})
-		mysql_version_is_at_least "5.5.34" && PERCONA_RC=${PERCONA_RC:-rel}
+		PERCONA_RC=${PERCONA_RC:-rel}
 		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/${PERCONA_PN}-${MY_PV}-${PERCONA_RC:-rel}${PERCONA_RELEASE}.tar.gz"
 #		http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/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/Percona-Server-5.6.13-rc60.5.tar.gz
@@ -174,7 +151,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
 		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"
 fi
@@ -196,46 +172,24 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-case "${BUILD}" in
-	"autotools")
-		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
-		;;
-	cmake*)
-		IUSE="debug embedded minimal +perl selinux ssl static static-libs test"
-		;;
-esac
-
-# Common IUSE
-IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling"
+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
-	mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent"
-	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \
-		REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph )"
-	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" && \
-		REQUIRED_USE="${REQUIRED_USE} minimal? ( !sphinx )"
-	mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
+	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} tokudb odbc xml" && \
-		REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc )"
-	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" && \
-		REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc )"
-fi
-
-if mysql_version_is_at_least "5.5"; then
-	REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) embedded? ( static-libs )"
-	IUSE="${IUSE} jemalloc tcmalloc"
-fi
-
-if mysql_version_is_at_least "5.5.7"; then
-	IUSE="${IUSE} systemtap"
+	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 )"
 fi
 
 if [[ ${PN} == "percona-server" ]]; then
-	mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam"
+	IUSE="${IUSE} pam"
 fi
 
-REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
+REQUIRED_USE="
+	${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) embedded? ( static-libs )
+	 minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
 
 #
 # DEPENDENCIES:
@@ -244,35 +198,43 @@ REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) stati
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
 DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kernel_linux? ( sys-process/procps )
+	ssl? ( >=dev-libs/openssl-1.0.0:= 
+		abi_x86_32? ( app-emulation/emul-linux-x86-baselibs )
+	)
+	kernel_linux? ( 
+		sys-process/procps:=
+		dev-libs/libaio:=
+	)
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
-	>=sys-libs/zlib-1.2.3
+	>=sys-libs/zlib-1.2.3:=[${MULTILIB_USEDEP}]
 	!dev-db/mariadb-native-client[mysqlcompat]
+	jemalloc? ( dev-libs/jemalloc:= )
+	tcmalloc? ( dev-util/google-perftools:= )
+	systemtap? ( >=dev-util/systemtap-1.3:= )
 "
 
 # 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"
+	DEPEND="${DEPEND} dev-libs/libedit:=[${MULTILIB_USEDEP}]"
 else
-	DEPEND="${DEPEND} >=sys-libs/readline-4.1"
+	DEPEND="${DEPEND} >=sys-libs/readline-4.1:=[${MULTILIB_USEDEP}]"
 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 )"
-	mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
-	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
 	# Bug 441700 MariaDB >=5.3 include custom mytop
-	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
+	DEPEND="${DEPEND} 
+		oqgraph? ( >=dev-libs/boost-1.40.0:= )
+		sphinx? ( app-misc/sphinx:= )
+		!minimal? ( pam? ( virtual/pam:= ) )
+		perl? ( !dev-db/mytop )"
 	if mysql_version_is_at_least "10.0.5" ; then
 		DEPEND="${DEPEND}
-			odbc? ( dev-db/unixODBC )
-			xml? ( dev-libs/libxml2 )
+			odbc? ( dev-db/unixODBC:= )
+			xml? ( dev-libs/libxml2:= )
 			"
 	fi
-	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )"
+	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:= )"
 fi
 
 # Having different flavours at the same time is not a good idea
@@ -281,21 +243,11 @@ for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; d
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
 
-if mysql_version_is_at_least "5.5" ; then
-	DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )"
-	DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )"
-fi
-
-if mysql_version_is_at_least "5.5.7" ; then
-	DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )"
-	DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
-fi
-
 if [[ ${PN} == "mysql-cluster" ]] ; then
 	# TODO: This really should include net-misc/memcached
 	# but the package does not install the files it seeks.
 	mysql_version_is_at_least "7.2.3" && \
-		DEPEND="${DEPEND} dev-libs/libevent"
+		DEPEND="${DEPEND} dev-libs/libevent:="
 fi
 
 # prefix: first need to implement something for #196294
@@ -306,13 +258,11 @@ RDEPEND="${DEPEND}
 
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	# Bug 455016 Add dependencies of mytop
-	if mysql_version_is_at_least "5.3" ; then
-		RDEPEND="${RDEPEND} perl? (
-			virtual/perl-Getopt-Long
-			dev-perl/TermReadKey
-			virtual/perl-Term-ANSIColor
-			virtual/perl-Time-HiRes ) "
-	fi
+	RDEPEND="${RDEPEND} perl? (
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes ) "
 fi
 
 if [[ ${PN} == "mariadb-galera" ]] ; then
@@ -336,12 +286,7 @@ DEPEND="${DEPEND}
 DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
 
 # compile-time-only
-DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
-
-# compile-time-only
-if mysql_version_is_at_least "5.5.8" ; then
-	DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
-fi
+DEPEND="${DEPEND} >=dev-util/cmake-2.8.9"
 
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
@@ -350,98 +295,27 @@ PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 
 #
-# External patches
-#
-
-# MariaDB has integrated PBXT until it was dropped in version 5.5.33
-# PBXT_VERSION means that we have a PBXT patch for this PV
-# PBXT was only introduced after 5.1.12
-pbxt_patch_available() {
-	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" && ( -n "${PBXT_VERSION}" ) ]]
-	return $?
-}
-
-pbxt_available() {
-	pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32"
-	return $?
-}
-
-# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-# MariaDB has integrated XtraDB
-# XTRADB_VERS means that we have a XTRADB patch for this PV
-# XTRADB was only introduced after 5.1.26
-xtradb_patch_available() {
-	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera"
-		&& ( -n "${XTRADB_VER}" ) && ( -n "${PERCONA_VER}" ) ]]
-	return $?
-}
-
-if pbxt_patch_available; then
-
-	PBXT_P="pbxt-${PBXT_VERSION}"
-	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
-	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
-fi
-
-# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-# vs. built outside the dir
-if pbxt_available; then
-
-	IUSE="${IUSE} pbxt"
-	PBXT_NEWSTYLE=1
-	REQUIRED_USE="${REQUIRED_USE} pbxt? ( !embedded ) "
-fi
-
-if xtradb_patch_available; then
-	XTRADB_P="percona-xtradb-${XTRADB_VER}"
-	XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz"
-	XTRADB_SRC_B1="http://www.percona.com/"
-	XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/"
-	XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}"
-	XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}"
-	XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}"
-	SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )"
-	IUSE="${IUSE} xtradb"
-	REQUIRED_USE="${REQUIRED_USE} xtradb? ( !embedded ) "
-fi
-
-#
 # HELPER FUNCTIONS:
 #
 
-# @FUNCTION: mysql-v2_disable_test
+# @FUNCTION: mysql-v3_disable_test
 # @DESCRIPTION:
 # Helper function to disable specific tests.
-mysql-v2_disable_test() {
-	${BUILD_INHERIT}_disable_test "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_minimal
-# @DESCRIPTION:
-# Helper function to configure minimal build
-configure_minimal() {
-	${BUILD_INHERIT}_configure_minimal "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_common
-# @DESCRIPTION:
-# Helper function to configure common builds
-configure_common() {
-	${BUILD_INHERIT}_configure_common "$@"
+mysql-v3_disable_test() {
+	mysql-cmake_disable_test "$@"
 }
 
 #
 # EBUILD FUNCTIONS
 #
 
-# @FUNCTION: mysql-v2_pkg_setup
+# @FUNCTION: mysql-v3_pkg_setup
 # @DESCRIPTION:
 # Perform some basic tests and tasks during pkg_setup phase:
 #   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
-#   check for conflicting use flags
 #   create new user and group for mysql
 #   warn about deprecated features
-mysql-v2_pkg_setup() {
+mysql-v3_pkg_setup() {
 
 	if has test ${FEATURES} ; then
 		if ! use minimal ; then
@@ -451,12 +325,6 @@ mysql-v2_pkg_setup() {
 		fi
 	fi
 
-	# Check for USE flag problems in pkg_setup
-	if ! mysql_version_is_at_least "5.2" && use debug ; then
-		# Also in package.use.mask
-		die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
-	fi
-
 	# This should come after all of the die statements
 	enewgroup mysql 60 || die "problem adding 'mysql' group"
 	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
@@ -479,10 +347,10 @@ mysql-v2_pkg_setup() {
 
 }
 
-# @FUNCTION: mysql-v2_src_unpack
+# @FUNCTION: mysql-v3_src_unpack
 # @DESCRIPTION:
 # Unpack the source code
-mysql-v2_src_unpack() {
+mysql-v3_src_unpack() {
 
 	# Initialize the proper variables first
 	mysql_init_vars
@@ -494,49 +362,176 @@ mysql-v2_src_unpack() {
 	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
 }
 
-# @FUNCTION: mysql-v2_src_prepare
+# @FUNCTION: mysql-v3_src_prepare
 # @DESCRIPTION:
 # Apply patches to the source code and remove unneeded bundled libs.
-mysql-v2_src_prepare() {
-	${BUILD_INHERIT}_src_prepare "$@"
+mysql-v3_src_prepare() {
+	mysql-cmake_src_prepare "$@"
 	if [[ ${PN} == "mysql-cluster" ]] ; then
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare
 	fi
 }
 
-# @FUNCTION: mysql-v2_src_configure
+_mysql-multilib_src_configure() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	mycmakeargs=(
+		-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
+		-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
+		-DENABLED_LOCAL_INFILE=1
+	)
+
+	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+		mycmakeargs+=( -DWITH_EDITLINE=system )
+	fi
+
+	if use ssl; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	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 )
+	fi
+
+        if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+                if use jemalloc ; then
+                        mycmakeargs+=( -DWITH_JEMALLOC="system" )
+                else
+                        mycmakeargs+=( -DWITH_JEMALLOC=no )
+                fi
+        fi
+
+	configure_cmake_locale
+
+	if multilib_build_binaries ; then
+		if use minimal ; then
+			configure_cmake_minimal
+		else
+			configure_cmake_standard
+		fi
+	else
+		configure_cmake_minimal
+	fi
+
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+	# 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"
+	fi
+	export CXXFLAGS
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	cmake-utils_src_configure
+}
+
+_mysql-multilib_src_compile() {
+
+	if ! multilib_build_binaries ; then
+		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
+	else
+		cmake-utils_src_compile
+	fi
+}
+
+_mysql-multilib_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if multilib_build_binaries; then
+		mysql-cmake_src_install
+	else
+	#	BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
+		cmake-utils_src_install
+	fi
+}
+
+# @FUNCTION: mysql-v3_src_configure
 # @DESCRIPTION:
 # Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-v2_src_configure() {
-	${BUILD_INHERIT}_src_configure "$@"
+mysql-v3_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	multilib_parallel_foreach_abi _mysql-multilib_src_configure "${@}"
 }
 
-# @FUNCTION: mysql-v2_src_compile
+# @FUNCTION: mysql-v3_src_compile
 # @DESCRIPTION:
 # Compile the mysql code.
-mysql-v2_src_compile() {
-	${BUILD_INHERIT}_src_compile "$@"
+mysql-v3_src_compile() {
+	debug-print-function ${FUNCNAME} "$@"
+
+#	multilib_foreach_abi _mysql-multilib_src_compile "${@}"
+	multilib_foreach_abi cmake-utils_src_compile "${@}"
 }
 
-# @FUNCTION: mysql-v2_src_install
+# @FUNCTION: mysql-v3_src_install
 # @DESCRIPTION:
 # Install mysql.
-mysql-v2_src_install() {
-	${BUILD_INHERIT}_src_install "$@"
+mysql-v3_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Do multilib magic only when >1 ABI is used.
+	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+		multilib_prepare_wrappers
+		# Make sure all headers are the same for each ABI.
+		multilib_check_headers
+	fi
+	multilib_foreach_abi _mysql-multilib_src_install "${@}"
+	multilib_install_wrappers
 }
 
-# @FUNCTION: mysql-v2_pkg_preinst
+# @FUNCTION: mysql-v3_pkg_preinst
 # @DESCRIPTION:
 # Create the user and groups for mysql - die if that fails.
-mysql-v2_pkg_preinst() {
+mysql-v3_pkg_preinst() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	if [[ ${PN} == "mysql-cluster" ]] ; then
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
 	fi
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
 }
 
-# @FUNCTION: mysql-v2_pkg_postinst
+# @FUNCTION: mysql-v3_pkg_postinst
 # @DESCRIPTION:
 # Run post-installation tasks:
 #   create the dir for logfiles if non-existant
@@ -544,7 +539,8 @@ mysql-v2_pkg_preinst() {
 #   install scripts
 #   issue required steps for optional features
 #   issue deprecation warnings
-mysql-v2_pkg_postinst() {
+mysql-v3_pkg_postinst() {
+	debug-print-function ${FUNCNAME} "$@"
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -621,30 +617,32 @@ mysql-v2_pkg_postinst() {
 	fi
 }
 
-# @FUNCTION: mysql-v2_getopt
+# @FUNCTION: mysql-v3_getopt
 # @DESCRIPTION:
 # Use my_print_defaults to extract specific config options
-mysql-v2_getopt() {
+mysql-v3_getopt() {
 	local mypd="${EROOT}"/usr/bin/my_print_defaults
 	section="$1"
 	flag="--${2}="
 	"${mypd}" $section | sed -n "/^${flag}/p"
 }
 
-# @FUNCTION: mysql-v2_getoptval
+# @FUNCTION: mysql-v3_getoptval
 # @DESCRIPTION:
 # Use my_print_defaults to extract specific config options
-mysql-v2_getoptval() {
+mysql-v3_getoptval() {
 	local mypd="${EROOT}"/usr/bin/my_print_defaults
 	section="$1"
 	flag="--${2}="
 	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
 }
 
-# @FUNCTION: mysql-v2_pkg_config
+# @FUNCTION: mysql-v3_pkg_config
 # @DESCRIPTION:
 # Configure mysql environment.
-mysql-v2_pkg_config() {
+mysql-v3_pkg_config() {
+
+	debug-print-function ${FUNCNAME} "$@"
 
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
@@ -691,13 +689,13 @@ mysql-v2_pkg_config() {
 	local maxtry=15
 
 	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		MYSQL_ROOT_PASSWORD="$(mysql-v2_getoptval 'client mysql' password)"
+		MYSQL_ROOT_PASSWORD="$(mysql-v3_getoptval 'client mysql' password)"
 	fi
-	MYSQL_TMPDIR="$(mysql-v2_getoptval mysqld tmpdir)"
+	MYSQL_TMPDIR="$(mysql-v3_getoptval mysqld tmpdir)"
 	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(mysql-v2_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG="$(mysql-v3_getoptval mysqld relay-log)"
 	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(mysql-v2_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN="$(mysql-v3_getoptval mysqld log-bin)"
 	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
 	if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
@@ -863,11 +861,3 @@ mysql-v2_pkg_config() {
 	wait %1
 	einfo "Done"
 }
-
-# @FUNCTION: mysql-v2_pkg_postrm
-# @DESCRIPTION:
-# Remove mysql symlinks.
-mysql-v2_pkg_postrm() {
-
-	: # mysql_lib_symlinks "${ED}"
-}

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 0b44d19..eee9242 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -27,9 +27,6 @@ case ${BUILD} in
 	"cmake")
 		BUILD_INHERIT="mysql-cmake"
 		;;
-	"cmake-multilib")
-		BUILD_INHERIT="mysql-cmake-multilib"
-		;;
 	"autotools")
 		BUILD_INHERIT="mysql-autotools"
 
@@ -200,7 +197,7 @@ case "${BUILD}" in
 	"autotools")
 		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
 		;;
-	cmake*)
+	"cmake")
 		IUSE="debug embedded minimal +perl selinux ssl static static-libs test"
 		;;
 esac

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

[Brian Evans]

commit:     8ec24b6f809cecc77fb8320620f29635da4b5204
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Mar  6 18:15:44 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Mar  6 18:15:44 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8ec24b6f

[virtual] Fix up function names after rename

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a606766..b6f33e6 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# @ECLASS: mysql-v3.eclass
+# @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
 # Maintainers:
 #	- MySQL Team <mysql-bugs@gentoo.org>
@@ -10,7 +10,7 @@
 #	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
 # @BLURB: This eclass provides most of the functions for mysql ebuilds
 # @DESCRIPTION:
-# The mysql-v3.eclass is the base eclass to build the mysql and
+# The mysql-multilib.eclass is the base eclass to build the mysql and
 # alternative projects (mariadb and percona) ebuilds.
 # This eclass uses the mysql-cmake eclass for the
 # specific bits related to the build system.
@@ -298,10 +298,10 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 # HELPER FUNCTIONS:
 #
 
-# @FUNCTION: mysql-v3_disable_test
+# @FUNCTION: mysql-multilib_disable_test
 # @DESCRIPTION:
 # Helper function to disable specific tests.
-mysql-v3_disable_test() {
+mysql-multilib_disable_test() {
 	mysql-cmake_disable_test "$@"
 }
 
@@ -309,13 +309,13 @@ mysql-v3_disable_test() {
 # EBUILD FUNCTIONS
 #
 
-# @FUNCTION: mysql-v3_pkg_setup
+# @FUNCTION: mysql-multilib_pkg_setup
 # @DESCRIPTION:
 # Perform some basic tests and tasks during pkg_setup phase:
 #   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
 #   create new user and group for mysql
 #   warn about deprecated features
-mysql-v3_pkg_setup() {
+mysql-multilib_pkg_setup() {
 
 	if has test ${FEATURES} ; then
 		if ! use minimal ; then
@@ -347,10 +347,10 @@ mysql-v3_pkg_setup() {
 
 }
 
-# @FUNCTION: mysql-v3_src_unpack
+# @FUNCTION: mysql-multilib_src_unpack
 # @DESCRIPTION:
 # Unpack the source code
-mysql-v3_src_unpack() {
+mysql-multilib_src_unpack() {
 
 	# Initialize the proper variables first
 	mysql_init_vars
@@ -362,10 +362,10 @@ mysql-v3_src_unpack() {
 	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
 }
 
-# @FUNCTION: mysql-v3_src_prepare
+# @FUNCTION: mysql-multilib_src_prepare
 # @DESCRIPTION:
 # Apply patches to the source code and remove unneeded bundled libs.
-mysql-v3_src_prepare() {
+mysql-multilib_src_prepare() {
 	mysql-cmake_src_prepare "$@"
 	if [[ ${PN} == "mysql-cluster" ]] ; then
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare
@@ -485,29 +485,29 @@ _mysql-multilib_src_install() {
 	fi
 }
 
-# @FUNCTION: mysql-v3_src_configure
+# @FUNCTION: mysql-multilib_src_configure
 # @DESCRIPTION:
 # Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-v3_src_configure() {
+mysql-multilib_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	multilib_parallel_foreach_abi _mysql-multilib_src_configure "${@}"
 }
 
-# @FUNCTION: mysql-v3_src_compile
+# @FUNCTION: mysql-multilib_src_compile
 # @DESCRIPTION:
 # Compile the mysql code.
-mysql-v3_src_compile() {
+mysql-multilib_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
 #	multilib_foreach_abi _mysql-multilib_src_compile "${@}"
 	multilib_foreach_abi cmake-utils_src_compile "${@}"
 }
 
-# @FUNCTION: mysql-v3_src_install
+# @FUNCTION: mysql-multilib_src_install
 # @DESCRIPTION:
 # Install mysql.
-mysql-v3_src_install() {
+mysql-multilib_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	# Do multilib magic only when >1 ABI is used.
@@ -520,10 +520,10 @@ mysql-v3_src_install() {
 	multilib_install_wrappers
 }
 
-# @FUNCTION: mysql-v3_pkg_preinst
+# @FUNCTION: mysql-multilib_pkg_preinst
 # @DESCRIPTION:
 # Create the user and groups for mysql - die if that fails.
-mysql-v3_pkg_preinst() {
+mysql-multilib_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ${PN} == "mysql-cluster" ]] ; then
@@ -531,7 +531,7 @@ mysql-v3_pkg_preinst() {
 	fi
 }
 
-# @FUNCTION: mysql-v3_pkg_postinst
+# @FUNCTION: mysql-multilib_pkg_postinst
 # @DESCRIPTION:
 # Run post-installation tasks:
 #   create the dir for logfiles if non-existant
@@ -539,7 +539,7 @@ mysql-v3_pkg_preinst() {
 #   install scripts
 #   issue required steps for optional features
 #   issue deprecation warnings
-mysql-v3_pkg_postinst() {
+mysql-multilib_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	# Make sure the vars are correctly initialized
@@ -617,30 +617,30 @@ mysql-v3_pkg_postinst() {
 	fi
 }
 
-# @FUNCTION: mysql-v3_getopt
+# @FUNCTION: mysql-multilib_getopt
 # @DESCRIPTION:
 # Use my_print_defaults to extract specific config options
-mysql-v3_getopt() {
+mysql-multilib_getopt() {
 	local mypd="${EROOT}"/usr/bin/my_print_defaults
 	section="$1"
 	flag="--${2}="
 	"${mypd}" $section | sed -n "/^${flag}/p"
 }
 
-# @FUNCTION: mysql-v3_getoptval
+# @FUNCTION: mysql-multilib_getoptval
 # @DESCRIPTION:
 # Use my_print_defaults to extract specific config options
-mysql-v3_getoptval() {
+mysql-multilib_getoptval() {
 	local mypd="${EROOT}"/usr/bin/my_print_defaults
 	section="$1"
 	flag="--${2}="
 	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
 }
 
-# @FUNCTION: mysql-v3_pkg_config
+# @FUNCTION: mysql-multilib_pkg_config
 # @DESCRIPTION:
 # Configure mysql environment.
-mysql-v3_pkg_config() {
+mysql-multilib_pkg_config() {
 
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -689,13 +689,13 @@ mysql-v3_pkg_config() {
 	local maxtry=15
 
 	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		MYSQL_ROOT_PASSWORD="$(mysql-v3_getoptval 'client mysql' password)"
+		MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password)"
 	fi
-	MYSQL_TMPDIR="$(mysql-v3_getoptval mysqld tmpdir)"
+	MYSQL_TMPDIR="$(mysql-multilib_getoptval mysqld tmpdir)"
 	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(mysql-v3_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG="$(mysql-multilib_getoptval mysqld relay-log)"
 	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(mysql-v3_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN="$(mysql-multilib_getoptval mysqld log-bin)"
 	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
 	if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then

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

[Brian Evans]

commit:     0a48fbb294cba40430cc76dd72abdd0c4b6fd78c
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Mar  7 20:29:54 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Mar  7 20:29:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0a48fbb2

[eclass] Refine multilib

---
 eclass/mysql-multilib.eclass | 282 ++++++++++++++++++++++---------------------
 1 file changed, 146 insertions(+), 136 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index b6f33e6..f699cc2 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -197,44 +197,47 @@ REQUIRED_USE="
 
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
+# MULTILIB_USEDEP only set for libraries used by the client library
 DEPEND="
-	ssl? ( >=dev-libs/openssl-1.0.0:= 
-		abi_x86_32? ( app-emulation/emul-linux-x86-baselibs )
+	ssl? ( >=dev-libs/openssl-1.0.0:0= 
 	)
 	kernel_linux? ( 
-		sys-process/procps:=
-		dev-libs/libaio:=
+		sys-process/procps:0=
+		dev-libs/libaio:0=
 	)
+	amd64? ( abi_x86_32? (
+		app-emulation/emul-linux-x86-baselibs[abi_x86_32]
+	) )
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
-	>=sys-libs/zlib-1.2.3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP}]
 	!dev-db/mariadb-native-client[mysqlcompat]
-	jemalloc? ( dev-libs/jemalloc:= )
-	tcmalloc? ( dev-util/google-perftools:= )
-	systemtap? ( >=dev-util/systemtap-1.3:= )
+	jemalloc? ( dev-libs/jemalloc:0=[${MULTILIB_USEDEP}] )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
 "
 
 # 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:=[${MULTILIB_USEDEP}]"
+	DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]"
 else
-	DEPEND="${DEPEND} >=sys-libs/readline-4.1:=[${MULTILIB_USEDEP}]"
+	DEPEND="${DEPEND} >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}]"
 fi
 
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	DEPEND="${DEPEND} 
-		oqgraph? ( >=dev-libs/boost-1.40.0:= )
-		sphinx? ( app-misc/sphinx:= )
-		!minimal? ( pam? ( virtual/pam:= ) )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= )
+		sphinx? ( app-misc/sphinx:0= )
+		!minimal? ( pam? ( virtual/pam:0= ) )
 		perl? ( !dev-db/mytop )"
 	if mysql_version_is_at_least "10.0.5" ; then
 		DEPEND="${DEPEND}
-			odbc? ( dev-db/unixODBC:= )
-			xml? ( dev-libs/libxml2:= )
+			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:= )"
+	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
 fi
 
 # Having different flavours at the same time is not a good idea
@@ -247,7 +250,7 @@ if [[ ${PN} == "mysql-cluster" ]] ; then
 	# TODO: This really should include net-misc/memcached
 	# but the package does not install the files it seeks.
 	mysql_version_is_at_least "7.2.3" && \
-		DEPEND="${DEPEND} dev-libs/libevent:="
+		DEPEND="${DEPEND} dev-libs/libevent:0="
 fi
 
 # prefix: first need to implement something for #196294
@@ -279,20 +282,20 @@ if [[ ${PN} == "mysql-cluster" ]] ; then
                DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )"
 fi
 
+# compile-time-only
 DEPEND="${DEPEND}
 	virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	>=dev-util/cmake-2.8.9
 "
 
-DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
-
-# compile-time-only
-DEPEND="${DEPEND} >=dev-util/cmake-2.8.9"
-
+# 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="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+	 =virtual/mysql-${MYSQL_PV_MAJOR}"
 
-# For other stuff to bring us in
-PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
+# my_config.h includes ABI specific data
+MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h )
 
 #
 # HELPER FUNCTIONS:
@@ -372,124 +375,106 @@ mysql-multilib_src_prepare() {
 	fi
 }
 
-_mysql-multilib_src_configure() {
 
+# @FUNCTION: mysql-multilib_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-multilib_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	mycmakeargs=(
-		-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
-		-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
-		-DENABLED_LOCAL_INFILE=1
-	)
-
-	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
-		mycmakeargs+=( -DWITH_EDITLINE=system )
-	fi
-
-	if use ssl; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	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 )
-	fi
-
-        if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-                if use jemalloc ; then
-                        mycmakeargs+=( -DWITH_JEMALLOC="system" )
-                else
-                        mycmakeargs+=( -DWITH_JEMALLOC=no )
-                fi
-        fi
-
-	configure_cmake_locale
+	_mysql-multilib_src_configure() {
+
+		debug-print-function ${FUNCNAME} "$@"
+
+		CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+		mycmakeargs=(
+			-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
+			-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
+			-DENABLED_LOCAL_INFILE=1
+			-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+		)
+
+		if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+			mycmakeargs+=( -DWITH_EDITLINE=system )
+		fi
 
-	if multilib_build_binaries ; then
-		if use minimal ; then
-			configure_cmake_minimal
+		if use ssl; then
+			mycmakeargs+=( -DWITH_SSL=system )
 		else
-			configure_cmake_standard
+			mycmakeargs+=( -DWITH_SSL=bundled )
 		fi
-	else
-		configure_cmake_minimal
-	fi
 
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
+		# 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 )
+		fi
 
-	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
-	# 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"
-	fi
-	export CXXFLAGS
+        	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+                	if use jemalloc ; then
+                        	mycmakeargs+=( -DWITH_JEMALLOC="system" )
+	                else
+        	                mycmakeargs+=( -DWITH_JEMALLOC=no )
+                	fi
+	        fi
 
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
+		configure_cmake_locale
 
-	cmake-utils_src_configure
-}
-
-_mysql-multilib_src_compile() {
+		if multilib_build_binaries ; then
+			if use minimal ; then
+				configure_cmake_minimal
+			else
+				configure_cmake_standard
+			fi
+		else
+			configure_cmake_minimal
+		fi
 
-	if ! multilib_build_binaries ; then
-		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
-	else
-		cmake-utils_src_compile
-	fi
-}
+		# Bug #114895, bug #110149
+		filter-flags "-O" "-O[01]"
 
-_mysql-multilib_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
+		CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+		CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+		# 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"
+		fi
+		export CXXFLAGS
 
-	if multilib_build_binaries; then
-		mysql-cmake_src_install
-	else
-	#	BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
-		cmake-utils_src_install
-	fi
-}
+		# bug #283926, with GCC4.4, this is required to get correct behavior.
+		append-flags -fno-strict-aliasing
 
-# @FUNCTION: mysql-multilib_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-multilib_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
+		cmake-utils_src_configure
+	}
 
 	multilib_parallel_foreach_abi _mysql-multilib_src_configure "${@}"
 }
@@ -498,6 +483,15 @@ mysql-multilib_src_configure() {
 # @DESCRIPTION:
 # Compile the mysql code.
 mysql-multilib_src_compile() {
+	#_mysql-multilib_src_compile() {
+	#
+	#	if ! multilib_build_binaries ; then
+	#		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
+	#	else
+	#		cmake-utils_src_compile
+	#	fi
+	#}
+
 	debug-print-function ${FUNCNAME} "$@"
 
 #	multilib_foreach_abi _mysql-multilib_src_compile "${@}"
@@ -508,21 +502,37 @@ mysql-multilib_src_compile() {
 # @DESCRIPTION:
 # Install mysql.
 mysql-multilib_src_install() {
+	_mysql-multilib_src_install() {
+		debug-print-function ${FUNCNAME} "$@"
+
+		if multilib_build_binaries; then
+			mysql-cmake_src_install
+		else
+		#	BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
+			cmake-utils_src_install
+			if ! use minimal && [[ "${PN}" == "mariadb" || "${PN}" == "mariadb-galera" ]] ; then
+				insinto /usr/include/mysql/private
+				doins sql/*.h
+			fi
+			
+		fi
+		# Do multilib magic only when >1 ABI is used.
+		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+			multilib_prepare_wrappers
+			# Make sure all headers are the same for each ABI.
+			multilib_check_headers
+		fi
+	}
+
 	debug-print-function ${FUNCNAME} "$@"
 
-	# Do multilib magic only when >1 ABI is used.
-	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-		multilib_prepare_wrappers
-		# Make sure all headers are the same for each ABI.
-		multilib_check_headers
-	fi
 	multilib_foreach_abi _mysql-multilib_src_install "${@}"
 	multilib_install_wrappers
 }
 
 # @FUNCTION: mysql-multilib_pkg_preinst
 # @DESCRIPTION:
-# Create the user and groups for mysql - die if that fails.
+# Call java-pkg-opt-2 eclass when mysql-cluster is installed
 mysql-multilib_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 

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

[Brian Evans]

commit:     a7ad95387c3fbe185db0850331f9b80bdd7a0093
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Mar 11 20:07:19 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Mar 11 20:07:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a7ad9538

[eclass] Update mariadb mirrors

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 207ddc7..5fd8a9f 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -111,11 +111,11 @@ if [[ -z ${SERVER_URI} ]]; then
 		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.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
-		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${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
+		http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		"
 		if [[ ${PN} == "mariadb-galera" ]]; then
 			MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 0b9d267..060c15b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -131,11 +131,11 @@ if [[ -z ${SERVER_URI} ]]; then
 		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.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
-		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${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
+		http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		"
 		if [[ ${PN} == "mariadb-galera" ]]; then
 			MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"

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

[Brian Evans]

commit:     9c8d5154a08df092d22bf919a9da9c167086b454
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Tue Mar 11 01:09:11 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Mar 11 22:44:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9c8d5154

[eclass] Dep cleanup to prevent issues with autotools builds

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 060c15b..1957ec8 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -243,13 +243,14 @@ REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) stati
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
 DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
 	kernel_linux? ( sys-process/procps )
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
-	>=sys-libs/zlib-1.2.3[static-libs?]
-	!dev-db/mariadb-native-client[mysqlcompat]
+	>=sys-libs/zlib-1.2.3
 "
+# TODO: add this as a dep if it is moved from the overlay
+#	!dev-db/mariadb-native-client[mysqlcompat]
 
 # 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
@@ -285,14 +286,13 @@ for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; d
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
 
-if mysql_version_is_at_least "5.5" ; then
-	DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] )"
-	DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )"
-fi
-
 if mysql_version_is_at_least "5.5.7" ; then
-	DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )"
-	DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )"
+	DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] ) 
+	tcmalloc? ( dev-util/google-perftools )
+	>=sys-libs/zlib-1.2.3[static-libs?]
+        ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	kernel_linux? ( dev-libs/libaio )"
 fi
 
 if [[ ${PN} == "mysql-cluster" ]] ; then

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

[Brian Evans]

commit:     82a0db72eeae3825a0cf083ecc2ae13a4a83838e
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Tue Mar 11 02:03:07 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Mar 11 22:44:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=82a0db72

[eclass] Remove pbxt info section from multilib

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 5fd8a9f..52ea3e2 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -610,21 +610,6 @@ mysql-multilib_pkg_postinst() {
 		elog "mysql_upgrade tool."
 		einfo
 	fi
-
-	if use_if_iuse pbxt ; then
-		elog "Note: PBXT is now statically built when enabled."
-		elog ""
-		elog "If, you previously installed as a plugin and "
-		elog "you cannot start the MySQL server,"
-		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
-		elog "use the MySQL upgrade script to restore the table"
-		elog "or execute the following SQL command:"
-		elog "    CREATE TABLE IF NOT EXISTS plugin ("
-		elog "      name char(64) binary DEFAULT '' NOT NULL,"
-		elog "      dl char(128) DEFAULT '' NOT NULL,"
-		elog "      PRIMARY KEY (name)"
-		elog "    ) CHARACTER SET utf8 COLLATE utf8_bin;"
-	fi
 }
 
 # @FUNCTION: mysql-multilib_getopt

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

[Brian Evans]

commit:     fa2177554b1b038c59b7e20b30b63f7fc464117e
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Mar 19 16:47:25 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Mar 19 16:47:25 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fa217755

[eclass] Sync with hasufell changes wrt #497532

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7fd992e..96f89b8 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -277,7 +277,10 @@ mysql-cmake_src_configure() {
 
 	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

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

[Brian Evans]

commit:     878bbcd0d4b98e7d17bbe059528e87709f50fc51
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Mar 26 23:12:13 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Mar 26 23:12:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=878bbcd0

[eclass] allow revisions of the virtual

---
 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 b541347..cee33d4 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -351,7 +351,7 @@ fi
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 # For other stuff to bring us in
-PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
+PDEPEND="${PDEPEND} ~virtual/mysql-${MYSQL_PV_MAJOR}"
 
 #
 # External patches

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

[Brian Evans]

commit:     63a8c74fc976c60926dc28839ad76e3887fa7623
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Mar 26 23:11:47 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Mar 26 23:11:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=63a8c74f

[eclass] Possbile better fix for debug builds

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 96f89b8..df067a6 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -275,12 +275,10 @@ mysql-cmake_src_configure() {
 
 	debug-print-function ${FUNCNAME} "$@"
 
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
+	CMAKE_BUILD_TYPE="$(usex debug "Debug" "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

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

[Brian Evans]

commit:     40da30287bc1129cac79eb959a089f15cccbbd78
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Apr  2 17:37:24 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Apr  2 17:37:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=40da3028

Revert "[eclass] Possbile better fix for debug builds"

This reverts commit 63a8c74fc976c60926dc28839ad76e3887fa7623.

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 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 df067a6..96f89b8 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -275,10 +275,12 @@ mysql-cmake_src_configure() {
 
 	debug-print-function ${FUNCNAME} "$@"
 
-	CMAKE_BUILD_TYPE="$(usex debug "Debug" "RelWithDebInfo")"
+	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

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

[Brian Evans]

commit:     b4e23e00dc25af07778b67472f32300f5801f814
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Sun Apr  6 11:47:22 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sun Apr  6 11:47:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b4e23e00

[eclass] Add libpcre-8.35 dep for mariadb 10

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 96f89b8..81159ac 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -332,8 +332,7 @@ mysql-cmake_src_configure() {
 		else
 			mycmakeargs+=( -DWITH_JEMALLOC=no )
 		fi
-	# TODO: uncomment this when libpcre 8.35 is released to remove bundled library
-#		mysql_version_is_at_least "10.0.9" mycmakeargs+=( -DWITH_PCRE=system )
+		mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system )
 	fi
 
 	configure_cmake_locale

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 7814b2d..7eb14bf 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -239,11 +239,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 			"
 	fi
 	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
-	# TODO: uncomment this when libpcre 8.35 is released to remove bundled library
-#	if mysql_version_is_at_least "10.0.9" ; then
-#		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs?]" || \
-#		DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
-#	fi
+	if mysql_version_is_at_least "10.0.9" ; then
+		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs]" || \
+		DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
+	fi
 fi
 
 # Having different flavours at the same time is not a good idea

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3a04875..67f9499 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -272,11 +272,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 			"
 	fi
 	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )"
-	# TODO: uncomment this when libpcre 8.35 is released to remove bundled library
-#	if mysql_version_is_at_least "10.0.9" ; then
-#		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs?]" || \
-#		 DEPEND="${DEPEND} >=dev-libs/libpcre-8.35"
-#	fi
+	if mysql_version_is_at_least "10.0.9" ; then
+		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \
+			DEPEND="${DEPEND} >=dev-libs/libpcre-8.35"
+	fi
 fi
 
 # Having different flavours at the same time is not a good idea

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

[Brian Evans]

commit:     1785d7937ecdea46f5791849d3d455d480099dee
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Apr 14 18:54:19 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Apr 14 18:54:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1785d793

Add CFLAGS option to mysql-multilib.eclass

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 7eb14bf..e2dd614 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -393,7 +393,10 @@ mysql-multilib_src_configure() {
 
 		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

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

[Jorge Manuel B. S. Vicetto]

commit:     6a600ca23795c0d5fae2b5af6da44d802f330717
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 01:47:07 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 01:47:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6a600ca2

Drop old unused code.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

---
 eclass/mysql-cmake.eclass | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index a113192..4109732 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -401,15 +401,6 @@ mysql-cmake_src_install() {
 	# Various junk (my-*.cnf moved elsewhere)
 	einfo "Removing duplicate /usr/share/mysql files"
 
-	# Clean up stuff for a minimal build
-#	if use minimal ; then
-#		einfo "Remove all extra content for minimal build"
-#		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
-#		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-#		rm -f "${ED}/usr/sbin/mysqld"
-#		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
-#	fi
-
 	# Unless they explicitly specific USE=test, then do not install the
 	# testsuite. It DOES have a use to be installed, esp. when you want to do a
 	# validation of your database configuration after tuning it.
@@ -474,11 +465,6 @@ mysql-cmake_src_install() {
 		done
 	fi
 
-#	cat <<-EOF > "${T}"/80mysql-libdir
-#	LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
-#	EOF
-#	doenvd "${T}"/80mysql-libdir
-
 	#Remove mytop if perl is not selected
 	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
 	&& rm -f "${ED}/usr/bin/mytop"

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

[Jorge Manuel B. S. Vicetto]

commit:     acedaf23e89fc6b0ce6bcd3f6921d850cf37db68
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 01:42:33 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 01:42:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=acedaf23

Whitespace.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 81159ac..a113192 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.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-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $
+# $Header: $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
@@ -34,7 +34,7 @@ mysql-cmake_disable_test() {
 	testsuite="${rawtestname/.*}"
 	testname="${rawtestname/*.}"
 	for mysql_disabled_file in \
-		${S}/mysql-test/disabled.def  \
+		${S}/mysql-test/disabled.def \
 		${S}/mysql-test/t/disabled.def ; do
 		[[ -f ${mysql_disabled_file} ]] && break
 	done
@@ -44,8 +44,8 @@ mysql-cmake_disable_test() {
 
 	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
 		for mysql_disabled_file in \
-			${S}/mysql-test/suite/${testsuite}/disabled.def  \
-			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
+			${S}/mysql-test/suite/${testsuite}/disabled.def \
+			${S}/mysql-test/suite/${testsuite}/t/disabled.def \
 			FAILED ; do
 			[[ -f ${mysql_disabled_file} ]] && break
 		done
@@ -54,7 +54,7 @@ mysql-cmake_disable_test() {
 		else
 			for mysql_disabled_dir in \
 				${S}/mysql-test/suite/${testsuite} \
-				${S}/mysql-test/suite/${testsuite}/t  \
+				${S}/mysql-test/suite/${testsuite}/t \
 				FAILED ; do
 				[[ -d ${mysql_disabled_dir} ]] && break
 			done
@@ -251,7 +251,7 @@ mysql-cmake_src_prepare() {
 	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
 
 	rm -f "scripts/mysqlbug"
-	if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33"  ); then
+	if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33" ); then
 		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
 	fi
 
@@ -348,7 +348,7 @@ mysql-cmake_src_configure() {
 
 	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
 	CXXFLAGS="${CXXFLAGS} -felide-constructors"
-	# Causes linkage failures.  Upstream bug #59607 removes it
+	# Causes linkage failures. Upstream bug #59607 removes it
 	if ! mysql_version_is_at_least "5.6" ; then
 		CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
 	fi

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

[Jorge Manuel B. S. Vicetto]

commit:     ffcc191d74c03f204053871dc05d9f964f747a7a
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 01:34:19 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 01:34:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ffcc191d

Whitespace.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

---
 eclass/mysql-v2.eclass | 69 +++++++++++++++++++++++++++-----------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 67f9499..92106aa 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.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-v2.eclass,v 1.24 2013/02/13 00:40:57 robbat2 Exp $
+# $Header: $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -285,12 +285,14 @@ for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; d
 done
 
 if mysql_version_is_at_least "5.5.7" ; then
-	DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] ) 
-	tcmalloc? ( dev-util/google-perftools )
-	>=sys-libs/zlib-1.2.3[static-libs?]
-        ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	kernel_linux? ( dev-libs/libaio )"
+	DEPEND="${DEPEND}
+		jemalloc? ( dev-libs/jemalloc[static-libs?] )
+		tcmalloc? ( dev-util/google-perftools )
+		>=sys-libs/zlib-1.2.3[static-libs?]
+		ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
+		systemtap? ( >=dev-util/systemtap-1.3 )
+		kernel_linux? ( dev-libs/libaio )
+	"
 fi
 
 if [[ ${PN} == "mysql-cluster" ]] ; then
@@ -309,11 +311,14 @@ RDEPEND="${DEPEND}
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	# Bug 455016 Add dependencies of mytop
 	if mysql_version_is_at_least "5.3" ; then
-		RDEPEND="${RDEPEND} perl? (
-			virtual/perl-Getopt-Long
-			dev-perl/TermReadKey
-			virtual/perl-Term-ANSIColor
-			virtual/perl-Time-HiRes ) "
+		RDEPEND="${RDEPEND}
+			perl? (
+				virtual/perl-Getopt-Long
+				dev-perl/TermReadKey
+				virtual/perl-Term-ANSIColor
+				virtual/perl-Time-HiRes
+			)
+		"
 	fi
 fi
 
@@ -321,14 +326,14 @@ 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
 
 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
 
 DEPEND="${DEPEND}
@@ -439,10 +444,10 @@ configure_common() {
 # @FUNCTION: mysql-v2_pkg_setup
 # @DESCRIPTION:
 # Perform some basic tests and tasks during pkg_setup phase:
-#   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
-#   check for conflicting use flags
-#   create new user and group for mysql
-#   warn about deprecated features
+#	die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
+#	check for conflicting use flags
+#	create new user and group for mysql
+#	warn about deprecated features
 mysql-v2_pkg_setup() {
 
 	if has test ${FEATURES} ; then
@@ -541,11 +546,11 @@ mysql-v2_pkg_preinst() {
 # @FUNCTION: mysql-v2_pkg_postinst
 # @DESCRIPTION:
 # Run post-installation tasks:
-#   create the dir for logfiles if non-existant
-#   touch the logfiles and secure them
-#   install scripts
-#   issue required steps for optional features
-#   issue deprecation warnings
+#	create the dir for logfiles if non-existant
+#	touch the logfiles and secure them
+#	install scripts
+#	issue required steps for optional features
+#	issue deprecation warnings
 mysql-v2_pkg_postinst() {
 
 	# Make sure the vars are correctly initialized
@@ -618,11 +623,11 @@ mysql-v2_pkg_postinst() {
 		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
 		elog "use the MySQL upgrade script to restore the table"
 		elog "or execute the following SQL command:"
-		elog "    CREATE TABLE IF NOT EXISTS plugin ("
-		elog "      name char(64) binary DEFAULT '' NOT NULL,"
-		elog "      dl char(128) DEFAULT '' NOT NULL,"
-		elog "      PRIMARY KEY (name)"
-		elog "    ) CHARACTER SET utf8 COLLATE utf8_bin;"
+		elog "	CREATE TABLE IF NOT EXISTS plugin ("
+		elog "		name char(64) binary DEFAULT '' NOT NULL,"
+		elog "		dl char(128) DEFAULT '' NOT NULL,"
+		elog "		PRIMARY KEY (name)"
+		elog "	) CHARACTER SET utf8 COLLATE utf8_bin;"
 	fi
 }
 
@@ -686,7 +691,7 @@ mysql-v2_pkg_config() {
 				ewarn "Attempting to use ${MY_DATADIR_s}"
 			else
 				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
 			fi
 		fi
 	fi
@@ -771,7 +776,7 @@ mysql-v2_pkg_config() {
 
 	use prefix || options="${options} --user=mysql"
 
-	# Fix bug 446200.  Don't reference host my.cnf
+	# Fix bug 446200. Don't reference host my.cnf
 	use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \
 		&& options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
 

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

[Brian Evans]

commit:     500e4008ac671e0f2065a9204ea1333938730532
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Apr 22 13:58:15 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Apr 22 13:58:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=500e4008

[eclass] MariaDB has shuffled source locations

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 92106aa..879ff9b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -131,6 +131,7 @@ if [[ -z ${SERVER_URI} ]]; then
 		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}/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

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

[Brian Evans]

commit:     40af541360ce070aa32ae5249695c46f4818048d
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Apr 23 13:18:14 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Apr 23 13:18:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=40af5413

[eclass] Fix potential issue for future gcc versions in pkg_setup

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index e2dd614..9a2f94c 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -347,7 +347,7 @@ 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-version) < 4.7 ]] ; then
+	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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 879ff9b..1830130 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -479,7 +479,7 @@ 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-version) < 4.7 ]] ; then
+	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

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

[Brian Evans]

commit:     de8b563fc1c80a130f34f76faa0bc8837b2d158b
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Apr 28 18:10:06 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Apr 28 18:10:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=de8b563f

[eclass] clean up dep for MariaDB 10

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 1815e75..28df036 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -240,7 +240,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	fi
 	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
 	if mysql_version_is_at_least "10.0.9" ; then
-		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs]" || \
 		DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
 	fi
 fi

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 1830130..15faf6c 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -274,8 +274,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	fi
 	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )"
 	if mysql_version_is_at_least "10.0.9" ; then
-		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \
-			DEPEND="${DEPEND} >=dev-libs/libpcre-8.35"
+		DEPEND="${DEPEND} >=dev-libs/libpcre-8.35"
 	fi
 fi
 

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

[Brian Evans]

commit:     c072c4efcefc4b26eb9f3b8f0aeda9bdda40c00e
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Apr 28 18:01:41 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Apr 28 18:01:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c072c4ef

[eclass] Convert multilib_build_binaries to multilib_is_native_abi

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 9a2f94c..1815e75 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -453,7 +453,7 @@ mysql-multilib_src_configure() {
 
 		configure_cmake_locale
 
-		if multilib_build_binaries ; then
+		if multilib_is_native_abi ; then
 			if use minimal ; then
 				configure_cmake_minimal
 			else
@@ -493,7 +493,7 @@ mysql-multilib_src_configure() {
 mysql-multilib_src_compile() {
 	#_mysql-multilib_src_compile() {
 	#
-	#	if ! multilib_build_binaries ; then
+	#	if ! multilib_is_native_abi ; then
 	#		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
 	#	else
 	#		cmake-utils_src_compile
@@ -513,7 +513,7 @@ mysql-multilib_src_install() {
 	_mysql-multilib_src_install() {
 		debug-print-function ${FUNCNAME} "$@"
 
-		if multilib_build_binaries; then
+		if multilib_is_native_abi; then
 			mysql-cmake_src_install
 		else
 		#	BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
@@ -522,7 +522,7 @@ mysql-multilib_src_install() {
 				insinto /usr/include/mysql/private
 				doins sql/*.h
 			fi
-			
+
 		fi
 		# Do multilib magic only when >1 ABI is used.
 		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then

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

[Brian Evans]

commit:     a6fc813816f0115c3911dce9db9d6ed66acaedac
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Apr 30 20:38:59 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Apr 30 20:38:59 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a6fc8138

[eclass] Fix pkg_config for mysql 5.6+ (needs InnoDB)

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 eclass/mysql-multilib.eclass | 29 +++++++++++++++++------------
 eclass/mysql-v2.eclass       | 31 ++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 28df036..d89e15a 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -747,7 +747,7 @@ mysql-multilib_pkg_config() {
 	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 innodb ssl log-bin relay-log slow-query-log external-locking \
+		federated ssl log-bin relay-log slow-query-log external-locking \
 		ndbcluster log-slave-updates \
 		; do
 		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
@@ -763,6 +763,22 @@ mysql-multilib_pkg_config() {
 	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"
+	fi
+
+	einfo "Creating the mysql database and setting proper"
+	einfo "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"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		mkdir -p "${PID_DIR}"
+		chown mysql:mysql "${PID_DIR}"
+		chmod 755 "${PID_DIR}"
+	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
@@ -789,17 +805,6 @@ mysql-multilib_pkg_config() {
 		cat "${help_tables}" >> "${sqltmp}"
 	fi
 
-	einfo "Creating the mysql database and setting proper"
-	einfo "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"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		mkdir "${PID_DIR}"
-		chown mysql:mysql "${PID_DIR}"
-		chmod 755 "${PID_DIR}"
-	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 \

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 15faf6c..5a7a6f7 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -764,7 +764,7 @@ mysql-v2_pkg_config() {
 	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 innodb ssl log-bin relay-log slow-query-log external-locking \
+		federated ssl log-bin relay-log slow-query-log external-locking \
 		ndbcluster log-slave-updates \
 		; do
 		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
@@ -780,11 +780,27 @@ mysql-v2_pkg_config() {
 	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"
+	fi
+
+	einfo "Creating the mysql database and setting proper"
+	einfo "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"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		mkdir -p "${PID_DIR}"
+		chown mysql:mysql "${PID_DIR}"
+		chmod 755 "${PID_DIR}"
+	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
-	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
+	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}'"
 	einfo "Command: $cmd"
 	eval $cmd \
 		>"${TMPDIR}"/mysql_install_db.log 2>&1
@@ -806,17 +822,6 @@ mysql-v2_pkg_config() {
 		cat "${help_tables}" >> "${sqltmp}"
 	fi
 
-	einfo "Creating the mysql database and setting proper"
-	einfo "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"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		mkdir "${PID_DIR}"
-		chown mysql:mysql "${PID_DIR}"
-		chmod 755 "${PID_DIR}"
-	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 \

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

[Brian Evans]

commit:     f1f205c2997d8ada03040c128a59c4c71ab63ea5
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu May  8 17:09:24 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu May  8 17:09:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f1f205c2

[eclass] Add my dev space as a patch source

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index cb5482c..5b46f66 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -154,6 +154,7 @@ if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
 		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"
 fi
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index d4d1bd1..7fb7bfa 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -176,6 +176,7 @@ if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
 		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"
 fi
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."

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

[Brian Evans]

commit:     b59f3b7b65ef303b96037e46d48a47e107e87dd2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu May  8 17:19:57 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu May  8 17:19:57 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b59f3b7b

[eclass] Add my dev space as a patch source (take 2)

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 5b46f66..a0cb75b 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -153,7 +153,7 @@ 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/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
 		http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
 fi
 

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 7fb7bfa..f66c2ab 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -175,7 +175,7 @@ if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
 		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/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
 		http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
 fi
 

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

[Brian Evans]

commit:     00600cbb6bc9432096f3da053748bc752804d4aa
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue May 13 03:14:10 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue May 13 03:14:10 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=00600cbb

[eclass] Restrict bison version for <=5.5 builds

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f66c2ab..cd0db68 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -341,6 +341,9 @@ DEPEND="${DEPEND}
 	virtual/yacc
 "
 
+# Only 5.5+ has been made compatible with Bison 3+
+mysql_version_is_at_least "5.5" || DEPEND="${DEPEND} !>sys-devel/bison-3.0"
+
 DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
 
 # compile-time-only

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

[Brian Evans]

commit:     78fa066003827efbc62b9be073e4194a57ab0a63
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue May 13 19:18:54 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue May 13 19:18:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=78fa0660

[eclass] use openssl multilib

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a0cb75b..2bc09b1 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -201,15 +201,11 @@ REQUIRED_USE="
 # These are used for both runtime and compiletime
 # MULTILIB_USEDEP only set for libraries used by the client library
 DEPEND="
-	ssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?]
-	)
-	kernel_linux? ( 
+	ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+	kernel_linux? (
 		sys-process/procps:0=
 		dev-libs/libaio:0=
 	)
-	amd64? ( abi_x86_32? (
-		app-emulation/emul-linux-x86-baselibs[abi_x86_32]
-	) )
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
 	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]

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

[Brian Evans]

commit:     af3b9537a2e906d2d74c74f6f6903ccf56f65ae9
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 14 02:09:43 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed May 14 02:31:02 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=af3b9537

[eclass] Revert bison block due to patch from Percona

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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index cd0db68..3f904ef 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -179,7 +179,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/"
@@ -341,9 +341,6 @@ DEPEND="${DEPEND}
 	virtual/yacc
 "
 
-# Only 5.5+ has been made compatible with Bison 3+
-mysql_version_is_at_least "5.5" || DEPEND="${DEPEND} !>sys-devel/bison-3.0"
-
 DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
 
 # compile-time-only

[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 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed May 14 13:36:42 2014 +0000
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
-			-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
-			-DENABLED_LOCAL_INFILE=1
-			-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		)
+	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
+		-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
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+		-DWITH_SSL=$(usex ssl system bundled)
+	)
 
-		if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
-			mycmakeargs+=( -DWITH_EDITLINE=system )
-		fi
+	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+		mycmakeargs+=( -DWITH_EDITLINE=system )
+	fi
 
-		if use ssl; then
-			mycmakeargs+=( -DWITH_SSL=system )
-		else
-			mycmakeargs+=( -DWITH_SSL=bundled )
-		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 )
-
-                	if use jemalloc ; then
-                        	mycmakeargs+=( -DWITH_JEMALLOC="system" )
-	                else
-        	                mycmakeargs+=( -DWITH_JEMALLOC=no )
-                	fi
-			# TODO: uncomment this when libpcre 8.35 is released to remove bundled library
-#			mysql_version_is_at_least "10.0.9" mycmakeargs+=( -DWITH_PCRE=system )
-	        fi
-
-		configure_cmake_locale
-
-		if multilib_is_native_abi ; then
-			if use minimal ; then
-				configure_cmake_minimal
-			else
-				configure_cmake_standard
-			fi
-		else
-			configure_cmake_minimal
-		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)
+		)
 
-		# Bug #114895, bug #110149
-		filter-flags "-O" "-O[01]"
+		mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system )
+        fi
 
-		CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-		CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
-		# 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"
-		fi
-		export CXXFLAGS
+	configure_cmake_locale
 
-		# bug #283926, with GCC4.4, this is required to get correct behavior.
-		append-flags -fno-strict-aliasing
+	if multilib_is_native_abi && ! use minimal ; then
+		configure_cmake_standard
+	else
+		configure_cmake_minimal
+	fi
 
-		cmake-utils_src_configure
-	}
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
 
-	multilib_parallel_foreach_abi _mysql-multilib_src_configure "${@}"
+	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+	# 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"
+	fi
+	export CXXFLAGS
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	cmake-utils_src_configure
 }
 
-# @FUNCTION: mysql-multilib_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
 mysql-multilib_src_compile() {
-	#_mysql-multilib_src_compile() {
-	#
-	#	if ! multilib_is_native_abi ; then
-	#		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
-	#	else
-	#		cmake-utils_src_compile
-	#	fi
-	#}
+	local _cmake_args=( "${@}" )
 
-	debug-print-function ${FUNCNAME} "$@"
+	multilib-minimal_src_compile
+}
 
-#	multilib_foreach_abi _mysql-multilib_src_compile "${@}"
-	multilib_foreach_abi cmake-utils_src_compile "${@}"
+multilib_src_compile() {
+	cmake-utils_src_compile "${_cmake_args[@]}"
 }
 
+
 # @FUNCTION: mysql-multilib_src_install
 # @DESCRIPTION:
 # Install mysql.
 mysql-multilib_src_install() {
-	_mysql-multilib_src_install() {
-		debug-print-function ${FUNCNAME} "$@"
-
-		if multilib_is_native_abi; then
-			mysql-cmake_src_install
-		else
-		#	BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
-			cmake-utils_src_install
-			if ! use minimal && [[ "${PN}" == "mariadb" || "${PN}" == "mariadb-galera" ]] ; then
-				insinto /usr/include/mysql/private
-				doins sql/*.h
-			fi
-
-		fi
-		# Do multilib magic only when >1 ABI is used.
-		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-			multilib_prepare_wrappers
-			# Make sure all headers are the same for each ABI.
-			multilib_check_headers
-		fi
-	}
+	multilib-minimal_src_install
+}
 
+multilib_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	multilib_foreach_abi _mysql-multilib_src_install "${@}"
-	multilib_install_wrappers
+	if multilib_is_native_abi; then
+		mysql-cmake_src_install
+	else
+		cmake-utils_src_install
+		if ! use minimal && [[ "${PN}" == "mariadb" || "${PN}" == "mariadb-galera" ]] ; then
+			insinto /usr/include/mysql/private
+			doins "${S}"/sql/*.h
+		fi
+	fi
 }
 
 # @FUNCTION: mysql-multilib_pkg_preinst

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

[Brian Evans]

commit:     fd82e8e13b6de28b2388c1b8812f4b2a32950a7c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 14 14:50:42 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed May 14 14:50:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fd82e8e1

[eclass] Fix static-libs on minimal

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index a9c743d..7bfdf53 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -129,6 +129,7 @@ configure_cmake_minimal() {
 		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
 		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
 		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+		$(cmake-utils_use_enable static-libs STATIC_LIBS)
 	)
 }
 

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

[Brian Evans]

commit:     0002fb2c57a23c8a371f10743e84bc539ed5db19
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 03:11:08 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu May 15 03:11:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0002fb2c

[eclass] Cleanup and add usex when useful

---
 eclass/mysql-cmake.eclass | 27 ++++++++-------------------
 eclass/mysql-v2.eclass    |  7 ++++---
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7bfdf53..2102845 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -8,6 +8,7 @@
 #	- MySQL Team <mysql-bugs@gentoo.org>
 #	- Robin H. Johnson <robbat2@gentoo.org>
 #	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+#	- Brian Evans <grknight@gentoo.org>
 # @BLURB: This eclass provides the support for cmake based mysql releases
 # @DESCRIPTION:
 # The mysql-cmake.eclass provides the support to build the mysql
@@ -129,7 +130,6 @@ configure_cmake_minimal() {
 		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
 		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
 		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
-		$(cmake-utils_use_enable static-libs STATIC_LIBS)
 	)
 }
 
@@ -147,7 +147,6 @@ configure_cmake_standard() {
 		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
 		$(cmake-utils_use_with profiling)
 		$(cmake-utils_use_enable systemtap DTRACE)
-		$(cmake-utils_use_enable static-libs STATIC_LIBS)
 	)
 
 	if use static; then
@@ -190,7 +189,6 @@ configure_cmake_standard() {
 
 		if mysql_version_is_at_least 10.0.5 ; then
 			# CassandraSE needs Apache Thrift which is not in portage
-			# TODO: Add use and deps for Connect SE external deps
 			mycmakeargs+=(
 				-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
 				$(mysql-cmake_use_plugin extraengine SEQUENCE)
@@ -308,31 +306,22 @@ mysql-cmake_src_configure() {
 		-DWITH_ZLIB=system
 		-DWITHOUT_LIBWRAP=1
 		-DENABLED_LOCAL_INFILE=1
+		$(cmake-utils_use_enable static-libs STATIC_LIBS)
+		-DWITH_SSL=$(usex ssl system bundled)
 	)
 
 	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
 		mycmakeargs+=( -DWITH_EDITLINE=system )
 	fi
 
-	if use ssl; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
 	# Bug 412851
-	# MariaDB requires this flag to compile with GPLv3 readline linked
+	# 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 )
-	fi
-
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-		if use jemalloc ; then
-			mycmakeargs+=( -DWITH_JEMALLOC="system" )
-		else
-			mycmakeargs+=( -DWITH_JEMALLOC=no )
-		fi
+		mycmakeargs+=(
+			-DNOT_FOR_DISTRIBUTION=1
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+		)
 		mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system )
 	fi
 

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3f904ef..3a9954a 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -8,6 +8,7 @@
 #	- MySQL Team <mysql-bugs@gentoo.org>
 #	- Robin H. Johnson <robbat2@gentoo.org>
 #	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+#	- Brian Evans <grknight@gentoo.org>
 # @BLURB: This eclass provides most of the functions for mysql ebuilds
 # @DESCRIPTION:
 # The mysql-v2.eclass is the base eclass to build the mysql and
@@ -792,9 +793,9 @@ mysql-v2_pkg_config() {
 	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
 	PID_DIR="${EROOT}/var/run/mysqld"
 	if [[ ! -d "${PID_DIR}" ]]; then
-		mkdir -p "${PID_DIR}"
-		chown mysql:mysql "${PID_DIR}"
-		chmod 755 "${PID_DIR}"
+		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"
 	fi
 
 	pushd "${TMPDIR}" &>/dev/null

[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 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu May 15 18:07:18 2014 +0000
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 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri May 16 00:24:48 2014 +0000
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:     623f3c3838de2dddf7c5949f4e5ec47bd5a083b5
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon May 19 16:23:57 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon May 19 17:01:54 2014 +0000
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 2>&1
@@ -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 2>&1
@@ -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/

[Brian Evans]

commit:     67580a5160a986950192117a7757041d0fcf9b98
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  4 00:48:52 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Jun  4 00:50:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=67580a51

Remove app-text/sphinx as a build DEPEND and sync mysql-multilib

---
 eclass/mysql-multilib.eclass | 22 ++++++++++++++++------
 eclass/mysql-v2.eclass       |  1 -
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 1f664cb..feb9ba5 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -111,6 +111,7 @@ if [[ -z ${SERVER_URI} ]]; then
 		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}/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
@@ -226,7 +227,6 @@ 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= )
-		sphinx? ( app-misc/sphinx:0= )
 		!minimal? ( pam? ( virtual/pam:0= ) )
 		perl? ( !dev-db/mytop )"
 	if mysql_version_is_at_least "10.0.5" ; then
@@ -576,6 +576,16 @@ mysql-multilib_pkg_postinst() {
 		elog "If you are upgrading major versions, you should run the"
 		elog "mysql_upgrade tool."
 		einfo
+
+		if [[ ${PN} == "mariadb-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}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+		fi
 	fi
 }
 
@@ -641,7 +651,7 @@ mysql-multilib_pkg_config() {
 				ewarn "Attempting to use ${MY_DATADIR_s}"
 			else
 				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
 			fi
 		fi
 	fi
@@ -726,7 +736,7 @@ mysql-multilib_pkg_config() {
 
 	use prefix || options="${options} --user=mysql"
 
-	# Fix bug 446200.  Don't reference host my.cnf
+	# Fix bug 446200. Don't reference host my.cnf
 	use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \
 		&& options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
 
@@ -741,9 +751,9 @@ mysql-multilib_pkg_config() {
 	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
 	PID_DIR="${EROOT}/var/run/mysqld"
 	if [[ ! -d "${PID_DIR}" ]]; then
-		mkdir -p "${PID_DIR}"
-		chown mysql:mysql "${PID_DIR}"
-		chmod 755 "${PID_DIR}"
+		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"
 	fi
 
 	pushd "${TMPDIR}" &>/dev/null

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index a1558de..f0c919a 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -264,7 +264,6 @@ 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 )"
-	mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
 	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"

[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 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Jun 18 19:46:07 2014 +0000
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 5.3.99" && IUSE="${IUSE} libevent"
 	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \
@@ -258,7 +263,11 @@ DEPEND="
 if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
 	DEPEND="${DEPEND} dev-libs/libedit"
 else
-	DEPEND="${DEPEND} >=sys-libs/readline-4.1"
+	if mysql_version_is_at_least "5.5" ; then
+		DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1 )"
+	else
+		DEPEND="${DEPEND} >=sys-libs/readline-4.1"
+	fi
 fi
 
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then

[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 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Jun 19 01:35:28 2014 +0000
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:     198abde0a12843f8ab960d0035dea48601a0abb0
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 17:33:24 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Jun 19 17:33:24 2014 +0000
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:     a2c9bd466dc0002cf2ccdf3dd291e95b7da378b6
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  2 01:02:41 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Jul  2 01:02:41 2014 +0000
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/

[Robin H. Johnson]

commit:     2a6c561576350e048695972e92e7a72a68017b26
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Tue Jul 29 17:58:10 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 17:58:10 2014 +0000
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 password"
 		read -rsp "    >" pwd1 ; echo
 
@@ -780,9 +780,13 @@ mysql-v2_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" \
@@ -805,10 +809,6 @@ mysql-v2_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"
@@ -829,7 +829,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}' '--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 2>&1
@@ -855,16 +855,16 @@ mysql-v2_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}
-		--tmpdir=${EROOT}/${MYSQL_TMPDIR}"
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
 	#einfo "About to start mysqld: ${mysqld}"
 	ebegin "Starting mysqld"
 	einfo "Command ${mysqld}"

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 01f1c6d..bd555ce 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.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.eclass,v 1.177 2013/03/16 19:20:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.179 2014/07/19 10:18:41 grobian Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -458,7 +458,7 @@ 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"
@@ -1153,7 +1153,7 @@ mysql_src_install() {
 		-e "s!= /var!= ${EPREFIX}/var!" \
 		"${FILESDIR}/${mycnf_src}" \
 		> "${TMPDIR}/my.cnf.ok"
-	use prefix && sed -i -e '/^user[ 	]*= mysql$/d' "${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" \
@@ -1366,17 +1366,17 @@ mysql_pkg_config() {
 	MYSQL_LOG_BIN="$(mysql_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
+	if [[ ! -d "${ROOT}"/$MYSQL_RELAY_LOG ]]; then
 		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
+		install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_RELAY_LOG
 	fi
 
 	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
@@ -1467,7 +1467,7 @@ mysql_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=${ROOT}/${MY_DATADIR} \

[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 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 17:59:40 2014 +0000
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) <vivo@gentoo.org>
 # Maintainer:

[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 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 20:24:41 2014 +0000
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" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
 
 	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
 

[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 +0000
Commit:     Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Thu Jul 31 02:33:49 2014 +0000
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 2>&1
@@ -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}
-		--tmpdir=${EROOT}/${MYSQL_TMPDIR}"
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
 	#einfo "About to start mysqld: ${mysqld}"
 	ebegin "Starting mysqld"
 	einfo "Command ${mysqld}"

[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 +0000
Commit:     Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Thu Jul 31 20:24:25 2014 +0000
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-bugs@gentoo.org>
 #	- Robin H. Johnson <robbat2@gentoo.org>
 #	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+#	- Brian Evans <grknight@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/

[Robin H. Johnson]

commit:     86f75190b39855859d637639ce53ec33de1c7756
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Sun Aug 10 05:47:54 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 05:47:54 2014 +0000
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:     e707d9f15df18f950a340baf9237e71bb07dbe71
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 19 18:40:47 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Aug 19 18:40:47 2014 +0000
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/

[Brian Evans]

commit:     8f467c68408121762877fe16227d23a023c82cce
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 18 20:55:37 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Aug 19 13:36:43 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8f467c68

Add boost as a requirement for mysql 5.7

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 41312a8..69bf3b7 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -247,6 +247,10 @@ else
 	DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
 fi
 
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
+	mysql_verison_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost:0="
+fi
+
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	DEPEND="${DEPEND}
@@ -260,9 +264,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 			"
 	fi
 	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
-	if mysql_version_is_at_least "10.0.9" ; then
-		DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
-	fi
+	mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
 fi
 
 # Having different flavours at the same time is not a good idea

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index dafc0f8..bb5044e 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -290,6 +290,10 @@ else
 	fi
 fi
 
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
+	mysql_verison_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 )"

[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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Aug 21 17:53:17 2014 +0000
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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Aug 21 18:25:16 2014 +0000
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:     fe8a357a3ee2336c245d166118d32dc3a64d473c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 22 18:14:17 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Aug 22 18:14:17 2014 +0000
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:     bba09978d54ec670a717091e93ac409e1addb60f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 19:04:59 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 19:04:59 2014 +0000
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:     f3026563c50abae2f0a233dfee178c05b0a137e4
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 16:18:45 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 16:18:45 2014 +0000
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:     27b7d345c61d929086d632ecc3fbcaa10c6db488
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  3 18:10:50 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Sep  3 18:10:50 2014 +0000
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:     f80bcd317e4a94055676f5cec1eb9b1ba2fe6398
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 13 14:21:37 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Sep 13 14:21:37 2014 +0000
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:     872c20f33a28f49d485c1d52465d273cdce40858
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 17 20:24:32 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Sep 17 20:24:32 2014 +0000
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:     218fe06531ffe10a282b115cabbeded703a8241e
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 20:32:17 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 20:32:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=218fe065

[eclass] remove cmake warning from cutting bundled lzma

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 979077d..c353e96 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -272,6 +272,7 @@ mysql-cmake_src_prepare() {
 		# Don't build bundled xz-utils
 		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
 		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
+		sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
 	fi
 
 	epatch_user

[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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct  8 17:26:58 2014 +0000
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:     cf4624ec566ad67130b74e1df009068a3e29822b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  8 19:25:29 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct  8 19:25:29 2014 +0000
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:     3912b1d0557bf1f5ec66ddcb96cb048d08b661d2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 16:37:51 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 16:37:51 2014 +0000
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:     01bcc9c442f1b13043196d5b1f35fcfa5ee6730a
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 17:17:57 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 17:17:57 2014 +0000
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:     1447f4e0be5a65b0c61e42b5d2db77578c570b83
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 25 02:53:40 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 02:53:40 2014 +0000
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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 03:02:12 2014 +0000
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:     589b9078fc13b36c13c7469a31920ce58a5eae82
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 18 19:35:10 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Nov 18 19:35:10 2014 +0000
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:     400d9bb8100719333600105bd46cacb73be02777
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 01:53:24 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 01:53:24 2014 +0000
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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 02:32:22 2014 +0000
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:     b00900f5bf615c2040d714905e766bcd14e98985
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 19:58:54 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 19:58:54 2014 +0000
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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 20:12:44 2014 +0000
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:     0ef9172664b19b1cf2afe6cf97e85d77b549de95
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 26 00:35:28 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Nov 26 00:35:28 2014 +0000
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:     f44c7967684afe750d487aaf8863dd5abda45301
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 30 15:30:27 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Dec 30 15:30:27 2014 +0000
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:     0288c405f5d71a1f77dfa342e8f8cf4bb8dfdc21
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 27 03:41:33 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jan 27 03:41:33 2015 +0000
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:     a37a0a00392da91158205334ddf0a4a940be6166
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 28 15:49:53 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 15:49:53 2015 +0000
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:     e8c0eadaaec5c5160cff4d8ecc7130f05dd7e39f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 30 19:32:16 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jan 30 19:32:16 2015 +0000
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 "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
-
 	cmake-utils_src_configure
 }
 

[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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Feb 10 18:36:34 2015 +0000
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:     88856ea27eb404cf197226d2bf489ff052b59a9a
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  8 23:24:29 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Mar  8 23:24:29 2015 +0000
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:     52e244863806a7844ae0fd2042e2d62417ed810b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 16:38:28 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 16:38:28 2015 +0000
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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 19:44:49 2015 +0000
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/

[Brian Evans]

commit:     dd83f2cb3e892a3a03fe1ce35a2140304d5e4cfe
Author:     layman <layman <AT> localhost>
AuthorDate: Fri May  1 12:29:01 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri May  1 12:29:01 2015 +0000
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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri May  1 12:41:03 2015 +0000
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:     7bf949f0b287b2b8a7c814705629a306d8acbcc7
Author:     layman <layman <AT> localhost>
AuthorDate: Fri May  1 18:49:27 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri May  1 18:49:27 2015 +0000
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:     4c924a5eb7f4b1b2a36362266318a83523694f26
Author:     layman <layman <AT> localhost>
AuthorDate: Wed Jun 10 18:11:32 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 18:11:32 2015 +0000
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 ..."
+	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"
@@ -959,7 +959,7 @@ mysql-multilib_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:     3011538a85fe4133a9f6747fa4aba3f94743f5b7
Author:     layman <layman <AT> localhost>
AuthorDate: Fri Jun 12 20:13:17 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 20:13:17 2015 +0000
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:     f051ae75402763b80bd9a10a44a6b75dd2f34426
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 17:44:14 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 17:44:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f051ae75

Fix compatibilty with old builds for building the server

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

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 4385728..d8bb0a6 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -672,10 +672,14 @@ multilib_src_configure() {
 
 	if use_if_iuse minimal ; then
 		configure_cmake_minimal
-	elif multilib_is_native_abi && use_if_iuse server ; then
-		configure_cmake_standard
+	elif in_iuse server ; then
+		if multilib_is_native_abi && use server ; then
+			configure_cmake_standard
+		else
+			configure_cmake_minimal
+		fi
 	else
-		configure_cmake_minimal
+		configure_cmake_standard
 	fi
 
 	# Always build NDB with mysql-cluster for libndbclient

[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 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 22:27:52 2015 +0000
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:     efe3735b38fa72ffeb36385e35e69468d7618e6d
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 15:05:52 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 15:05:52 2015 +0000
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:     6a73b4acc639a4f07173f8d0342d4a9c2e3e009f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 02:02:45 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 02:02:45 2015 +0000
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:     c8da824625d6763c6a0e69e172a36b869113f5f6
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 13:53:52 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 13:53:52 2015 +0000
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/

[Brian Evans]

commit:     ba5c1a689a4981e20cf0b58734353c8bc8064899
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 13:30:05 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 13:30:05 2015 +0000
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:     ddbb447439c29bd1d9a64f362e51ffcff3249cf3
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 19:17:42 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 19:17:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ddbb4474

Update copyright year on mysql-cmake.eclass

Signed-off-by: Brian Evans <grknight <AT> 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:     9203d0799f02f999ff8f8f8f697ce80df1382df3
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 13:00:28 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 13:00:28 2015 +0000
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 <grknight <AT> 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:     6e2be137829438864279bd17f959b443235dcedc
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 01:41:41 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 01:41:41 2015 +0000
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 <grknight <AT> 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:     cf9f250ef4b95510b52e6e9fe96796294509260b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 15:01:40 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 15:01:40 2015 +0000
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 <grknight <AT> 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:     a232fdf242b8ce0353bb03600148c44f0356bd1f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 15:06:47 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 15:06:47 2015 +0000
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 <grknight <AT> 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:     230727ca970a327e9338829cdff30c98973e8928
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 17:32:46 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 17:32:46 2015 +0000
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 <grknight <AT> 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/

[Brian Evans]

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

More config cleanup; fix variables

Signed-off-by: Brian Evans <grknight <AT> 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:     bc5a6b4582e762b4999356033e7f68749b7a215f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 02:51:46 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 02:51:46 2015 +0000
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 <grknight <AT> 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:     e5fa46171e5636a6f3d74f2fdb3615394501a00f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 18:48:09 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 18:48:09 2015 +0000
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 <grknight <AT> 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/

[Brian Evans]

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

mysql-multilib.eclass: use https URLs for patches

Signed-off-by: Brian Evans <grknight <AT> 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:     615f93f211a038110fc840203a68d66c31c3d249
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 16:54:11 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 16:54:11 2015 +0000
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 <grknight <AT> 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:     968ec8e3261cc3f9013ddb26a3f2c9968ed45e5e
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 16:52:32 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 16:52:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=968ec8e3

Restrict tests when libressl is enabled

Signed-off-by: Brian Evans <grknight <AT> 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:     575e5ab98beafd988af73a49c43fdf36872ac6bc
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 16:48:00 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 16:48:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=575e5ab9

Add in minor fixes from portage tree

Signed-off-by: Brian Evans <grknight <AT> 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:     f14a3555383c2bb5693caa243e055ec4f114ca75
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 18:33:28 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 18:33:28 2015 +0000
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 <grknight <AT> 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 <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 18:29:47 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 18:29:47 2015 +0000
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 <grknight <AT> 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:     7556dd45f579a57c8fd2944b865f938fb6f07c07
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 21:50:48 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 21:50:48 2015 +0000
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 <grknight <AT> 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:     9aaf18966bccd86b6b01e8480b2ec52f6d66cdc5
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 15:14:12 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 15:14:12 2015 +0000
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 <grknight <AT> 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:     653fb8eb186372b414c54d11115bcf84e8bc41e2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 15:07:07 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 15:07:07 2015 +0000
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:     546326e3c1847d6a93425e3c22cc3981bb36d816
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 18:33:48 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 18:33:48 2015 +0000
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 <grknight <AT> 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:     8c240ee6acb0a20ebb9bea19548c42f18d2ded55
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 20:29:36 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 20:29:36 2016 +0000
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 <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 20:41:14 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 20:41:14 2016 +0000
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:     b1c6beb73bed558dd857ab79ff6df4edb2fcf575
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 02:19:52 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 02:19:52 2016 +0000
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:     0ad5f2b290c38ec5620e00ee86dbf392488b78b2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 03:27:34 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 03:27:34 2016 +0000
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 <USE flag> <flag name>"
-	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:     272d86839db2042ebe26dd2193850e018c737eb4
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 02:56:17 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 02:56:17 2016 +0000
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 <vivo@gentoo.org>
+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
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
+		MY_SOURCEDIR=${SERVER_URI##*/}
+		MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
+}
+fi

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

[Brian Evans]

commit:     5ccfa79991dabaee7cfd091f060c26792ebe68a2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 20:18:22 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 20:18:22 2016 +0000
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:     d08d64cf16700b01a91fbc152b8aaed6ccdd792f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 01:24:43 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 01:24:43 2016 +0000
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:     5a1dc50695c4c58f4a7cd9a7c211199d13932ef4
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 14:31:48 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 14:31:48 2016 +0000
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:     3fe58ecd995db0c53fbcc56c124966a9363126f9
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 18:54:49 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed May 11 18:54:49 2016 +0000
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:     ef63412e7200ee99e779b9187293da57a229121b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 18:46:34 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 16:44:03 2016 +0000
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:     b225c397c78dc425644d9a4d76344a517ee7f106
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 03:09:25 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 16:44:00 2016 +0000
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 <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 18:48:50 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 16:44:03 2016 +0000
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:     d2542647b05af87035eba75c1736f6c79e54a31b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 18:35:07 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 18:37:02 2017 +0000
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)
+		-DPKG_CONFIG_EXECUTABLE="$(tc-getPKG_CONFIG)"
 	)
 
 	if use test ; then
@@ -537,7 +546,9 @@ multilib_src_compile() {
 # Install mysql.
 mysql-multilib-r1_src_install() {
 	# wrap the config script
-	MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+	if ! declare -a MULTILIB_CHOST_TOOLS ; then
+		MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+	fi
 
 	multilib-minimal_src_install
 }

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

[Brian Evans]

commit:     aee6312b4652e1bde78a9e91b0bc86744d73d4f2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 17:53:42 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 17:53:42 2017 +0000
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:     f6991af2a166e3adb9420be99d68499a066a2b3b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 14:36:14 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 14:36:14 2017 +0000
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:     b08acd1f575ac0fc07235798f28ae27d24506a63
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 14:41:08 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 14:41:08 2017 +0000
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:     7b3271b8f3747a83e9696193c804346ff2b9ea7c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 17:15:46 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue May  2 17:15:46 2017 +0000
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:     96d0e4e1a3b07d3b15891c002860f35087fc9869
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 12:51:17 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri May 19 12:51:17 2017 +0000
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 <mysql-bugs@gentoo.org>

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

[Brian Evans]

commit:     3e550e892fb47294b31cb31e05583fe12550a627
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 02:42:18 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 02:42:18 2017 +0000
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/

[Brian Evans]

commit:     80ff75dfa87fdd93388b18c56b92584f3d29b5cf
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 19:05:09 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 19:23:51 2017 +0000
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 )"
+		REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc !tcmalloc )"
 fi
 
 if mysql_version_is_at_least "5.5"; then
@@ -359,11 +357,8 @@ 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
 
@@ -514,8 +509,7 @@ mysql-v2_pkg_setup() {
 		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
+	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
@@ -703,7 +697,7 @@ mysql-v2_pkg_config() {
 
 	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
 
-	if built_with_use ${CATEGORY}/${PN} minimal ; then
+	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
 		die "Minimal builds do NOT include the MySQL server"
 	fi
 
@@ -897,7 +891,7 @@ mysql-v2_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:     3007cfdf814727b90978e91991c0ad26f2ad4a74
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 14:26:59 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 14:26:59 2017 +0000
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/

[Thomas Deutschmann]

commit:     9133c827163ccb5ca724df2ca77d85a626daa88e
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jun 10 09:10:49 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 13:22:04 2018 +0000
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"