| 1 |
grknight 15/02/08 22:03:56 |
| 2 |
|
| 3 |
Modified: ChangeLog mysql-multilib.eclass |
| 4 |
Log: |
| 5 |
Fix dependency on ncurses for bug 539354 and restructure to remove user confusion with the xml flag for mariadb |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1523 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1523&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1523&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1522&r2=1.1523 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1522 |
| 18 |
retrieving revision 1.1523 |
| 19 |
diff -u -r1.1522 -r1.1523 |
| 20 |
--- ChangeLog 5 Feb 2015 23:28:17 -0000 1.1522 |
| 21 |
+++ ChangeLog 8 Feb 2015 22:03:56 -0000 1.1523 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1522 2015/02/05 23:28:17 blueness Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1523 2015/02/08 22:03:56 grknight Exp $ |
| 27 |
+ |
| 28 |
+ 08 Feb 2015; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
| 29 |
+ Fix dependency on ncurses for bug 539354 and restructure to remove user |
| 30 |
+ confusion with the xml flag for mariadb |
| 31 |
|
| 32 |
05 Feb 2015; Anthony G. Basile <blueness@g.o> toolchain.eclass: |
| 33 |
Restore the old way of dealing with fixed includes for bsd, bug #536878. |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.13 eclass/mysql-multilib.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.13&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.13&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.12&r2=1.13 |
| 42 |
|
| 43 |
Index: mysql-multilib.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v |
| 46 |
retrieving revision 1.12 |
| 47 |
retrieving revision 1.13 |
| 48 |
diff -u -r1.12 -r1.13 |
| 49 |
--- mysql-multilib.eclass 28 Jan 2015 13:48:58 -0000 1.12 |
| 50 |
+++ mysql-multilib.eclass 8 Feb 2015 22:03:56 -0000 1.13 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2014 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.12 2015/01/28 13:48:58 grknight Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.13 2015/02/08 22:03:56 grknight Exp $ |
| 56 |
|
| 57 |
# @ECLASS: mysql-multilib.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -212,8 +212,7 @@ |
| 60 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
| 61 |
IUSE="${IUSE} oqgraph pam sphinx tokudb" |
| 62 |
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers |
| 63 |
- mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \ |
| 64 |
- REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )" |
| 65 |
+ mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" |
| 66 |
REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" |
| 67 |
|
| 68 |
# MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries |
| 69 |
@@ -239,7 +238,7 @@ |
| 70 |
|
| 71 |
REQUIRED_USE=" |
| 72 |
${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) |
| 73 |
- minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )" |
| 74 |
+ minimal? ( !extraengine !embedded ) static? ( !ssl )" |
| 75 |
|
| 76 |
# |
| 77 |
# DEPENDENCIES: |
| 78 |
@@ -254,6 +253,7 @@ |
| 79 |
sys-process/procps:0= |
| 80 |
dev-libs/libaio:0= |
| 81 |
) |
| 82 |
+ sys-libs/ncurses |
| 83 |
>=sys-apps/sed-4 |
| 84 |
>=sys-apps/texinfo-4.7-r1 |
| 85 |
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] |
| 86 |
@@ -300,8 +300,10 @@ |
| 87 |
perl? ( !dev-db/mytop )" |
| 88 |
if mysql_version_is_at_least "10.0.5" ; then |
| 89 |
DEPEND="${DEPEND} |
| 90 |
- odbc? ( dev-db/unixODBC:0= ) |
| 91 |
- xml? ( dev-libs/libxml2:2= ) |
| 92 |
+ extraengine? ( |
| 93 |
+ odbc? ( dev-db/unixODBC:0= ) |
| 94 |
+ xml? ( dev-libs/libxml2:2= ) |
| 95 |
+ ) |
| 96 |
" |
| 97 |
fi |
| 98 |
mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" |
| 99 |
@@ -375,10 +377,12 @@ |
| 100 |
fi |
| 101 |
|
| 102 |
# compile-time-only |
| 103 |
+# ncurses only needs multilib for compile time due to a binary that will be not installed |
| 104 |
DEPEND="${DEPEND} |
| 105 |
virtual/yacc |
| 106 |
static? ( sys-libs/ncurses[static-libs] ) |
| 107 |
>=dev-util/cmake-2.8.9 |
| 108 |
+ sys-libs/ncurses[${MULTILIB_USEDEP}] |
| 109 |
" |
| 110 |
|
| 111 |
# For other stuff to bring us in |
| 112 |
@@ -431,9 +435,9 @@ |
| 113 |
enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" |
| 114 |
|
| 115 |
if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then |
| 116 |
- ewarn "Upstream has noted that the NDB cluster support in the 5.0 and" |
| 117 |
- ewarn "5.1 series should NOT be put into production. In the near" |
| 118 |
- ewarn "future, it will be disabled from building." |
| 119 |
+ ewarn "The NDB cluster support is no longer built." |
| 120 |
+ ewarn "Please use dev-db/mysql-cluster for NDB." |
| 121 |
+ ewarn "In the near future, the USE flag will be removed." |
| 122 |
fi |
| 123 |
|
| 124 |
if [[ ${PN} == "mysql-cluster" ]] ; then |
Archives