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

2019-08-26 Thread Brian Evans 
commit: be2fa3947868e58ab535bb61631ba8562b205a59
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Aug 26 14:11:47 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Aug 26 14:11:47 2019 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=be2fa394

Drop dev-db/myodbc from the repo

Signed-off-by: Brian Evans  gentoo.org>

 dev-db/myodbc/ChangeLog| 181 -
 dev-db/myodbc/Manifest |  24 ---
 .../myodbc/files/5.2.7-mariadb-dynamic-array.patch |  79 -
 dev-db/myodbc/files/5.2.7-my_malloc.patch  |  18 --
 dev-db/myodbc/files/5.3-cmake-doc-path.patch   |  43 -
 dev-db/myodbc/files/5.3-cxxlinkage.patch   |  43 -
 .../myodbc/files/5.3-mariadb-buffer_length.patch   |  93 ---
 .../myodbc/files/5.3-mariadb-dynamic-array.patch   |  96 ---
 dev-db/myodbc/files/5.3.10-cxxlinkage.patch|  29 
 dev-db/myodbc/files/5.3.4-cxxlinkage.patch |  40 -
 dev-db/myodbc/files/cmake-doc-path.patch   |  43 -
 dev-db/myodbc/files/odbc.ini.m4|  17 --
 dev-db/myodbc/files/odbcinst.ini.m4|   5 -
 dev-db/myodbc/metadata.xml |   8 -
 dev-db/myodbc/myodbc-5.3.10.ebuild | 146 -
 dev-db/myodbc/myodbc-5.3.4.ebuild  | 122 --
 16 files changed, 987 deletions(-)

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
deleted file mode 100644
index f9d3054..000
--- a/dev-db/myodbc/ChangeLog
+++ /dev/null
@@ -1,181 +0,0 @@
-# ChangeLog for dev-db/myodbc
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  18 Nov 2015; Brian Evans  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  +files/5.2.7-my_malloc.patch,
-  myodbc-5.2.7-r2.ebuild:
-  dev-db/myodbc Add patch from bug 548912
-
-  17 May 2015; Brian Evans  -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  myodbc-5.2.7-r1.ebuild:
-  x86 stable wrt bug #525298
-
-  02 Mar 2015; Agostino Sarubbo  myodbc-5.2.7-r1.ebuild:
-  Stable for ppc, wrt bug #525298
-
-  12 Feb 2015; Pacho Ramos  myodbc-5.2.7-r1.ebuild:
-  amd64 stable, bug #525298
-
-  15 Nov 2014; Chema Alonso  myodbc-5.2.7.ebuild:
-  Stable for amd64 wrt bug #513646
-
-*myodbc-5.2.7-r1 (01 Sep 2014)
-
-  01 Sep 2014; Brian Evans 
-  +files/5.2.7-r1-cxxlinkage.patch, +myodbc-5.2.7-r1.ebuild:
-  Revision bump to enable multilib
-
-  20 Aug 2014; Brian Evans  +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  +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  +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  myodbc-5.1.6.ebuild:
-  Fix src_prepare
-
-  02 Mar 2013; Markos Chandras  myodbc-5.1.6.ebuild:
-  Move Qt dependencies to the new category
-
-  31 Jul 2012; Michael Palimaka  myodbc-5.1.6.ebuild:
-  Add missing slot dependencies on Qt.
-
-  10 Jul 2010; Robin H. Johnson  -myodbc-3.51.06.ebuild,
-  -myodbc-3.51.11.ebuild, -myodbc-3.51.12.ebuild,
-  -myodbc-3.51.26_p1127.ebuild, -myodbc-3.51.26_p1127-r1.ebuild,
-  -myodbc-3.51.27_p695.ebuild, -myodbc-5.1.5_p1144.ebuild:
-  Old versions don't work on newer unixODBC, so clean them up. Latest is
-  stable anyway.
-
-  26 Jun 2010;  myodbc-5.1.6.ebuild:
-  ppc stable #322277
-
-  24 Jun 2010; Pacho Ramos  myodbc-5.1.6.ebuild:
-  stable amd64, bug 322277
-
-  14 Jun 2010; Christian Faulhammer  myodbc-5.1.6.ebuild:
-  stable x86, bug 322277
-
-  11 Apr 2010;  myodbc-3.51.26_p1127-r1.ebuild,
-  myodbc-5.1.5_p1144.ebuild:
-  ppc stable #302944
-
-  07 Feb 2010; Markos Chandras 
-  myodbc-3.51.26_p1127-r1.ebuild, myodbc-5.1.5_p1144.ebuild:
-  Stable on amd64 wrt bug #302944
-
-  03 Feb 2010; Christian Faulhammer 
-  myodbc-3.51.26_p1127-r1.ebuild:
-  stable x86, bug 302944
-
-  03 Feb 2010; Christian Faulhammer 
-  myodbc-5.1.5_p1144.ebuild:
-  stable x86, bug 302944
-
-*myodbc-5.1.6 (31 Jan 2010)
-
-  31 Jan 2010; Robin H. Johnson  +myodbc-5.1.6.ebuild,
-  +files/myodbc-5.1.6-qt4-includedir.patch:
-  Version bump for 5.1 slot, now includes support for Qt Gui.
-
-*myodbc-3.51.27_p695 (31 Jan 2010)
-
-  31 Jan 2010; Robin H. Johnson 
-  +myodbc-3.51.27_p695.ebuild:
-  Add 3.51.27 as the final release in the 3.51 series.
-
-  26 Feb 2009; Joseph

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

