Revision bump to enable multilib

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

4 files changed, 176 insertions, 9 deletions

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 858310804103..71c706ef8b59 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/myodbc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.37 2014/08/20 18:52:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.38 2014/09/01 01:15:27 grknight Exp $
+
+*myodbc-5.2.7-r1 (01 Sep 2014)
+
+  01 Sep 2014; Brian Evans <grknight@gentoo.org>
+  +files/5.2.7-r1-cxxlinkage.patch, +myodbc-5.2.7-r1.ebuild:
+  Revision bump to enable multilib
 
   20 Aug 2014;  <grknight@gentoo.org> +files/5.2.7-cxxlinkage.patch,
   +files/5.2.7-mariadb-dynamic-array.patch, myodbc-5.2.7.ebuild:
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 7cd8ae52a4db..ff768b1901d7 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX 5.2.7-cxxlinkage.patch 1136 SHA256 db9cf630c1f64df9b7fac583e71cedd6106b200f5455b5b2be1486fe163d7124 SHA512 a0822f95c4362a571d559cf61da2e99f1dd9a69fe57075693f337f651ed43bcc59a5a6c27b9c88125a9e078b0a0a5d50200d2a4a9c8a8371854c5101cfd58040 WHIRLPOOL d49d4ee8d9a392f04a83c1f1e5d2041fe56e81d18b9f71d8e9728ad7da80b11a786cb247979df0c4e1afa5b1ce409381a7b3d0ce95aaee13b468e3a1232ea45d
 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 myodbc-5.1.6-qt4-includedir.patch 580 SHA256 ba1ccd551f87b6d19ddfdb6cfb6f88f61b23c7718a3ed415ef5d94db225373d2 SHA512 79fb5a47f43555b14de8186c0afde91917fa647a000211f1a999cdcfe4aefc374d85e5e950c97260d682ec3498474c25200b27bda63cc31ec5612e08189f317a WHIRLPOOL ecd8eaaac7dc5ea1a294c1f3560c5a8ceb770b4d7abb4a754e71313b5976f82f6df2f8695734470a7988cdc1b01cf0c868ec6a268193dab9179d6043e909d9ba
 AUX odbc.ini.m4 517 SHA256 0f14bd8815aac8c75ff3b2b6e86b2883fbe4e2e6e3de153e772091c7a5c124e5 SHA512 60883bced4be275f9496910ecbf11d92e9d550e28c12eca8549546f3b5f5fd12322fabb81611bb4d951bab6d203ddd82aafe8ec8bdf0b6aa61a94eac6770fb3b WHIRLPOOL 2c12b3565efe6f92f8f43f9de84e667b066f6b82e17590b1c918540becc9554b1224c14f40dfa7c263818089208b7851b2ca6a6f881d77196564b57db49634fe
@@ -10,17 +11,18 @@ AUX odbcinst.ini.m4 233 SHA256 893011ec62a2631cf41521717cbebfddf48ae3a633c8ca1e7
 DIST mysql-connector-odbc-5.1.6.tar.gz 1041247 SHA256 1d53c3a20cf68b089535278d3e69c0e49f367a457640c5f8af25c1cbf4ffb02e SHA512 74fe41c09a6261e31475c17a6b96d3161737c792fec6b2774f51fa58adae592143e44d6a2bf5dc2ec445b5e19653aa6abc9e6d0d37cc478bb26137f2658766f9 WHIRLPOOL 573f942682581514adb94183c633eb38a0ab1c990ead1f7da1e90aedcff18da392480bfaa1216d3e9b0c8b261f963bd81c0ed5f7192c74a8294028783e6f85e9
 DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f WHIRLPOOL 928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
 EBUILD myodbc-5.1.6.ebuild 3351 SHA256 d4e3d271c2d8de85797fd497a9cebcbfbc66c6e511d3a7cd47d3b275f8257c42 SHA512 83bff8d93e2167db4a1f9b51fcd83ffcb91b5993962d99b1e894e7187db01275d8cd3dffc769b67a462b50b520714ae97e66d47792f0f7ac9c8dc5c1cd3a6fa2 WHIRLPOOL 53faa9b1ada3f2f8f57670952891995733cc7fc7d4f7174231f55b03294bb7e2e2edc8baed2e2e7a0cefc97b1cb681fda1951e430fd2f82863059c55ed70a5b6
+EBUILD myodbc-5.2.7-r1.ebuild 3402 SHA256 aa1b3be62f8229cec7e5b319df7a0c3cfd6883cb57adba94b30102e67e932a0b SHA512 10dc3db84775470ca31ea29c22a6479b1debfe31cf809b880b0f3fca19f6dc7ed187d149840dfa2b21264c3612179b3c7f23de5477b616ed355f8cad2a9053cf WHIRLPOOL 416ade9970a03ce6d3761c62bbc18577e1d9928f43d9bec7bb137f0c91bd5df1b6a053742fc73f8a72f3ff46942bb4a925ca8e9a1bd7f8a395c5348a769d4810
 EBUILD myodbc-5.2.7.ebuild 3199 SHA256 18f116106ac02fb1375c20e86c71d144b4d16dcec84abf0645390dc6d974d9b4 SHA512 1c95a6bba275e01ebe2e61f8f513c0f042021b0e7373a4f7aa5aab162cc2c33062e4a0eaea29a568225182749dc421291e791c31a8073509610fc6f93d659482 WHIRLPOOL 0dc3f8574b2f8f0562af59d0bc7b5fd080fd06ac5430f89eb32b63b7ceeb1e95844dfafa2cef6181b542ad477f5ae9411bcef9249e88f302ecd6d810ee3d4741
