grknight 14/08/29 18:50:39 Modified: ChangeLog mysql-multilib.eclass Log: Sync mysql-multilib.eclass from mysql overlay
Revision Changes Path 1.1359 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1359&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1359&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1358&r2=1.1359 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1358 retrieving revision 1.1359 diff -u -r1.1358 -r1.1359 --- ChangeLog 28 Aug 2014 18:20:49 -0000 1.1358 +++ ChangeLog 29 Aug 2014 18:50:39 -0000 1.1359 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1358 2014/08/28 18:20:49 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1359 2014/08/29 18:50:39 grknight Exp $ + + 30 Aug 2014; Brian Evans <grkni...@gentoo.org> mysql-multilib.eclass: + Fix percona-server SRC_URI, add missing dep on mariadb-galera for rsync sst, + Add future deps for packages. 28 Aug 2014; Sven Vermeulen <sw...@gentoo.org> selinux-policy-2.eclass: Simplify rlpkg call and optimize package relabeling thanks to Jason Perfinion 1.6 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.5&r2=1.6 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mysql-multilib.eclass 17 Aug 2014 22:50:23 -0000 1.5 +++ mysql-multilib.eclass 29 Aug 2014 18:50:39 -0000 1.6 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.5 2014/08/17 22:50:23 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.6 2014/08/29 18:50:39 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -73,7 +73,8 @@ # MariaDB has left the numbering schema but keeping compatibility if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then case ${PV} in - 10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;; + 10.0*) MYSQL_PV_MAJOR="5.6" ;; + 10.1*) MYSQL_PV_MAJOR="5.7" ;; esac fi @@ -135,7 +136,7 @@ MY_PV=$(get_version_component_range 1-3 ${PV}) PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV}) PERCONA_RC=$(get_version_component_range 6 ${PV}) - 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"; + 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"; # http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-rel30.2.tar.gz # 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 else @@ -246,6 +247,10 @@ DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" fi +if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then + mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost:0=" +fi + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then # Bug 441700 MariaDB >=5.3 include custom mytop DEPEND="${DEPEND} @@ -259,11 +264,11 @@ " fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" - if mysql_version_is_at_least "10.0.9" ; then - DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" - fi + mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" fi +[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )" + # Having different flavours at the same time is not a good idea for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do [[ ${i} == ${PN} ]] || @@ -298,8 +303,11 @@ # The wsrep API version must match between the ebuild and sys-cluster/galera. # This will be indicated by WSREP_REVISION in the ebuild and the first number # in the version of sys-cluster/galera + # + # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst RDEPEND="${RDEPEND} =sys-cluster/galera-${WSREP_REVISION}* + sys-process/lsof " fi @@ -323,6 +331,9 @@ # my_config.h includes ABI specific data MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) +# wrap the config script +MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) + # # HELPER FUNCTIONS: #
