1 |
commit: 0a4f621821c5c2ebd8e52ab24264b047cb60f5ad |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 15 19:13:01 2019 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 15 19:13:01 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4f6218 |
7 |
|
8 |
dev-db/mariadb-connector-c: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
12 |
|
13 |
dev-db/mariadb-connector-c/Manifest | 2 - |
14 |
...db-connector-c-3.0.7-fix-pkconfig-file-r1.patch | 32 ------- |
15 |
.../mariadb-connector-c-3.0.7-r1.ebuild | 102 -------------------- |
16 |
.../mariadb-connector-c-3.0.8.ebuild | 103 --------------------- |
17 |
4 files changed, 239 deletions(-) |
18 |
|
19 |
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest |
20 |
index 4ce03a3c9a6..6b46d2466d8 100644 |
21 |
--- a/dev-db/mariadb-connector-c/Manifest |
22 |
+++ b/dev-db/mariadb-connector-c/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e |
25 |
-DIST mariadb-connector-c-3.0.7-src.tar.gz 667274 BLAKE2B 75d2d548d51889aecc8af56cbeb61f5eaf21e60924b70dd0559214de464eae209743febdb5d443797f853bc902352f7333aefe84cb367f61f7bf2c341a4a8ac2 SHA512 70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219 |
26 |
-DIST mariadb-connector-c-3.0.8-src.tar.gz 674455 BLAKE2B eca5972f8443c78cdc9f450e7e88ee1c69e2a004664916a0f7dfd9a1ab8242c9e11d3cafcd95323262223fba5d68c5d489d4f61fdddb8369cf603cdd563cfe51 SHA512 d9f970c7ac164ef7d8dd748bf2f749cc1f877a9c8f68a1d57e9ff62d95046bb9505619feca1f1d0d1cdefc1ac49489742aadf4ad9e47c8e6a9b8b40c56eed788 |
27 |
DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946 SHA512 6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a |
28 |
|
29 |
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch |
30 |
deleted file mode 100644 |
31 |
index 1fe06e2c8e5..00000000000 |
32 |
--- a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch |
33 |
+++ /dev/null |
34 |
@@ -1,32 +0,0 @@ |
35 |
-https://bugs.gentoo.org/673218 |
36 |
- |
37 |
---- a/mariadb_config/CMakeLists.txt |
38 |
-+++ b/mariadb_config/CMakeLists.txt |
39 |
-@@ -59,5 +59,5 @@ INSTALL(TARGETS mariadb_config |
40 |
- COMPONENT Development) |
41 |
- |
42 |
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc |
43 |
-- DESTINATION "lib/pkgconfig" |
44 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig |
45 |
- COMPONENT Development) |
46 |
---- a/mariadb_config/libmariadb.pc.in |
47 |
-+++ b/mariadb_config/libmariadb.pc.in |
48 |
-@@ -7,13 +7,12 @@ |
49 |
- # |
50 |
- |
51 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
52 |
--includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ |
53 |
--libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ |
54 |
-+includedir=${prefix}/include |
55 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
56 |
- |
57 |
- Name: libmariadb |
58 |
- Version: @CPACK_PACKAGE_VERSION@ |
59 |
-+URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ |
60 |
- Description: MariaDB Connector/C dynamic library |
61 |
--Cflags: -I${includedir} |
62 |
--Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@ |
63 |
-- |
64 |
-- |
65 |
-+Cflags: -I${includedir}/mariadb |
66 |
-+Libs: -L${libdir} -lmariadb |
67 |
|
68 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild |
69 |
deleted file mode 100644 |
70 |
index 2cd32bf0db3..00000000000 |
71 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild |
72 |
+++ /dev/null |
73 |
@@ -1,102 +0,0 @@ |
74 |
-# Copyright 1999-2018 Gentoo Authors |
75 |
-# Distributed under the terms of the GNU General Public License v2 |
76 |
- |
77 |
-EAPI=6 |
78 |
- |
79 |
-VCS_INHERIT="" |
80 |
-if [[ "${PV}" == 9999 ]] ; then |
81 |
- VCS_INHERIT="git-r3" |
82 |
- EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" |
83 |
-else |
84 |
- MY_PN=${PN#mariadb-} |
85 |
- MY_PV=${PV/_b/-b} |
86 |
- SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" |
87 |
- S="${WORKDIR%/}/${PN}-${MY_PV}-src" |
88 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
89 |
-fi |
90 |
- |
91 |
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT} |
92 |
- |
93 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
94 |
- |
95 |
-MULTILIB_WRAPPED_HEADERS+=( |
96 |
- /usr/include/mariadb/mariadb_version.h |
97 |
-) |
98 |
- |
99 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
100 |
-HOMEPAGE="https://mariadb.org/" |
101 |
-LICENSE="LGPL-2.1" |
102 |
- |
103 |
-SLOT="0/3" |
104 |
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test" |
105 |
- |
106 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
107 |
- virtual/libiconv:=[${MULTILIB_USEDEP}] |
108 |
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
109 |
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
110 |
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
111 |
- ssl? ( |
112 |
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
113 |
- !gnutls? ( |
114 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
115 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
116 |
- ) |
117 |
- ) |
118 |
- " |
119 |
-RDEPEND="${DEPEND} |
120 |
- mysqlcompat? ( |
121 |
- !dev-db/mysql[client-libs(+)] |
122 |
- !dev-db/mysql-cluster[client-libs(+)] |
123 |
- !dev-db/mariadb[client-libs(+)] |
124 |
- !dev-db/mariadb-galera[client-libs(+)] |
125 |
- !dev-db/percona-server[client-libs(+)] |
126 |
- !dev-db/mysql-connector-c ) |
127 |
- !>=dev-db/mariadb-10.2.0[client-libs(+)] |
128 |
- " |
129 |
-PATCHES=( |
130 |
- "${FILESDIR}"/gentoo-layout-3.0.patch |
131 |
- "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file-r1.patch |
132 |
-) |
133 |
- |
134 |
-src_configure() { |
135 |
- # bug 508724 mariadb cannot use ld.gold |
136 |
- tc-ld-disable-gold |
137 |
- multilib-minimal_src_configure |
138 |
-} |
139 |
- |
140 |
-multilib_src_configure() { |
141 |
- local mycmakeargs=( |
142 |
- -DWITH_EXTERNAL_ZLIB=ON |
143 |
- -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
144 |
- -DWITH_CURL=$(usex curl ON OFF) |
145 |
- -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) |
146 |
- -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" |
147 |
- -DINSTALL_LIBDIR="$(get_libdir)" |
148 |
- -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
149 |
- -DINSTALL_BINDIR=bin |
150 |
- -DWITH_UNIT_TESTS=$(usex test ON OFF) |
151 |
- ) |
152 |
- cmake-utils_src_configure |
153 |
-} |
154 |
- |
155 |
-multilib_src_compile() { |
156 |
- cmake-utils_src_compile |
157 |
-} |
158 |
- |
159 |
-multilib_src_install() { |
160 |
- cmake-utils_src_install |
161 |
- if use mysqlcompat ; then |
162 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 |
163 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so |
164 |
- fi |
165 |
-} |
166 |
- |
167 |
-multilib_src_install_all() { |
168 |
- if ! use static-libs ; then |
169 |
- find "${D}" -name "*.a" -delete || die |
170 |
- fi |
171 |
- if use mysqlcompat ; then |
172 |
- dosym mariadb_config /usr/bin/mysql_config |
173 |
- dosym mariadb /usr/include/mysql |
174 |
- fi |
175 |
-} |
176 |
|
177 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild |
178 |
deleted file mode 100644 |
179 |
index c957edaec2d..00000000000 |
180 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild |
181 |
+++ /dev/null |
182 |
@@ -1,103 +0,0 @@ |
183 |
-# Copyright 1999-2019 Gentoo Authors |
184 |
-# Distributed under the terms of the GNU General Public License v2 |
185 |
- |
186 |
-EAPI=6 |
187 |
- |
188 |
-VCS_INHERIT="" |
189 |
-if [[ "${PV}" == 9999 ]] ; then |
190 |
- VCS_INHERIT="git-r3" |
191 |
- EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" |
192 |
-else |
193 |
- MY_PN=${PN#mariadb-} |
194 |
- MY_PV=${PV/_b/-b} |
195 |
- SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" |
196 |
- S="${WORKDIR%/}/${PN}-${MY_PV}-src" |
197 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
198 |
-fi |
199 |
- |
200 |
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT} |
201 |
- |
202 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
203 |
- |
204 |
-MULTILIB_WRAPPED_HEADERS+=( |
205 |
- /usr/include/mariadb/mariadb_version.h |
206 |
-) |
207 |
- |
208 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
209 |
-HOMEPAGE="https://mariadb.org/" |
210 |
-LICENSE="LGPL-2.1" |
211 |
- |
212 |
-SLOT="0/3" |
213 |
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test" |
214 |
- |
215 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
216 |
- virtual/libiconv:=[${MULTILIB_USEDEP}] |
217 |
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
218 |
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
219 |
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
220 |
- ssl? ( |
221 |
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
222 |
- !gnutls? ( |
223 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
224 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
225 |
- ) |
226 |
- ) |
227 |
- " |
228 |
-RDEPEND="${DEPEND} |
229 |
- mysqlcompat? ( |
230 |
- !dev-db/mysql[client-libs(+)] |
231 |
- !dev-db/mysql-cluster[client-libs(+)] |
232 |
- !dev-db/mariadb[client-libs(+)] |
233 |
- !dev-db/mariadb-galera[client-libs(+)] |
234 |
- !dev-db/percona-server[client-libs(+)] |
235 |
- !dev-db/mysql-connector-c ) |
236 |
- !>=dev-db/mariadb-10.2.0[client-libs(+)] |
237 |
- " |
238 |
-PATCHES=( |
239 |
- "${FILESDIR}"/gentoo-layout-3.0.patch |
240 |
- "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch |
241 |
-) |
242 |
- |
243 |
-src_configure() { |
244 |
- # bug 508724 mariadb cannot use ld.gold |
245 |
- tc-ld-disable-gold |
246 |
- multilib-minimal_src_configure |
247 |
-} |
248 |
- |
249 |
-multilib_src_configure() { |
250 |
- local mycmakeargs=( |
251 |
- -DWITH_EXTERNAL_ZLIB=ON |
252 |
- -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
253 |
- -DWITH_CURL=$(usex curl ON OFF) |
254 |
- -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) |
255 |
- -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" |
256 |
- -DINSTALL_LIBDIR="$(get_libdir)" |
257 |
- -DINSTALL_PCDIR="$(get_libdir)/pkgconfig" |
258 |
- -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
259 |
- -DINSTALL_BINDIR=bin |
260 |
- -DWITH_UNIT_TESTS=$(usex test ON OFF) |
261 |
- ) |
262 |
- cmake-utils_src_configure |
263 |
-} |
264 |
- |
265 |
-multilib_src_compile() { |
266 |
- cmake-utils_src_compile |
267 |
-} |
268 |
- |
269 |
-multilib_src_install() { |
270 |
- cmake-utils_src_install |
271 |
- if use mysqlcompat ; then |
272 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 |
273 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so |
274 |
- fi |
275 |
-} |
276 |
- |
277 |
-multilib_src_install_all() { |
278 |
- if ! use static-libs ; then |
279 |
- find "${D}" -name "*.a" -delete || die |
280 |
- fi |
281 |
- if use mysqlcompat ; then |
282 |
- dosym mariadb_config /usr/bin/mysql_config |
283 |
- dosym mariadb /usr/include/mysql |
284 |
- fi |
285 |
-} |