[gentoo-commits] proj/mysql:master commit in: eclass/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     a6971bac926e46480aa46cbd7e6a06444a1e3702
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Feb  1 20:40:25 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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
 "