grknight 15/06/10 18:08:02 Modified: ChangeLog mysql-multilib.eclass Log: Resolve cirucular dependency for bug 551686; Make USE=cluster die early for all except dev-db/mysql-cluster; Documentation update for variables, remove 2 unused and add WSREP_REVISION; Clarify mariadb bindist USE
Revision Changes Path 1.1651 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1651&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1651&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1650&r2=1.1651 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1650 retrieving revision 1.1651 diff -u -r1.1650 -r1.1651 --- ChangeLog 9 Jun 2015 22:00:44 -0000 1.1650 +++ ChangeLog 10 Jun 2015 18:08:02 -0000 1.1651 @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1650 2015/06/09 22:00:44 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1651 2015/06/10 18:08:02 grknight Exp $ + + 10 Jun 2015; <[email protected]> mysql-multilib.eclass: + Resolve cirucular dependency for bug 551686; Make USE=cluster die early for + all except dev-db/mysql-cluster; Documentation update for variables, remove 2 + unused and add WSREP_REVISION; Clarify mariadb bindist USE 09 Jun 2015; Michael Weber <[email protected]> netsurf.eclass: Update for buildsystem-1.3 1.21 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.20&r2=1.21 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mysql-multilib.eclass 24 May 2015 04:35:49 -0000 1.20 +++ mysql-multilib.eclass 10 Jun 2015 18:08:02 -0000 1.21 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.20 2015/05/24 04:35:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.21 2015/06/10 18:08:02 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -101,16 +101,6 @@ # This eclass should only be used with at least mysql-5.5.35 mysql_version_is_at_least "5.5.35" || die "This eclass should only be used with >=mysql-5.5.35" -# @ECLASS-VARIABLE: XTRADB_VER -# @DEFAULT_UNSET -# @DESCRIPTION: -# Version of the XTRADB storage engine - -# @ECLASS-VARIABLE: PERCONA_VER -# @DEFAULT_UNSET -# @DESCRIPTION: -# Designation by PERCONA for a MySQL version to apply an XTRADB release - # Work out the default SERVER_URI correctly if [[ -z ${SERVER_URI} ]]; then [[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}" @@ -120,8 +110,13 @@ MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV}) MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" SERVER_URI=" - http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz + http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz + http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz + http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz + http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz + http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz + http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz @@ -353,6 +348,11 @@ virtual/perl-Time-HiRes ) " fi +# @ECLASS-VARIABLE: WSREP_REVISION +# @DEFAULT_UNSET +# @DESCRIPTION: +# Version of the sys-cluster/galera API (major version in portage) to use for galera clustering + if [[ -n "${WSREP_REVISION}" ]] ; then # 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 @@ -369,10 +369,11 @@ RDEPEND="${RDEPEND} ${GALERA_RDEPEND} sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( - >=dev-db/xtrabackup-bin-2.2.4 net-misc/socat[ssl] ) " + # Causes a circular dependency if DBD-mysql is not already installed + PDEPEND="${PDEPEND} sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 )" fi if [[ ${PN} == "mysql-cluster" ]] ; then @@ -391,7 +392,7 @@ # For other stuff to bring us in # dev-perl/DBD-mysql is needed by some scripts installed by MySQL -PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) +PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-${MYSQL_PV_MAJOR}" # my_config.h includes ABI specific data @@ -433,6 +434,9 @@ die fi fi + if use_if_iuse cluster && [[ "${PN}" != "mysql-cluster" ]]; then + die "NDB Cluster support has been removed from all packages except mysql-cluster" + fi } # @FUNCTION: mysql-multilib_pkg_setup @@ -455,12 +459,6 @@ enewgroup mysql 60 || die "problem adding 'mysql' group" enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" - if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then - ewarn "The NDB cluster support is no longer built." - ewarn "Please use dev-db/mysql-cluster for NDB." - ewarn "In the near future, the USE flag will be removed." - fi - if [[ ${PN} == "mysql-cluster" ]] ; then mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup fi @@ -572,11 +570,18 @@ fi if in_iuse bindist ; then - mycmakeargs+=( - -DWITH_READLINE=$(usex bindist 1 0) - -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) - $(usex bindist -DHAVE_BFD_H=0 '') - ) + # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION + if multilib_is_native_abi; then + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + ) + else + mycmakeargs+=( + -DWITH_READLINE=1 + -DNOT_FOR_DISTRIBUTION=0 + ) + fi fi ### TODO: make this system but issues with UTF-8 prevent it
