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 7F12E1581F2 for ; Wed, 24 Apr 2024 19:08:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0943E29B7; Wed, 24 Apr 2024 19:08:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 9EDBBE29B7 for ; Wed, 24 Apr 2024 19:08:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 AF5C83431CF for ; Wed, 24 Apr 2024 19:08:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D09E1745 for ; Wed, 24 Apr 2024 19:08:29 +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: <1713985672.a043c51e799c86d2a15b4ff636c4e5345eae3bf3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/myodbc/myodbc-8.0.32.ebuild X-VCS-Directories: dev-db/myodbc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a043c51e799c86d2a15b4ff636c4e5345eae3bf3 X-VCS-Branch: master Date: Wed, 24 Apr 2024 19:08:29 +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: 91afab9d-ebc6-4314-8c64-b4d16c3b3100 X-Archives-Hash: 56283afbca7f190d21e8d8387a1b6fc8 commit: a043c51e799c86d2a15b4ff636c4e5345eae3bf3 Author: Sam James gentoo org> AuthorDate: Wed Apr 24 19:07:42 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 24 19:07:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a043c51e dev-db/myodbc: don't install test dir Signed-off-by: Sam James gentoo.org> dev-db/myodbc/myodbc-8.0.32.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-db/myodbc/myodbc-8.0.32.ebuild b/dev-db/myodbc/myodbc-8.0.32.ebuild index 4b81f9c17da2..942a50b491f7 100644 --- a/dev-db/myodbc/myodbc-8.0.32.ebuild +++ b/dev-db/myodbc/myodbc-8.0.32.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,6 +12,7 @@ MY_P="${MY_PN}-${PV/_p/r}-src" DESCRIPTION="ODBC driver for MySQL" HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/" SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="${MAJOR}" @@ -22,22 +23,21 @@ RDEPEND=" >=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} # Careful! DRIVER_NAME="${PN}-${SLOT}" -# Patch document path so it doesn't install files to /usr PATCHES=( + # Patch document path so it doesn't install files to /usr "${FILESDIR}/${MAJOR}-cmake-doc-path.patch" "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch" "${FILESDIR}/${PN}-8.0.32-include-string.patch" ) src_prepare() { - # Remove Tests + # Remove tests sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ - "${S}/CMakeLists.txt" + "${S}/CMakeLists.txt" || die cmake_src_prepare } @@ -70,6 +70,8 @@ multilib_src_configure() { multilib_src_install_all() { debug-print-function ${FUNCNAME} "$@" + rm -rf "${ED}"/usr/test || die + dodir /usr/share/${PN}-${SLOT} for i in odbc.ini odbcinst.ini; do einfo "Building $i"