From 30850af5d50a14ca417cf33ae740189af717347d Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Fri, 2 Aug 2019 18:45:59 +0200 Subject: [PATCH] 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 --- 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 6801847b2410..5526aadc9727 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 ded6636a984f..51372d0a361f 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 -- 2.26.2