Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
Date: Sat, 23 May 2020 14:38:34
Message-Id: 1590244691.a69704c313996267099dfa3c72041d003d951b9a.whissi@gentoo
commit:     a69704c313996267099dfa3c72041d003d951b9a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 14:38:00 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 <whissi <AT> 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