Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: eclass/
Date: Fri, 30 Sep 2011 02:51:47
Message-Id: 8c9b069c8f0c053c02f607084c8c1f692157068f.jmbsvicetto@gentoo
1 commit: 8c9b069c8f0c053c02f607084c8c1f692157068f
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 02:50:24 2011 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 02:50:24 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8c9b069c
7
8 [mysql-v2.eclass] Sync eclass from tree.
9
10 ---
11 eclass/mysql-v2.eclass | 12 +++++++-----
12 1 files changed, 7 insertions(+), 5 deletions(-)
13
14 diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
15 index dadcba7..d50c9c2 100644
16 --- a/eclass/mysql-v2.eclass
17 +++ b/eclass/mysql-v2.eclass
18 @@ -1,6 +1,6 @@
19 # Copyright 1999-2011 Gentoo Foundation
20 # Distributed under the terms of the GNU General Public License v2
21 -# $Header: $
22 +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.8 2011/09/25 12:43:28 grobian Exp $
23
24 # @ECLASS: mysql-v2.eclass
25 # @MAINTAINER:
26 @@ -19,8 +19,8 @@
27 # phase hooks.
28
29 # @ECLASS-VARIABLE: BUILD
30 -# @DESCRIPTION: Build type of the mysql version
31 -# The default value is autotools
32 +# @DESCRIPTION:
33 +# Build type of the mysql version
34 : ${BUILD:=autotools}
35
36 case ${BUILD} in
37 @@ -41,7 +41,8 @@ esac
38 MYSQL_EXTRAS=""
39
40 # @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
41 -# @DESCRIPTION: The version of the MYSQL_EXTRAS repo to use to build mysql
42 +# @DESCRIPTION:
43 +# The version of the MYSQL_EXTRAS repo to use to build mysql
44 [[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git-2"
45
46 inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
47 @@ -250,8 +251,9 @@ for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
48 DEPEND="${DEPEND} !dev-db/${i}"
49 done
50
51 +# prefix: first need to implement something for #196294
52 RDEPEND="${DEPEND}
53 - !minimal? ( dev-db/mysql-init-scripts )
54 + !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
55 selinux? ( sec-policy/selinux-mysql )
56 "