From 5b5df25227111ef465caf5c52bcfb66dac3219cd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jan 2018 20:11:46 +0000 Subject: gentoo resync : 19.01.2018 --- dev-db/myodbc/Manifest | 12 ++- dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 4 +- dev-db/myodbc/myodbc-5.2.7-r2.ebuild | 124 ------------------------------- dev-db/myodbc/myodbc-5.2.7-r3.ebuild | 133 ++++++++++++++++++++++++++++++++++ dev-db/myodbc/myodbc-5.3.8-r1.ebuild | 115 ----------------------------- dev-db/myodbc/myodbc-5.3.8.ebuild | 137 ----------------------------------- dev-db/myodbc/myodbc-5.3.9.ebuild | 116 +++++++++++++++++++++++++++++ 7 files changed, 256 insertions(+), 385 deletions(-) delete mode 100644 dev-db/myodbc/myodbc-5.2.7-r2.ebuild create mode 100644 dev-db/myodbc/myodbc-5.2.7-r3.ebuild delete mode 100644 dev-db/myodbc/myodbc-5.3.8-r1.ebuild delete mode 100644 dev-db/myodbc/myodbc-5.3.8.ebuild create mode 100644 dev-db/myodbc/myodbc-5.3.9.ebuild (limited to 'dev-db/myodbc') diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest index bb4afc91e175..6573e5517232 100644 --- a/dev-db/myodbc/Manifest +++ b/dev-db/myodbc/Manifest @@ -9,11 +9,9 @@ AUX cmake-doc-path.patch 1498 BLAKE2B b79110c92b7fc80c64fdf05b469c4bb333d68610ff AUX odbc.ini.m4 406 BLAKE2B 3a20c28b1971753a14a4aa4d30efcc7de833488501a41d9404987567623d48250ce1daea1d3138adaef36741c4f2e0eafc60eba554e5262b45084f93f5205160 SHA512 84ab2a3aab594123d42b65205a7faf8e91fe9416a9e3c4c4c354533b9a298395f59172649c91dc0b671392bfbe5baeaddb6aa47119ce4c825917f3977d9dd521 AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4a21a2bf0bd5f1bd1e5c3d1c9a28522e3aa07c1261abac92301819d4112ac6a000a729aca9f7f7ad6 SHA512 6d929bbffd602a9f060a05998149a6b16334f8a5e3db30d02ff5d38c0065085d085042521e700b87a63766e32aa27ae92be72cef33c2a7aa8f6767b6b71c82c8 DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 BLAKE2B 297f1ae57802f682616283bae9c3ff7ef88f8f016274884794f6b476bf9b92bc1da8af9cb89f41fa2a74238f91fbc39b9427529b806ac4ffb52aecd895cd8cd8 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f -DIST mysql-connector-odbc-5.3.8-linux-debian8-x86-32bit.tar.gz 11295329 BLAKE2B 1d8b40fab8bb62ce94588ca1cdc4a93fe628ae8aa20b304c0a3b905b3139b754fb7d132e7ed82b49d87ba4eb1796027403fcc56319f8a07e39610014b9d6e2f0 SHA512 5d13d8545f3868eeaceb6e5d8b0f1a3ba8e5ce916ffa6d94467f0b5a0c057129d09fedb0084b25fe36da250aaf8bb21ba991696c1ed0def338792c2e4b592b56 -DIST mysql-connector-odbc-5.3.8-linux-debian8-x86-64bit.tar.gz 11782557 BLAKE2B a44914bbd782898ce240c519f80730bbe1d6a0aafb82a0e359d3dcd7934d4c7680c4f44b3d66510fe54c66d24d966972bceac2aa86096973e417a209af04e321 SHA512 c28c1851a6ca560db78f96610b631edeeefb0006032eb17e3bd55da955abbbdfcf72d4a9b305a21151bb08a28b141ac89b3688cf778bfbc91393bfabb5e63783 -DIST mysql-connector-odbc-5.3.8-src.tar.gz 690403 BLAKE2B 7d6f66456bef9696840f3cb7811c9560bfed7df17fd3057450ca53ff4e93c2bb5d023361a85d025b18a06031eeafa413e710ec65397ecad4aa86c4e14f81441f SHA512 4703deab548f2953a58421b20977ced8dfd197d5274f89dd9e080cebdf35da007e558d5d52b6b09109744eddc2905c834f1e3e2ac83df4249d069d5e14fd34ee -EBUILD myodbc-5.2.7-r1.ebuild 3365 BLAKE2B 9b49c6af05a6bf95ce9cec8396ff7526388d816e7e817040ad2c1a35a2106122eff7d3876e3dab37e7e38fdac9f4ca96039fa8c300712bad9198fe2768f75022 SHA512 a88183fe7f51a2ba092b9128e686bfcc2e087e538e25d2a112b8854203f027e25f4119edae2ea8c6247697fa1dcbc678e6502daa480a84ca0bac983edcff3c45 -EBUILD myodbc-5.2.7-r2.ebuild 3484 BLAKE2B 8795267a0aef88d9b82b30c74dd1cca5626992c118143f8093f11c433829950477e4ab0207b15266fdcf7b3dbd698b4e79fdff87e3af15d4330cce0d23a5ee24 SHA512 af941381825c2bcc6de112ecf3fa928c178c41af43d29d708ac052f906591452ff0eb7c1e44eed27ee533826663699172ba321af7c27ba3705eaf8447149604f -EBUILD myodbc-5.3.8-r1.ebuild 3075 BLAKE2B 522fed656d60ba47c792006349baa31dc250805c3dcc194e31059d6ca198b746f0eb9e799a00af8e1b4d6000cebecb55e400b8c76000d99967f5cbfa64b8d86f SHA512 1629ffe70f9f960b7e9e9bba95193c9e75e20d77c90324c70fd259b7e983374d85fd2591e6fcab908480e82ec264ea1d5d27d21532de05a68fb1977465dd8b1e -EBUILD myodbc-5.3.8.ebuild 3932 BLAKE2B 8c765e329b77d9014f4a1e8daae08fba64c995cab350a1bd5bba2dfa9a8e2b8a5385ba91450f370705a319dba3a2f8d40cc12d48a7970749c8359064a4fff423 SHA512 9e8e780e7f5c190716a4568184e168b55912d9e079f810debbeba691ca9764200fc7a6f518063f86b1722609ed287f08375a7f2223b1eee955654cb5b0fd62f7 +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 +EBUILD myodbc-5.2.7-r1.ebuild 3363 BLAKE2B c2023e4e3d9b5be097438f32a44b754ac41b3366b978d28220a8cbc5e33575045dd68d120c6bd6e3abe89bce427a560cbfdf8752e609ca2bcf63b616e898a9d0 SHA512 f2b041eec24689bf072691e127381a180545bbef7d60e79ba76160c09ce8088999ee251a439a4bd6cafe5c7055ad454e5b68cf2dd5120353bd40da09c15919e7 +EBUILD myodbc-5.2.7-r3.ebuild 3750 BLAKE2B 6645c7641146af49eff4d377a1a03a7392296d9b322e5cfd336f22441a3811f87f52ddb11d4a157c9674bea25489c9d1abafee927549c76871a4dab3ac982fce SHA512 4f2ffedf90249633cb4ebed682963dee63b0ab69a58ad1201c26ba77108c0d4b4c38d28b09123e4ef79be1a4e0648cb1c361e3cb7c19a825bc708bb4213cad91 +EBUILD myodbc-5.3.9.ebuild 3142 BLAKE2B 5f535a2f331a91d4884ccd2f6e7429fe2b981375f6c71a4e4a1d85d1ee226760221a3aa29790c1cf3e69a9963f43c1c266ff9c5c26b4b89d5fd77f5adfe49ca6 SHA512 376f9bb1fb00b8e0ca2fe2f9962bf259eb2bd5828a9422f8f63897756359140a84b1e064d84e6a26590713050f7cf0c3820c1de1fa375e723fa1cf708fa5f5e0 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild index 22819c507ced..1e2fd5944d09 100644 --- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild +++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -54,7 +54,7 @@ multilib_src_configure() { mycmakeargs+=( -DMYSQL_CXX_LINKAGE=0 -DWITH_UNIXODBC=1 - -DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so" + -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so" -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)" -DLIB_SUBDIR="$(get_libdir)" diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild deleted file mode 100644 index e475faca21ee..000000000000 --- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2017 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="" - -# Does not build with mysql-connector-c -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/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" - - # 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}/${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 -} - -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_r.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 new file mode 100644 index 000000000000..326e8d0289e2 --- /dev/null +++ b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild @@ -0,0 +1,133 @@ +# 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}] + abi_x86_32? ( + !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] + ) + !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)" + ) + 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/dev-db/myodbc/myodbc-5.3.8-r1.ebuild b/dev-db/myodbc/myodbc-5.3.8-r1.ebuild deleted file mode 100644 index 8dafc3edf903..000000000000 --- a/dev-db/myodbc/myodbc-5.3.8-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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-debian8-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}] - abi_x86_32? ( - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - ) -" -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" \ - >"${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-5.3.8.ebuild b/dev-db/myodbc/myodbc-5.3.8.ebuild deleted file mode 100644 index 228a5be73d57..000000000000 --- a/dev-db/myodbc/myodbc-5.3.8.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2017 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="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 mysql-connector-c -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/mysql-connector-c -" -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}/${MAJOR}-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" - default -} - -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" - - # 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="${clientlib}" - -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 - ) - 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.3.9.ebuild b/dev-db/myodbc/myodbc-5.3.9.ebuild new file mode 100644 index 000000000000..4493cf5bd1e2 --- /dev/null +++ b/dev-db/myodbc/myodbc-5.3.9.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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}] + abi_x86_32? ( + !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] + ) +" +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}" +} -- cgit v1.2.3