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"