1 |
commit: 30850af5d50a14ca417cf33ae740189af717347d |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 2 16:45:59 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 2 16:56:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30850af5 |
7 |
|
8 |
dev-db/mysql: don't install man pages installed by mysql-connector-c |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
dev-db/mysql/mysql-5.6.45.ebuild | 7 +++++++ |
14 |
dev-db/mysql/mysql-5.7.27.ebuild | 8 ++++++++ |
15 |
2 files changed, 15 insertions(+) |
16 |
|
17 |
diff --git a/dev-db/mysql/mysql-5.6.45.ebuild b/dev-db/mysql/mysql-5.6.45.ebuild |
18 |
index 6801847b241..5526aadc972 100644 |
19 |
--- a/dev-db/mysql/mysql-5.6.45.ebuild |
20 |
+++ b/dev-db/mysql/mysql-5.6.45.ebuild |
21 |
@@ -196,6 +196,13 @@ src_prepare() { |
22 |
echo > "${S}/support-files/SELinux/CMakeLists.txt" || die |
23 |
fi |
24 |
|
25 |
+ # Don't clash with dev-db/mysql-connector-c |
26 |
+ rm \ |
27 |
+ man/my_print_defaults.1 \ |
28 |
+ man/perror.1 \ |
29 |
+ man/zlib_decompress.1 \ |
30 |
+ || die |
31 |
+ |
32 |
if use libressl ; then |
33 |
sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ |
34 |
"${S}/cmake/ssl.cmake" || die |
35 |
|
36 |
diff --git a/dev-db/mysql/mysql-5.7.27.ebuild b/dev-db/mysql/mysql-5.7.27.ebuild |
37 |
index ded6636a984..51372d0a361 100644 |
38 |
--- a/dev-db/mysql/mysql-5.7.27.ebuild |
39 |
+++ b/dev-db/mysql/mysql-5.7.27.ebuild |
40 |
@@ -296,6 +296,14 @@ src_prepare() { |
41 |
"${S}"/zlib \ |
42 |
|| die |
43 |
|
44 |
+ # Don't clash with dev-db/mysql-connector-c |
45 |
+ rm \ |
46 |
+ man/my_print_defaults.1 \ |
47 |
+ man/perror.1 \ |
48 |
+ man/zlib_decompress.1 \ |
49 |
+ || die |
50 |
+ |
51 |
+ |
52 |
if use libressl ; then |
53 |
sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ |
54 |
"${S}/cmake/ssl.cmake" || die |