From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3C3ED1381DF for ; Wed, 17 Feb 2016 03:30:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61A97E07F5; Wed, 17 Feb 2016 03:30:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DECF6E07F5 for ; Wed, 17 Feb 2016 03:30:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57154340AB6 for ; Wed, 17 Feb 2016 03:30:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AEDC110AF for ; Wed, 17 Feb 2016 03:30:04 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1455679654.0ad5f2b290c38ec5620e00ee86dbf392488b78b2.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 0ad5f2b290c38ec5620e00ee86dbf392488b78b2 X-VCS-Branch: master Date: Wed, 17 Feb 2016 03:30:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a4ce1534-fec1-4509-95f3-0cc0791153cd X-Archives-Hash: 3621bbc2bfb6d1f145f21f45df280596 commit: 0ad5f2b290c38ec5620e00ee86dbf392488b78b2 Author: Brian Evans gentoo org> AuthorDate: Wed Feb 17 03:27:34 2016 +0000 Commit: Brian Evans gentoo 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 " - 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"