2018-10-16 Thread Brian Evans 
commit: 79619025a7e5a1d71dcb94e827ce52183bf1405b
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Oct 17 01:43:25 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Oct 17 01:43:25 2018 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=79619025

dev-db/myodbc: Drop 5.2.7 versions

Signed-off-by: Brian Evans  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

 dev-db/myodbc/Manifest|  27 +++---
 dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch |  40 -
 dev-db/myodbc/myodbc-5.2.7-r1.ebuild  | 118 -
 dev-db/myodbc/myodbc-5.2.7-r2.ebuild  | 121 --
 4 files changed, 13 insertions(+), 293 deletions(-)

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ca32def..0941e8b 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,25 +1,24 @@
 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA256
 
-DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 
0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 
f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
 WHIRLPOOL 
928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
 DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 SHA256 
e15fe714b0236bdb7adea28a5d14a62511b5657cd83a6be664b45a4ef077fcb5 SHA512 
ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
 WHIRLPOOL 
e27aa8c51b575972ceb2f82d36ae4146835e1893808d9a5f98c31924fb16ee576880c7ae3393b89beb4f952c5436699d25efb4cd0e0d25b454a31bdfeedea98e
 DIST mysql-connector-odbc-5.3.4-src.tar.gz 667340 SHA256 
a5f7a490f2958f2768d18b8a57f71909f9699a8619c82776b3ad1c02b8abce0d SHA512 
1e3a0c06091f6ca34e89f9fc915f34e94b840db8626a93f56d464aff8d1f8a275c4ef494046ac760e8bcf910a05b91e39a8a1842711e4a78adddcc412ff77ec8
 WHIRLPOOL 
