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 F1E5A1384B4 for ; Wed, 29 Jul 2015 15:02:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FE8E14084; Wed, 29 Jul 2015 15:02:56 +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 D299814084 for ; Wed, 29 Jul 2015 15:02:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEDAE3406F1 for ; Wed, 29 Jul 2015 15:02:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9BEA5BB for ; Wed, 29 Jul 2015 15:02:43 +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: <1438182352.efe3735b38fa72ffeb36385e35e69468d7618e6d.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: efe3735b38fa72ffeb36385e35e69468d7618e6d X-VCS-Branch: master Date: Wed, 29 Jul 2015 15:02:43 +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: d68133a1-86a7-410e-9302-bdb62c63ac0c X-Archives-Hash: 9773053014698fcad79aefeedf513c0a commit: efe3735b38fa72ffeb36385e35e69468d7618e6d Author: Brian Evans gentoo org> AuthorDate: Wed Jul 29 15:05:52 2015 +0000 Commit: Brian Evans gentoo 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