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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49A441382C5 for ; Mon, 24 May 2021 07:39:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C3B2E085E; Mon, 24 May 2021 07:39:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79658E085E for ; Mon, 24 May 2021 07:39:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1960B340C6C for ; Mon, 24 May 2021 07:39:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9277E79C for ; Mon, 24 May 2021 07:39:46 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1621841976.5c2f79070a634b395cb396ad7e13426a4b30e032.juippis@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.12.ebuild X-VCS-Directories: dev-db/mariadb-connector-odbc/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 5c2f79070a634b395cb396ad7e13426a4b30e032 X-VCS-Branch: master Date: Mon, 24 May 2021 07:39:46 +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: 63ec5d7c-0a4e-428b-a972-0ae576c21aa3 X-Archives-Hash: ec214967f7a5ced066949f8dcb8147db commit: 5c2f79070a634b395cb396ad7e13426a4b30e032 Author: Jaco Kroon uls co za> AuthorDate: Thu May 6 19:51:16 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon May 24 07:39:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2f7907 dev-db/mariadb-connector-odbc: Version 3.1.12 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/20706 Signed-off-by: Joonas Niilola gentoo.org> dev-db/mariadb-connector-odbc/Manifest | 1 + .../mariadb-connector-odbc-3.1.12.ebuild | 69 ++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest index bb40643d79b..6a43107889d 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.11-ga-src.tar.gz 542434 BLAKE2B 318e5a269c6f4584df4ffd2272f5db4a354f3616d52b60d2c5f785faabc1eaabe47a75f07e3cd97847d4413670391acdb71092955b8facd9f81b8706ab78c966 SHA512 185f58b05f196bfe8b23d5470877dcfc0550be45d2f4538ddbd0b96aadde5cdbc0346ecaf65554728875e33b88761211349bf0d1def17f3b7cd43abae9d706b3 +DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B b770d79d1724480589b941ded1552bcfedb85eb1f59256269c8cd219e395dc5c151ab6762ea49c062900187ec4ae6a161a33a15ea3ffd4addc542f1c9f846121 SHA512 9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3 SHA512 ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild new file mode 100644 index 00000000000..9e99b65066b --- /dev/null +++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.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="https://downloads.mariadb.org/interstitial/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 +}