37bbaac3098377c82889cc30a3bd8b088b751e81a0116b87945a0efccd60f5c3a689176ccbaf866f7957404bbb08d08f9a7885ad68448f7a65188da3b33eb9f2
 -BEGIN PGP SIGNATURE-
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlp/xCZfFIAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlvGk7xfFIAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7axjw/8CvLJt67erbQNFH1HvJ+zWl0U7bNsXZAirgP0Z8qs4tRPLT7QrNI6TaUS
-1X31ETYfJ3GlUgvhXnw9UnASJ1DNRMHrRO1GJpOFIAmL+R5ZxKlm6Uvl4EBH3WF6
-rakfNklyx2OPwWqIf/K8IM7QwF+k2uxaXSPKF2lWapEUvxFsjsfcXKqJG4LmT8W1
-23y2RT6rMO2KUhElnM4skCWO2W1nIw8JnZvWfwN8gZnEIR7shv/sPNxaCYjO3EhR
-F/XDKoq7H1+Q81/UgxF/47RZZ7GX4yU6ba+kOU/nza/WCN15rGuXZ2HqZeKzcE5l
-KRuxNLOJqajdycFksUXHWLonboD0k9UPRJ4qFA2hq1mK3H/fUJQ9NZO8LnR61EO2
-RY052qrGcJ3g1vamH0onqdY5guld9MR3Bh5Gc1kuq6APG6nhaE+rpSTYJ6QYEq7V
-m31qFN6Se93j0ED0oDcY77APIVoGRFZMof4X+a9uO/DdwBr2MYG+Sfxnr12xWZmA
-ltwxcRjOSBQZbJwmblEl9zyyboivoXqAcrw1rfwBkZsyMgJdvgKs3fSBnUCFSOU+
-ei5DH8vDF9x6Ew6FFGHwpEQd7GULCE8jR+Vc8cyztEGiGHppEX8zhpM4iFgYai5i
-Grj19xsQ0wLvQHl/BJ5o8JxMmFryFXpYtmoddEz9xdzd+4KKa0I=
-=H5eI
+o7YUkRAAsl1lJcDOEH4i3f7i0438IcDzttcMx1T1tLnDG6pBPlD9Bi5igUNJ2x76
+7y8N5CdCJ23aF9UfuqgCVromlxIXIzOzczTHE+cTwRRyeAiDagKfrgkF8Whs+4pD
+bMzeZbFOsxlUSPWZXJ8OZXjA1/pILplo+Nc2gvieoR7ykaoRSndVkKxLHzC68QpW
+8ZS3kPCQ3U55OIcwMc0T4UNsrEqOW3dC3eRMXuAy+Qy0HYrPSpdvrupm2gi/zOUF
+HVm1JfoW+OaBoLxdCp2nnEnrBCEoGB+nu9QDexk1XmHLILmOarVngb83gfEjYW0b
+bw0ltQvhf7/AU+27k0lMtv0DbwJ7akbz5nCy7XszcBMZsoqtIs2jNg6lqiwGa4JO
+bOQ/eqIPrHYUWd1hq3HMRw30/dVdXGyRmYJWl8y0hucx2NxoEGop4bWWSpB210Fq
+PPakT1T6ySjrVGnrMitg4Omug+a9rWoPhGMrYhK1leT5FFoK0sjeZO/rBupTOuSo
+9i7g3Old3suvoIF2e2saWHGZS7+E1DH/iEWnu8g+kNcMqmj4Q8+ctC33SIkVll08
+PVpHZ9D1a+mFTpSSQrntsBotIaid3QZgJ9aDEW2DTHG+1iXy/rPRIwEvjW32q/fj
+c0P1wKU8Nk/GLR59Vd6aAIPF5ofvywEMBkafa+6GTaTLg/l8vCo=
+=5Rnq
 -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
deleted file mode 100644
index 2bdb4a5..000
--- a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
 a/cmake/FindMySQL.cmake2014-06-18 18:50:16.0 -0400
-+++ b/cmake/FindMySQL.cmake2014-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"
-

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

2018-02-13 Thread Brian Evans 
commit: 9a8b3c8b18650945c047cda78bbea4c7cc87be28
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Feb 13 15:39:05 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Feb 13 15:39:05 2018 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=9a8b3c8b

dev-db/myodbc: Exclude mariadb from myodbc-5.3.10

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/myodbc/myodbc-5.3.10.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-db/myodbc/myodbc-5.3.10.ebuild 
b/dev-db/myodbc/myodbc-5.3.10.ebuild
index 9fd6b22..f4ac130 100644
--- a/dev-db/myodbc/myodbc-5.3.10.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10.ebuild
@@ -21,13 +21,14 @@ SLOT="${MAJOR}"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-# Does not build with mysql-connector-c
+# Does not build with mariadb
 RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
abi_x86_32? (
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
)
+   !dev-db/mariadb[client-libs(+)]
 "
 DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}

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

2018-02-10 Thread Brian Evans 
commit: 2b93bcf7d21b4d4f299dfcb7a9f59e004be1199f
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Feb 11 04:18:49 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Feb 11 04:18:49 2018 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=2b93bcf7

