From be2fa3947868e58ab535bb61631ba8562b205a59 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 26 Aug 2019 10:11:47 -0400 Subject: Drop dev-db/myodbc from the repo Signed-off-by: Brian Evans --- 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(-) delete mode 100644 dev-db/myodbc/ChangeLog delete mode 100644 dev-db/myodbc/Manifest delete mode 100644 dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch delete mode 100644 dev-db/myodbc/files/5.2.7-my_malloc.patch delete mode 100644 dev-db/myodbc/files/5.3-cmake-doc-path.patch delete mode 100644 dev-db/myodbc/files/5.3-cxxlinkage.patch delete mode 100644 dev-db/myodbc/files/5.3-mariadb-buffer_length.patch delete mode 100644 dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch delete mode 100644 dev-db/myodbc/files/5.3.10-cxxlinkage.patch delete mode 100644 dev-db/myodbc/files/5.3.4-cxxlinkage.patch delete mode 100644 dev-db/myodbc/files/cmake-doc-path.patch delete mode 100644 dev-db/myodbc/files/odbc.ini.m4 delete mode 100644 dev-db/myodbc/files/odbcinst.ini.m4 delete mode 100644 dev-db/myodbc/metadata.xml delete mode 100644 dev-db/myodbc/myodbc-5.3.10.ebuild delete mode 100644 dev-db/myodbc/myodbc-5.3.4.ebuild diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog deleted file mode 100644 index f9d3054..0000000 --- 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 Jezak myodbc-3.51.12.ebuild: - Marked ppc stable. - -*myodbc-5.1.5_p1144 (01 Nov 2008) - - 01 Nov 2008; Robin H. Johnson - +myodbc-5.1.5_p1144.ebuild: - Include 5.1 version now, in a new SLOT. - -*myodbc-3.51.26_p1127-r1 (01 Nov 2008) - - 01 Nov 2008; Robin H. Johnson - +myodbc-3.51.26_p1127-r1.ebuild: - Bring in slotted myodbc in preparation for 5.1. Also fix bug #159026 with - $FILESDIR usage during pkg_config. Use sed instead of m4. Driver name for - DSN also includes SLOT value. - -*myodbc-3.51.26_p1127 (01 Nov 2008) - - 01 Nov 2008; Robin H. Johnson - +myodbc-3.51.26_p1127.ebuild: - Version bump per bug #240088, also handles new upstream source location - and versioning. - - 02 Jul 2007; Piotr Jaroszyński myodbc-3.51.12.ebuild: - (QA) RESTRICT clean up. - - 31 Jan 2007; Marius Mauch myodbc-3.51.06.ebuild, - myodbc-3.51.11.ebuild, myodbc-3.51.12.ebuild: - Replacing einfo with elog - - 23 Nov 2006; Francesco Riosa myodbc-3.51.06.ebuild, - myodbc-3.51.11.ebuild, myodbc-3.51.12.ebuild: - dev-db/mysql => virtual/mysql - - 28 Oct 2006; Sven Wegener myodbc-3.51.06.ebuild, - myodbc-3.51.11.ebuild, myodbc-3.51.12.ebuild: - Use emerge --config instead of ebuild config. - -*myodbc-3.51.12 (24 Jun 2006) - - 24 Jun 2006; Francesco Riosa +myodbc-3.51.12.ebuild: - version bump - - 21 Jan 2006; myodbc-3.51.11.ebuild: - Added ~ppc keyword. - - 16 Aug 2005; Francesco Riosa myodbc-3.51.11.ebuild: - Workaround for bug #102026, now configuring without samples and test - - 27 Jul 2005; Francesco Riosa myodbc-3.51.11.ebuild: - "unstable" to "stable" after testing on amd64 and x86. - - 28 Jun 2005; Simon Stelling myodbc-3.51.11.ebuild: - added ~amd64 keyword - -*myodbc-3.51.11 (17 May 2005) - - 17 May 2005; Robin H. Johnson +metadata.xml, - +myodbc-3.51.11.ebuild: - Add metadata. New version for mysql-4.1 support. - - 29 Jun 2004; Aron Griffis myodbc-3.51.06.ebuild: - sync IUSE (+debug, +doc, +static) - - 07 Dec 2003; Martin Holzer myodbc-3.51.06.ebuild: - adding RESTRICT="nomirror" - - 26 Oct 2003; Robin H. Johnson myodbc-3.51.06.ebuild, - files/odbc.ini.m4, files/odbcinst.ini.m4: - major changes made for auto-configuration of driver and DSN. - -*myodbc-3.51.06 (26 Oct 2003) - - 26 Oct 2003; Robin H. Johnson myodbc-3.51.06.ebuild: - initial commit, bug #15546, submitted by Zhen Lin diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest deleted file mode 100644 index 0941e8b..0000000 --- a/dev-db/myodbc/Manifest +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -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/n0o7YFAlvGk7xfFIAAAAAALgAo -aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2 -QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0 -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-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch deleted file mode 100644 index 6cfe7cd..0000000 --- a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch +++ /dev/null @@ -1,79 +0,0 @@ -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.000000000 -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 > 100001 -+ 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.c 2014-06-18 18:50:16.000000000 -0400 -+++ b/driver/desc.c 2014-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 > 100001 -+ 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 > 100001 -+ 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.000000000 -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 > 100001 -+ 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.000000000 -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 - if work with copy of the originally parsed string */ -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10, MYF(0)); -+ my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0)); -+#else - my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10); - my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10); -+#endif - } - - return pq; diff --git a/dev-db/myodbc/files/5.2.7-my_malloc.patch b/dev-db/myodbc/files/5.2.7-my_malloc.patch deleted file mode 100644 index bc6c65e..0000000 --- a/dev-db/myodbc/files/5.2.7-my_malloc.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Brau a/util/odbcinstw.c b/util/odbcinstw.c ---- a/util/odbcinstw.c 2014-04-23 21:54:40.000000000 +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/files/5.3-cmake-doc-path.patch b/dev-db/myodbc/files/5.3-cmake-doc-path.patch deleted file mode 100644 index 54f35d4..0000000 --- a/dev-db/myodbc/files/5.3-cmake-doc-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -=== modified file 'CMakeLists.txt' ---- a/CMakeLists.txt 2013-03-09 09:51:06 +0000 -+++ b/CMakeLists.txt 2013-03-09 11:05:27 +0000 -@@ -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 ChangeLog DESTINATION .) -- INSTALL(FILES README DESTINATION .) -- INSTALL(FILES README.debug DESTINATION .) -- INSTALL(FILES INSTALL DESTINATION .) -+ INSTALL(FILES ChangeLog DESTINATION ${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 .) - ELSE() -- INSTALL(FILES LICENSE.mysql DESTINATION .) - ENDIF() - - ENDIF(WIN32) - --INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .) -+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH}) - - INCLUDE(CPack) - - - diff --git a/dev-db/myodbc/files/5.3-cxxlinkage.patch b/dev-db/myodbc/files/5.3-cxxlinkage.patch deleted file mode 100644 index 319262c..0000000 --- a/dev-db/myodbc/files/5.3-cxxlinkage.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake ---- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500 -+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500 -@@ -747,7 +747,7 @@ - endif() - - if(NOT MYSQL_CXXFLAGS) -- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603) -+ if(MYSQL_CXX_LINKAGE) - _mysql_conf(MYSQL_CXXFLAGS "--cxxflags") - set(MYSQL_CXX_LINKAGE 1) - else() -diff -aurN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2017-02-17 13:50:43.556006202 -0500 -+++ b/CMakeLists.txt 2017-02-17 13:57:15.745676184 -0500 -@@ -242,10 +242,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}") - -diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake ---- a/cmake/FindMySQL.cmake 2017-02-17 14:44:29.532733308 -0500 -+++ b/cmake/FindMySQL.cmake 2017-02-17 14:48:56.756740330 -0500 -@@ -270,8 +270,8 @@ - set(_static_lib_ext ".lib") # Careful, can be import library for DLL - elseif(MYSQLCLIENT_NO_THREADS) - # In 5.1 and below there is a single threaded library -- set(_dynamic_libs "mysqlclient") -- set(_static_libs "libmysqlclient.a") -+ set(_dynamic_libs "${MYSQLCLIENT_LIB_NAME}") -+ set(_static_libs "lib${MYSQLCLIENT_LIB_NAME}.a") - set(_static_lib_ext ".a") - else() - # We try the multithreaded "libmysqlclient_r" first and if not diff --git a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch b/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch deleted file mode 100644 index 1be9cc4..0000000 --- a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -aurN a/driver/connect.c b/driver/connect.c ---- a/driver/connect.c 2016-11-29 07:40:13.000000000 -0500 -+++ b/driver/connect.c 2017-02-17 16:14:48.116640371 -0500 -@@ -510,11 +510,11 @@ - } - } - --#if MYSQL_VERSION_ID >= 50709 -- mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length); -+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION) -+ mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length_value); - #else - // for older versions just use net_buffer_length() macro -- dbc->net_buffer_length = net_buffer_length; -+ dbc->net_buffer_length_value = net_buffer_length; - #endif - return rc; - -diff -aurN a/driver/cursor.c b/driver/cursor.c ---- a/driver/cursor.c 2016-11-29 07:40:13.000000000 -0500 -+++ b/driver/cursor.c 2017-02-17 16:13:19.163299885 -0500 -@@ -1485,7 +1485,7 @@ - We have a limited capacity to shove data across the wire, but - we handle this by sending in multiple calls to exec_stmt_query() - */ -- if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length) -+ if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length_value) - { - break_insert= TRUE; - break; -diff -aurN a/driver/driver.h b/driver/driver.h ---- a/driver/driver.h 2016-11-29 07:40:13.000000000 -0500 -+++ b/driver/driver.h 2017-02-17 16:10:57.072950723 -0500 -@@ -378,7 +378,7 @@ - int txn_isolation; - uint port; - uint cursor_count; -- ulong net_buffer_length; -+ ulong net_buffer_length_value; - uint commit_flag; - #ifdef THREAD - myodbc_mutex_t lock; -diff -aurN a/driver/info.c b/driver/info.c ---- a/driver/info.c 2016-11-29 07:40:13.000000000 -0500 -+++ b/driver/info.c 2017-02-17 16:12:54.315763441 -0500 -@@ -587,7 +587,7 @@ - MYINFO_SET_USHORT(0); - - case SQL_MAX_STATEMENT_LEN: -- MYINFO_SET_ULONG(dbc->net_buffer_length); -+ MYINFO_SET_ULONG(dbc->net_buffer_length_value); - - case SQL_MAX_TABLE_NAME_LEN: - MYINFO_SET_USHORT(NAME_LEN); -diff -aurN a/driver/connect.c b/driver/connect.c ---- a/driver/connect.c 2017-02-17 16:16:14.609026769 -0500 -+++ b/driver/connect.c 2017-02-17 16:34:29.637592664 -0500 -@@ -179,7 +179,7 @@ - /* Set other connection options */ - - if (ds->allow_big_results || ds->safe) --#if MYSQL_VERSION_ID >= 50709 -+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION) - mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long); - #else - /* max_allowed_packet is a magical mysql macro. */ -@@ -252,7 +252,7 @@ - ds_get_utf8attr(ds->rsakey, &ds->rsakey8)); - } - --#if MYSQL_VERSION_ID >= 50710 -+#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION) - { - char tls_options[128] = { 0 }; - if (!ds->no_tls_1) -@@ -323,7 +323,7 @@ - #endif - - mysql->options.use_ssl = !ds->disable_ssl_default; --#if MYSQL_VERSION_ID >= 50703 -+#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION) - { - if (ds->ssl_enforce) - { -@@ -332,7 +332,7 @@ - } - #endif - --#if MYSQL_VERSION_ID >= 50711 -+#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION) - if (ds->sslmode) - { - unsigned int mode = 0; diff --git a/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch deleted file mode 100644 index 9672061..0000000 --- a/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c ---- a/driver/catalog_no_i_s.c 2016-11-29 07:40:13.000000000 -0500 -+++ b/driver/catalog_no_i_s.c 2017-02-17 14:07:03.979683613 -0500 -@@ -1093,7 +1093,11 @@ - unsigned long *lengths; - SQLRETURN rc= SQL_SUCCESS; - -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0)); -+#else - myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0); -+#endif - - /* Get the list of tables that match szCatalog and szTable */ - myodbc_mutex_lock(&stmt->dbc->lock); -diff -aurN a/driver/desc.c b/driver/desc.c ---- a/driver/desc.c 2016-11-29 07:40:13.000000000 -0500 -+++ b/driver/desc.c 2017-02-17 14:09:30.139954232 -0500 -@@ -63,13 +63,21 @@ - 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 > 100001 -+ if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0))) -+#else - if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0)) -+#endif - { - x_free((char *)desc); - return NULL; - } - -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, MYF(0))) -+#else - if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0)) -+#endif - { - delete_dynamic(&desc->records); - x_free((char *)desc); -@@ -997,7 +1005,11 @@ - delete_dynamic(&dest->records); - if (myodbc_init_dynamic_array(&dest->records, sizeof(DESCREC), - src->records.max_element, -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ src->records.alloc_increment, MYF(0))) -+#else - 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 2016-11-29 07:40:13.000000000 -0500 -+++ b/driver/handle.c 2017-02-17 14:10:32.078797593 -0500 -@@ -409,7 +409,11 @@ - } - } - -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0)); -+#else - myodbc_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 2016-11-29 07:40:13.000000000 -0500 -+++ b/driver/parse.c 2017-02-17 14:12:00.638143846 -0500 -@@ -139,8 +139,13 @@ - - /* TODO: Store offsets rather than ptrs. In this case we will be fine - if work with copy of the originally parsed string */ -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ myodbc_init_dynamic_array(&pq->token, sizeof(uint), 20, 10, MYF(0)); -+ myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0)); -+#else - myodbc_init_dynamic_array(&pq->token, sizeof(uint), 20, 10); - myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10); -+#endif - } - - return pq; -diff -aurN a/MYODBC_MYSQL.h b/MYODBC_MYSQL.h ---- a/MYODBC_MYSQL.h 2016-11-29 07:40:13.000000000 -0500 -+++ b/MYODBC_MYSQL.h 2017-02-17 15:04:47.153994839 -0500 -@@ -44,7 +44,7 @@ - #endif - - #ifdef THREAD --#if MYSQL_VERSION_ID < 50703 -+#if MYSQL_VERSION_ID < 50703 || defined(MARIADB_BASE_VERSION) - #include - #define myodbc_mutex_t pthread_mutex_t - #define myodbc_key_t pthread_key_t diff --git a/dev-db/myodbc/files/5.3.10-cxxlinkage.patch b/dev-db/myodbc/files/5.3.10-cxxlinkage.patch deleted file mode 100644 index 796a137..0000000 --- a/dev-db/myodbc/files/5.3.10-cxxlinkage.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake ---- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500 -+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500 -@@ -747,7 +747,7 @@ - endif() - - if(NOT MYSQL_CXXFLAGS) -- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603) -+ if(MYSQL_CXX_LINKAGE) - _mysql_conf(MYSQL_CXXFLAGS "--cxxflags") - set(MYSQL_CXX_LINKAGE 1) - else() -diff -aurN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-02-10 21:41:13.161553751 -0500 -+++ b/CMakeLists.txt 2018-02-10 21:45:20.038398824 -0500 -@@ -379,10 +379,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}") - diff --git a/dev-db/myodbc/files/5.3.4-cxxlinkage.patch b/dev-db/myodbc/files/5.3.4-cxxlinkage.patch deleted file mode 100644 index c770c9b..0000000 --- a/dev-db/myodbc/files/5.3.4-cxxlinkage.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 2015-07-17 12:25:30.706091000 -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 -uarN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2015-07-17 12:20:19.106091000 -0400 -+++ b/CMakeLists.txt 2015-07-17 12:26:36.909091000 -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}") - diff --git a/dev-db/myodbc/files/cmake-doc-path.patch b/dev-db/myodbc/files/cmake-doc-path.patch deleted file mode 100644 index c7f7d9d..0000000 --- a/dev-db/myodbc/files/cmake-doc-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -=== modified file 'CMakeLists.txt' ---- CMakeLists.txt 2013-03-09 09:51:06 +0000 -+++ CMakeLists.txt 2013-03-09 11:05:27 +0000 -@@ -33,6 +33,12 @@ - SET(CONNECTOR_MAJOR "5") - SET(CONNECTOR_MINOR "2") - -+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) -+ - IF(CONNECTOR_MINOR LESS 10) - SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}") - ELSE(CONNECTOR_MINOR LESS 10) -@@ -329,19 +335,17 @@ - - ELSE(WIN32) - -- INSTALL(FILES ChangeLog DESTINATION .) -- INSTALL(FILES README DESTINATION .) -- INSTALL(FILES README.debug DESTINATION .) -- INSTALL(FILES INSTALL DESTINATION .) -+ INSTALL(FILES ChangeLog DESTINATION ${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 .) - ELSE() -- INSTALL(FILES LICENSE.mysql DESTINATION .) - ENDIF() - - ENDIF(WIN32) - --INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .) -+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH}) - - INCLUDE(CPack) - - - diff --git a/dev-db/myodbc/files/odbc.ini.m4 b/dev-db/myodbc/files/odbc.ini.m4 deleted file mode 100644 index 4255730..0000000 --- a/dev-db/myodbc/files/odbc.ini.m4 +++ /dev/null @@ -1,17 +0,0 @@ -# vim:ts=4 noexpandtab ft=dosini: -# -[ODBC Data Sources] -__PN__-test = MySQL ODBC __PF__ Driver Testing DSN - -# see http://www.mysql.com/products/myodbc/faq_toc.html -# for details about the following entry -[__PN__-test] -Description = MySQL ODBC __PF__ Driver Testing DSN -Driver = __PN__ -Socket = /var/run/mysqld/mysqld.sock -Server = localhost -User = root -Database = test -Option = 3 -#Port = -#Password = diff --git a/dev-db/myodbc/files/odbcinst.ini.m4 b/dev-db/myodbc/files/odbcinst.ini.m4 deleted file mode 100644 index 744503c..0000000 --- a/dev-db/myodbc/files/odbcinst.ini.m4 +++ /dev/null @@ -1,5 +0,0 @@ -# vim:ts=4 noexpandtab ft=dosini: -# -[__PN__] -Description = MySQL ODBC __PF__ Driver -Driver = /usr/lib/libmyodbc3.so diff --git a/dev-db/myodbc/metadata.xml b/dev-db/myodbc/metadata.xml deleted file mode 100644 index 709689b..0000000 --- a/dev-db/myodbc/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - mysql-bugs@gentoo.org - MySQL - - diff --git a/dev-db/myodbc/myodbc-5.3.10.ebuild b/dev-db/myodbc/myodbc-5.3.10.ebuild deleted file mode 100644 index f4ac130..0000000 --- a/dev-db/myodbc/myodbc-5.3.10.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Build is broken with ninja -CMAKE_MAKEFILE_GENERATOR=emake - -inherit cmake-multilib 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="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="${MAJOR}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -# 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} - -# Careful! -DRIVER_NAME="${PN}-${SLOT}" - -# Patch document path so it doesn't install files to /usr -PATCHES=( - "${FILESDIR}/${MAJOR}-cmake-doc-path.patch" - "${FILESDIR}/5.3.10-cxxlinkage.patch" -# "${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch" - "${FILESDIR}/5.2.7-my_malloc.patch" -# "${FILESDIR}/${MAJOR}-mariadb-buffer_length.patch" -) - -src_prepare() { - # Fix undefined references due to standards change -# append-cflags -std=gnu89 - - # 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" - - cmake-utils_src_prepare -} - -multilib_src_configure() { -# local clientlib -# for clientlib in "mariadb" "perconaclient" "mysqlclient" "notfound" ; do -# [[ -x "${EPREFIX}/usr/$(get_libdir)/lib${clientlib}.so" ]] && break -# done -# [[ "${clientlib}x" == "notfoundx" ]] && \ -# die "Installed client library name could not be determined" - - # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB - mycmakeargs+=( - -DMYSQL_CXX_LINKAGE=0 - -DWITH_UNIXODBC=1 -# -DMYSQLCLIENT_LIB_NAME="${clientlib}" -# -DMYSQLCLIENT_LIB_NAME="mysqlclient" - -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} - -DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}" - -DMYSQL_INCLUDE_DIR="$(mysql_config --variable=pkgincludedir)" - -DMYSQLCLIENT_NO_THREADS=ON - -DDISABLE_GUI=ON - # The NUMA and LIBWRAP options are not really used. - # They are just copied from the server code - -DWITH_NUMA=OFF - -DWITH_LIBWRAP=OFF - ) - 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/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}" -} diff --git a/dev-db/myodbc/myodbc-5.3.4.ebuild b/dev-db/myodbc/myodbc-5.3.4.ebuild deleted file mode 100644 index 876fa6c..0000000 --- a/dev-db/myodbc/myodbc-5.3.4.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils multilib-minimal 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="gtk" - -# Does not build with mysql-connector-c -RDEPEND=" - dev-db/unixODBC[${MULTILIB_USEDEP}] - ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}] - gtk? ( x11-libs/gtk+:2= ) - !dev-db/mysql-connector-c -" -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" || die - - # Fix as-needed on the installer binary - 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" \ - "${FILESDIR}/${PV}-cxxlinkage.patch" \ - "${FILESDIR}/5.2.7-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 - -# append-ldflags - local mycmakeargs=( - -DMYSQL_CXX_LINKAGE=0 - -DWITH_UNIXODBC=1 - -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so" - -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} - -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)" - -DLIB_SUBDIR="$(get_libdir)" - -DMYSQL_CONFIG_EXECUTABLE="/usr/bin/${CHOST}-mysql_config" - -DDISABLE_GUI=$(usex gtk 0 1) - ) - 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}" -} -- cgit v1.2.3-65-gdbad