[gentoo-commits] proj/mysql:split-client commit in: dev-db/myodbc/files/, dev-db/myodbc/

[Brian Evans]

commit:     aa8af9a54f59c92c1010b84f798d5524c35f0577
Author:     layman <layman <AT> localhost>
AuthorDate: Thu Jun 25 15:06:53 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 15:06:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=aa8af9a5

copy all files from portage tree

 dev-db/myodbc/ChangeLog                            | 45 ++++++++++++++++++++--
 dev-db/myodbc/Manifest                             | 32 ++++++++++++++-
 dev-db/myodbc/files/5.2.7-cxxlinkage.patch         | 23 -----------
 dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch      | 40 +++++++++++++++++++
 ...{myodbc-5.2.7.ebuild => myodbc-5.2.7-r1.ebuild} | 31 ++++++++-------
 5 files changed, 129 insertions(+), 42 deletions(-)

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 0bc92e4..9ed0ffc 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -1,9 +1,46 @@
 # ChangeLog for dev-db/myodbc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.33 2013/05/10 08:17:39 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.44 2015/05/17 21:24:37 grknight Exp $
 
-  24 Jul 2013; Brian Evans <grknight@×××××××.com> myodbc-5.2.5.ebuild:
-  [myodbc] Remove as-needed hack by adding a library to installer/CMakeLists.txt
+  17 May 2015; Brian Evans <grknight@g.o> -files/5.2.7-cxxlinkage.patch,
+  -files/myodbc-5.1.6-qt4-includedir.patch, -myodbc-5.1.6.ebuild,
+  -myodbc-5.2.7.ebuild:
+  Drop old; 5.1 series no longer builds with current libmysqlclient from servers
+
+  19 Apr 2015; Pacho Ramos <pacho@g.o> myodbc-5.2.7-r1.ebuild:
+  x86 stable wrt bug #525298
+
+  02 Mar 2015; Agostino Sarubbo <ago@g.o> myodbc-5.2.7-r1.ebuild:
+  Stable for ppc, wrt bug #525298
+
+  12 Feb 2015; Pacho Ramos <pacho@g.o> myodbc-5.2.7-r1.ebuild:
+  amd64 stable, bug #525298
+
+  15 Nov 2014; Chema Alonso <nimiux@g.o> myodbc-5.2.7.ebuild:
+  Stable for amd64 wrt bug #513646
+
+*myodbc-5.2.7-r1 (01 Sep 2014)
+
+  01 Sep 2014; Brian Evans <grknight@g.o>
+  +files/5.2.7-r1-cxxlinkage.patch, +myodbc-5.2.7-r1.ebuild:
+  Revision bump to enable multilib
+
+  20 Aug 2014; Brian Evans <grknight@g.o> +files/5.2.7-cxxlinkage.patch,
+  +files/5.2.7-mariadb-dynamic-array.patch, myodbc-5.2.7.ebuild:
+  Fix build failures on >=dev-db/mariadb-10.0
+
+*myodbc-5.2.7 (29 Jul 2014)
+
+  29 Jul 2014; Brian Evans <grknight@g.o> +myodbc-5.2.7.ebuild,
+  -myodbc-5.2.6.ebuild:
+  Version bump, fix slotting of installer utility, and bump required mysql
+  version. Remove old
+
+*myodbc-5.2.6 (04 May 2014)
+
+  04 May 2014; Brian Evans <grknight@g.o> +files/cmake-doc-path.patch,
+  +myodbc-5.2.6.ebuild:
+  Version bump to 5.2.6. Fixes bugs #380141, #442322, #462432, #474088
 
   10 May 2013; Patrick Lauer <patrick@g.o> myodbc-5.1.6.ebuild:
   Fix src_prepare

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index f52d0b6..c23dddb 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1,31 @@
-DIST mysql-connector-odbc-5.2.6-src.tar.gz 595963 SHA256 005bba26358819bb5db48d23e8eb4a94cc234dfa103dd47a6c2602e7e70ad17b SHA512 9732b3034bdeb24700d0369d066fb43ca6f0327c2d3a3f1fff77d51ab37a83139536a7caae377791d979132c9640d67fddb4040095478924f4c8139ec6f404a5 WHIRLPOOL d8f0fc2cc7ec0b7602a2e6434d2680174dd50fe1d16dd03e0370ba1ec7807b09a83411e62aca3d68d540c1a564c759cbfea63c2d3adb6b642286a49d4dfc1330
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 5.2.7-mariadb-dynamic-array.patch 3053 SHA256 132b49d939fe26939e3c794a1db7dc50f28e552c81db7913006dfee45cb4b503 SHA512 26d35effbf4e74ef634c6e42dced40830402aa0925571f4bd55acd3dfe06f1c8c8f3bab4e9bb4bcd3f72dc87ecc3a093b984df4837548710899f97d8bdeca7b6 WHIRLPOOL a778ec270547a4fd0f7907f7eb5005da966575f77c9c886f545c393e4a21ac58656316202d5bd48cc7523d35e61a97c806564dbf7a7573009780c8c936d502ee
+AUX 5.2.7-r1-cxxlinkage.patch 1707 SHA256 323beef3086506a7313507403ff632ac00ab86a082eb71e44bdffd5dc2f176dd SHA512 3d0f1839e1b200d7746d2c7161ee2a85813bf40517a70777d361e482efd6d6b0be88415d339d6dccc49de865a0d714fbbce2b74abb1bbc12c4f4681a5bd5abf8 WHIRLPOOL 2823b2bf237c999ddb0caac94abd7bcd3ec04dda01d3440982d537557aee29f4cf14b464607dcc6681c8b990b87caedc9864a04ebe3fe831bb4e0dab9a1c1e80
+AUX cmake-doc-path.patch 1498 SHA256 75477998ba483fb1f6a5dde6cbd4719ac2e98e32540e7eb46bd334a0b354abe2 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e WHIRLPOOL 0631c7cef81bb8541ca0af96afcf9ed8118aef87702d89d5237a8744bc6d9324b6cb148f3c32e4d225df038d15ad5c8583d0a6a49e33e9fc7b9cd44b319982be
+AUX odbc.ini.m4 517 SHA256 0f14bd8815aac8c75ff3b2b6e86b2883fbe4e2e6e3de153e772091c7a5c124e5 SHA512 60883bced4be275f9496910ecbf11d92e9d550e28c12eca8549546f3b5f5fd12322fabb81611bb4d951bab6d203ddd82aafe8ec8bdf0b6aa61a94eac6770fb3b WHIRLPOOL 2c12b3565efe6f92f8f43f9de84e667b066f6b82e17590b1c918540becc9554b1224c14f40dfa7c263818089208b7851b2ca6a6f881d77196564b57db49634fe
+AUX odbcinst.ini.m4 233 SHA256 893011ec62a2631cf41521717cbebfddf48ae3a633c8ca1e7774f11930fe2537 SHA512 d6a27b1915133e23ab4f16930446e6c623e3636490c1a772a531805d6abbaf8470fa59924f68f01faabf496be7b5f17294fe51a9f940dfa45f03a9abc120f953 WHIRLPOOL e8a10ae834eb97e63ed3dc637f534e556c9e13d11dc71ac0f9e3a0f16054d9e8a23be7bf6f68319817a9bdde7ae735b55be86728f80b7ec4d5ffe00d403c6536
+DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f WHIRLPOOL 928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
+EBUILD myodbc-5.2.7-r1.ebuild 3396 SHA256 5ea6a923d5c99957b1793d87bd57794656ed6f06e6101ed47a9c8a01298c5a08 SHA512 35f1c45be864ab59040f8478a03bc16938f5faf7d489f1ace518378b2c5b772472013cd5883ad4d7a5b2dbf7be93788cb178d8b8056dbebdb800677036c13105 WHIRLPOOL 7b0a2bb6d68ace7c776778e022f1a697a78a7c8bdab62c7d3b50911286ff8a94d6347d9b7486074e0b150171ea8e778cacd665ca14d6de434e9aac9db900f9d0
+MISC ChangeLog 6162 SHA256 d10e1200a9ba81821c4bd4ee937d97e658f8fbb5a6358ae3f66958133efa354c SHA512 083eaba41d46b2ef9817dc5a3d810128564e12ef373c44f6007eeed1245379847b382375af2b39dac8e16b222cb718c7a3a9838a1f512fce758914086d1f1228 WHIRLPOOL bd995078e99eed21d23965b288fb7f77685a54981f76a7f48a0cc8b92886f7f8540a8b964365d61083d0df481234d47741e324d9d10c436115833c44c6bbc71f
+MISC metadata.xml 158 SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569 SHA512 538b01075e7bf3f429546654620fa773f3926594d7747d778ce6250263a7ba32fd7e63e14232fd89d503780b783fb7ab401ff2a0040a8d36c99c5c232609ca56 WHIRLPOOL 1739fa77f8bf21977b25d7c05d8da902f0a30335da5fcaca2b35200e504199c645d4115b8d2b4790ccdb692d7010c7a2cc09b27994679af8be6164f1c007e964
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVWQcZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2SLkQAIp2p0TPguTnjmbEYVxQKwnG
+oyNMcZ0/zsnoDWV8o4j0aHOqH2zQQbiBcua+t2+tejCjoFyQqyPeOGjzxILctoif
+LCKKryRG26XQylTsdQTEJnEdrG3VGBDKcBmIWFcPkyIJzWWl5A5+B38BjjdXelUb
+lL8Pr/JgZYAWqh19cwtcr+Cne+KxtrH9qW8VXAo7vqSM/7Q4gQWxsBprokYTsRFK
+B6gaEKnSjsK+PxQU7N9jqEBfKsFRsG54sW0wYrqSWEF8Ymt99HlVcGYtjpqPhuMb
+4aiKqUN0eWkqzphQJZfQ8D+5w1zZTvKWbwKeTaM/wmciHcHNxQVWd9Zj9fQHEcsF
+UDIA3lrCXvZd5Yy/q5kH53krZeJyp0kXiLij+NKXZqIE9+K9m3lrpknYiysnDIp1
+0Tm3RRTQXapQVexIy0LxxDK0XiaiEVRudiSWUiQDfXjqzuMMabzbgeajG9Bk7+uz
+rJxsSp66ki4QP2slsem0hsZq0sNNb/nNVwJ4deFEcfybKHbrlvVM3zgF8zfd5gfJ
+AzYtX83BMDBdQell6ORa93epR6JbKiCdiqRm2YN7Q/lA/Lavrzc5yovTuq9Mfo44
+9FD1uHPdrRzX+M82j9nJArcF+x8NXk2uONfysfLh5p6lTjFQKLojjxeZhDoEV5t3
+yw4sAlINMTZ4VYt7BadP
+=UYl/
+-----END PGP SIGNATURE-----

