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@gentoo.org>

diff --git a/dev-db/mariadb/mariadb-10.1.45.ebuild b/dev-db/mariadb/mariadb-10.1.45.ebuild
index 5b6926dcb645c852dea4a02d97fe0ce1badaac11..7997e60894953e4747f3cdef08bc57b91292eaba 100644 (file)
--- 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 78c9b96474376f4a7b1a9a13fc75cb3a3dffa86a..021ce65734e69d218ee5b3c161e8f323a283da09 100644 (file)
--- 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 3e0a6b1ad7bc2573131bb9113700440650b01623..eca052d12161009c934fd60921769fa0e86184cf 100644 (file)
--- 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 bc071222e2a60d906847a19c79c1814c423ccda9..036c71ff86bc12f5b9dedaabde76ff00fd88801a 100644 (file)
--- 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