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 662A21389DF for ; Tue, 12 Feb 2013 22:47:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3330AE04C2; Tue, 12 Feb 2013 22:47:44 +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 6A7D1E0508 for ; Tue, 12 Feb 2013 22:47:43 +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 7A4A233E67E for ; Tue, 12 Feb 2013 22:47:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6A8F2E4089 for ; Tue, 12 Feb 2013 22:47:40 +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: <1359751225.a6971bac926e46480aa46cbd7e6a06444a1e3702.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-autotools.eclass eclass/mysql-cmake.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: a6971bac926e46480aa46cbd7e6a06444a1e3702 X-VCS-Branch: master Date: Tue, 12 Feb 2013 22:47:40 +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: e6817795-4103-44e8-b517-357b5d1b7e4a X-Archives-Hash: b441bc9b9cf148f33870c51a85504fb0 commit: a6971bac926e46480aa46cbd7e6a06444a1e3702 Author: Brian Evans lavabit com> AuthorDate: Fri Feb 1 20:40:25 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Feb 1 20:40:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a6971bac Bug 455016 Add deps for mytop and tie it to USE="perl" --- eclass/mysql-autotools.eclass | 5 +++++ eclass/mysql-cmake.eclass | 4 ++++ eclass/mysql-v2.eclass | 11 ++++++++++- 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index 1ea254a..1e41571 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -657,4 +657,9 @@ mysql-autotools_src_install() { fi mysql_lib_symlinks "${ED}" + + #Remove mytop if perl is not selected + [[ "${PN}" == "mariadb" ]] && ! use perl \ + && mysql_version_is_at_least "5.3" \ + && rm -f "${ED}/usr/bin/mytop" } diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 8673691..ffbcbd2 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -393,4 +393,8 @@ mysql-cmake_src_install() { fi mysql_lib_symlinks "${ED}" + + #Remove mytop if perl is not selected + [[ "${PN}" == "mariadb" ]] && ! use perl \ + && rm -f "${ED}/usr/bin/mytop" } diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index a3b1dc9..8e5056a 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -241,7 +241,7 @@ done # Bug 441700 MariaDB >=5.3 include custom mytop [[ "${PN}" == "mariadb" ]] \ && mysql_version_is_at_least "5.3" \ -&& DEPEND="${DEPEND} !dev-db/mytop" +&& DEPEND="${DEPEND} perl? ( !dev-db/mytop )" mysql_version_is_at_least "5.5.7" \ && DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \ @@ -259,6 +259,15 @@ RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql ) " +# Bug 455016 Add dependancies of mytop +[[ "${PN}" == "mariadb" ]] \ +&& mysql_version_is_at_least "5.3" \ +&& RDEPEND="${RDEPEND} perl? ( + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes ) " + DEPEND="${DEPEND} virtual/yacc "