1 |
commit: 0d73e3c23002ac214b23131084de34b05977b6fc |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 17 01:35:51 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 17 01:35:51 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=0d73e3c2 |
7 |
|
8 |
dev-db/mariadb-connector-c: Drop cmake-multilib and old builds |
9 |
|
10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6 |
13 |
|
14 |
dev-db/mariadb-connector-c/Manifest | 30 +++--- |
15 |
.../mariadb-connector-c-2.0.0-r1.ebuild | 81 ---------------- |
16 |
.../mariadb-connector-c-2.1.0.ebuild | 80 ---------------- |
17 |
.../mariadb-connector-c-2.2.2.ebuild | 4 +- |
18 |
.../mariadb-connector-c-3.0.1_beta.ebuild | 104 -------------------- |
19 |
.../mariadb-connector-c-3.0.3.ebuild | 105 --------------------- |
20 |
.../mariadb-connector-c-9999.ebuild | 24 ++--- |
21 |
7 files changed, 25 insertions(+), 403 deletions(-) |
22 |
|
23 |
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest |
24 |
index a4c0a98..96c1c73 100644 |
25 |
--- a/dev-db/mariadb-connector-c/Manifest |
26 |
+++ b/dev-db/mariadb-connector-c/Manifest |
27 |
@@ -1,27 +1,23 @@ |
28 |
-----BEGIN PGP SIGNED MESSAGE----- |
29 |
Hash: SHA256 |
30 |
|
31 |
-DIST mariadb-connector-c-2.1.0-src.tar.gz 1912888 SHA256 568050b89463af7610d458669fd9eee06dcc9405689aca8a526ac8c013b59167 SHA512 1bf06ed2fe2a39c15bbd48029b2e6aaf0a9b4704f18e0caa9f356f6b41c8e57e5170e83e875929eb77ec631250f983d1cf8d60d78156b1e6795518a1a346bbe7 WHIRLPOOL 205319d1e4b47f41f2e5f409f66ba9101d7a041ac7550f3886471db02ae329d671a12ebd2177bbec83d2f99baa603589ca8d45fe09ed7f4f20c26a9150ed0624 |
32 |
DIST mariadb-connector-c-2.2.2-src.tar.gz 519724 SHA256 93f56ad9f08bbaf0da8ef03bc96f7093c426ae40dede60575d485e1b99e6406b SHA512 8e7b35345de3ae3902b74613646c17641e441548ec87eb97c635c98dcddb0862411a625d9e82ba62324babe21d0d099a241b074826f0b396b425a80e714dd355 WHIRLPOOL e09d535186726cad6c880327e2045176a8bc773675381262bcff071ecccbdaa6b2fc802250cedf9d3a5f8848fa178fba9a8e236e3d3d988800826176376b91b1 |
33 |
-DIST mariadb-connector-c-3.0.1_beta-src.tar.gz 650137 SHA256 37b7922254e637285e69deceaa81667be103b1ac904b5a946a74d6d3ec97eeac SHA512 99e65987317b4169558191e45449332465188721429842f5196afb22f5e7ec31ac833c75ca8820c9bd63f7745df58fd17e809a83bca58d1a74f329dc10aee551 WHIRLPOOL 770e7e4368fbc17e871a704112c94522b27f564dd66d4520d0afdb46ef0e32e054d533d93a2ff60b9d7f42e15a2c33d2d8723dcb07f4d8f5b459820c797b012b |
34 |
-DIST mariadb-connector-c-3.0.3-src.tar.gz 666928 SHA256 210f0ee3414b235d3db8e98e9e5a0a98381ecf771e67ca4a688036368984eeea SHA512 6da66a32165cb74b106bf94e13a35d4bb38f05e5d2b3ff3740862dfc0892a7705977c1394b4f84b8e1f1e50a59a3fadbc62e7733b1feb532c6368a9fc262db04 WHIRLPOOL 808428dbf05546a2066ce8198e9713bc5e86caf068ed3ab308ee8e912d39248e1c0d7ddc912d8d12ec77411a744c8db5b3dc2351329b06e28ef5be22b5bc8790 |
35 |
-DIST mariadb_client-2.0.0-src.tar.gz 1923436 SHA256 fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 SHA512 7be7454dedc218bb5cdeae5d54c461129cc4611d0e380c4d2bf60bc276e85ea0ae52b0dcf8a41edef0e0e678e1392c2ddcebb9c4a75ad4625808fd0cc7522c75 WHIRLPOOL be699bbda7d86a8708347fcfdc0ebdc17f1fe6ee6e4d1b839e849673450849ab4838eee8d6995a45009a899dbe88d63f7e09dc94933b598b16709db92958aa55 |
36 |
-----BEGIN PGP SIGNATURE----- |
37 |
Version: GnuPG v2 |
38 |
|
39 |
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlpt6ulfFIAAAAAALgAo |
40 |
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlvGkfJfFIAAAAAALgAo |
41 |
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2 |
42 |
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0 |
43 |
-o7YVpxAAsM1Pzw+qxoXilOvt3NTCtH74pVTG37cls30jxH0t4/sHeegKubqIDgRA |
44 |
-e/Rsb+Ap6urwpwFg3owHEksgdaHcoStVnEjWhvjJzlS3wbbV7NDpql8J4hZTTD+Z |
45 |
-ftb6GZurv+C6PplZCfVag8Z/zeOT698VZL7aLIMDE6KMBGj+KSES/q1fmQtGGQI8 |
46 |
-Jp4r7ZJGazZmQnjDoFiBizTNRwXRc3mJ8izN1qUWeeahuRegrYF5EK6u/JtzhOnW |
47 |
-ukXfAdRBDZuTqeX9LZwtLpFZLsH1SfTH6BStBgnYOu865a2MlF1PKtCe/OOeR/WX |
48 |
-/PGzv5+dws6bF08hXG4aOZQSfuznzcpUIYcQQAco6xOGKYQJ0DztV1/0nrza9zKq |
49 |
-GkfiJGJLfQAhBbMttv3sod777NlFcs+7P+BFGxgY5xMLiGQDXVjhmPtVxHRK0cO0 |
50 |
-cvalKmvIzBpxx1pBv5e9HumNv3uDcBQ8jnuEdeHKfH5jLJuRynS4UPD7D5iCuKPg |
51 |
-Hq5+gEEDz/0XG9DjFagIwK6OyurAmV79Ia37UF8dQi0ikMhpIq/dN5IfOxpj59lD |
52 |
-yFRKp5BBHBBram+pnzTPTcZHnernuyBNKxYGNOovQ3zILA41I/Hbhhfq5sbyNnHG |
53 |
-bdhbnTKujLYiD/MZtzZ5xQCTt9bDx1P7dlv5y2kTTMeyxuRj2Gc= |
54 |
-=x+dp |
55 |
+o7aOZg/+N0nU88jEV2GjbwsxV98LaGTSYNlNzGT84WL9G2dHjxXodI6eli7tfjXf |
56 |
+BufXEXqrS6VahipTya6JCG4P/z+06AvpA7ZHCUZkJ/m88gnDQ5vdMnjFYVfm7iVO |
57 |
+ODA4mzPcdJ1ah6OeRYsk1kqFqFLhr40weDSMwTjbLAm1771RVzJSkz0L7acRF+WE |
58 |
+F960IK1WaWY9K0D/nRb0VgCckfcLOHQBUsNmQru/QopI196thCP9wnaQQWFyqjIL |
59 |
+pbduyvBc3rPmTeBo+Gm3R2F2rqy2tyxccmYpoYERbYNomuUnSo9Lgo9qe+yRhKXf |
60 |
+hleNchUqUFNYnwvCAx42SU2CNxzBufTVJyTvCvFq1PcUwlVGq+3VIaElwcspzo5f |
61 |
+8eiORT66BM5lV79eG1Tqj4P+ctwIKp3Mq89pfwT9IjgZljDukz56fgZQvDFZQkqs |
62 |
+dZhQoyV7rLx+VKwj/s4k58B8o7kS7IDrCqMhTcwsZJ/gn2xRqeIMUxWxJgnndAZE |
63 |
+5lPHf+/johpj8Zffhd4ehFSe9A4oyAP3BUdndScSixqY58F+f4S5MN32ZHELLng3 |
64 |
+3NO/a4kUcMZ0nF8B4LXygQciKBqMJVp3N+xUL3sKH33ZfJl+PHv5JEvKkaa4JZLT |
65 |
+zbIg5aV+znJR7sdyQWcBE31NYnyJphcz6riROk9KK78d2Zvp3s8= |
66 |
+=BD3O |
67 |
-----END PGP SIGNATURE----- |
68 |
|
69 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild |
70 |
deleted file mode 100644 |
71 |
index 5743d88..0000000 |
72 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild |
73 |
+++ /dev/null |
74 |
@@ -1,81 +0,0 @@ |
75 |
-# Copyright 1999-2017 Gentoo Foundation |
76 |
-# Distributed under the terms of the GNU General Public License v2 |
77 |
- |
78 |
-EAPI=5 |
79 |
- |
80 |
-VCS_INHERIT="" |
81 |
-if [[ "${PV}" == 9999 ]] ; then |
82 |
- VCS_INHERIT="git-r3" |
83 |
- EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git" |
84 |
- KEYWORDS="" |
85 |
-else |
86 |
- MY_PN="mariadb_client" |
87 |
- SRC_URI=" |
88 |
- http://ftp.osuosl.org/pub/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz |
89 |
- http://mirrors.fe.up.pt/pub/mariadb/client-native${PV}/src/${MY_PN}-${PV}-src.tar.gz |
90 |
- http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz |
91 |
- " |
92 |
- S="${WORKDIR}/${MY_PN}-${PV}-src" |
93 |
- KEYWORDS="~amd64 ~x86" |
94 |
-fi |
95 |
- |
96 |
-inherit cmake-multilib eutils ${VCS_INHERIT} |
97 |
- |
98 |
-MULTILIB_WRAPPED_HEADERS+=( |
99 |
- /usr/include/mariadb/my_config.h |
100 |
-) |
101 |
- |
102 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
103 |
-HOMEPAGE="http://mariadb.org/" |
104 |
-LICENSE="LGPL-2.1" |
105 |
- |
106 |
-SLOT="0/2" |
107 |
-IUSE="doc +mysqlcompat +ssl static-libs" |
108 |
- |
109 |
-CDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
110 |
- virtual/libiconv:=[${MULTILIB_USEDEP}] |
111 |
- ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) |
112 |
- " |
113 |
-# Block server packages due to /usr/bin/mariadb_config symlink there |
114 |
-# TODO: make server package block only when mysqlcompat is enabled |
115 |
-RDEPEND="${CDEPEND} |
116 |
- !dev-db/mysql |
117 |
- !dev-db/mysql-cluster |
118 |
- !dev-db/mysql-connector-c |
119 |
- !dev-db/mariadb |
120 |
- !dev-db/mariadb-galera |
121 |
- !dev-db/percona-server |
122 |
- " |
123 |
-DEPEND="${CDEPEND} |
124 |
- doc? ( app-text/xmlto )" |
125 |
- |
126 |
-src_prepare() { |
127 |
- epatch "${FILESDIR}/fix-libdir.patch" \ |
128 |
- "${FILESDIR}/fix-mariadb_config.patch" |
129 |
-} |
130 |
- |
131 |
-src_configure() { |
132 |
- mycmakeargs+=( |
133 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
134 |
- -DWITH_EXTERNAL_ZLIB=ON |
135 |
- $(cmake-utils_use_with ssl OPENSSL) |
136 |
- $(cmake-utils_use_with mysqlcompat MYSQLCOMPAT) |
137 |
- $(cmake-utils_use_build doc DOCS) |
138 |
- ) |
139 |
- cmake-multilib_src_configure |
140 |
-} |
141 |
- |
142 |
-multilib_src_install() { |
143 |
- cmake-utils_src_install |
144 |
- if ! use static-libs ; then |
145 |
- rm "${ED}/usr/$(get_libdir)/libmariadbclient.a" || die |
146 |
- use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a" || die |
147 |
- fi |
148 |
-} |
149 |
- |
150 |
-multilib_src_install_all() { |
151 |
- if use mysqlcompat ; then |
152 |
- dosym mariadb_config /usr/bin/mysql_config |
153 |
- dosym mariadb /usr/include/mysql |
154 |
- fi |
155 |
-} |
156 |
|
157 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild |
158 |
deleted file mode 100644 |
159 |
index 2e8d6b3..0000000 |
160 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild |
161 |
+++ /dev/null |
162 |
@@ -1,80 +0,0 @@ |
163 |
-# Copyright 1999-2017 Gentoo Foundation |
164 |
-# Distributed under the terms of the GNU General Public License v2 |
165 |
- |
166 |
-EAPI=5 |
167 |
- |
168 |
-VCS_INHERIT="" |
169 |
-if [[ "${PV}" == 9999 ]] ; then |
170 |
- VCS_INHERIT="git-r3" |
171 |
- EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git" |
172 |
- KEYWORDS="" |
173 |
-else |
174 |
- MY_PN=${PN#mariadb-} |
175 |
- SRC_URI=" |
176 |
- http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz |
177 |
- http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz |
178 |
- http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz |
179 |
- " |
180 |
- S="${WORKDIR}/${P}-src" |
181 |
- KEYWORDS="~amd64 ~x86" |
182 |
-fi |
183 |
- |
184 |
-inherit cmake-multilib eutils ${VCS_INHERIT} |
185 |
- |
186 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
187 |
- |
188 |
-MULTILIB_WRAPPED_HEADERS+=( |
189 |
- /usr/include/mariadb/my_config.h |
190 |
-) |
191 |
- |
192 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
193 |
-HOMEPAGE="http://mariadb.org/" |
194 |
-LICENSE="LGPL-2.1" |
195 |
- |
196 |
-SLOT="0/2" |
197 |
-IUSE="mysqlcompat +ssl static-libs" |
198 |
- |
199 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
200 |
- virtual/libiconv:=[${MULTILIB_USEDEP}] |
201 |
- ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
202 |
- " |
203 |
-# Block server packages due to /usr/bin/mariadb_config symlink there |
204 |
-# TODO: make server package block only when mysqlcompat is enabled |
205 |
-RDEPEND="${DEPEND} |
206 |
- !dev-db/mysql |
207 |
- !dev-db/mysql-cluster |
208 |
- !dev-db/mariadb |
209 |
- !dev-db/mariadb-galera |
210 |
- !dev-db/percona-server |
211 |
- mysqlcompat? ( !dev-db/mysql-connector-c ) |
212 |
- " |
213 |
- |
214 |
-src_prepare() { |
215 |
- epatch \ |
216 |
- "${FILESDIR}/fix-mariadb_config-2.1.0.patch" \ |
217 |
- "${FILESDIR}/gentoo-layout.patch" |
218 |
- epatch_user |
219 |
-} |
220 |
- |
221 |
-multilib_src_configure() { |
222 |
- mycmakeargs+=( |
223 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
224 |
- -DWITH_EXTERNAL_ZLIB=ON |
225 |
- $(cmake-utils_use_with ssl OPENSSL) |
226 |
- $(cmake-utils_use_with mysqlcompat MYSQLCOMPAT) |
227 |
- -DLIB_INSTALL_DIR=$(get_libdir) |
228 |
- -DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin |
229 |
- -DINSTALL_LAYOUT=GENTOO |
230 |
- ) |
231 |
- cmake-utils_src_configure |
232 |
-} |
233 |
- |
234 |
-multilib_src_install_all() { |
235 |
- if ! use static-libs ; then |
236 |
- find "${D}" -name "*.a" -delete || die |
237 |
- fi |
238 |
- if use mysqlcompat ; then |
239 |
- dosym mariadb_config /usr/bin/mysql_config |
240 |
- dosym mariadb /usr/include/mysql |
241 |
- fi |
242 |
-} |
243 |
|
244 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild |
245 |
index d484eca..882ee60 100644 |
246 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild |
247 |
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild |
248 |
@@ -1,4 +1,4 @@ |
249 |
-# Copyright 1999-2017 Gentoo Foundation |
250 |
+# Copyright 1999-2018 Gentoo Authors |
251 |
# Distributed under the terms of the GNU General Public License v2 |
252 |
|
253 |
EAPI=6 |
254 |
@@ -65,7 +65,7 @@ multilib_src_install_all() { |
255 |
find "${D}" -name "*.a" -delete || die |
256 |
fi |
257 |
if use mysqlcompat ; then |
258 |
- dosym /usr/sbin/mariadb_config /usr/bin/mysql_config |
259 |
+ dosym ../sbin/mariadb_config /usr/bin/mysql_config |
260 |
dosym mariadb /usr/include/mysql |
261 |
fi |
262 |
} |
263 |
|
264 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild |
265 |
deleted file mode 100644 |
266 |
index 89d8b33..0000000 |
267 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild |
268 |
+++ /dev/null |
269 |
@@ -1,104 +0,0 @@ |
270 |
-# Copyright 1999-2017 Gentoo Foundation |
271 |
-# Distributed under the terms of the GNU General Public License v2 |
272 |
- |
273 |
-EAPI=6 |
274 |
- |
275 |
-VCS_INHERIT="" |
276 |
-if [[ "${PV}" == 9999 ]] ; then |
277 |
- VCS_INHERIT="git-r3" |
278 |
- EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git" |
279 |
- KEYWORDS="" |
280 |
-else |
281 |
- MY_PN=${PN#mariadb-} |
282 |
- MY_PV=${PV/_b/-b} |
283 |
- SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" |
284 |
- S="${WORKDIR}/${PN}-${MY_PV}-src" |
285 |
- KEYWORDS="~amd64 ~x86" |
286 |
-fi |
287 |
- |
288 |
-inherit cmake-utils multilib-minimal ${VCS_INHERIT} |
289 |
- |
290 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
291 |
- |
292 |
-MULTILIB_WRAPPED_HEADERS+=( |
293 |
- /usr/include/mariadb/mariadb_version.h |
294 |
-) |
295 |
- |
296 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
297 |
-HOMEPAGE="http://mariadb.org/" |
298 |
-LICENSE="LGPL-2.1" |
299 |
- |
300 |
-SLOT="0/2" |
301 |
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs" |
302 |
- |
303 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
304 |
- virtual/libiconv:=[${MULTILIB_USEDEP}] |
305 |
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
306 |
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
307 |
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
308 |
- ssl? ( |
309 |
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
310 |
- !gnutls? ( |
311 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
312 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
313 |
- ) |
314 |
- ) |
315 |
- " |
316 |
-RDEPEND="${DEPEND} |
317 |
- mysqlcompat? ( |
318 |
- !dev-db/mysql |
319 |
- !dev-db/mysql-cluster |
320 |
- !dev-db/mariadb |
321 |
- !dev-db/mariadb-galera |
322 |
- !dev-db/percona-server |
323 |
- !dev-db/mysql-connector-c ) |
324 |
- " |
325 |
-PATCHES=( |
326 |
- "${FILESDIR}/gentoo-layout-3.0.patch" ) |
327 |
- |
328 |
-src_prepare() { |
329 |
- local gpluginconf="${T}/gentoo-plugins.cmake" |
330 |
- touch "${gpluginconf}" || die |
331 |
- # Plugins cannot be disabled by a build switch, redefine them in our own file to be included |
332 |
- if ! use kerberos ; then |
333 |
- echo 'REGISTER_PLUGIN("AUTH_GSSAPI" "" "auth_gssapi_plugin" "OFF" "auth_gssapi_client" 1)' \ |
334 |
- >> "${gpluginconf}" || die |
335 |
- fi |
336 |
- if ! use curl ; then |
337 |
- echo 'REGISTER_PLUGIN("REMOTEIO" "" "remote_io_plugin" "OFF" "remote_io" 1)' \ |
338 |
- >> "${gpluginconf}" || die |
339 |
- fi |
340 |
- default |
341 |
-} |
342 |
- |
343 |
-multilib_src_configure() { |
344 |
- local mycmakeargs=( |
345 |
- -DWITH_EXTERNAL_ZLIB=ON |
346 |
- -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
347 |
- -DWITH_CURL=$(usex curl ON OFF) |
348 |
- -DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF) |
349 |
- -DINSTALL_LIBDIR="$(get_libdir)" |
350 |
- -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
351 |
- -DINSTALL_BINDIR=bin |
352 |
- -DPLUGIN_CONF_FILE:STRING="${T}/gentoo-plugins.cmake" |
353 |
- ) |
354 |
- cmake-utils_src_configure |
355 |
-} |
356 |
- |
357 |
-multilib_src_install() { |
358 |
- cmake-utils_src_install |
359 |
- if use mysqlcompat ; then |
360 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 |
361 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so |
362 |
- fi |
363 |
-} |
364 |
- |
365 |
-multilib_src_install_all() { |
366 |
- if ! use static-libs ; then |
367 |
- find "${D}" -name "*.a" -delete || die |
368 |
- fi |
369 |
- if use mysqlcompat ; then |
370 |
- dosym mariadb_config /usr/bin/mysql_config |
371 |
- dosym mariadb /usr/include/mysql |
372 |
- fi |
373 |
-} |
374 |
|
375 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild |
376 |
deleted file mode 100644 |
377 |
index 552150c..0000000 |
378 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild |
379 |
+++ /dev/null |
380 |
@@ -1,105 +0,0 @@ |
381 |
-# Copyright 1999-2018 Gentoo Foundation |
382 |
-# Distributed under the terms of the GNU General Public License v2 |
383 |
- |
384 |
-EAPI=6 |
385 |
- |
386 |
-VCS_INHERIT="" |
387 |
-if [[ "${PV}" == 9999 ]] ; then |
388 |
- VCS_INHERIT="git-r3" |
389 |
- EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git" |
390 |
- KEYWORDS="" |
391 |
-else |
392 |
- MY_PN=${PN#mariadb-} |
393 |
- MY_PV=${PV/_b/-b} |
394 |
- SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" |
395 |
- S="${WORKDIR}/${PN}-${MY_PV}-src" |
396 |
- KEYWORDS="~amd64 ~x86" |
397 |
-fi |
398 |
- |
399 |
-inherit cmake-utils multilib-minimal ${VCS_INHERIT} |
400 |
- |
401 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
402 |
- |
403 |
-MULTILIB_WRAPPED_HEADERS+=( |
404 |
- /usr/include/mariadb/mariadb_version.h |
405 |
-) |
406 |
- |
407 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
408 |
-HOMEPAGE="http://mariadb.org/" |
409 |
-LICENSE="LGPL-2.1" |
410 |
- |
411 |
-SLOT="0/2" |
412 |
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs" |
413 |
- |
414 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
415 |
- virtual/libiconv:=[${MULTILIB_USEDEP}] |
416 |
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
417 |
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
418 |
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
419 |
- ssl? ( |
420 |
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
421 |
- !gnutls? ( |
422 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
423 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
424 |
- ) |
425 |
- ) |
426 |
- " |
427 |
-RDEPEND="${DEPEND} |
428 |
- mysqlcompat? ( |
429 |
- !dev-db/mysql[client-libs(+)] |
430 |
- !dev-db/mysql-cluster[client-libs(+)] |
431 |
- !dev-db/mariadb[client-libs(+)] |
432 |
- !dev-db/mariadb-galera[client-libs(+)] |
433 |
- !dev-db/percona-server[client-libs(+)] |
434 |
- !dev-db/mysql-connector-c ) |
435 |
- !>=dev-db/mariadb-10.2.0[client-libs(+)] |
436 |
- " |
437 |
-PATCHES=( |
438 |
- "${FILESDIR}/gentoo-layout-3.0.patch" ) |
439 |
- |
440 |
-src_prepare() { |
441 |
- local gpluginconf="${T}/gentoo-plugins.cmake" |
442 |
- touch "${gpluginconf}" || die |
443 |
- # Plugins cannot be disabled by a build switch, redefine them in our own file to be included |
444 |
- if ! use kerberos ; then |
445 |
- echo 'REGISTER_PLUGIN("AUTH_GSSAPI" "" "auth_gssapi_plugin" "OFF" "auth_gssapi_client" 1)' \ |
446 |
- >> "${gpluginconf}" || die |
447 |
- fi |
448 |
- if ! use curl ; then |
449 |
- echo 'REGISTER_PLUGIN("REMOTEIO" "" "remote_io_plugin" "OFF" "remote_io" 1)' \ |
450 |
- >> "${gpluginconf}" || die |
451 |
- fi |
452 |
- cmake-utils_src_prepare |
453 |
-} |
454 |
- |
455 |
-multilib_src_configure() { |
456 |
- local mycmakeargs=( |
457 |
- -DWITH_EXTERNAL_ZLIB=ON |
458 |
- -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
459 |
- -DWITH_CURL=$(usex curl ON OFF) |
460 |
- -DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF) |
461 |
- -DINSTALL_LIBDIR="$(get_libdir)" |
462 |
- -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
463 |
- -DINSTALL_BINDIR=bin |
464 |
- -DPLUGIN_CONF_FILE:STRING="${T}/gentoo-plugins.cmake" |
465 |
- ) |
466 |
- cmake-utils_src_configure |
467 |
-} |
468 |
- |
469 |
-multilib_src_install() { |
470 |
- cmake-utils_src_install |
471 |
- if use mysqlcompat ; then |
472 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 |
473 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so |
474 |
- fi |
475 |
-} |
476 |
- |
477 |
-multilib_src_install_all() { |
478 |
- if ! use static-libs ; then |
479 |
- find "${D}" -name "*.a" -delete || die |
480 |
- fi |
481 |
- if use mysqlcompat ; then |
482 |
- dosym mariadb_config /usr/bin/mysql_config |
483 |
- dosym mariadb /usr/include/mysql |
484 |
- fi |
485 |
-} |
486 |
|
487 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
488 |
index 8b4cb07..c45c245 100644 |
489 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
490 |
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
491 |
@@ -1,7 +1,7 @@ |
492 |
-# Copyright 1999-2017 Gentoo Foundation |
493 |
+# Copyright 1999-2018 Gentoo Authors |
494 |
# Distributed under the terms of the GNU General Public License v2 |
495 |
|
496 |
-EAPI=5 |
497 |
+EAPI=6 |
498 |
|
499 |
VCS_INHERIT="" |
500 |
if [[ "${PV}" == 9999 ]] ; then |
501 |
@@ -19,7 +19,7 @@ else |
502 |
KEYWORDS="~amd64 ~x86" |
503 |
fi |
504 |
|
505 |
-inherit cmake-multilib eutils ${VCS_INHERIT} |
506 |
+inherit cmake-utils multilib-minimal ${VCS_INHERIT} |
507 |
|
508 |
MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
509 |
|
510 |
@@ -27,6 +27,9 @@ MULTILIB_WRAPPED_HEADERS+=( |
511 |
/usr/include/mariadb/my_config.h |
512 |
) |
513 |
|
514 |
+PATCHES=( "${FILESDIR}/fix-mariadb_config-2.1.0.patch" |
515 |
+ "${FILESDIR}/gentoo-layout.patch" ) |
516 |
+ |
517 |
DESCRIPTION="C client library for MariaDB/MySQL" |
518 |
HOMEPAGE="http://mariadb.org/" |
519 |
LICENSE="LGPL-2.1" |
520 |
@@ -49,19 +52,12 @@ RDEPEND="${DEPEND} |
521 |
mysqlcompat? ( !dev-db/mysql-connector-c ) |
522 |
" |
523 |
|
524 |
-src_prepare() { |
525 |
- epatch \ |
526 |
- "${FILESDIR}/fix-mariadb_config-2.1.0.patch" \ |
527 |
- "${FILESDIR}/gentoo-layout.patch" |
528 |
- epatch_user |
529 |
-} |
530 |
- |
531 |
multilib_src_configure() { |
532 |
- mycmakeargs+=( |
533 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
534 |
+ local mycmakeargs=( |
535 |
+ -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" |
536 |
-DWITH_EXTERNAL_ZLIB=ON |
537 |
- $(cmake-utils_use_with ssl OPENSSL) |
538 |
- $(cmake-utils_use_with mysqlcompat MYSQLCOMPAT) |
539 |
+ -DOPENSSL=$(usex ssl ON OFF) |
540 |
+ -DMYSQLCOMPAT=$(usex mysqlcompat ON OFF) |
541 |
-DLIB_INSTALL_DIR=$(get_libdir) |
542 |
-DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin |
543 |
-DINSTALL_LAYOUT=GENTOO |