From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1342220-garchives=archives.gentoo.org@lists.gentoo.org> 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 28F1C158086 for <garchives@archives.gentoo.org>; Mon, 22 Nov 2021 10:11:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99296E08F4; 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 635D4E08F4 for <gentoo-commits@lists.gentoo.org>; 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 BE3D9343315 for <gentoo-commits@lists.gentoo.org>; Mon, 22 Nov 2021 10:11:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FB961F4 for <gentoo-commits@lists.gentoo.org>; Mon, 22 Nov 2021 10:11:16 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1637575723.7a779e99999cf36a0e52aa01b0cfb42602c9775c.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.11-r2.ebuild dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild X-VCS-Directories: dev-db/mariadb-connector-odbc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7a779e99999cf36a0e52aa01b0cfb42602c9775c X-VCS-Branch: master Date: Mon, 22 Nov 2021 10:11:16 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 749a9b98-4a09-4e65-9e95-79bd089ef34c X-Archives-Hash: 434578c743659d05a9801fcdce21d3b6 commit: 7a779e99999cf36a0e52aa01b0cfb42602c9775c Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> AuthorDate: Fri Nov 12 09:33:22 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 22 10:08:43 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a779e99 dev-db/mariadb-connector-odbc: Prune old versions. 3.1.6 is long gone, and 3.11 is second stable (3.13 en route). Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-db/mariadb-connector-odbc/Manifest | 2 - .../mariadb-connector-odbc-3.1.11-r2.ebuild | 69 ---------------------- .../mariadb-connector-odbc-3.1.6.ebuild | 65 -------------------- 3 files changed, 136 deletions(-) diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest index 91c5dc606a63..f442eeab540d 100644 --- a/dev-db/mariadb-connector-odbc/Manifest +++ b/dev-db/mariadb-connector-odbc/Manifest @@ -1,4 +1,2 @@ -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.13-src.tar.gz 546893 BLAKE2B 7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f SHA512 b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3 -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.11-r2.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild deleted file mode 100644 index 3ef0c53a9e12..000000000000 --- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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}-ga-src.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/3.1" -KEYWORDS="amd64 x86" -IUSE="ssl" - -S="${S}-ga-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 -} diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild deleted file mode 100644 index 6e710c764084..000000000000 --- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2018-2020 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}-ga-src.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/3.1" -KEYWORDS="~amd64 ~x86" -IUSE="gnutls ssl" - -S="${S}-ga-src" - -DEPEND="=dev-db/mariadb-connector-c-$(ver_cut 1-2)* - dev-db/unixODBC" -RDEPEND="${DEPEND}" - -src_prepare() { - cmake_src_prepare - - cp "${FILESDIR}/odbcinst.ini" . || die - sed -e "s,lib/lib,$(get_libdir)/lib,g" -i "odbcinst.ini" || die -} - -multilib_src_configure() { - append-cppflags $(mariadb_config --cflags || die) - local mycmakeargs=( - -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) - -DMARIADB_LINK_DYNAMIC=YES - -DUSE_SYSTEM_INSTALLED_LIB=YES - -DINSTALL_DOC_DIR="/usr/share/doc/${P}" - -DINSTALL_LICENSE_DIR="/usr/share/doc/${P}" - #-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 "Alterantively 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 -}