From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A55E158086 for ; Mon, 22 Nov 2021 10:11:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFB5CE08F7; Mon, 22 Nov 2021 10:11:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C3A3E08F7 for ; Mon, 22 Nov 2021 10:11:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE27D343297 for ; Mon, 22 Nov 2021 10:11:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5517A1FB for ; Mon, 22 Nov 2021 10:11:16 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1637575725.aec4a4d41a7e02b3b9984e4988a4d7ebc2d244d5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb-connector-odbc/Manifest dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild X-VCS-Directories: dev-db/mariadb-connector-odbc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: aec4a4d41a7e02b3b9984e4988a4d7ebc2d244d5 X-VCS-Branch: master Date: Mon, 22 Nov 2021 10:11:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 257be3f2-ba02-43fb-95ba-0b35d0d03f55 X-Archives-Hash: ae7d8eaade5c84f76ecc7f364588e7de commit: aec4a4d41a7e02b3b9984e4988a4d7ebc2d244d5 Author: Jaco Kroon uls co za> AuthorDate: Fri Nov 12 09:39:50 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 22 10:08:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec4a4d4 dev-db/mariadb-connector-odbc: 3.1.14 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/22913 Signed-off-by: Sam James gentoo.org> dev-db/mariadb-connector-odbc/Manifest | 1 + .../mariadb-connector-odbc-3.1.14.ebuild | 69 ++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest index f442eeab540d..08aa13d342b7 100644 --- a/dev-db/mariadb-connector-odbc/Manifest +++ b/dev-db/mariadb-connector-odbc/Manifest @@ -1,2 +1,3 @@ DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B b770d79d1724480589b941ded1552bcfedb85eb1f59256269c8cd219e395dc5c151ab6762ea49c062900187ec4ae6a161a33a15ea3ffd4addc542f1c9f846121 SHA512 9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb DIST mariadb-connector-odbc-3.1.13-src.tar.gz 546893 BLAKE2B 7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f SHA512 b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3 +DIST mariadb-connector-odbc-3.1.14-src.tar.gz 549698 BLAKE2B 612879086805c57b42036bb224b14ef1ab287d2ff288a5ec5ec6db7334fc8b82acd648476eca1dee282393486d117cadf1bbdcb0e78eae52bab26a0c05cb1fbe SHA512 bb3cb74ccd17a8df39456ccf3091579bbdfc56431954a978f488928df54e3f9ad1c5b67cb411be4b661ba0e0bdd69ccd4d00ea4bfd72c3f448b560031830512d diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild new file mode 100644 index 000000000000..3c026e814745 --- /dev/null +++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild @@ -0,0 +1,69 @@ +# Copyright 2018-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="MariaDB Connector/ODBC" +HOMEPAGE="https://downloads.mariadb.org/connector-odbc/" +SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/3.1" +KEYWORDS="~amd64 ~x86" +IUSE="ssl" + +S="${S}-src" + +# USE=ssl merely enables the configuration options (seemingly for interactive +# sessions) and does not cause direct linking to any SSL libraries. However, +# it doesn't make sense enable these configuration options unless the +# underlying mariadb-connector-c has ssl enabled, thus if we have USE=ssl, +# require mariadb-connector-c to have it too. +DEPEND="=dev-db/mariadb-connector-c-$(ver_cut 1-2)*:=[ssl?] + dev-db/unixODBC" +RDEPEND="${DEPEND}" + +src_prepare() { + cmake_src_prepare + + sed -e "s,/lib/,/$(get_libdir)/,g" "${FILESDIR}/odbcinst2.ini" > odbcinst.ini || die +} + +multilib_src_configure() { + append-cppflags $(mariadb_config --cflags || die) + local mycmakeargs=( + -DWITH_SSL=$(usex ssl OPENSSL OFF) + -DMARIADB_LINK_DYNAMIC=YES + -DUSE_SYSTEM_INSTALLED_LIB=YES + -DINSTALL_DOCDIR="/usr/share/doc/${PF}" + -DINSTALL_LICENSEDIR="/usr/share/doc/${PF}" + #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)" + ) + cmake_src_configure +} + +multilib_src_install_all() { + insinto /usr/share/${PN} + doins odbcinst.ini +} + +pkg_postinst() { + elog "Please remember to use emerge --config =${P} to install the ODBC ini files." + elog "Alternatively run: /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini" +} + +pkg_config() { + [[ -n "${ROOT}" ]] && die "Sorry, non-standard ROOT setting is not supported." + + if /usr/bin/odbcinst -q -d -n maodbc &>/dev/null; then + einfo "maodbc (MariaDB ODBC driver) has already been installed." + else + ebegin "Installing maodbc (MariaDB ODBC driver)" + /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini + eend ${?} || die + fi +}