dev-db/myodbc: Add version 5.3.10 for testing

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

 dev-db/myodbc/Manifest |  23 
 dev-db/myodbc/files/5.3-cmake-doc-path.patch   |  43 ++
 dev-db/myodbc/files/5.3-cxxlinkage.patch   |  43 ++
 .../myodbc/files/5.3-mariadb-buffer_length.patch   |  93 +
 .../myodbc/files/5.3-mariadb-dynamic-array.patch   |  96 ++
 dev-db/myodbc/files/5.3.10-cxxlinkage.patch|  29 +
 dev-db/myodbc/files/odbc.ini.m4|   1 -
 dev-db/myodbc/files/odbcinst.ini.m4|   1 -
 dev-db/myodbc/myodbc-5.3.10.ebuild | 145 +
 9 files changed, 472 insertions(+), 2 deletions(-)

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 809ce4d..ca32def 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,2 +1,25 @@
+-BEGIN PGP SIGNED MESSAGE-
+Hash: SHA256
+
 DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 
0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 
f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
 WHIRLPOOL 
928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
+DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 SHA256 
e15fe714b0236bdb7adea28a5d14a62511b5657cd83a6be664b45a4ef077fcb5 SHA512 
ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
 WHIRLPOOL 
e27aa8c51b575972ceb2f82d36ae4146835e1893808d9a5f98c31924fb16ee576880c7ae3393b89beb4f952c5436699d25efb4cd0e0d25b454a31bdfeedea98e
 DIST mysql-connector-odbc-5.3.4-src.tar.gz 667340 SHA256 
a5f7a490f2958f2768d18b8a57f71909f9699a8619c82776b3ad1c02b8abce0d SHA512 
1e3a0c06091f6ca34e89f9fc915f34e94b840db8626a93f56d464aff8d1f8a275c4ef494046ac760e8bcf910a05b91e39a8a1842711e4a78adddcc412ff77ec8
 WHIRLPOOL 
37bbaac3098377c82889cc30a3bd8b088b751e81a0116b87945a0efccd60f5c3a689176ccbaf866f7957404bbb08d08f9a7885ad68448f7a65188da3b33eb9f2
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlp/xCZfFIAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
+QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
+o7axjw/8CvLJt67erbQNFH1HvJ+zWl0U7bNsXZAirgP0Z8qs4tRPLT7QrNI6TaUS
+1X31ETYfJ3GlUgvhXnw9UnASJ1DNRMHrRO1GJpOFIAmL+R5ZxKlm6Uvl4EBH3WF6
+rakfNklyx2OPwWqIf/K8IM7QwF+k2uxaXSPKF2lWapEUvxFsjsfcXKqJG4LmT8W1
+23y2RT6rMO2KUhElnM4skCWO2W1nIw8JnZvWfwN8gZnEIR7shv/sPNxaCYjO3EhR
+F/XDKoq7H1+Q81/UgxF/47RZZ7GX4yU6ba+kOU/nza/WCN15rGuXZ2HqZeKzcE5l
+KRuxNLOJqajdycFksUXHWLonboD0k9UPRJ4qFA2hq1mK3H/fUJQ9NZO8LnR61EO2
+RY052qrGcJ3g1vamH0onqdY5guld9MR3Bh5Gc1kuq6APG6nhaE+rpSTYJ6QYEq7V
+m31qFN6Se93j0ED0oDcY77APIVoGRFZMof4X+a9uO/DdwBr2MYG+Sfxnr12xWZmA
+ltwxcRjOSBQZbJwmblEl9zyyboivoXqAcrw1rfwBkZsyMgJdvgKs3fSBnUCFSOU+
+ei5DH8vDF9x6Ew6FFGHwpEQd7GULCE8jR+Vc8cyztEGiGHppEX8zhpM4iFgYai5i
+Grj19xsQ0wLvQHl/BJ5o8JxMmFryFXpYtmoddEz9xdzd+4KKa0I=
+=H5eI
+-END PGP SIGNATURE-

diff --git a/dev-db/myodbc/files/5.3-cmake-doc-path.patch 
b/dev-db/myodbc/files/5.3-cmake-doc-path.patch
new file mode 100644
index 000..54f35d4
--- /dev/null
+++ b/dev-db/myodbc/files/5.3-cmake-doc-path.patch
@@ -0,0 +1,43 @@
+=== modified file 'CMakeLists.txt'
+--- a/CMakeLists.txt   2013-03-09 09:51:06 +
 b/CMakeLists.txt   2013-03-09 11:05:27 +
