1 |
commit: 3a81979e66468006181677f2ac9e5b2bdf5d3704 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 1 21:23:14 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 1 21:23:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a81979e |
7 |
|
8 |
dev-db/mariadb-connector-c: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
dev-db/mariadb-connector-c/Manifest | 1 - |
14 |
...b-connector-c-3.0.6-provide-pkconfig-file.patch | 48 ---------- |
15 |
...riadb-connector-c-3.0.8-fix-pkconfig-file.patch | 21 ----- |
16 |
.../mariadb-connector-c-3.0.6-r1.ebuild | 103 --------------------- |
17 |
dev-db/mariadb-connector-c/metadata.xml | 11 +-- |
18 |
5 files changed, 4 insertions(+), 180 deletions(-) |
19 |
|
20 |
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest |
21 |
index 854f5361f2f..50ad9a5d2bf 100644 |
22 |
--- a/dev-db/mariadb-connector-c/Manifest |
23 |
+++ b/dev-db/mariadb-connector-c/Manifest |
24 |
@@ -1,3 +1,2 @@ |
25 |
-DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e |
26 |
DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60 SHA512 44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8 |
27 |
DIST mariadb-connector-c-3.1.7-src.tar.gz 742923 BLAKE2B 641c3c49cf83af918e5dab06f9b8afecd59bd7b6486cc55b33749cd0ef317ab6cff86da9b85829b0309305a190e16f4ecc369210c54070e265387a5818c48ca1 SHA512 0b7f6497b6b88b2bbcb870b7c3a8f3fe0bf547c6b5d9b95cc99423aa8ea02ac510c5fb71079e7cd79a49741c7f26f3e68c39e245b18fab46754e8640f79ff670 |
28 |
|
29 |
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch |
30 |
deleted file mode 100644 |
31 |
index 02bbefce357..00000000000 |
32 |
--- a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch |
33 |
+++ /dev/null |
34 |
@@ -1,48 +0,0 @@ |
35 |
---- a/mariadb_config/CMakeLists.txt |
36 |
-+++ b/mariadb_config/CMakeLists.txt |
37 |
-@@ -46,6 +46,8 @@ ENDIF() |
38 |
- |
39 |
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in |
40 |
- ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY) |
41 |
-+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in |
42 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY) |
43 |
- |
44 |
- ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) |
45 |
- |
46 |
-@@ -54,3 +56,6 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) |
47 |
- INSTALL(TARGETS mariadb_config |
48 |
- DESTINATION "bin" |
49 |
- COMPONENT Development) |
50 |
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc |
51 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig |
52 |
-+ COMPONENT Development) |
53 |
---- a/mariadb_config/libmariadb.pc.in |
54 |
-+++ b/mariadb_config/libmariadb.pc.in |
55 |
-@@ -1,19 +1,11 @@ |
56 |
--# |
57 |
--# pkg_config.pc.in |
58 |
--# |
59 |
--# pkg_config configuration file |
60 |
--# For a detailed description of options, please visit |
61 |
--# Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) |
62 |
--# |
63 |
-- |
64 |
--includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ |
65 |
--libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ |
66 |
--prefix=@PREFIX_INSTALL_DIR@ |
67 |
-+prefix=@CMAKE_INSTALL_PREFIX@ |
68 |
-+exec_prefix=${prefix} |
69 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
70 |
-+includedir=${prefix}/include |
71 |
- |
72 |
- Name: libmariadb |
73 |
--Version: @LIBMARIADB_VERSION@ |
74 |
- Description: MariaDB Connector/C dynamic library |
75 |
--Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ |
76 |
--Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ |
77 |
-- |
78 |
-- |
79 |
-+Version: @LIBMARIADB_VERSION@ |
80 |
-+URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ |
81 |
-+Libs: -L${libdir} -lmariadb |
82 |
-+Cflags: -I${includedir}/mariadb |
83 |
|
84 |
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch |
85 |
deleted file mode 100644 |
86 |
index 1a16a2c0101..00000000000 |
87 |
--- a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch |
88 |
+++ /dev/null |
89 |
@@ -1,21 +0,0 @@ |
90 |
---- a/mariadb_config/libmariadb.pc.in |
91 |
-+++ b/mariadb_config/libmariadb.pc.in |
92 |
-@@ -7,13 +7,12 @@ |
93 |
- # |
94 |
- |
95 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
96 |
--includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ |
97 |
--libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ |
98 |
-+includedir=${prefix}/include |
99 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
100 |
- |
101 |
- Name: libmariadb |
102 |
- Version: @CPACK_PACKAGE_VERSION@ |
103 |
-+URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ |
104 |
- Description: MariaDB Connector/C dynamic library |
105 |
--Cflags: -I${includedir} |
106 |
--Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@ |
107 |
-- |
108 |
-- |
109 |
-+Cflags: -I${includedir}/mariadb |
110 |
-+Libs: -L${libdir} -lmariadb |
111 |
|
112 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild |
113 |
deleted file mode 100644 |
114 |
index 7d95dd88436..00000000000 |
115 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild |
116 |
+++ /dev/null |
117 |
@@ -1,103 +0,0 @@ |
118 |
-# Copyright 1999-2020 Gentoo Authors |
119 |
-# Distributed under the terms of the GNU General Public License v2 |
120 |
- |
121 |
-EAPI=6 |
122 |
- |
123 |
-VCS_INHERIT="" |
124 |
-if [[ "${PV}" == 9999 ]] ; then |
125 |
- VCS_INHERIT="git-r3" |
126 |
- EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" |
127 |
-else |
128 |
- MY_PN=${PN#mariadb-} |
129 |
- MY_PV=${PV/_b/-b} |
130 |
- SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" |
131 |
- S="${WORKDIR%/}/${PN}-${MY_PV}-src" |
132 |
- KEYWORDS="amd64 arm arm64 hppa ia64 ppc64 s390 sparc x86" |
133 |
-fi |
134 |
- |
135 |
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT} |
136 |
- |
137 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
138 |
- |
139 |
-MULTILIB_WRAPPED_HEADERS+=( |
140 |
- /usr/include/mariadb/mariadb_version.h |
141 |
-) |
142 |
- |
143 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
144 |
-HOMEPAGE="https://mariadb.org/" |
145 |
-LICENSE="LGPL-2.1" |
146 |
- |
147 |
-SLOT="0/3" |
148 |
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test" |
149 |
-RESTRICT="!test? ( test )" |
150 |
- |
151 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
152 |
- virtual/libiconv:=[${MULTILIB_USEDEP}] |
153 |
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
154 |
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
155 |
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
156 |
- ssl? ( |
157 |
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
158 |
- !gnutls? ( |
159 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
160 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
161 |
- ) |
162 |
- ) |
163 |
- " |
164 |
-RDEPEND="${DEPEND} |
165 |
- mysqlcompat? ( |
166 |
- !dev-db/mysql[client-libs(+)] |
167 |
- !dev-db/mysql-cluster[client-libs(+)] |
168 |
- !dev-db/mariadb[client-libs(+)] |
169 |
- !dev-db/mariadb-galera[client-libs(+)] |
170 |
- !dev-db/percona-server[client-libs(+)] |
171 |
- !dev-db/mysql-connector-c ) |
172 |
- !>=dev-db/mariadb-10.2.0[client-libs(+)] |
173 |
- " |
174 |
-PATCHES=( |
175 |
- "${FILESDIR}"/gentoo-layout-3.0.patch |
176 |
- "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch |
177 |
-) |
178 |
- |
179 |
-src_configure() { |
180 |
- # bug 508724 mariadb cannot use ld.gold |
181 |
- tc-ld-disable-gold |
182 |
- multilib-minimal_src_configure |
183 |
-} |
184 |
- |
185 |
-multilib_src_configure() { |
186 |
- local mycmakeargs=( |
187 |
- -DWITH_EXTERNAL_ZLIB=ON |
188 |
- -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
189 |
- -DWITH_CURL=$(usex curl ON OFF) |
190 |
- -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) |
191 |
- -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
192 |
- -DINSTALL_LIBDIR="$(get_libdir)" |
193 |
- -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
194 |
- -DINSTALL_BINDIR=bin |
195 |
- -DWITH_UNIT_TESTS=$(usex test ON OFF) |
196 |
- ) |
197 |
- cmake-utils_src_configure |
198 |
-} |
199 |
- |
200 |
-multilib_src_compile() { |
201 |
- cmake-utils_src_compile |
202 |
-} |
203 |
- |
204 |
-multilib_src_install() { |
205 |
- cmake-utils_src_install |
206 |
- if use mysqlcompat ; then |
207 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 |
208 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so |
209 |
- fi |
210 |
-} |
211 |
- |
212 |
-multilib_src_install_all() { |
213 |
- if ! use static-libs ; then |
214 |
- find "${D}" -name "*.a" -delete || die |
215 |
- fi |
216 |
- if use mysqlcompat ; then |
217 |
- dosym mariadb_config /usr/bin/mysql_config |
218 |
- dosym mariadb /usr/include/mysql |
219 |
- fi |
220 |
-} |
221 |
|
222 |
diff --git a/dev-db/mariadb-connector-c/metadata.xml b/dev-db/mariadb-connector-c/metadata.xml |
223 |
index 9c4d844e879..357d7d00f10 100644 |
224 |
--- a/dev-db/mariadb-connector-c/metadata.xml |
225 |
+++ b/dev-db/mariadb-connector-c/metadata.xml |
226 |
@@ -1,11 +1,8 @@ |
227 |
<?xml version="1.0" encoding="UTF-8"?> |
228 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
229 |
<pkgmetadata> |
230 |
-<maintainer type="project"> |
231 |
-<email>mysql-bugs@g.o</email> |
232 |
-<name>MySQL</name> |
233 |
-</maintainer> |
234 |
-<use> |
235 |
-<flag name="mysqlcompat">Enable mysqlclient library symbolic links</flag> |
236 |
-</use> |
237 |
+ <maintainer type="project"> |
238 |
+ <email>mysql-bugs@g.o</email> |
239 |
+ <name>MySQL</name> |
240 |
+ </maintainer> |
241 |
</pkgmetadata> |