commit: dec8372a0b3e7cff5081aa32e3ead407d16e1836
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 12:47:46 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 12:48:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec8372a
dev-db/myodbc: Drop slot 5.2
Acked-by: Brian Evans <grknight <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-db/myodbc/Manifest | 1 -
.../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.2.7-r1-cxxlinkage.patch | 40 -------
dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 117 ------------------
dev-db/myodbc/myodbc-5.2.7-r3.ebuild | 131 ---------------------
profiles/package.mask | 5 -
7 files changed, 391 deletions(-)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index c15882461b4..a3791a4441a 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,4 +1,3 @@
-DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 BLAKE2B
297f1ae57802f682616283bae9c3ff7ef88f8f016274884794f6b476bf9b92bc1da8af9cb89f41fa2a74238f91fbc39b9427529b806ac4ffb52aecd895cd8cd8
SHA512
f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
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
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 6cfe7cd274b..00000000000
--- 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 bc6c65ef301..00000000000
--- 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.2.7-r1-cxxlinkage.patch
b/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch
deleted file mode 100644
index 2bdb4a581c8..00000000000
--- 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.cmake 2014-06-18 18:50:16.000000000 -0400
-+++ b/cmake/FindMySQL.cmake 2014-08-20 10:05:00.191485304 -0400
-@@ -105,16 +105,16 @@
- # Finally remove the dot
- STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}")
-
-- IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+ IF(MYSQL_CXX_LINKAGE)
- EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags"
- OUTPUT_VARIABLE _mysql_config_output
- )
- SET(MYSQL_CXX_LINKAGE 1)
-- ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+ ELSE (MYSQL_CXX_LINKAGE)
- EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
- OUTPUT_VARIABLE _mysql_config_output
- )
-- ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+ ENDIF(MYSQL_CXX_LINKAGE)
-
- # Remove the stl4port dependency
- STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output
"${_mysql_config_output}")
-diff -aurN mysql-connector-odbc-5.2.7-src.orig/CMakeLists.txt
mysql-connector-odbc-5.2.7-src/CMakeLists.txt
---- a/CMakeLists.txt 2014-08-27 13:51:27.050553560 -0400
-+++ b/CMakeLists.txt 2014-08-27 13:55:41.702359680 -0400
-@@ -256,10 +256,9 @@
- SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
- SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
-
--SET(LIB_SUBDIR "lib")
--IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES
"(x86_64|ppc64|ppc64p7|s390x|sparc64)")
-- SET(LIB_SUBDIR "lib64")
--ENDIF()
-+IF(NOT LIB_SUBDIR)
-+ MESSAGE(ERROR "LIB_SUBDIR is not set")
-+ENDIF(NOT LIB_SUBDIR)
- MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
-
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
deleted file mode 100644
index 2698ccabd5d..00000000000
--- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib eutils flag-o-matic versionator
-
-MAJOR="$(get_version_component_range 1-2 $PV)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/";
-SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-src_prepare() {
- # Remove Tests
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
- "${S}/CMakeLists.txt"
-
- # Fix as-needed on the installer binary
- echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >>
"${S}/installer/CMakeLists.txt"
-
- # Patch document path so it doesn't install files to /usr
- epatch "${FILESDIR}/cmake-doc-path.patch" \
- "${FILESDIR}/${PVR}-cxxlinkage.patch" \
- "${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
-
- # Fix undefined references due to standards change
- append-cflags -std=gnu89
-}
-
-multilib_src_configure() {
- # The RPM_BUILD flag does nothing except install to /usr/lib64 when
"x86_64"
- # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't
exist on MariaDB
- mycmakeargs+=(
- -DMYSQL_CXX_LINKAGE=0
- -DWITH_UNIXODBC=1
- -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so"
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
- -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
- -DLIB_SUBDIR="$(get_libdir)"
- )
- cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
- debug-print-function ${FUNCNAME} "$@"
-
- dodir /usr/share/${PN}-${SLOT}
- for i in odbc.ini odbcinst.ini; do
- einfo "Building $i"
- sed \
- -e "s,__PN__,${DRIVER_NAME},g" \
- -e "s,__PF__,${MAJOR},g" \
- -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
- >"${D}"/usr/share/${PN}-${SLOT}/${i} \
- <"${FILESDIR}"/${i}.m4 \
- || die "Failed to build $i"
- done;
- mv "${D}/usr/bin/myodbc-installer" \
- "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move
slotted binary"
-}
-
-pkg_config() {
-
- [ "${ROOT}" != "/" ] && \
- die 'Sorry, non-standard ROOT setting is not supported :-('
-
- local msg='MySQL ODBC driver'
- local drivers=$(/usr/bin/odbcinst -q -d)
-
- if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
- ebegin "Installing ${msg}"
- /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
- rc=$?
- eend $rc
- [ $rc -ne 0 ] && die
- else
- einfo "Skipping already installed ${msg}"
- fi
-
- local sources=$(/usr/bin/odbcinst -q -s)
- msg='sample MySQL ODBC DSN'
- if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
- ebegin "Installing ${msg}"
- /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
- rc=$?
- eend $rc
- [ $rc -ne 0 ] && die
- else
- einfo "Skipping already installed ${msg}"
- fi
-}
-
-pkg_postinst() {
-
- elog "If this is a new install, please run the following command"
- elog "to configure the MySQL ODBC drivers and sources:"
- elog "emerge --config =${CATEGORY}/${PF}"
- elog "Please note that the driver name used to form the DSN now
includes the SLOT."
- elog "The myodbc-install utility is installed as
myodbc-install-${MAJOR}"
-}
diff --git a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
deleted file mode 100644
index f44807fe599..00000000000
--- a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-# Does not build with mysql-connector-c
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
- !dev-db/mysql-connector-c
- !>=dev-db/mariadb-10.2.0
-"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-src_prepare() {
- # Remove Tests
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
- "${S}/CMakeLists.txt"
-
- # Fix as-needed on the installer binary
- echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >>
"${S}/installer/CMakeLists.txt"
-
- # Patch document path so it doesn't install files to /usr
- local FILES=( "${FILESDIR}/cmake-doc-path.patch"
- "${FILESDIR}/${PV}-r1-cxxlinkage.patch"
- "${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
- "${FILESDIR}/${PV}-my_malloc.patch" )
-
- # Fix undefined references due to standards change
- append-cflags -std=gnu89
-
- MYSQL_SERVER_INCLUDE=$(mysql_config --include | cut -d ' ' -f 1)
- append-cflags "${MYSQL_SERVER_INCLUDE}/server"
-
- append-cppflags -DSTACK_DIRECTION=1
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- # The RPM_BUILD flag does nothing except install to /usr/lib64 when
"x86_64"
- # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't
exist on MariaDB
- mycmakeargs+=(
- -DMYSQL_CXX_LINKAGE=0
- -DWITH_UNIXODBC=1
- -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so"
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
- -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
- -DLIB_SUBDIR="$(get_libdir)"
- -DNO_THREADS=ON
- )
- 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" \
- -e
"s,lib/libmyodbc,$(get_libdir)/${DRIVER_NAME}/libmyodbc,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/profiles/package.mask b/profiles/package.mask
index 130001db8a5..e70853e7dde 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -162,11 +162,6 @@ media-libs/celt
# experimental features and accept a more unstable release.
>=www-client/chromium-71
-# Brian Evans <[email protected]> (16 Sep 2018)
-# Broken build on modern clients. Please update to latest slot.
-# Slot to be removed in 30 days
-dev-db/myodbc:5.2
-
# Andreas K. Hüttel <[email protected]> (11 Sep 2018)
# Mask transition ebuilds that were needed only for <glibc-2.26
# We will keep them in the tree as long as we have masked
