Use eclass variables to block the validate_password plugin wrt bug 556348

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D1F781EFF9F4A3B6)

3 files changed, 13 insertions, 17 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index c71bf7b71e59..3c94f635e06d 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.744 2015/07/30 04:26:27 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.745 2015/07/30 20:40:19 grknight Exp $
+
+  30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-5.6.26-r1.ebuild,
+  mysql-5.6.26.ebuild:
+  Use eclass variables to block the validate_password plugin wrt bug 556348
 
 *mysql-5.6.26 (30 Jul 2015)
 *mysql-5.6.26-r1 (30 Jul 2015)
diff --git a/dev-db/mysql/mysql-5.6.26-r1.ebuild b/dev-db/mysql/mysql-5.6.26-r1.ebuild
index f4f94a505923..a334c338e436 100644
--- a/dev-db/mysql/mysql-5.6.26-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.26-r1.ebuild
@@ -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/dev-db/mysql/mysql-5.6.26-r1.ebuild,v 1.1 2015/07/30 04:26:27 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26-r1.ebuild,v 1.2 2015/07/30 20:40:19 grknight Exp $
 
 EAPI="5"
 
@@ -27,13 +27,9 @@ RDEPEND="${RDEPEND}"
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
-src_configure() {
-	# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
-	# disable until we see what happens with it
-	local mycmakeargs
-	mycmakeargs+=( -DWITHOUT_VALIDATE_PASSWORD=1 )
-	mysql-multilib_src_configure
-}
+# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
+# disable until we see what happens with it
+MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
 
 # Official test instructions:
 # USE='server embedded extraengine perl ssl static-libs community' \
diff --git a/dev-db/mysql/mysql-5.6.26.ebuild b/dev-db/mysql/mysql-5.6.26.ebuild
index bc3d1910ae34..032352605c85 100644
--- a/dev-db/mysql/mysql-5.6.26.ebuild
+++ b/dev-db/mysql/mysql-5.6.26.ebuild
@@ -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/dev-db/mysql/mysql-5.6.26.ebuild,v 1.1 2015/07/30 04:26:27 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26.ebuild,v 1.2 2015/07/30 20:40:19 grknight Exp $
 
 EAPI="5"
 
@@ -26,13 +26,9 @@ RDEPEND="${RDEPEND}"
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
-src_configure() {
-	# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
-	# disable until we see what happens with it
-	local mycmakeargs
-	mycmakeargs+=( -DWITHOUT_VALIDATE_PASSWORD=1 )
-	mysql-multilib_src_configure
-}
+# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
+# disable until we see what happens with it
+MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
 
 # Official test instructions:
 # USE='embedded extraengine perl ssl static-libs community' \