diff --git a/dev-db/myodbc/files/5.2.7-cxxlinkage.patch b/dev-db/myodbc/files/5.2.7-cxxlinkage.patch
deleted file mode 100644
index a78c89b..0000000
--- a/dev-db/myodbc/files/5.2.7-cxxlinkage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uarN mysql-connector-odbc-5.3.4-src.orig/cmake/FindMySQL.cmake mysql-connector-odbc-5.3.4-src/cmake/FindMySQL.cmake
---- mysql-connector-odbc-5.3.4-src.orig/cmake/FindMySQL.cmake	2014-06-18 18:50:16.000000000 -0400
-+++ mysql-connector-odbc-5.3.4-src/cmake/FindMySQL.cmake	2014-08-20 10:05:00.191485304 -0400
-@@ -105,16 +105,16 @@
-   # Finally remove the dot
-   STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}")
- 
--  IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+  IF(MYSQL_CXX_LINKAGE)
-     EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags"
-             OUTPUT_VARIABLE _mysql_config_output
-             )
-     SET(MYSQL_CXX_LINKAGE 1)
--  ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+  ELSE (MYSQL_CXX_LINKAGE)
-     EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
-             OUTPUT_VARIABLE _mysql_config_output
-             )
--  ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+  ENDIF(MYSQL_CXX_LINKAGE)
- 
-   # Remove the stl4port dependency
-   STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}")

