1 |
grknight 14/08/29 18:50:39 |
2 |
|
3 |
Modified: ChangeLog mysql-multilib.eclass |
4 |
Log: |
5 |
Sync mysql-multilib.eclass from mysql overlay |
6 |
|
7 |
Revision Changes Path |
8 |
1.1359 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1359&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1359&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1358&r2=1.1359 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1358 |
18 |
retrieving revision 1.1359 |
19 |
diff -u -r1.1358 -r1.1359 |
20 |
--- ChangeLog 28 Aug 2014 18:20:49 -0000 1.1358 |
21 |
+++ ChangeLog 29 Aug 2014 18:50:39 -0000 1.1359 |
22 |
@@ -1,6 +1,10 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1358 2014/08/28 18:20:49 swift Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1359 2014/08/29 18:50:39 grknight Exp $ |
27 |
+ |
28 |
+ 30 Aug 2014; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
29 |
+ Fix percona-server SRC_URI, add missing dep on mariadb-galera for rsync sst, |
30 |
+ Add future deps for packages. |
31 |
|
32 |
28 Aug 2014; Sven Vermeulen <swift@g.o> selinux-policy-2.eclass: |
33 |
Simplify rlpkg call and optimize package relabeling thanks to Jason Perfinion |
34 |
|
35 |
|
36 |
|
37 |
1.6 eclass/mysql-multilib.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.6&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.6&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.5&r2=1.6 |
42 |
|
43 |
Index: mysql-multilib.eclass |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v |
46 |
retrieving revision 1.5 |
47 |
retrieving revision 1.6 |
48 |
diff -u -r1.5 -r1.6 |
49 |
--- mysql-multilib.eclass 17 Aug 2014 22:50:23 -0000 1.5 |
50 |
+++ mysql-multilib.eclass 29 Aug 2014 18:50:39 -0000 1.6 |
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.5 2014/08/17 22:50:23 grknight Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.6 2014/08/29 18:50:39 grknight Exp $ |
56 |
|
57 |
# @ECLASS: mysql-multilib.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -73,7 +73,8 @@ |
60 |
# MariaDB has left the numbering schema but keeping compatibility |
61 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
62 |
case ${PV} in |
63 |
- 10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;; |
64 |
+ 10.0*) MYSQL_PV_MAJOR="5.6" ;; |
65 |
+ 10.1*) MYSQL_PV_MAJOR="5.7" ;; |
66 |
esac |
67 |
fi |
68 |
|
69 |
@@ -135,7 +136,7 @@ |
70 |
MY_PV=$(get_version_component_range 1-3 ${PV}) |
71 |
PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV}) |
72 |
PERCONA_RC=$(get_version_component_range 6 ${PV}) |
73 |
- SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz" |
74 |
+ SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz" |
75 |
# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-rel30.2.tar.gz |
76 |
# http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz |
77 |
else |
78 |
@@ -246,6 +247,10 @@ |
79 |
DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" |
80 |
fi |
81 |
|
82 |
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then |
83 |
+ mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost:0=" |
84 |
+fi |
85 |
+ |
86 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
87 |
# Bug 441700 MariaDB >=5.3 include custom mytop |
88 |
DEPEND="${DEPEND} |
89 |
@@ -259,11 +264,11 @@ |
90 |
" |
91 |
fi |
92 |
mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" |
93 |
- if mysql_version_is_at_least "10.0.9" ; then |
94 |
- DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" |
95 |
- fi |
96 |
+ mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" |
97 |
fi |
98 |
|
99 |
+[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )" |
100 |
+ |
101 |
# Having different flavours at the same time is not a good idea |
102 |
for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do |
103 |
[[ ${i} == ${PN} ]] || |
104 |
@@ -298,8 +303,11 @@ |
105 |
# The wsrep API version must match between the ebuild and sys-cluster/galera. |
106 |
# This will be indicated by WSREP_REVISION in the ebuild and the first number |
107 |
# in the version of sys-cluster/galera |
108 |
+ # |
109 |
+ # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst |
110 |
RDEPEND="${RDEPEND} |
111 |
=sys-cluster/galera-${WSREP_REVISION}* |
112 |
+ sys-process/lsof |
113 |
" |
114 |
fi |
115 |
|
116 |
@@ -323,6 +331,9 @@ |
117 |
# my_config.h includes ABI specific data |
118 |
MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) |
119 |
|
120 |
+# wrap the config script |
121 |
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
122 |
+ |
123 |
# |
124 |
# HELPER FUNCTIONS: |
125 |
# |