[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

[Brian Evans]

commit:     453b9938c8d1ed1e9494f812e20df8b1e6b862f6
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:23:33 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 18:23:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=453b9938

dev-db/myodbc: Clean up build process using multilib-minimal; adding die to 
external commands

Package-Manager: portage-2.2.25
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/myodbc/ChangeLog           | 4 ++++
 dev-db/myodbc/myodbc-5.3.4.ebuild | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 8bc0aea..f9d3054 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  18 Nov 2015; Brian Evans <grkni...@gentoo.org> myodbc-5.3.4.ebuild:
+  dev-db/myodbc: Clean up build process using multilib-minimal; adding die to
+  external commands
+
   11 Aug 2015; Brian Evans <grkni...@gentoo.org> +files/5.2.7-my_malloc.patch,
   myodbc-5.2.7-r2.ebuild:
   dev-db/myodbc Add patch from bug 548912

diff --git a/dev-db/myodbc/myodbc-5.3.4.ebuild 
b/dev-db/myodbc/myodbc-5.3.4.ebuild
index 3041ff1..5e86689 100644
--- a/dev-db/myodbc/myodbc-5.3.4.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit cmake-multilib eutils flag-o-matic versionator
+inherit cmake-utils multilib-minimal eutils flag-o-matic versionator
 
 MAJOR="$(get_version_component_range 1-2 $PV)"
 MY_PN="mysql-connector-odbc"
@@ -35,10 +35,10 @@ DRIVER_NAME="${PN}-${SLOT}"
 src_prepare() {
        # Remove Tests
        sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
-               "${S}/CMakeLists.txt"
+               "${S}/CMakeLists.txt" || die
 
        # Fix as-needed on the installer binary
-       echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> 
"${S}/installer/CMakeLists.txt"
+       echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> 
"${S}/installer/CMakeLists.txt" || die
 
        # Patch document path so it doesn't install files to /usr
        epatch "${FILESDIR}/cmake-doc-path.patch" \
@@ -51,7 +51,7 @@ multilib_src_configure() {
        # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't 
exist on MariaDB
 
 #      append-ldflags
-       mycmakeargs+=(
+       local mycmakeargs=(
                -DMYSQL_CXX_LINKAGE=0
                -DWITH_UNIXODBC=1
                -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so"