From 98b4500e1d13364ae2e43259b918ca840c4d0c05 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 15 Oct 2017 16:19:11 -0700 Subject: [PATCH] dev-db/mysql-connector-c: [QA] Add cmake-utils_src_prepare Package-Manager: Portage-2.3.11, Repoman-2.3.3 --- .../mysql-connector-c/mysql-connector-c-6.1.5.ebuild | 6 +----- .../mysql-connector-c-6.1.6-r1.ebuild | 11 +++++------ .../mysql-connector-c-6.1.6-r2.ebuild | 12 +++++------- .../mysql-connector-c-6.1.9-r1.ebuild | 2 +- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild index f865e84f6663..1813980a0934 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild @@ -35,11 +35,7 @@ RDEPEND="${CDEPEND} DEPEND="${CDEPEND}" DOCS=( README Docs/ChangeLog ) - -src_prepare() { - epatch "${FILESDIR}/openssl-cmake-detection.patch" - epatch_user -} +PATCHES=( "${FILESDIR}/openssl-cmake-detection.patch" ) multilib_src_configure() { mycmakeargs+=( diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild index ae0938c61b5e..b7b764fde620 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild @@ -39,12 +39,11 @@ DEPEND="${CDEPEND}" DOCS=( README Docs/ChangeLog ) -src_prepare() { - epatch "${FILESDIR}/openssl-cmake-detection.patch" \ - "${FILESDIR}/conn-c-includes.patch" \ - "${FILESDIR}/mysql_com.patch" - epatch_user -} +PATCHES=( + "${FILESDIR}/openssl-cmake-detection.patch" + "${FILESDIR}/conn-c-includes.patch" + "${FILESDIR}/mysql_com.patch" +) multilib_src_configure() { mycmakeargs+=( diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild index 32e4df87bd45..fccb70097d1e 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild @@ -39,13 +39,11 @@ RDEPEND="${CDEPEND} DEPEND="${CDEPEND}" DOCS=( README Docs/ChangeLog ) - -src_prepare() { - epatch "${FILESDIR}/openssl-cmake-detection.patch" \ - "${FILESDIR}/conn-c-includes.patch" \ - "${FILESDIR}/mysql_com.patch" - epatch_user -} +PATCHES=( + "${FILESDIR}/openssl-cmake-detection.patch" + "${FILESDIR}/conn-c-includes.patch" + "${FILESDIR}/mysql_com.patch" +) multilib_src_configure() { mycmakeargs+=( diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild index 5222a52edcdb..7a1da326d8a4 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild @@ -44,7 +44,7 @@ PATCHES=( src_prepare() { sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die - default + cmake-utils_src_prepare } multilib_src_configure() { -- 2.26.2