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 95FB6138CEE for ; Thu, 25 Jun 2015 14:25:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80140E084F; Thu, 25 Jun 2015 14:25:50 +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 3206BE084F for ; Thu, 25 Jun 2015 14:25:50 +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 22E40340836 for ; Thu, 25 Jun 2015 14:25:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C79AD9FE for ; Thu, 25 Jun 2015 14:25:45 +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: <1435242304.cda61c8ce44038cb1b9685098b99762ee97d0a4f.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:split-client commit in: eclass/, dev-db/mysql-connector-c/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild eclass/mysql-multilib.eclass X-VCS-Directories: dev-db/mysql-connector-c/ eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: cda61c8ce44038cb1b9685098b99762ee97d0a4f X-VCS-Branch: split-client Date: Thu, 25 Jun 2015 14:25:45 +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: 7272b6b1-1108-46a3-b2de-7eb31424a8ea X-Archives-Hash: 2c43eae1ed76d8c84bb4c63e38a6bdbd commit: cda61c8ce44038cb1b9685098b99762ee97d0a4f Author: layman localhost> AuthorDate: Thu Jun 25 14:25:04 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Jun 25 14:25:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=cda61c8c Fix dependencies dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild | 10 +++++----- eclass/mysql-multilib.eclass | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild index 289f2d6..771a07b 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild @@ -26,12 +26,12 @@ CDEPEND=" ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) " RDEPEND="${CDEPEND} - !dev-db/mysql - !dev-db/mysql-cluster - !dev-db/mariadb + !dev-db/mysql[client-libs(+)] + !dev-db/mysql-cluster[client-libs(+)] + !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat] - !dev-db/mariadb-galera - !dev-db/percona-server + !dev-db/mariadb-galera[client-libs(+)] + !dev-db/percona-server[client-libs(+)] " DEPEND="${CDEPEND} >=dev-util/cmake-2.8.9 diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 175f455..a786828 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -370,9 +370,9 @@ RDEPEND="${DEPEND} " if [[ ${HAS_TOOLS_PATCH} ]] ; then - RDEPEND="${RDEPEND} + RDEPEND="${RDEPEND} server? ( !prefix? ( dev-db/mysql-init-scripts ) ) - !client-libs? ( virtual/libmysqclient )" + !client-libs? ( virtual/libmysqlclient )" else RDEPEND="${RDEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )" fi