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 B0121138334 for ; Thu, 22 Aug 2019 20:02:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E61AE0814; Thu, 22 Aug 2019 20:02:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 314A2E0814 for ; Thu, 22 Aug 2019 20:02:30 +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 1261434A14A for ; Thu, 22 Aug 2019 20:02:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBDA3774 for ; Thu, 22 Aug 2019 20:02:25 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1566503126.93dc56e0b40fe411ad82b3990f85bd5adf562dad.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild X-VCS-Directories: dev-db/mysql-connector-c/ dev-db/mysql-connector-c/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 93dc56e0b40fe411ad82b3990f85bd5adf562dad X-VCS-Branch: master Date: Thu, 22 Aug 2019 20:02:25 +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: 9b01852b-73de-494c-98fa-4bd0e7a58c9e X-Archives-Hash: d03e6a5ce0fc4c59f987301ef995f27e commit: 93dc56e0b40fe411ad82b3990f85bd5adf562dad Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Aug 22 19:38:53 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Aug 22 19:45:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93dc56e0 dev-db/mysql-connector-c: rev bump - Always install {lz4,zlib}_decompress - Avoid file collisions Closes: https://bugs.gentoo.org/692580 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> ...-8.0.17-always-build-decompress-utilities.patch | 22 ++++++++++++++++++++++ ...1.ebuild => mysql-connector-c-8.0.17-r2.ebuild} | 15 +++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch new file mode 100644 index 00000000000..927662705aa --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch @@ -0,0 +1,22 @@ +--- a/utilities/CMakeLists.txt ++++ b/utilities/CMakeLists.txt +@@ -101,15 +101,11 @@ MYSQL_ADD_EXECUTABLE(perror perror.cc) + ADD_DEPENDENCIES(perror GenError) + TARGET_LINK_LIBRARIES(perror mysys) + +-IF (BUILD_BUNDLED_LZ4) +- MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) +- TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) +-ENDIF() ++MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) ++TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) + +-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) +- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) +- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) +-ENDIF() ++MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) ++TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) + + IF(WITH_INNOBASE_STORAGE_ENGINE) + diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild similarity index 85% rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild index c99bb77dd8a..3eb18955b0b 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild @@ -19,6 +19,7 @@ SLOT="0/21" IUSE="ldap libressl static-libs" RDEPEND=" + >=app-arch/lz4-0_p131:= sys-libs/zlib:=[${MULTILIB_USEDEP}] ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) @@ -26,11 +27,22 @@ RDEPEND=" " DEPEND="${RDEPEND}" +# Avoid file collisions, #692580 +RDEPEND+=" !