summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2013-01-20 02:23:10 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2013-01-20 02:23:10 +0000
commit2c18d0bdbee4f4c8cfff572a59c2643342e09b4a (patch)
treec52061a89019ac0dc60d19bc64a03dc874bcefb5 /eclass/mysql-v2.eclass
parentBump, includes upstream security fixes. Many thanks to Brian Evans <grknight@... (diff)
downloadhistorical-2c18d0bdbee4f4c8cfff572a59c2643342e09b4a.tar.gz
historical-2c18d0bdbee4f4c8cfff572a59c2643342e09b4a.tar.bz2
historical-2c18d0bdbee4f4c8cfff572a59c2643342e09b4a.zip
Sync mysql eclasses from overlay. Includes fix for bug #434552, support for google-mysql, new configurations.
Diffstat (limited to 'eclass/mysql-v2.eclass')
-rw-r--r--eclass/mysql-v2.eclass38
1 files changed, 19 insertions, 19 deletions
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index ac20d17f9633..221ed61c02a8 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.21 2012/11/01 23:57:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.22 2013/01/20 02:23:10 robbat2 Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -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 )"