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 EE9C8138585 for ; Sun, 20 Jan 2013 02:15:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AD7D21C036; Sun, 20 Jan 2013 02:15:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 728B021C04A for ; Sun, 20 Jan 2013 02:15:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C4FF33DAD2 for ; Sun, 20 Jan 2013 02:15:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 17012E4083 for ; Sun, 20 Jan 2013 02:15:04 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1356752206.abf3f16cdd9f4f48ea566d2c3e022a9de5d347ce.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: abf3f16cdd9f4f48ea566d2c3e022a9de5d347ce X-VCS-Branch: master Date: Sun, 20 Jan 2013 02:15: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: a1453b26-1b4e-4283-98d8-77f263dcaa3d X-Archives-Hash: 1be6b1c90a4c91632620f35c0752a4ec commit: abf3f16cdd9f4f48ea566d2c3e022a9de5d347ce Author: Brian Evans lavabit com> AuthorDate: Sat Dec 29 03:36:46 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Dec 29 03:36:46 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=abf3f16c Move DEPEND variables before RDEPEND which dynamically link runtime libraries --- eclass/mysql-v2.eclass | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index ac20d17..59d3223 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -220,6 +220,24 @@ for i in "mysql" "mariadb" ; do DEPEND="${DEPEND} !dev-db/${i}" done +[[ "${PN}" == "mariadb" ]] \ +&& mysql_version_is_at_least "5.2" \ +&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" + +[[ "${PN}" == "mariadb" ]] \ +&& mysql_version_is_at_least "5.2.5" \ +&& DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" + +mysql_version_is_at_least "5.5.7" \ +&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \ +&& DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )" + +mysql_version_is_at_least "5.5" \ +&& DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )" + +mysql_version_is_at_least "5.5" \ +&& DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )" + # prefix: first need to implement something for #196294 RDEPEND="${DEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) @@ -239,24 +257,6 @@ DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" mysql_version_is_at_least "5.5.8" \ && DEPEND="${DEPEND} >=dev-util/cmake-2.6.3" -[[ "${PN}" == "mariadb" ]] \ -&& mysql_version_is_at_least "5.2" \ -&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" - -[[ "${PN}" == "mariadb" ]] \ -&& mysql_version_is_at_least "5.2.5" \ -&& DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" - -mysql_version_is_at_least "5.5.7" \ -&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \ -&& DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )" - -mysql_version_is_at_least "5.5" \ -&& DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )" - -mysql_version_is_at_least "5.5" \ -&& DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )" - # dev-perl/DBD-mysql is needed by some scripts installed by MySQL PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"