diff --git a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch b/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch
new file mode 100644
index 0000000..2bdb4a5
--- /dev/null
+++ b/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch
@@ -0,0 +1,40 @@
+diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake	2014-06-18 18:50:16.000000000 -0400
++++ b/cmake/FindMySQL.cmake	2014-08-20 10:05:00.191485304 -0400
+@@ -105,16 +105,16 @@
+   # Finally remove the dot
+   STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}")
+ 
+-  IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
++  IF(MYSQL_CXX_LINKAGE)
+     EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags"
+             OUTPUT_VARIABLE _mysql_config_output
+             )
+     SET(MYSQL_CXX_LINKAGE 1)
+-  ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
++  ELSE (MYSQL_CXX_LINKAGE)
+     EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
+             OUTPUT_VARIABLE _mysql_config_output
+             )
+-  ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
++  ENDIF(MYSQL_CXX_LINKAGE)
+ 
+   # Remove the stl4port dependency
+   STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}")
+diff -aurN mysql-connector-odbc-5.2.7-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.7-src/CMakeLists.txt
+--- a/CMakeLists.txt	2014-08-27 13:51:27.050553560 -0400
++++ b/CMakeLists.txt	2014-08-27 13:55:41.702359680 -0400
+@@ -256,10 +256,9 @@
+ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
+ SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
+ 
+-SET(LIB_SUBDIR "lib")
+-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)")
+-  SET(LIB_SUBDIR "lib64")
+-ENDIF()
++IF(NOT LIB_SUBDIR)
++        MESSAGE(ERROR "LIB_SUBDIR is not set")
++ENDIF(NOT LIB_SUBDIR)
+ MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
+ 
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})

