summaryrefslogtreecommitdiff
path: root/dev-db/myodbc
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/myodbc')
-rw-r--r--dev-db/myodbc/Manifest20
-rw-r--r--dev-db/myodbc/files/5.3-cmake-doc-path.patch43
-rw-r--r--dev-db/myodbc/files/5.3.10-cxxlinkage.patch29
-rw-r--r--dev-db/myodbc/files/5.3.10-mariadb.patch58
-rw-r--r--dev-db/myodbc/files/8.0.16-cxxlinkage.patch63
-rw-r--r--dev-db/myodbc/files/cmake-doc-path.patch43
-rw-r--r--dev-db/myodbc/myodbc-5.3.10-r3.ebuild130
-rw-r--r--dev-db/myodbc/myodbc-5.3.9.ebuild112
-rw-r--r--dev-db/myodbc/myodbc-8.0.16.ebuild119
-rw-r--r--dev-db/myodbc/myodbc-8.0.17.ebuild119
-rw-r--r--dev-db/myodbc/myodbc-8.0.20.ebuild118
-rw-r--r--dev-db/myodbc/myodbc-8.0.21.ebuild (renamed from dev-db/myodbc/myodbc-8.0.19.ebuild)0
12 files changed, 2 insertions, 852 deletions
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index b9fbb6735fb8..902a632385ee 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,23 +1,7 @@
-AUX 5.3-cmake-doc-path.patch 1480 BLAKE2B 5f89253a86fa97fbf4103fbe797f60449245195e9c8d0f6d7f065e654a402de0461459dd11d9d878f0794089261ee5ee9fac3240bf90f7c8382edb54d84b27a6 SHA512 aa2303161af2b53608acc127464951cf77492a1a90e869a58893ba10a014077d7f8f319325b77713fffceeaa002943f4ce52b6cb9571b0b3d3d7ab562601968d
-AUX 5.3.10-cxxlinkage.patch 1027 BLAKE2B b3df78658e4fb3243debb6f95cea6c5530db309ffc50f3a6afaff8bce143d147b4645a4bef4a54f6d04203ea132d4245812f5a2473ad7e9899f6e6b3c0799213 SHA512 f4d6df55313ccba995c8bd2e182397ce2652c2fbc0f0706474386654fb890fc47cad3a18f306206e840a47b729569e9a0ccb1cc2401c5280792afc4f544b41fd
-AUX 5.3.10-mariadb.patch 1744 BLAKE2B a9e33c86f999394d77757f69f1f314238123fa4158297961b4ce0f501e6fb743927e892c1f6640945842e843da56a826e5da1a968d84f7e5dcf3b2b4a590c0e8 SHA512 ebf62a2e0cc901fce81d0ad358f62d1c41494a5e35fb5a4df6913d1f4d5b8bbb638a23cabfe483818efa39688744b7be8b98d922b4bdff830de701c665da0fa0
AUX 8.0-cmake-doc-path.patch 1384 BLAKE2B 96f2bb290e48363c9cfababb845732291f709a4f996f13ea39cb2dd5fc0a19a68dd87cbf3454fd48c5f2281ebb0f786f2415b6e45f5714c967e5ba5b5005bd5d SHA512 d2a007d9c6846ad22a1f43c621f0376085802f3b15ca846fa1dd5bc8c3fb6ec1dc913240cb1135ab16f9dd369c8680aba5f600c7d28660dd28bb06873d97cce3
-AUX 8.0.16-cxxlinkage.patch 1890 BLAKE2B 0b19115acada4abea75466891cced6979011736de9a64686b8ef5ec1f9bfad8c6297ac48f26d3297f24b6817cfaced033a3d42120bfb948cc1e9e7204665abc4 SHA512 460aad29170b8694cc6776553fef8ac15ca715f7dceea392f4a0c75fef98ac6e7a40cdd57c86ae4bcd216b942fa0a2ea92862defc54f8466ea32c74f6a6832e5
-AUX cmake-doc-path.patch 1498 BLAKE2B b79110c92b7fc80c64fdf05b469c4bb333d68610ff4fadc78bd307689651e41bcd66f33fd782db1b69c863ef81faee3d5eb485d5c9bd284db8be3948d2bec7e7 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e
AUX myodbc-8.0.19-cxxlinkage.patch 812 BLAKE2B 18e0f62ceb6bb33ad282972a8aae2f755c0324dbff09b450230d7eafb054a37b2f2ea47d6ab9eed42b0ce0682383c6a9e00d222dd5d7c81bb0ea4f4fe470808e SHA512 f4eb1f8c2182a1a6002548a3ef1fa37e859613b8ab31c67c34d6d7f237f435fe2cdada05e75a518d67c05175e5a6535ece55541bfde477df9820a871e83347d3
AUX odbc.ini.m4 406 BLAKE2B 3a20c28b1971753a14a4aa4d30efcc7de833488501a41d9404987567623d48250ce1daea1d3138adaef36741c4f2e0eafc60eba554e5262b45084f93f5205160 SHA512 84ab2a3aab594123d42b65205a7faf8e91fe9416a9e3c4c4c354533b9a298395f59172649c91dc0b671392bfbe5baeaddb6aa47119ce4c825917f3977d9dd521
AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4a21a2bf0bd5f1bd1e5c3d1c9a28522e3aa07c1261abac92301819d4112ac6a000a729aca9f7f7ad6 SHA512 6d929bbffd602a9f060a05998149a6b16334f8a5e3db30d02ff5d38c0065085d085042521e700b87a63766e32aa27ae92be72cef33c2a7aa8f6767b6b71c82c8
-DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a566668be17f595ca7ba SHA512 ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
-DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e SHA512 02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
-DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
-DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d SHA512 b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
-DIST mysql-connector-odbc-8.0.17-src.tar.gz 3953949 BLAKE2B 6d7fcef89c15d9f421f690291e793f1020b5f77f5e2132f130becd1ceed041887ffce77fda4cbc411d06972f1d488d434c8f132c0778af30a436c6b6e372e59e SHA512 474b107eb5d4c23e10c24dcf37b3787418afbd34ea385791fd0d8cdb5d29a6770cde4a61e3591329b344c442ff8f6daad3a2c250e881f9f5837eaa4e951af7e4
-DIST mysql-connector-odbc-8.0.19-src.tar.gz 3770465 BLAKE2B 7c57d85c13c17c08e1aed1deff3d60851ff68474c42971ea796fc50e3b766d7c49e5d993527691534c30f4007a94be852ac240bf50244cd3adf0f9500fbfc68c SHA512 4761d9d3eeccc932bfd76b9b27be4672e65b6125e85312dcfcb0b8b3cfe0ccf19982d40b2f85ae26e936e968d35d3136bab201b7dcb47eb4ad460c178c0d9f88
-DIST mysql-connector-odbc-8.0.20-src.tar.gz 3734268 BLAKE2B 606e8fe88712371da74bee8f44b21a56a2572603b1af693733fdd9ccd7ab62cb16a224593b368a40a021ed87ee433213a1a03b775c07b6bd28bbc44b7f905288 SHA512 483eb5c1d4a75ec4ec8681b33633bf89db708737191d149e1fed3c8bf0f839ab70951982a664fbf078c73fdfc114b126b5146682238faa244c904becf80858d7
-EBUILD myodbc-5.3.10-r3.ebuild 3591 BLAKE2B 0b7fb7976b32eb39b4e77c1d95011a623eab9ae83f02414911e7408614126a6a838d9ad8142092505c060d4142f1ac3f22f561ab6997e548999626c8c7b1e783 SHA512 73827923259949c1054f52727ec692312c37d887a6f56b8116d83dc9a91a2928ec2bacad723d9b41a32be56aea654cd94959f93237591d0aeb67df69ea563b41
-EBUILD myodbc-5.3.9.ebuild 3071 BLAKE2B 505f2c1707196ce3cf18a6923e06a441b61586658456fd4c7785ad8ce05e66794084c72d010a0ec00ee980fa8ec343e1df277ec2547573b81ad10607ba68a694 SHA512 abbc5624fbe6aac4a6dfb2483e697141f6c16ea3ce3060fb5b4e12c3c9c78a50cb1d0678f8967b9383944ae3a3c94d9d9f6f4bdb4b9103ee9d26cc182bdee86a
-EBUILD myodbc-8.0.16.ebuild 3101 BLAKE2B 28664fd845b3bfb251e2f754c06b1b21ac1fb0ce85fbcaf620ff4ebea4ee181fe3c2f7c00ff8b47a084dc2e31a893c35f2d28e6176a4a40d508a6b0ebdfd57cd SHA512 856408b130fad4e4fc70fd48d841a2969aa85df46eeebb1d1476e5054b5d78af8e799463a7314f6db4131e4868146d6838c528b85f5bec1c569230231516a2cc
-EBUILD myodbc-8.0.17.ebuild 3111 BLAKE2B 4b0f0391bb0b71fc277da100630891bfca04d4ca87c3852eb728c1ba19c3de875654ee7fc1c5c66de1071f9c732c5bd2203ebd83f3654d616617895fa7a936ed SHA512 c5f960395fdb30f398dd182dafd4b75fcb6d7270ac327637e3d2fe169727cb377ee66a4e46e1a14221fc6c7aa34a617d5da636bc96f909eef772f73ec56b6a00
-EBUILD myodbc-8.0.19.ebuild 3113 BLAKE2B e27fc21290dfa09309813f047e0c72bad42c2cc5ca6aa54c3698b0456b42007d3c7676c5062838be9ecb8033d8b1e12dae01a7bc213cd7ce3356bdd30dee7a86 SHA512 f34dc7a7aaa9825c42ffca24cb9ffa136a8e0abeb5de0871bb3413f7b28cc8587fb01768d60ca55434787ca818acb29d97b13b6ba3ef9e3791e38c8f7b445652
-EBUILD myodbc-8.0.20.ebuild 3116 BLAKE2B e1d9057d6619769695a2035f3c130c4a7568a61f7ebdbdd95536d958ccdb0059324a2eecdaa5c9a24e71f3d0ef705218f1d9ff0f7f83f9f8211e58eb9332040c SHA512 89da191c673dd03bdc1189a1b79230158b3dc3d67644a1242e70db4f202b9f5d39aec001c04abe5d6da00f7aab41c1a36fd4815d5484f2373aed6f8a072c1f9a
+DIST mysql-connector-odbc-8.0.21-src.tar.gz 3744268 BLAKE2B d43942cc94858023ae0c2140ffba8a0a676a763b167ef4cbf500b2b9c14d2b3486696f68d03b2cc4607cb7f302e2af25f1e5ce564441ecf6d44a03874e489c07 SHA512 dca83db2ae25e08e44eaf814cad7234c8b17c2935de69bec7d238881404b2bc062fd7e28c626b594a062ee488123be545b9384742e09168e64a1423425a41c40
+EBUILD myodbc-8.0.21.ebuild 3113 BLAKE2B e27fc21290dfa09309813f047e0c72bad42c2cc5ca6aa54c3698b0456b42007d3c7676c5062838be9ecb8033d8b1e12dae01a7bc213cd7ce3356bdd30dee7a86 SHA512 f34dc7a7aaa9825c42ffca24cb9ffa136a8e0abeb5de0871bb3413f7b28cc8587fb01768d60ca55434787ca818acb29d97b13b6ba3ef9e3791e38c8f7b445652
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
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 54f35d41d96a..000000000000
--- 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.10-cxxlinkage.patch b/dev-db/myodbc/files/5.3.10-cxxlinkage.patch
deleted file mode 100644
index 796a13754f86..000000000000
--- 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.10-mariadb.patch b/dev-db/myodbc/files/5.3.10-mariadb.patch
deleted file mode 100644
index c860349e4b71..000000000000
--- a/dev-db/myodbc/files/5.3.10-mariadb.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/include/sys_main.h 2018-01-19 05:36:38.000000000 -0500
-+++ b/include/sys_main.h 2018-03-01 11:40:04.554713079 -0500
-@@ -20,6 +20,8 @@
- extern "C" {
- #endif
-
-+#include "sys/mysql/psi/psi_memory.h"
-+
- #define MY_FAE 8 /* Fatal if any error */
- #define MY_WME 16 /* Write message on error */
- #define MY_ZEROFILL 32 /* my_malloc(), fill array with zero */
---- a/driver/connect.c 2018-01-19 05:36:38.000000000 -0500
-+++ b/driver/connect.c 2018-03-01 11:39:51.458676373 -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));
- }
- #endif
--#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;
-@@ -510,7 +510,7 @@
- }
- }
-
--#if MYSQL_VERSION_ID >= 50709
-+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
- mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_len);
- #else
- // for older versions just use net_buffer_length() macro
diff --git a/dev-db/myodbc/files/8.0.16-cxxlinkage.patch b/dev-db/myodbc/files/8.0.16-cxxlinkage.patch
deleted file mode 100644
index 326036c0b88d..000000000000
--- a/dev-db/myodbc/files/8.0.16-cxxlinkage.patch
+++ /dev/null
@@ -1,63 +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|aarch64)")
-- 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/driver/CMakeLists.txt b/driver/CMakeLists.txt
---- a/driver/CMakeLists.txt 2019-06-11 13:46:37.863345781 -0400
-+++ b/driver/CMakeLists.txt 2019-06-11 14:04:25.758997218 -0400
-@@ -194,29 +194,3 @@
-
- ENDWHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
-
--IF(MYSQL8)
-- SET(ssl_libs_to_find
-- libcrypto.*
-- libssl.*
-- libeay32.*
-- ssleay32.*
-- )
--
-- SET(_SSL_PATH)
--
-- IF(WIN32)
-- SET(_SSL_PATH ${MYSQL_DIR}/bin/)
-- ELSE(WIN32)
-- SET(_SSL_PATH ${MYSQL_DIR}/lib/)
-- ENDIF(WIN32)
--
-- FOREACH(_lib_to_find IN LISTS ssl_libs_to_find)
-- INSTALL(DIRECTORY ${_SSL_PATH} DESTINATION ${LIB_SUBDIR}
-- FILES_MATCHING
-- PATTERN "mecab" EXCLUDE
-- PATTERN "pkgconfig" EXCLUDE
-- PATTERN "plugin" EXCLUDE
-- PATTERN ${_lib_to_find})
-- ENDFOREACH()
--
--ENDIF(MYSQL8)
-\ No newline at end of file
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 c7f7d9d37ce7..000000000000
--- 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/myodbc-5.3.10-r3.ebuild b/dev-db/myodbc/myodbc-5.3.10-r3.ebuild
deleted file mode 100644
index ffae941ae9e1..000000000000
--- a/dev-db/myodbc/myodbc-5.3.10-r3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 libmariadb
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- <dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
- !>=dev-db/mariadb-10.2.0[client-libs(+)]
- !dev-db/mariadb-connector-c[mysqlcompat(-)]
-"
-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}/5.3.10-mariadb.patch"
-)
-
-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"
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
- mycmakeargs+=(
- -DMYSQL_CXX_LINKAGE=0
- -DWITH_UNIXODBC=1
- -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.9.ebuild b/dev-db/myodbc/myodbc-5.3.9.ebuild
deleted file mode 100644
index af3037935451..000000000000
--- a/dev-db/myodbc/myodbc-5.3.9.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit multilib-minimal versionator
-
-MAJOR="$(get_version_component_range 1-2 $PV)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-linux-debian9-x86"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/"
-BASE_URI="https://cdn.mysql.com/Downloads/Connector-ODBC/${MAJOR}/${MY_P}"
-#https://cdn.mysql.com//Downloads/Connector-ODBC/5.3/mysql-connector-odbc-5.3.8-linux-debian8-x86-64bit.tar.gz
-SRC_URI="amd64? ( ${BASE_URI}-64bit.tar.gz abi_x86_32? ( ${BASE_URI}-32bit.tar.gz ) )
- x86? ( ${BASE_URI}-32bit.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]"
-S=${WORKDIR}
-
-#src_configure() { :; }
-
-src_compile() { :; }
-
-multilib_src_install() {
- cd "${S}" || die
- local prefix
- if use amd64 && multilib_is_native_abi ; then
- prefix="${MY_P}-64bit"
- else
- prefix="${MY_P}-32bit"
- fi
- exeinto /usr/$(get_libdir)/${PN}-${MAJOR}
- doexe ${prefix}/lib/libmyodbc5a.so ${prefix}/lib/libmyodbc5w.so
-# use gtk && doexe ${prefix}/lib/libmyodbc5S.so
-}
-
-multilib_src_install_all() {
- local DRIVER_NAME="${PN}-${SLOT}"
- local prefix
- if use amd64 ; then
- prefix="${MY_P}-64bit"
- else
- prefix="${MY_P}-32bit"
- fi
- exeinto /usr/bin
- newexe "${prefix}/bin/myodbc-installer" myodbc-installer-${MAJOR}
-
- 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" \
- -e "s,lib/libmyodbc,$(get_libdir)/${DRIVER_NAME}/libmyodbc,g" \
- >"${D}/usr/share/${DRIVER_NAME}/${i}" \
- <"${FILESDIR}"/${i}.m4 \
- || die "Failed to build $i"
- done;
-
- dodoc ${prefix}/{ChangeLog,INSTALL,README,Licenses_for_Third-Party_Components.txt}
-}
-
-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-8.0.16.ebuild b/dev-db/myodbc/myodbc-8.0.16.ebuild
deleted file mode 100644
index a5db40b27ad7..000000000000
--- a/dev-db/myodbc/myodbc-8.0.16.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-MAJOR="$(ver_cut 1-2)"
-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=""
-
-# Broken when built dynamically against libmysqlclient.so
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
-"
-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}/8.0.16-cxxlinkage.patch"
-)
-
-src_prepare() {
- # Remove Tests
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
- "${S}/CMakeLists.txt"
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- mycmakeargs+=(
- -DMYSQLCLIENT_STATIC_LINKING=1
- -DMYSQL_CXX_LINKAGE=1
- -DWITH_UNIXODBC=1
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
- -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
- -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-8.0.17.ebuild b/dev-db/myodbc/myodbc-8.0.17.ebuild
deleted file mode 100644
index aabca64a42ab..000000000000
--- a/dev-db/myodbc/myodbc-8.0.17.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-MAJOR="$(ver_cut 1-2)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/"
-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=""
-
-# Broken when built dynamically against libmysqlclient.so
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
-"
-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}/8.0.16-cxxlinkage.patch"
-)
-
-src_prepare() {
- # Remove Tests
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
- "${S}/CMakeLists.txt"
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- mycmakeargs+=(
- -DMYSQLCLIENT_STATIC_LINKING=1
- -DMYSQL_CXX_LINKAGE=1
- -DWITH_UNIXODBC=1
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
- -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
- -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-8.0.20.ebuild b/dev-db/myodbc/myodbc-8.0.20.ebuild
deleted file mode 100644
index 4577fecc2341..000000000000
--- a/dev-db/myodbc/myodbc-8.0.20.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-MAJOR="$(ver_cut 1-2)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/"
-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=""
-
-# Broken when built dynamically against libmysqlclient.so
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
-"
-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}/${PN}-8.0.19-cxxlinkage.patch"
-)
-
-src_prepare() {
- # Remove Tests
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
- "${S}/CMakeLists.txt"
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- mycmakeargs+=(
- -DMYSQLCLIENT_STATIC_LINKING=1
- -DMYSQL_CXX_LINKAGE=1
- -DWITH_UNIXODBC=1
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
- -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
- -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-8.0.19.ebuild b/dev-db/myodbc/myodbc-8.0.21.ebuild
index 93159f140c95..93159f140c95 100644
--- a/dev-db/myodbc/myodbc-8.0.19.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.21.ebuild