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 46DA5158008 for ; Thu, 15 Jun 2023 12:09:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63AB0E08D1; Thu, 15 Jun 2023 12:09:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44965E08D1 for ; Thu, 15 Jun 2023 12:09:30 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 433B233BEBC for ; Thu, 15 Jun 2023 12:09:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77E00A8B for ; Thu, 15 Jun 2023 12:09:27 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1686830909.c6ba1aaf31fe16e83c376c279e8e923c6feb69dc.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild X-VCS-Directories: dev-db/mysql-workbench/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: c6ba1aaf31fe16e83c376c279e8e923c6feb69dc X-VCS-Branch: master Date: Thu, 15 Jun 2023 12:09:27 +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: 9fe13355-ae91-49fa-8368-0b08baec2034 X-Archives-Hash: e85d7ecd9994b42d38737ef4c869bd70 commit: c6ba1aaf31fe16e83c376c279e8e923c6feb69dc Author: Hans de Graaff gentoo org> AuthorDate: Thu Jun 15 12:08:29 2023 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Thu Jun 15 12:08:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ba1aaf dev-db/mysql-workbench: fix unixODBC compilation The mysql-workbench code already was changed to work with the latest unixODBC release. Revert the workaround and require the latest version. Signed-off-by: Hans de Graaff gentoo.org> dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild index 8d82780756f3..c7a1e0a6bc79 100644 --- a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild +++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild @@ -51,7 +51,7 @@ CDEPEND="${PYTHON_DEPS} dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-8.0.27-r1 dev-db/vsqlite++ - || ( dev-db/libiodbc dev-db/unixODBC ) + || ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 ) dev-python/pexpect >=dev-python/paramiko-1.7.4 " @@ -83,8 +83,6 @@ src_prepare() { sed -i -e 's/-Werror//' CMakeLists.txt || die ## Fix doc install directory sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die - ## Look for an existing header file - sed -i -e 's/unixodbc.h/unixodbc_conf.h/' build/cmake/Modules/FindUNIXODBC.cmake || die ## package is very fragile... strip-flags