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 7E3B11382C5 for ; Sat, 23 May 2020 14:38:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A3C1E088B; Sat, 23 May 2020 14:38:33 +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 64D88E088B for ; Sat, 23 May 2020 14:38:33 +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 9814434E9EA for ; Sat, 23 May 2020 14:38:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABB851EB for ; Sat, 23 May 2020 14:38:28 +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: <1590244691.a69704c313996267099dfa3c72041d003d951b9a.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/mariadb-10.1.45.ebuild dev-db/mariadb/mariadb-10.2.32.ebuild dev-db/mariadb/mariadb-10.3.23.ebuild dev-db/mariadb/mariadb-10.4.13.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a69704c313996267099dfa3c72041d003d951b9a X-VCS-Branch: master Date: Sat, 23 May 2020 14:38:28 +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: 6ec2731c-daa6-4bb4-9d0b-8204be70dc9c X-Archives-Hash: 7df69acf3c72d0c4d1656c0f3c44bf1e commit: a69704c313996267099dfa3c72041d003d951b9a Author: Thomas Deutschmann gentoo org> AuthorDate: Sat May 23 14:38:00 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat May 23 14:38:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69704c3 dev-db/mariadb: drop perror.1 sed workaround sed call no longer works after upstream changes [Link 1]. We are now patching CMakeLists.txt directly as part of our cmake: build without client libs and tools patch. Link 1: https://github.com/MariaDB/server/commit/5271d43648957141b55159958b66fd635d80ac85 Link 2: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2fd815cdb09de08a302b80746fd40c65d30d69e Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/mariadb/mariadb-10.1.45.ebuild | 1 - dev-db/mariadb/mariadb-10.2.32.ebuild | 1 - dev-db/mariadb/mariadb-10.3.23.ebuild | 1 - dev-db/mariadb/mariadb-10.4.13.ebuild | 1 - 4 files changed, 4 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.1.45.ebuild b/dev-db/mariadb/mariadb-10.1.45.ebuild index 5b6926dcb64..7997e608949 100644 --- a/dev-db/mariadb/mariadb-10.1.45.ebuild +++ b/dev-db/mariadb/mariadb-10.1.45.ebuild @@ -270,7 +270,6 @@ src_prepare() { # Don't clash with dev-db/mysql-connector-c sed -i -e 's/ my_print_defaults.1//' \ - -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die cmake-utils_src_prepare diff --git a/dev-db/mariadb/mariadb-10.2.32.ebuild b/dev-db/mariadb/mariadb-10.2.32.ebuild index 78c9b964743..021ce65734e 100644 --- a/dev-db/mariadb/mariadb-10.2.32.ebuild +++ b/dev-db/mariadb/mariadb-10.2.32.ebuild @@ -277,7 +277,6 @@ src_prepare() { # Don't clash with dev-db/mysql-connector-c sed -i -e 's/ my_print_defaults.1//' \ - -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die # Fix galera_recovery.sh script diff --git a/dev-db/mariadb/mariadb-10.3.23.ebuild b/dev-db/mariadb/mariadb-10.3.23.ebuild index 3e0a6b1ad7b..eca052d1216 100644 --- a/dev-db/mariadb/mariadb-10.3.23.ebuild +++ b/dev-db/mariadb/mariadb-10.3.23.ebuild @@ -288,7 +288,6 @@ src_prepare() { # Don't clash with dev-db/mysql-connector-c sed -i -e 's/ my_print_defaults.1//' \ - -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die # Fix galera_recovery.sh script diff --git a/dev-db/mariadb/mariadb-10.4.13.ebuild b/dev-db/mariadb/mariadb-10.4.13.ebuild index bc071222e2a..036c71ff86b 100644 --- a/dev-db/mariadb/mariadb-10.4.13.ebuild +++ b/dev-db/mariadb/mariadb-10.4.13.ebuild @@ -280,7 +280,6 @@ src_prepare() { # Don't clash with dev-db/mysql-connector-c sed -i -e 's/ my_print_defaults.1//' \ - -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die # Fix galera_recovery.sh script