1 |
commit: 69cbac782eeef839d3e9e1a219d2edeabd5324fb |
2 |
Author: layman <layman <AT> localhost> |
3 |
AuthorDate: Fri May 1 12:41:03 2015 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 1 12:41:03 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=69cbac78 |
7 |
|
8 |
Sync headers and changes from portage |
9 |
|
10 |
eclass/mysql-multilib.eclass | 2 +- |
11 |
eclass/mysql-v2.eclass | 5 ++++- |
12 |
eclass/mysql.eclass | 2 +- |
13 |
3 files changed, 6 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
16 |
index c7c2696..e6432f7 100644 |
17 |
--- a/eclass/mysql-multilib.eclass |
18 |
+++ b/eclass/mysql-multilib.eclass |
19 |
@@ -1,6 +1,6 @@ |
20 |
# Copyright 1999-2015 Gentoo Foundation |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.18 2015/03/17 19:39:43 grknight Exp $ |
23 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.19 2015/05/01 12:34:31 grknight Exp $ |
24 |
|
25 |
# @ECLASS: mysql-multilib.eclass |
26 |
# @MAINTAINER: |
27 |
|
28 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
29 |
index f613204..9f7b0e7 100644 |
30 |
--- a/eclass/mysql-v2.eclass |
31 |
+++ b/eclass/mysql-v2.eclass |
32 |
@@ -1,6 +1,6 @@ |
33 |
# Copyright 1999-2015 Gentoo Foundation |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.36 2015/02/16 14:37:50 grknight Exp $ |
36 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.38 2015/05/01 12:34:31 grknight Exp $ |
37 |
|
38 |
# @ECLASS: mysql-v2.eclass |
39 |
# @MAINTAINER: |
40 |
@@ -222,12 +222,15 @@ IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling" |
41 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ |
42 |
mysql_version_is_at_least "5.5" ; then |
43 |
IUSE="bindist ${IUSE}" |
44 |
+ RESTRICT="${RESTRICT} !bindist? ( bindist )" |
45 |
elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ |
46 |
mysql_check_version_range "5.5.37 to 5.6.11.99" ; then |
47 |
IUSE="bindist ${IUSE}" |
48 |
+ RESTRICT="${RESTRICT} !bindist? ( bindist )" |
49 |
elif [[ ${PN} == "mysql-cluster" ]] && \ |
50 |
mysql_check_version_range "7.2 to 7.2.99.99" ; then |
51 |
IUSE="bindist ${IUSE}" |
52 |
+ RESTRICT="${RESTRICT} !bindist? ( bindist )" |
53 |
fi |
54 |
|
55 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
56 |
|
57 |
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass |
58 |
index 4271a6c..7a129fc 100644 |
59 |
--- a/eclass/mysql.eclass |
60 |
+++ b/eclass/mysql.eclass |
61 |
@@ -1,6 +1,6 @@ |
62 |
# Copyright 1999-2015 Gentoo Foundation |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.181 2014/07/29 20:24:00 robbat2 Exp $ |
65 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.182 2015/05/01 12:34:31 grknight Exp $ |
66 |
|
67 |
# @ECLASS: mysql.eclass |
68 |
# @MAINTAINER: |