Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/
Date: Mon, 03 May 2021 08:18:25
Message-Id: 1620029556.f4be4ab43d52e66e022bda1addff254631b904b3.zlogene@gentoo
1 commit: f4be4ab43d52e66e022bda1addff254631b904b3
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 3 08:12:36 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 08:12:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4be4ab4
7
8 dev-db/mysql-connector-c: remove libressl support
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild | 6 ++----
14 dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild | 6 ++----
15 dev-db/mysql-connector-c/mysql-connector-c-8.0.24.ebuild | 6 ++----
16 3 files changed, 6 insertions(+), 12 deletions(-)
17
18 diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
19 index b6cc7e4f6d8..0cd2c65693f 100644
20 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
21 +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
22 @@ -16,15 +16,14 @@ SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
23 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
24
25 SLOT="0/21"
26 -IUSE="ldap libressl static-libs"
27 +IUSE="ldap static-libs"
28
29 RDEPEND="
30 >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
31 app-arch/zstd:=[${MULTILIB_USEDEP}]
32 sys-libs/zlib:=[${MULTILIB_USEDEP}]
33 ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
34 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
35 - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
36 + dev-libs/openssl:0=[${MULTILIB_USEDEP}]
37 "
38 DEPEND="${RDEPEND}"
39
40 @@ -44,7 +43,6 @@ S="${WORKDIR}/mysql-${PV}"
41 PATCHES=(
42 "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
43 "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
44 - "${FILESDIR}"/${PN}-8.0.21-libressl.patch
45 )
46
47 src_prepare() {
48
49 diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
50 index 4923fe57f0c..d90ed6a3841 100644
51 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
52 +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
53 @@ -25,15 +25,14 @@ fi
54
55 LICENSE="GPL-2"
56 SLOT="0/21"
57 -IUSE="ldap libressl static-libs"
58 +IUSE="ldap static-libs"
59
60 RDEPEND="
61 >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
62 app-arch/zstd:=[${MULTILIB_USEDEP}]
63 sys-libs/zlib:=[${MULTILIB_USEDEP}]
64 ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
65 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
66 - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
67 + dev-libs/openssl:0=[${MULTILIB_USEDEP}]
68 "
69 DEPEND="${RDEPEND}"
70
71 @@ -51,7 +50,6 @@ DOCS=( README )
72 PATCHES=(
73 "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
74 "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
75 - "${FILESDIR}"/${PN}-8.0.23-libressl.patch
76 )
77
78 src_prepare() {
79
80 diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.24.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.24.ebuild
81 index adbf8b74bd4..337984117ad 100644
82 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.24.ebuild
83 +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.24.ebuild
84 @@ -25,15 +25,14 @@ fi
85
86 LICENSE="GPL-2"
87 SLOT="0/21"
88 -IUSE="ldap libressl static-libs"
89 +IUSE="ldap static-libs"
90
91 RDEPEND="
92 >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
93 app-arch/zstd:=[${MULTILIB_USEDEP}]
94 sys-libs/zlib:=[${MULTILIB_USEDEP}]
95 ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
96 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
97 - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
98 + dev-libs/openssl:0=[${MULTILIB_USEDEP}]
99 "
100 DEPEND="${RDEPEND}"
101
102 @@ -51,7 +50,6 @@ DOCS=( README )
103 PATCHES=(
104 "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
105 "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
106 - "${FILESDIR}"/${PN}-8.0.23-libressl.patch
107 )
108
109 src_prepare() {