| 1 |
commit: 4f8dc640ce2f94c8878349e1f9cf28a9ecf663f3 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 30 02:06:36 2011 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 30 02:07:10 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4f8dc640 |
| 7 |
|
| 8 |
[mysql.eclass] Sync with tree eclass. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql.eclass | 18 ++++++++++-------- |
| 12 |
1 files changed, 10 insertions(+), 8 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass |
| 15 |
index 391351b..78b482b 100644 |
| 16 |
--- a/eclass/mysql.eclass |
| 17 |
+++ b/eclass/mysql.eclass |
| 18 |
@@ -1,13 +1,14 @@ |
| 19 |
-# Copyright 1999-2009 Gentoo Foundation |
| 20 |
+# Copyright 1999-2011 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.161 2011/07/08 11:35:01 ssuominen Exp $ |
| 23 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.166 2011/09/25 12:43:28 grobian Exp $ |
| 24 |
|
| 25 |
# @ECLASS: mysql.eclass |
| 26 |
# @MAINTAINER: |
| 27 |
-# Author: Francesco Riosa (Retired) <vivo@g.o> |
| 28 |
-# Maintainers: MySQL Team <mysql-bugs@g.o> |
| 29 |
-# - Luca Longinotti <chtekk@g.o> |
| 30 |
-# - Robin H. Johnson <robbat2@g.o> |
| 31 |
+# MySQL Team <mysql-bugs@g.o> |
| 32 |
+# Luca Longinotti <chtekk@g.o> |
| 33 |
+# Robin H. Johnson <robbat2@g.o> |
| 34 |
+# @AUTHOR: |
| 35 |
+# Francesco Riosa (Retired) <vivo@g.o> |
| 36 |
# @BLURB: This eclass provides most of the functions for mysql ebuilds |
| 37 |
# @DESCRIPTION: |
| 38 |
# The mysql.eclass provides almost all the code to build the mysql ebuilds |
| 39 |
@@ -141,8 +142,9 @@ for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do |
| 40 |
DEPEND="${DEPEND} !dev-db/${i}" |
| 41 |
done |
| 42 |
|
| 43 |
+# prefix: first need to implement something for #196294 |
| 44 |
RDEPEND="${DEPEND} |
| 45 |
- !minimal? ( dev-db/mysql-init-scripts ) |
| 46 |
+ !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) |
| 47 |
selinux? ( sec-policy/selinux-mysql )" |
| 48 |
|
| 49 |
DEPEND="${DEPEND} |
| 50 |
@@ -618,7 +620,7 @@ configure_51() { |
| 51 |
| xargs -0 sed -r -n \ |
| 52 |
-e '/^MYSQL_STORAGE_ENGINE/{ |
| 53 |
s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ; |
| 54 |
- s~^([^ ]+).*~\1~gp; |
| 55 |
+ s~^([^ ]+).*~\1~gp; |
| 56 |
}' \ |
| 57 |
| tr -s '\n' ' ' |
| 58 |
)" |
Archives