Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, profiles/, dev-db/myodbc/files/
Date: Tue, 16 Oct 2018 12:48:28
Message-Id: 1539694087.dec8372a0b3e7cff5081aa32e3ead407d16e1836.asturm@gentoo
1 commit: dec8372a0b3e7cff5081aa32e3ead407d16e1836
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 16 12:47:46 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 16 12:48:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec8372a
7
8 dev-db/myodbc: Drop slot 5.2
9
10 Acked-by: Brian Evans <grknight <AT> gentoo.org>
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 dev-db/myodbc/Manifest | 1 -
15 .../myodbc/files/5.2.7-mariadb-dynamic-array.patch | 79 -------------
16 dev-db/myodbc/files/5.2.7-my_malloc.patch | 18 ---
17 dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch | 40 -------
18 dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 117 ------------------
19 dev-db/myodbc/myodbc-5.2.7-r3.ebuild | 131 ---------------------
20 profiles/package.mask | 5 -
21 7 files changed, 391 deletions(-)
22
23 diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
24 index c15882461b4..a3791a4441a 100644
25 --- a/dev-db/myodbc/Manifest
26 +++ b/dev-db/myodbc/Manifest
27 @@ -1,4 +1,3 @@
28 -DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 BLAKE2B 297f1ae57802f682616283bae9c3ff7ef88f8f016274884794f6b476bf9b92bc1da8af9cb89f41fa2a74238f91fbc39b9427529b806ac4ffb52aecd895cd8cd8 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
29 DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a566668be17f595ca7ba SHA512 ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
30 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e SHA512 02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
31 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
32
33 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
34 deleted file mode 100644
35 index 6cfe7cd274b..00000000000
36 --- a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
37 +++ /dev/null
38 @@ -1,79 +0,0 @@
39 -diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c
40 ---- a/driver/catalog_no_i_s.c 2014-06-18 18:50:16.000000000 -0400
41 -+++ b/driver/catalog_no_i_s.c 2014-08-20 14:08:33.997339096 -0400
42 -@@ -1093,7 +1093,11 @@
43 - unsigned long *lengths;
44 - SQLRETURN rc= SQL_SUCCESS;
45 -
46 -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
47 -+ my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0));
48 -+#else
49 - my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
50 -+#endif
51 -
52 - /* Get the list of tables that match szCatalog and szTable */
53 - pthread_mutex_lock(&stmt->dbc->lock);
54 -diff -aurN a/driver/desc.c b/driver/desc.c
55 ---- a/driver/desc.c 2014-06-18 18:50:16.000000000 -0400
56 -+++ b/driver/desc.c 2014-08-20 14:07:37.409169269 -0400
57 -@@ -63,8 +63,12 @@
58 - but in desc_get_rec we manually get a pointer to it. This avoids
59 - having to call set_dynamic after modifying the DESCREC.
60 - */
61 -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
62 -+ if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0)))
63 -+#else
64 - if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
65 -+#endif
66 - {
67 - x_free((char *)desc);
68 - return NULL;
69 - }
70 -@@ -995,9 +1003,15 @@
71 -
72 - /* copy the records */
73 - delete_dynamic(&dest->records);
74 -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
75 -+ if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
76 -+ src->records.max_element,
77 -+ src->records.alloc_increment, MYF(0)))
78 -+#else
79 - if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
80 - src->records.max_element,
81 - src->records.alloc_increment))
82 -+#endif
83 - {
84 - return set_desc_error(dest, "HY001",
85 - "Memory allocation error",
86 -diff -aurN a/driver/handle.c b/driver/handle.c
87 ---- a/driver/handle.c 2014-06-18 18:50:16.000000000 -0400
88 -+++ b/driver/handle.c 2014-08-20 14:05:00.364248403 -0400
89 -@@ -403,7 +403,11 @@
90 - }
91 - }
92 -
93 -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
94 -+ my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0));
95 -+#else
96 - my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
97 -+#endif
98 - memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
99 - (*param_bind)->max_element);
100 -
101 -diff -aurN a/driver/parse.c b/driver/parse.c
102 ---- a/driver/parse.c 2014-06-18 18:50:16.000000000 -0400
103 -+++ b/driver/parse.c 2014-08-20 14:03:54.336383876 -0400
104 -@@ -129,8 +129,13 @@
105 -
106 - /* TODO: Store offsets rather than ptrs. In this case we will be fine
107 - if work with copy of the originally parsed string */
108 -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
109 -+ my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10, MYF(0));
110 -+ my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0));
111 -+#else
112 - my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10);
113 - my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
114 -+#endif
115 - }
116 -
117 - return pq;
118
119 diff --git a/dev-db/myodbc/files/5.2.7-my_malloc.patch b/dev-db/myodbc/files/5.2.7-my_malloc.patch
120 deleted file mode 100644
121 index bc6c65ef301..00000000000
122 --- a/dev-db/myodbc/files/5.2.7-my_malloc.patch
123 +++ /dev/null
124 @@ -1,18 +0,0 @@
125 -diff -Brau a/util/odbcinstw.c b/util/odbcinstw.c
126 ---- a/util/odbcinstw.c 2014-04-23 21:54:40.000000000 +0200
127 -+++ b/util/odbcinstw.c 2015-05-08 15:29:09.400568356 +0200
128 -@@ -68,13 +68,7 @@
129 -
130 - if (lpszRetBuffer && cbRetBuffer)
131 - {
132 -- ret= malloc(cbRetBuffer + 1);
133 -- /*
134 -- We cannot rely on getting correct results from the next call of
135 -- SQLGetPrivateProfileString. So, taking precautions against unititialized
136 -- values in the allocated buffer.
137 -- */
138 -- memset(ret, 0, cbRetBuffer + 1);
139 -+ ret= my_malloc(cbRetBuffer + 1, MYF(MY_ZEROFILL));
140 - }
141 - else
142 - ret= NULL;
143
144 diff --git a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch b/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch
145 deleted file mode 100644
146 index 2bdb4a581c8..00000000000
147 --- a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch
148 +++ /dev/null
149 @@ -1,40 +0,0 @@
150 -diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
151 ---- a/cmake/FindMySQL.cmake 2014-06-18 18:50:16.000000000 -0400
152 -+++ b/cmake/FindMySQL.cmake 2014-08-20 10:05:00.191485304 -0400
153 -@@ -105,16 +105,16 @@
154 - # Finally remove the dot
155 - STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}")
156 -
157 -- IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
158 -+ IF(MYSQL_CXX_LINKAGE)
159 - EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags"
160 - OUTPUT_VARIABLE _mysql_config_output
161 - )
162 - SET(MYSQL_CXX_LINKAGE 1)
163 -- ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
164 -+ ELSE (MYSQL_CXX_LINKAGE)
165 - EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
166 - OUTPUT_VARIABLE _mysql_config_output
167 - )
168 -- ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
169 -+ ENDIF(MYSQL_CXX_LINKAGE)
170 -
171 - # Remove the stl4port dependency
172 - STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}")
173 -diff -aurN mysql-connector-odbc-5.2.7-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.7-src/CMakeLists.txt
174 ---- a/CMakeLists.txt 2014-08-27 13:51:27.050553560 -0400
175 -+++ b/CMakeLists.txt 2014-08-27 13:55:41.702359680 -0400
176 -@@ -256,10 +256,9 @@
177 - SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
178 - SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
179 -
180 --SET(LIB_SUBDIR "lib")
181 --IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)")
182 -- SET(LIB_SUBDIR "lib64")
183 --ENDIF()
184 -+IF(NOT LIB_SUBDIR)
185 -+ MESSAGE(ERROR "LIB_SUBDIR is not set")
186 -+ENDIF(NOT LIB_SUBDIR)
187 - MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
188 -
189 - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
190
191 diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
192 deleted file mode 100644
193 index 2698ccabd5d..00000000000
194 --- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
195 +++ /dev/null
196 @@ -1,117 +0,0 @@
197 -# Copyright 1999-2018 Gentoo Foundation
198 -# Distributed under the terms of the GNU General Public License v2
199 -
200 -EAPI=5
201 -inherit cmake-multilib eutils flag-o-matic versionator
202 -
203 -MAJOR="$(get_version_component_range 1-2 $PV)"
204 -MY_PN="mysql-connector-odbc"
205 -MY_P="${MY_PN}-${PV/_p/r}-src"
206 -
207 -DESCRIPTION="ODBC driver for MySQL"
208 -HOMEPAGE="http://www.mysql.com/products/myodbc/"
209 -SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
210 -RESTRICT="primaryuri"
211 -
212 -LICENSE="GPL-2"
213 -SLOT="${MAJOR}"
214 -KEYWORDS="amd64 ppc x86"
215 -IUSE=""
216 -
217 -RDEPEND="
218 - dev-db/unixODBC[${MULTILIB_USEDEP}]
219 - ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]"
220 -DEPEND="${RDEPEND}"
221 -S=${WORKDIR}/${MY_P}
222 -
223 -# Careful!
224 -DRIVER_NAME="${PN}-${SLOT}"
225 -
226 -src_prepare() {
227 - # Remove Tests
228 - sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
229 - "${S}/CMakeLists.txt"
230 -
231 - # Fix as-needed on the installer binary
232 - echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
233 -
234 - # Patch document path so it doesn't install files to /usr
235 - epatch "${FILESDIR}/cmake-doc-path.patch" \
236 - "${FILESDIR}/${PVR}-cxxlinkage.patch" \
237 - "${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
238 -
239 - # Fix undefined references due to standards change
240 - append-cflags -std=gnu89
241 -}
242 -
243 -multilib_src_configure() {
244 - # The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
245 - # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
246 - mycmakeargs+=(
247 - -DMYSQL_CXX_LINKAGE=0
248 - -DWITH_UNIXODBC=1
249 - -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so"
250 - -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
251 - -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
252 - -DLIB_SUBDIR="$(get_libdir)"
253 - )
254 - cmake-utils_src_configure
255 -}
256 -
257 -multilib_src_install_all() {
258 - debug-print-function ${FUNCNAME} "$@"
259 -
260 - dodir /usr/share/${PN}-${SLOT}
261 - for i in odbc.ini odbcinst.ini; do
262 - einfo "Building $i"
263 - sed \
264 - -e "s,__PN__,${DRIVER_NAME},g" \
265 - -e "s,__PF__,${MAJOR},g" \
266 - -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
267 - >"${D}"/usr/share/${PN}-${SLOT}/${i} \
268 - <"${FILESDIR}"/${i}.m4 \
269 - || die "Failed to build $i"
270 - done;
271 - mv "${D}/usr/bin/myodbc-installer" \
272 - "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
273 -}
274 -
275 -pkg_config() {
276 -
277 - [ "${ROOT}" != "/" ] && \
278 - die 'Sorry, non-standard ROOT setting is not supported :-('
279 -
280 - local msg='MySQL ODBC driver'
281 - local drivers=$(/usr/bin/odbcinst -q -d)
282 -
283 - if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
284 - ebegin "Installing ${msg}"
285 - /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
286 - rc=$?
287 - eend $rc
288 - [ $rc -ne 0 ] && die
289 - else
290 - einfo "Skipping already installed ${msg}"
291 - fi
292 -
293 - local sources=$(/usr/bin/odbcinst -q -s)
294 - msg='sample MySQL ODBC DSN'
295 - if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
296 - ebegin "Installing ${msg}"
297 - /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
298 - rc=$?
299 - eend $rc
300 - [ $rc -ne 0 ] && die
301 - else
302 - einfo "Skipping already installed ${msg}"
303 - fi
304 -}
305 -
306 -pkg_postinst() {
307 -
308 - elog "If this is a new install, please run the following command"
309 - elog "to configure the MySQL ODBC drivers and sources:"
310 - elog "emerge --config =${CATEGORY}/${PF}"
311 - elog "Please note that the driver name used to form the DSN now includes the SLOT."
312 - elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
313 -}
314
315 diff --git a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
316 deleted file mode 100644
317 index f44807fe599..00000000000
318 --- a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
319 +++ /dev/null
320 @@ -1,131 +0,0 @@
321 -# Copyright 1999-2018 Gentoo Foundation
322 -# Distributed under the terms of the GNU General Public License v2
323 -
324 -EAPI=6
325 -inherit cmake-multilib flag-o-matic versionator
326 -
327 -MAJOR="$(get_version_component_range 1-2 $PV)"
328 -MY_PN="mysql-connector-odbc"
329 -MY_P="${MY_PN}-${PV/_p/r}-src"
330 -
331 -DESCRIPTION="ODBC driver for MySQL"
332 -HOMEPAGE="http://www.mysql.com/products/myodbc/"
333 -SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
334 -RESTRICT="primaryuri"
335 -
336 -LICENSE="GPL-2"
337 -SLOT="${MAJOR}"
338 -KEYWORDS="amd64 ~ppc ~x86"
339 -IUSE=""
340 -
341 -# Does not build with mysql-connector-c
342 -RDEPEND="
343 - dev-db/unixODBC[${MULTILIB_USEDEP}]
344 - ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
345 - !dev-db/mysql-connector-c
346 - !>=dev-db/mariadb-10.2.0
347 -"
348 -DEPEND="${RDEPEND}"
349 -S=${WORKDIR}/${MY_P}
350 -
351 -# Careful!
352 -DRIVER_NAME="${PN}-${SLOT}"
353 -
354 -src_prepare() {
355 - # Remove Tests
356 - sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
357 - "${S}/CMakeLists.txt"
358 -
359 - # Fix as-needed on the installer binary
360 - echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
361 -
362 - # Patch document path so it doesn't install files to /usr
363 - local FILES=( "${FILESDIR}/cmake-doc-path.patch"
364 - "${FILESDIR}/${PV}-r1-cxxlinkage.patch"
365 - "${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
366 - "${FILESDIR}/${PV}-my_malloc.patch" )
367 -
368 - # Fix undefined references due to standards change
369 - append-cflags -std=gnu89
370 -
371 - MYSQL_SERVER_INCLUDE=$(mysql_config --include | cut -d ' ' -f 1)
372 - append-cflags "${MYSQL_SERVER_INCLUDE}/server"
373 -
374 - append-cppflags -DSTACK_DIRECTION=1
375 -
376 - cmake-utils_src_prepare
377 -}
378 -
379 -multilib_src_configure() {
380 - # The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
381 - # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
382 - mycmakeargs+=(
383 - -DMYSQL_CXX_LINKAGE=0
384 - -DWITH_UNIXODBC=1
385 - -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so"
386 - -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
387 - -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
388 - -DLIB_SUBDIR="$(get_libdir)"
389 - -DNO_THREADS=ON
390 - )
391 - cmake-utils_src_configure
392 -}
393 -
394 -multilib_src_install_all() {
395 - debug-print-function ${FUNCNAME} "$@"
396 -
397 - dodir /usr/share/${PN}-${SLOT}
398 - for i in odbc.ini odbcinst.ini; do
399 - einfo "Building $i"
400 - sed \
401 - -e "s,__PN__,${DRIVER_NAME},g" \
402 - -e "s,__PF__,${MAJOR},g" \
403 - -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
404 - -e "s,lib/libmyodbc,$(get_libdir)/${DRIVER_NAME}/libmyodbc,g" \
405 - >"${D}"/usr/share/${PN}-${SLOT}/${i} \
406 - <"${FILESDIR}"/${i}.m4 \
407 - || die "Failed to build $i"
408 - done;
409 - mv "${D}/usr/bin/myodbc-installer" \
410 - "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
411 -}
412 -
413 -pkg_config() {
414 -
415 - [ "${ROOT}" != "/" ] && \
416 - die 'Sorry, non-standard ROOT setting is not supported :-('
417 -
418 - local msg='MySQL ODBC driver'
419 - local drivers=$(/usr/bin/odbcinst -q -d)
420 -
421 - if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
422 - ebegin "Installing ${msg}"
423 - /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
424 - rc=$?
425 - eend $rc
426 - [ $rc -ne 0 ] && die
427 - else
428 - einfo "Skipping already installed ${msg}"
429 - fi
430 -
431 - local sources=$(/usr/bin/odbcinst -q -s)
432 - msg='sample MySQL ODBC DSN'
433 - if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
434 - ebegin "Installing ${msg}"
435 - /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
436 - rc=$?
437 - eend $rc
438 - [ $rc -ne 0 ] && die
439 - else
440 - einfo "Skipping already installed ${msg}"
441 - fi
442 -}
443 -
444 -pkg_postinst() {
445 -
446 - elog "If this is a new install, please run the following command"
447 - elog "to configure the MySQL ODBC drivers and sources:"
448 - elog "emerge --config =${CATEGORY}/${PF}"
449 - elog "Please note that the driver name used to form the DSN now includes the SLOT."
450 - elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
451 -}
452
453 diff --git a/profiles/package.mask b/profiles/package.mask
454 index 130001db8a5..e70853e7dde 100644
455 --- a/profiles/package.mask
456 +++ b/profiles/package.mask
457 @@ -162,11 +162,6 @@ media-libs/celt
458 # experimental features and accept a more unstable release.
459 >=www-client/chromium-71
460
461 -# Brian Evans <grknight@g.o> (16 Sep 2018)
462 -# Broken build on modern clients. Please update to latest slot.
463 -# Slot to be removed in 30 days
464 -dev-db/myodbc:5.2
465 -
466 # Andreas K. Hüttel <dilfridge@g.o> (11 Sep 2018)
467 # Mask transition ebuilds that were needed only for <glibc-2.26
468 # We will keep them in the tree as long as we have masked