grknight 15/07/30 04:22:47 Modified: ChangeLog mysql-multilib.eclass Log: Add blocker below virtual/mysql-5.6-r4 for new split ebuilds
Revision Changes Path 1.1737 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1737&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1737&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1736&r2=1.1737 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1736 retrieving revision 1.1737 diff -u -r1.1736 -r1.1737 --- ChangeLog 29 Jul 2015 15:01:43 -0000 1.1736 +++ ChangeLog 30 Jul 2015 04:22:47 -0000 1.1737 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1736 2015/07/29 15:01:43 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1737 2015/07/30 04:22:47 grknight Exp $ + + 30 Jul 2015; Brian Evans <grkni...@gentoo.org> mysql-multilib.eclass: + Add blocker below virtual/mysql-5.6-r4 for new split ebuilds 29 Jul 2015; Brian Evans <grkni...@gentoo.org> mysql-multilib.eclass: Fix pkg_config function error with non-existant USE flags 1.25 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.24&r2=1.25 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mysql-multilib.eclass 29 Jul 2015 15:01:43 -0000 1.24 +++ mysql-multilib.eclass 30 Jul 2015 04:22:47 -0000 1.25 @@ -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.24 2015/07/29 15:01:43 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.25 2015/07/30 04:22:47 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -385,7 +385,8 @@ if [[ ${HAS_TOOLS_PATCH} ]] ; then RDEPEND="${RDEPEND} server? ( !prefix? ( dev-db/mysql-init-scripts ) ) - !client-libs? ( virtual/libmysqlclient )" + !client-libs? ( virtual/libmysqlclient ) + !<virtual/mysql-5.6-r4" else RDEPEND="${RDEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )" fi @@ -588,7 +589,7 @@ fi # debug hack wrt #497532 - mycmakeargs=( + mycmakeargs+=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" -DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
