1 |
commit: 687a4cbd39b0cb043ee2ce0640da268944cdd9cf |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 15 15:57:58 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 15 15:58:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687a4cbd |
7 |
|
8 |
dev-db/mariadb-connector-c: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
dev-db/mariadb-connector-c/Manifest | 2 - |
14 |
.../mariadb-connector-c-3.0.3-r1.ebuild | 116 --------------------- |
15 |
.../mariadb-connector-c-3.0.4-r1.ebuild | 101 ------------------ |
16 |
3 files changed, 219 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest |
19 |
index 0ee9098ae57..42e70beae03 100644 |
20 |
--- a/dev-db/mariadb-connector-c/Manifest |
21 |
+++ b/dev-db/mariadb-connector-c/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST mariadb-connector-c-3.0.3-src.tar.gz 666928 BLAKE2B 83181949f1867909fd96696ac5cc9d11433a0c772ecb97d862983916b235d380fd84462d547faf42756d6698dd9dbe7dcd4d6b1d0f6336e147f5a597108ea025 SHA512 6da66a32165cb74b106bf94e13a35d4bb38f05e5d2b3ff3740862dfc0892a7705977c1394b4f84b8e1f1e50a59a3fadbc62e7733b1feb532c6368a9fc262db04 |
24 |
-DIST mariadb-connector-c-3.0.4-src.tar.gz 659406 BLAKE2B 9285880338e6040976741d8b440d78ef95005d44e0e7b1428cb526735380038d6dfaccfd6bd689f4b9c084a340281b2d8f4f38a193d1c6a4c5853c5333617899 SHA512 6edc7b70380aade1c88a3d9dac70d6da846e6e2e7d7b0dc2eddaba148dc3889f2baa3e757a8b91e479b1ae14051d9f948fbfdc516219e21d4a3117f6700cb020 |
25 |
DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e |
26 |
|
27 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index b15b8490e8e..00000000000 |
30 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,116 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-VCS_INHERIT="" |
39 |
-if [[ "${PV}" == 9999 ]] ; then |
40 |
- VCS_INHERIT="git-r3" |
41 |
- EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git" |
42 |
- KEYWORDS="~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc" |
43 |
-else |
44 |
- MY_PN=${PN#mariadb-} |
45 |
- MY_PV=${PV/_b/-b} |
46 |
- SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" |
47 |
- S="${WORKDIR}/${PN}-${MY_PV}-src" |
48 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86" |
49 |
-fi |
50 |
- |
51 |
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT} |
52 |
- |
53 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
54 |
- |
55 |
-MULTILIB_WRAPPED_HEADERS+=( |
56 |
- /usr/include/mariadb/mariadb_version.h |
57 |
-) |
58 |
- |
59 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
60 |
-HOMEPAGE="https://mariadb.org/" |
61 |
-LICENSE="LGPL-2.1" |
62 |
- |
63 |
-SLOT="0/3" |
64 |
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs" |
65 |
- |
66 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
67 |
- virtual/libiconv:=[${MULTILIB_USEDEP}] |
68 |
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
69 |
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
70 |
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
71 |
- ssl? ( |
72 |
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
73 |
- !gnutls? ( |
74 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
75 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
76 |
- ) |
77 |
- ) |
78 |
- " |
79 |
-RDEPEND="${DEPEND} |
80 |
- mysqlcompat? ( |
81 |
- !dev-db/mysql[client-libs(+)] |
82 |
- !dev-db/mysql-cluster[client-libs(+)] |
83 |
- !dev-db/mariadb[client-libs(+)] |
84 |
- !dev-db/mariadb-galera[client-libs(+)] |
85 |
- !dev-db/percona-server[client-libs(+)] |
86 |
- !dev-db/mysql-connector-c ) |
87 |
- !>=dev-db/mariadb-10.2.0[client-libs(+)] |
88 |
- " |
89 |
-PATCHES=( |
90 |
- "${FILESDIR}/gentoo-layout-3.0.patch" ) |
91 |
- |
92 |
-src_prepare() { |
93 |
- local gpluginconf="${T}/gentoo-plugins.cmake" |
94 |
- touch "${gpluginconf}" || die |
95 |
- # Plugins cannot be disabled by a build switch, redefine them in our own file to be included |
96 |
- if ! use kerberos ; then |
97 |
- echo 'REGISTER_PLUGIN("AUTH_GSSAPI" "" "auth_gssapi_plugin" "OFF" "auth_gssapi_client" 1)' \ |
98 |
- >> "${gpluginconf}" || die |
99 |
- fi |
100 |
- if ! use curl ; then |
101 |
- echo 'REGISTER_PLUGIN("REMOTEIO" "" "remote_io_plugin" "OFF" "remote_io" 1)' \ |
102 |
- >> "${gpluginconf}" || die |
103 |
- fi |
104 |
- cmake-utils_src_prepare |
105 |
-} |
106 |
- |
107 |
-src_configure() { |
108 |
- # bug 508724 mariadb cannot use ld.gold |
109 |
- tc-ld-disable-gold |
110 |
- multilib-minimal_src_configure |
111 |
-} |
112 |
- |
113 |
-multilib_src_configure() { |
114 |
- local mycmakeargs=( |
115 |
- -DWITH_EXTERNAL_ZLIB=ON |
116 |
- -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
117 |
- -DWITH_CURL=$(usex curl ON OFF) |
118 |
- -DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF) |
119 |
- -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" |
120 |
- -DINSTALL_LIBDIR="$(get_libdir)" |
121 |
- -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
122 |
- -DINSTALL_BINDIR=bin |
123 |
- -DPLUGIN_CONF_FILE:STRING="${T}/gentoo-plugins.cmake" |
124 |
- ) |
125 |
- cmake-utils_src_configure |
126 |
-} |
127 |
- |
128 |
-multilib_src_compile() { |
129 |
- cmake-utils_src_compile |
130 |
-} |
131 |
- |
132 |
-multilib_src_install() { |
133 |
- cmake-utils_src_install |
134 |
- if use mysqlcompat ; then |
135 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 |
136 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so |
137 |
- fi |
138 |
-} |
139 |
- |
140 |
-multilib_src_install_all() { |
141 |
- if ! use static-libs ; then |
142 |
- find "${D}" -name "*.a" -delete || die |
143 |
- fi |
144 |
- if use mysqlcompat ; then |
145 |
- dosym mariadb_config /usr/bin/mysql_config |
146 |
- dosym mariadb /usr/include/mysql |
147 |
- fi |
148 |
-} |
149 |
|
150 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.4-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.4-r1.ebuild |
151 |
deleted file mode 100644 |
152 |
index df11d552495..00000000000 |
153 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.4-r1.ebuild |
154 |
+++ /dev/null |
155 |
@@ -1,101 +0,0 @@ |
156 |
-# Copyright 1999-2018 Gentoo Foundation |
157 |
-# Distributed under the terms of the GNU General Public License v2 |
158 |
- |
159 |
-EAPI=6 |
160 |
- |
161 |
-VCS_INHERIT="" |
162 |
-if [[ "${PV}" == 9999 ]] ; then |
163 |
- VCS_INHERIT="git-r3" |
164 |
- EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" |
165 |
- KEYWORDS="" |
166 |
-else |
167 |
- MY_PN=${PN#mariadb-} |
168 |
- MY_PV=${PV/_b/-b} |
169 |
- SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" |
170 |
- S="${WORKDIR%/}/${PN}-${MY_PV}-src" |
171 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86" |
172 |
-fi |
173 |
- |
174 |
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT} |
175 |
- |
176 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
177 |
- |
178 |
-MULTILIB_WRAPPED_HEADERS+=( |
179 |
- /usr/include/mariadb/mariadb_version.h |
180 |
-) |
181 |
- |
182 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
183 |
-HOMEPAGE="https://mariadb.org/" |
184 |
-LICENSE="LGPL-2.1" |
185 |
- |
186 |
-SLOT="0/3" |
187 |
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test" |
188 |
- |
189 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
190 |
- virtual/libiconv:=[${MULTILIB_USEDEP}] |
191 |
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
192 |
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
193 |
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
194 |
- ssl? ( |
195 |
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
196 |
- !gnutls? ( |
197 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
198 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
199 |
- ) |
200 |
- ) |
201 |
- " |
202 |
-RDEPEND="${DEPEND} |
203 |
- mysqlcompat? ( |
204 |
- !dev-db/mysql[client-libs(+)] |
205 |
- !dev-db/mysql-cluster[client-libs(+)] |
206 |
- !dev-db/mariadb[client-libs(+)] |
207 |
- !dev-db/mariadb-galera[client-libs(+)] |
208 |
- !dev-db/percona-server[client-libs(+)] |
209 |
- !dev-db/mysql-connector-c ) |
210 |
- !>=dev-db/mariadb-10.2.0[client-libs(+)] |
211 |
- " |
212 |
-PATCHES=( |
213 |
- "${FILESDIR%/}/gentoo-layout-3.0.patch" ) |
214 |
- |
215 |
-src_configure() { |
216 |
- # bug 508724 mariadb cannot use ld.gold |
217 |
- tc-ld-disable-gold |
218 |
- multilib-minimal_src_configure |
219 |
-} |
220 |
- |
221 |
-multilib_src_configure() { |
222 |
- local mycmakeargs=( |
223 |
- -DWITH_EXTERNAL_ZLIB=ON |
224 |
- -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
225 |
- -DWITH_CURL=$(usex curl ON OFF) |
226 |
- -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) |
227 |
- -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" |
228 |
- -DINSTALL_LIBDIR="$(get_libdir)" |
229 |
- -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
230 |
- -DINSTALL_BINDIR=bin |
231 |
- -DWITH_UNIT_TESTS=$(usex test ON OFF) |
232 |
- ) |
233 |
- cmake-utils_src_configure |
234 |
-} |
235 |
- |
236 |
-multilib_src_compile() { |
237 |
- cmake-utils_src_compile |
238 |
-} |
239 |
- |
240 |
-multilib_src_install() { |
241 |
- cmake-utils_src_install |
242 |
- if use mysqlcompat ; then |
243 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 |
244 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so |
245 |
- fi |
246 |
-} |
247 |
- |
248 |
-multilib_src_install_all() { |
249 |
- if ! use static-libs ; then |
250 |
- find "${D}" -name "*.a" -delete || die |
251 |
- fi |
252 |
- if use mysqlcompat ; then |
253 |
- dosym mariadb_config /usr/bin/mysql_config |
254 |
- dosym mariadb /usr/include/mysql |
255 |
- fi |
256 |
-} |