[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/

[Thomas Deutschmann]

commit:     30850af5d50a14ca417cf33ae740189af717347d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 16:45:59 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 16:56:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30850af5

dev-db/mysql: don't install man pages installed by mysql-connector-c

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-db/mysql/mysql-5.6.45.ebuild | 7 +++++++
 dev-db/mysql/mysql-5.7.27.ebuild | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/dev-db/mysql/mysql-5.6.45.ebuild b/dev-db/mysql/mysql-5.6.45.ebuild
index 6801847b241..5526aadc972 100644
--- a/dev-db/mysql/mysql-5.6.45.ebuild
+++ b/dev-db/mysql/mysql-5.6.45.ebuild
@@ -196,6 +196,13 @@ src_prepare() {
                echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
        fi
 
+       # Don't clash with dev-db/mysql-connector-c
+       rm \
+               man/my_print_defaults.1 \
+               man/perror.1 \
+               man/zlib_decompress.1 \
+               || die
+
        if use libressl ; then
                sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
                        "${S}/cmake/ssl.cmake" || die

diff --git a/dev-db/mysql/mysql-5.7.27.ebuild b/dev-db/mysql/mysql-5.7.27.ebuild
index ded6636a984..51372d0a361 100644
--- a/dev-db/mysql/mysql-5.7.27.ebuild
+++ b/dev-db/mysql/mysql-5.7.27.ebuild
@@ -296,6 +296,14 @@ src_prepare() {
                "${S}"/zlib \
                || die
 
+       # Don't clash with dev-db/mysql-connector-c
+       rm \
+               man/my_print_defaults.1 \
+               man/perror.1 \
+               man/zlib_decompress.1 \
+               || die
+
+
        if use libressl ; then
                sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
                        "${S}/cmake/ssl.cmake" || die