From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3FDF3138331 for ; Tue, 27 Sep 2016 16:44:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE89BE0BD7; Tue, 27 Sep 2016 16:44:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0D25E0BD7 for ; Tue, 27 Sep 2016 16:44:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3399D340139 for ; Tue, 27 Sep 2016 16:44:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB96A2498 for ; Tue, 27 Sep 2016 16:44:24 +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: <1474994643.ef63412e7200ee99e779b9187293da57a229121b.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: ef63412e7200ee99e779b9187293da57a229121b X-VCS-Branch: master Date: Tue, 27 Sep 2016 16:44:24 +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: 8dc4a951-fa3a-4537-b519-cb132c02aab7 X-Archives-Hash: f440770acdc2288c0b7f79c119c26667 commit: ef63412e7200ee99e779b9187293da57a229121b Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Sep 26 18:46:34 2016 +0000 Commit: Brian Evans gentoo 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"