[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-native-client/

[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-native-client/

[Brian Evans]

commit:     c8672f707baed88d97815784f509a30a9085ab1a
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Mar  5 15:46:13 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Mar  5 16:00:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c8672f70

[mariadb-native-client] Update multilib deps

---
 dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild  | 6 ++++--
 dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
index 510e42a..fb43970 100644
--- a/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
+++ b/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -27,7 +27,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc static-libs"
 
-RDEPEND="dev-libs/openssl"
+RDEPEND="
+	dev-libs/openssl:=
+	amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs  ) )"
 DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto )"
 

diff --git a/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild
index a73260e..a0a135c 100644
--- a/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild
+++ b/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -31,8 +31,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc +mysqlcompat +ssl static-libs"
 
-RDEPEND="sys-libs/zlib
-	ssl? ( dev-libs/openssl )
+RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:=
+		amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs  )  )
+	 )
 	mysqlcompat? (
 		!dev-db/mysql
 		!dev-db/mysql-cluster

[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-native-client/

[Brian Evans]

commit:     d798a31c68f75803740184271d56e9077bc705d2
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Apr 29 17:20:42 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Apr 29 17:20:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d798a31c

Remove RelWithDebInfo target to respect CFLAGS

---
 dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
index 12a38e3..088c7ec 100644
--- a/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
+++ b/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
@@ -53,7 +53,6 @@ src_prepare() {
 }
 
 src_configure() {
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
 	mycmakeargs+=(
 		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_EXTERNAL_ZLIB=ON