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 81273138A1F for ; Mon, 28 Apr 2014 18:10:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B89B6E09F3; Mon, 28 Apr 2014 18:10:52 +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 330A9E09F3 for ; Mon, 28 Apr 2014 18:10:52 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08EB333FD0E for ; Mon, 28 Apr 2014 18:10:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B600118743 for ; Mon, 28 Apr 2014 18:10:48 +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: <1398708606.de8b563fc1c80a130f34f76faa0bc8837b2d158b.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: de8b563fc1c80a130f34f76faa0bc8837b2d158b X-VCS-Branch: master Date: Mon, 28 Apr 2014 18:10:48 +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: 748b4311-d3ff-4000-812e-a380e5c574b3 X-Archives-Hash: aa91200f51a3a55e7499e9330aff2431 commit: de8b563fc1c80a130f34f76faa0bc8837b2d158b Author: Brian Evans tuffmail com> AuthorDate: Mon Apr 28 18:10:06 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Mon Apr 28 18:10:06 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=de8b563f [eclass] clean up dep for MariaDB 10 Signed-off-by: Brian Evans tuffmail.com> --- eclass/mysql-multilib.eclass | 1 - eclass/mysql-v2.eclass | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 1815e75..28df036 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -240,7 +240,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" if mysql_version_is_at_least "10.0.9" ; then - use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs]" || \ DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" fi fi diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 1830130..15faf6c 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -274,8 +274,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )" if mysql_version_is_at_least "10.0.9" ; then - use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \ - DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" + DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" fi fi