+@@ -33,6 +33,12 @@
+ 
+ INCLUDE(version.cmake)
+ 
++IF(WITH_DOCUMENTATION_INSTALL_PATH)
++  set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
++ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
++  set(DOCUMENTATION_INSTALL_PATH 
${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
++ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
++
+ #Default is to build both drivers
+ IF(UNICODE OR NOT ANSI)
+   MESSAGE(STATUS "Configuring to build Unicode driver")
+@@ -329,19 +335,17 @@
+ 
+ ELSE(WIN32)
+ 
+-  INSTALL(FILES ChangeLogDESTINATION .)
+-  INSTALL(FILES README   DESTINATION .)
+-  INSTALL(FILES README.debug DESTINATION .)
+-  INSTALL(FILES INSTALL  DESTINATION .)
++INSTALL(FILES ChangeLogDESTINATION ${DOCUMENTATION_INSTALL_PATH})
++INSTALL(FILES README   DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++INSTALL(FILES INSTALL  DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+   IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+-INSTALL(FILES COPYING   DESTINATION .)
+

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

2017-03-02 Thread Brian Evans 
commit: e6c4cf4c035466d8b015bb23d1d3b2f9f7cc4352
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Mar  2 14:25:16 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Mar  2 14:25:16 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=e6c4cf4c

dev-db/myodbc: Drop $Id$ header

 dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 3 +--
 dev-db/myodbc/myodbc-5.2.7-r2.ebuild | 3 +--
 dev-db/myodbc/myodbc-5.3.4.ebuild| 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild 
b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
index 59c2005..7887761 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 inherit cmake-multilib eutils flag-o-matic versionator

diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild 
b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
index 65b99da..93cf915 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 inherit cmake-multilib eutils flag-o-matic versionator

diff --git a/dev-db/myodbc/myodbc-5.3.4.ebuild 
b/dev-db/myodbc/myodbc-5.3.4.ebuild
index 5e86689..876fa6c 100644
--- a/dev-db/myodbc/myodbc-5.3.4.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.4.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 inherit cmake-utils multilib-minimal eutils flag-o-matic versionator

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

2015-11-19 Thread Brian Evans 
commit: 453b9938c8d1ed1e9494f812e20df8b1e6b862f6
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov 18 18:23:33 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Nov 18 18:23:33 2015 +
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  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  +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"

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

2015-08-11 Thread Brian Evans 
commit: 5929f97adf99d702bb2f0c415616f824a22caeb7
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Aug 11 17:11:28 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Aug 11 17:11:28 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=5929f97a

dev-db/myodbc Add patch from bug 548912

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

 dev-db/myodbc/ChangeLog   |  4 
 dev-db/myodbc/files/5.2.7-my_malloc.patch | 18 ++
 dev-db/myodbc/myodbc-5.2.7-r2.ebuild  |  5 +++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 4a81ef1..8bc0aea 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$
 
+  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
+
   17 May 2015; Brian Evans grkni...@gentoo.org -files/5.2.7-cxxlinkage.patch,
   -files/myodbc-5.1.6-qt4-includedir.patch, -myodbc-5.1.6.ebuild,
   -myodbc-5.2.7.ebuild:

diff --git a/dev-db/myodbc/files/5.2.7-my_malloc.patch 
b/dev-db/myodbc/files/5.2.7-my_malloc.patch
new file mode 100644
index 000..bc6c65e
--- /dev/null
+++ b/dev-db/myodbc/files/5.2.7-my_malloc.patch
@@ -0,0 +1,18 @@
+diff -Brau a/util/odbcinstw.c b/util/odbcinstw.c
+--- a/util/odbcinstw.c 2014-04-23 21:54:40.0 +0200
 b/util/odbcinstw.c 2015-05-08 15:29:09.400568356 +0200
+@@ -68,13 +68,7 @@
+ 
+   if (lpszRetBuffer  cbRetBuffer)
+   {
+-ret= malloc(cbRetBuffer + 1);
+-/*
+-  We cannot rely on getting correct results from the next call of
+-  SQLGetPrivateProfileString. So, taking precautions against unititialized
+-  values in the allocated buffer.
+-*/
+-memset(ret, 0, cbRetBuffer + 1);
++ret= my_malloc(cbRetBuffer + 1, MYF(MY_ZEROFILL));
+   }
+   else
+ ret= NULL;

diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild 
b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
index cf7133d..65b99da 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
@@ -44,8 +44,9 @@ src_prepare() {
 
# 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
+   ${FILESDIR}/${PV}-r1-cxxlinkage.patch \
+   ${FILESDIR}/${PV}-mariadb-dynamic-array.patch \
+   ${FILESDIR}/${PV}-my_malloc.patch
 }
 
 multilib_src_configure() {

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

2015-07-17 Thread Brian Evans 
commit: 154ac5b346502c06c2dddf53ec53399aa58ced4a
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri Jul 17 16:40:12 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri Jul 17 16:40:12 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=154ac5b3

Version bump

 dev-db/myodbc/Manifest |  31 +---
 dev-db/myodbc/files/5.3.4-cxxlinkage.patch |  40 ++
 dev-db/myodbc/myodbc-5.3.4.ebuild  | 123 +
 3 files changed, 164 insertions(+), 30 deletions(-)

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index c23dddb..809ce4d 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,31 +1,2 @@
--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
-
-iQJ8BAEBCABmBQJVWQcZXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-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

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

2014-09-03 Thread Brian Evans 
commit: 394c6142969009f50a8bb5296416043608acf55c
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sun Aug 31 22:37:06 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Wed Sep  3 22:11:51 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=394c6142

Sync myodbc 5.2.7 from tree

---
 dev-db/myodbc/files/5.2.7-cxxlinkage.patch | 23 +++
 .../myodbc/files/5.2.7-mariadb-dynamic-array.patch | 79 ++
 .../{myodbc-5.2.6.ebuild = myodbc-5.2.7.ebuild}   | 20 --
 3 files changed, 115 insertions(+), 7 deletions(-)

diff --git a/dev-db/myodbc/files/5.2.7-cxxlinkage.patch 
b/dev-db/myodbc/files/5.2.7-cxxlinkage.patch
new file mode 100644
index 000..a78c89b
--- /dev/null
+++ b/dev-db/myodbc/files/5.2.7-cxxlinkage.patch
@@ -0,0 +1,23 @@
+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.0 -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-mariadb-dynamic-array.patch 
b/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
new file mode 100644
index 000..6cfe7cd
--- /dev/null
+++ b/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
@@ -0,0 +1,79 @@
+diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c
+--- a/driver/catalog_no_i_s.c  2014-06-18 18:50:16.0 -0400
 b/driver/catalog_no_i_s.c  2014-08-20 14:08:33.997339096 -0400
+@@ -1093,7 +1093,11 @@
+   unsigned long *lengths;
+   SQLRETURN rc= SQL_SUCCESS;
+ 
++#if defined(MARIADB_BASE_VERSION)  MYSQL_VERSION_ID  11
++  my_init_dynamic_array(records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0));
++#else
+   my_init_dynamic_array(records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
++#endif
+ 
+   /* Get the list of tables that match szCatalog and szTable */
+   pthread_mutex_lock(stmt-dbc-lock);
+diff -aurN a/driver/desc.c b/driver/desc.c
+--- a/driver/desc.c2014-06-18 18:50:16.0 -0400
 b/driver/desc.c2014-08-20 14:07:37.409169269 -0400
+@@ -63,8 +63,12 @@
+  but in desc_get_rec we manually get a pointer to it. This avoids
+  having to call set_dynamic after modifying the DESCREC.
+   */
++#if defined(MARIADB_BASE_VERSION)  MYSQL_VERSION_ID  11
++  if (my_init_dynamic_array(desc-records, sizeof(DESCREC), 0, 0, MYF(0)))
++#else
+   if (my_init_dynamic_array(desc-records, sizeof(DESCREC), 0, 0))
++#endif
+   {
+ x_free((char *)desc);
+ return NULL;
+   }
+@@ -995,9 +1003,15 @@
+ 
+   /* copy the records */
+   delete_dynamic(dest-records);
++#if defined(MARIADB_BASE_VERSION)  MYSQL_VERSION_ID  11
++  if (my_init_dynamic_array(dest-records, sizeof(DESCREC),
++src-records.max_element,
++src-records.alloc_increment, MYF(0)))
++#else
+   if (my_init_dynamic_array(dest-records, sizeof(DESCREC),
+ src-records.max_element,
+ src-records.alloc_increment))
++#endif
+   {
+ return set_desc_error(dest, HY001,
+   Memory allocation error,
+diff -aurN a/driver/handle.c b/driver/handle.c
+--- a/driver/handle.c  2014-06-18 18:50:16.0 -0400
 b/driver/handle.c  2014-08-20 14:05:00.364248403 -0400
+@@ -403,7 +403,11 @@
+ }
+   }
+ 
++#if defined(MARIADB_BASE_VERSION)  MYSQL_VERSION_ID  11
++  my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, 
MYF(0));
++#else
+   my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
++#endif
+   memset((*param_bind)-buffer, 0, sizeof(MYSQL_BIND) *
+   
(*param_bind)-max_element);
+ 
+diff -aurN a/driver/parse.c b/driver/parse.c
+--- a/driver/parse.c   2014-06-18 18:50:16.0 -0400
 b/driver/parse.c   2014-08-20 14:03:54.336383876 -0400
+@@ -129,8 +129,13 @@
+ 
+ /* TODO: Store offsets rather than ptrs. In this case we will be fine
+

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

2014-04-18 Thread Brian Evans 
commit: 7515e4ec76382418d4746c5c22c150e27360f8a1
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Thu Apr 17 20:18:56 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu Apr 17 20:18:56 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7515e4ec

[myodbc] Version bump

Signed-off-by: Brian Evans grknight AT tuffmail.com

---
 dev-db/myodbc/Manifest | 2 +-
 dev-db/myodbc/{myodbc-5.2.5.ebuild = myodbc-5.2.6.ebuild} | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ed3dbfb..f52d0b6 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1 @@
-DIST mysql-connector-odbc-5.2.5-src.tar.gz 581313 SHA256 
54e35c646bb4d972bc18fba40d486059aac336d838269bef8049d1d78ebfb96a SHA512 
a503df647690073e5b6b02ea49b3db380e6524388addd37b9993dcc0d0fb325c0d1e0954bbbc5a01e5d59c1ee20aab021dce731f89debfe07e61f9caad31e5cc
 WHIRLPOOL 
f3c0e42760142436c84756f2c75c2351185be7ade9101d0ff6ecdd762d6421f01d8ce333673edef4a84c6b2c832a52e5ac47ec8403df376ba15df8e60480bed1
+DIST mysql-connector-odbc-5.2.6-src.tar.gz 595963 SHA256 
005bba26358819bb5db48d23e8eb4a94cc234dfa103dd47a6c2602e7e70ad17b SHA512 
9732b3034bdeb24700d0369d066fb43ca6f0327c2d3a3f1fff77d51ab37a83139536a7caae377791d979132c9640d67fddb4040095478924f4c8139ec6f404a5
 WHIRLPOOL 
d8f0fc2cc7ec0b7602a2e6434d2680174dd50fe1d16dd03e0370ba1ec7807b09a83411e62aca3d68d540c1a564c759cbfea63c2d3adb6b642286a49d4dfc1330

diff --git a/dev-db/myodbc/myodbc-5.2.5.ebuild 
b/dev-db/myodbc/myodbc-5.2.6.ebuild
similarity index 96%
rename from dev-db/myodbc/myodbc-5.2.5.ebuild
rename to dev-db/myodbc/myodbc-5.2.6.ebuild
index 0dfdd64..7d1ee67 100644
--- a/dev-db/myodbc/myodbc-5.2.5.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.6.ebuild
@@ -43,7 +43,9 @@ src_prepare() {
 
 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
-DMYSQL_LIB=$(mysql_config 
--variable=pkglibdir)/libmysqlclient_r.so