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 231431382C5 for ; Sat, 6 Mar 2021 12:22:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A759E087A; Sat, 6 Mar 2021 12:21:59 +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 60A41E087A for ; Sat, 6 Mar 2021 12:21:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E46D4340EA9 for ; Sat, 6 Mar 2021 12:21:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 516D02A9 for ; Sat, 6 Mar 2021 12:21:56 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1615033308.e304c85d3f4e55cb89af39249be96d8dc64cb114.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild X-VCS-Directories: dev-db/mysql-connector-c/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e304c85d3f4e55cb89af39249be96d8dc64cb114 X-VCS-Branch: master Date: Sat, 6 Mar 2021 12:21:56 +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: cd381aee-dc9f-4102-a1c4-8c61a902f96e X-Archives-Hash: e9aefb3890052295b296b0e31395f9dd commit: e304c85d3f4e55cb89af39249be96d8dc64cb114 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 25 10:32:26 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 6 12:21:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e304c85d dev-db/mysql-connector-c: Switch to cmake.eclass, skel.ebuild order Closes: https://bugs.gentoo.org/770526 Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../mysql-connector-c/mysql-connector-c-8.0.23.ebuild | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild index 17f49931dfe..6553c3776e5 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib # wrap the config script @@ -10,12 +11,11 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) DESCRIPTION="C client library for MariaDB/MySQL" HOMEPAGE="https://dev.mysql.com/downloads/" -LICENSE="GPL-2" - SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86" +LICENSE="GPL-2" SLOT="0/21" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86" IUSE="ldap libressl static-libs" RDEPEND=" @@ -25,7 +25,7 @@ RDEPEND=" ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - " +" DEPEND="${RDEPEND}" # Avoid file collisions, #692580 @@ -48,7 +48,7 @@ PATCHES=( ) src_prepare() { - sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die + sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die # All these are for the server only. # Disable rpm call which would trigger sandbox, #692368 @@ -73,7 +73,7 @@ src_prepare() { echo > libmysql/authentication_ldap/CMakeLists.txt || die fi - cmake-utils_src_prepare + cmake_src_prepare } multilib_src_configure() { @@ -93,11 +93,7 @@ multilib_src_configure() { -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITHOUT_SERVER=ON ) - cmake-utils_src_configure -} - -multilib_src_install() { - cmake-utils_src_install + cmake_src_configure } multilib_src_install_all() {