diff --git a/dev-db/myodbc/myodbc-5.2.7.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
similarity index 80%
rename from dev-db/myodbc/myodbc-5.2.7.ebuild
rename to dev-db/myodbc/myodbc-5.2.7-r1.ebuild
index 8f853ad..e1ff527 100644
--- a/dev-db/myodbc/myodbc-5.2.7.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild,v 1.2 2014/08/20 18:52:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7-r1.ebuild,v 1.4 2015/04/19 07:02:28 pacho Exp $
 
 EAPI=5
-inherit cmake-utils eutils flag-o-matic versionator
+inherit cmake-multilib eutils flag-o-matic versionator
 
 MAJOR="$(get_version_component_range 1-2 $PV)"
 MY_PN="mysql-connector-odbc"
@@ -16,14 +16,17 @@ RESTRICT="primaryuri"
 
 LICENSE="GPL-2"
 SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
-	dev-db/unixODBC
-	>=virtual/mysql-5.5
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	>=virtual/mysql-5.5[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+	)
 "
-DEPEND="${DEPEND} ${RDEPEND}"
+DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}
 
 # Careful!
@@ -39,26 +42,26 @@ src_prepare() {
 
 	# Patch document path so it doesn't install files to /usr
 	epatch "${FILESDIR}/cmake-doc-path.patch" \
-		"${FILESDIR}/${PV}-cxxlinkage.patch" \
+		"${FILESDIR}/${PVR}-cxxlinkage.patch" \
 		"${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
 }
 
-src_configure() {
+multilib_src_configure() {
 	# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
 	# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
 	mycmakeargs+=(
 		-DMYSQL_CXX_LINKAGE=0
 		-DWITH_UNIXODBC=1
-		-DRPM_BUILD=1
 		-DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so"
-		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${P}
+		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+		-DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
+		-DLIB_SUBDIR="$(get_libdir)"
 	)
-
 	cmake-utils_src_configure
 }
 
-src_install() {
-	cmake-utils_src_install
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
 
 	dodir /usr/share/${PN}-${SLOT}
 	for i in odbc.ini odbcinst.ini; do