-MISC ChangeLog 5309 SHA256 4593068514655dc93d2153ec93f7bd58b5a714fe9829f197b3214ceea4b9e4d7 SHA512 b2159292b62df2e196a4ff17340f8999aab4eac5be59de0fb1ce7753aae4482a90bef2d2f466fb02abf58f54c4136d8d6339cf20639b5d3fc18bd77c764e0b94 WHIRLPOOL 420e55bc217bb14d73717cff0b9dd5369e3a580d4fdaa6d27e07bf8ed63fca4743e97ab9e4e2333346fb7a5348d62904044e1fa26dfbb214e7417bb092d2c80d
+MISC ChangeLog 5487 SHA256 08b80234c2b82a736d41b317df5ec12de3b13aafb35963bffc2b92eac76f50b8 SHA512 31b42e103f9d0972ec3b604e0834a9cdf0d3f75b3e83e58a962809da3a14f07b9ce31aefe395b2039afdb4f371dfe373fe29e8611852224878ddc3905124e32d WHIRLPOOL da4809587341ade9429b6b96afeee5bf3cbcf8573a4241762e91d14a43524fc05defe6698d0f563236dbbf903e52b3a33a481ec1b42ee07c4c3435ed63fad380
 MISC metadata.xml 158 SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569 SHA512 538b01075e7bf3f429546654620fa773f3926594d7747d778ce6250263a7ba32fd7e63e14232fd89d503780b783fb7ab401ff2a0040a8d36c99c5c232609ca56 WHIRLPOOL 1739fa77f8bf21977b25d7c05d8da902f0a30335da5fcaca2b35200e504199c645d4115b8d2b4790ccdb692d7010c7a2cc09b27994679af8be6164f1c007e964
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT9O6GAAoJEE4V4vFnx44dcckH/j481A0TyywOtePmzezcNBkW
-0CSndeAoXVR7VNtN4vQx8BTBNtNuHV4/xIgDwr+j4rqczo0NjV2Ue2UYM3gJnpjc
-0/D0qar3iOs2aE1OD++jvKMCo7SqA5a0t1Fwo3SsATGj/VnWIYh+Bb05kPwLZgYU
-me85NIOnimCB6jCiMUGcr+0FEx5vULfNZrU3+aiB+2mOP9MeH/0m7AtB/GcgBMA+
-9ad6TahswMy+e0Ao27ceqVXJCfrNzz85LBRMchnGIpoy98l5+pke1k7zjncjYNFn
-WdfPI59CMdYDsfhWmlWwhGHmprSXhAAnXOaUcx3TBGZCmzudDTlqoEYCwa6QSd4=
-=b3Ks
+iQEcBAEBCAAGBQJUA8i3AAoJEE4V4vFnx44dmQoH/A+UfX1xyuQbYbzyZs8n4sUQ
+Y9EiuO6gdfmGfkfo+opM4W1nIOUawJ+UOyW6m1+yFMZQ3LFJHuJhzTvQ2PtKSKbz
+XGq0mrup3BpD3DNVc3lHKUxSIz0Cf768W1f6yNwDTIKHBgtBHNv6Hn/rdwxnsI4T
+lExYSsK8sMBn4oe48eNTN8v7jXyTXjEobig4cFnaMrAt37xvpRWOWB3OV+OJO6oc
+Vv6OtMWNg86ZP51T6Mgkg/5TzuJRn8jyYC0mydiV9IcKClIZpOyNaVWsTrdSTYH/
+3T+CaC56/5P4LinRg6alDPOGOlqotNosNGUujOmELcNHEhKMJRaZ7LMnxSPR3PE=
+=M383
 -----END PGP SIGNATURE-----
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 000000000000..2bdb4a581c89
--- /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-r1.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
new file mode 100644
index 000000000000..921c32fc1345
--- /dev/null
+++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/09/01 01:15:27 grknight Exp $
+
+EAPI=5
+inherit cmake-multilib eutils flag-o-matic versionator
+
+MAJOR="$(get_version_component_range 1-2 $PV)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="http://www.mysql.com/products/myodbc/"
+SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+RESTRICT="primaryuri"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	>=virtual/mysql-5.5[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+src_prepare() {
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	# Fix as-needed on the installer binary
+	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
+
+	# Patch document path so it doesn't install files to /usr
+	epatch "${FILESDIR}/cmake-doc-path.patch" \
+		"${FILESDIR}/${PVR}-cxxlinkage.patch" \
+		"${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
+}
+
+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
+		-DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so"
+		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+		-DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
+		-DLIB_SUBDIR="$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${MAJOR},g" \
+			-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done;
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
+}
+
+pkg_config() {
+
+	[ "${ROOT}" != "/" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
+}