Bug #396089: Avoid automagic systemtap/dtrace in MySQL 5.5.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index be4a0cab2ea66e3de4908a68bd58d6ed98535d88..139269796eab4750ee48cfc880dcb0b370463345 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.57 2011/12/27 06:54:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.58 2011/12/27 07:37:20 robbat2 Exp $
+
+  27 Dec 2011; Robin H. Johnson <robbat2@gentoo.org> mysql-cmake.eclass,
+  mysql-v2.eclass:
+  Bug #396089: Avoid automagic systemtap/dtrace in MySQL 5.5.
 
   27 Dec 2011; Mike Gilbert <floppym@gentoo.org> twisted.eclass:
   Only call doman on manpages in twisted_src_install. Credit to Arfrever.

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index b882ff54963ab8327563ba82202d2c37158717bd..a8cebb5d26270632f4c67d03f03d4378b75d96e7 100644 (file)
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.3 2011/12/27 07:34:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.4 2011/12/27 07:37:20 robbat2 Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
@@ -128,6 +128,7 @@ configure_cmake_standard() {
                $(cmake-utils_use_with debug)
                $(cmake-utils_use_with embedded EMBEDDED_SERVER)
                $(cmake-utils_use_with profiling)
+               $(cmake-utils_use_enable systemtap DTRACE)
        )
 
        if use ssl; then

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 5f82221bf93fe0e93a5c38b4b9957fca226cf17e..33d9cf9f36d851112f3bda0c999b3d13dc6c3696 100644 (file)
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.10 2011/11/17 16:04:02 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.11 2011/12/27 07:37:20 robbat2 Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -227,6 +227,9 @@ IUSE="${IUSE} berkdb"
 && mysql_version_is_at_least "5.2.5" \
 && IUSE="${IUSE} sphinx"
 
+mysql_version_is_at_least "5.5.7" \
+&& IUSE="${IUSE} systemtap"
+
 
 #
 # DEPENDENCIES:
@@ -279,6 +282,9 @@ mysql_version_is_at_least "5.5.8" \
 && 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 )"
+
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"