| 1 |
commit: 66cbe1efb8709b058a5dfae9ffc69c8d0677027d |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 17 01:39:57 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 17 01:39:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=66cbe1ef |
| 7 |
|
| 8 |
Drop old mysql-connector-c which is in ::gentoo |
| 9 |
|
| 10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-db/mysql-connector-c/Manifest | 2 - |
| 13 |
.../mysql-connector-c/files/conn-c-includes.patch | 15 ---- |
| 14 |
dev-db/mysql-connector-c/files/mysql_com.patch | 31 --------- |
| 15 |
.../files/openssl-cmake-detection.patch | 12 ---- |
| 16 |
dev-db/mysql-connector-c/metadata.xml | 10 --- |
| 17 |
.../mysql-connector-c-6.1.5.ebuild | 65 ------------------ |
| 18 |
.../mysql-connector-c-6.1.6-r2.ebuild | 79 ---------------------- |
| 19 |
.../mysql-connector-c-6.1.6.ebuild | 69 ------------------- |
| 20 |
8 files changed, 283 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest |
| 23 |
deleted file mode 100644 |
| 24 |
index 5c0e7d8..0000000 |
| 25 |
--- a/dev-db/mysql-connector-c/Manifest |
| 26 |
+++ /dev/null |
| 27 |
@@ -1,2 +0,0 @@ |
| 28 |
-DIST mysql-connector-c-6.1.5-src.tar.gz 3455028 SHA256 278f2b40f3980079bc7ad247cb2bf08967ce56ef79da468ae26ff2e2a560be66 SHA512 be47ed70865744ff9ecb9376972208504327514f03635e54c05e81d324bcf9ba777300a12738d8ca32b95c9c31d734dc9f6ebb7bb24fd11821560a6b0f09bb56 WHIRLPOOL bfdd17908cae63ef5b5006bdf28432bb12738044fe99960fdddab6da527ab41211a48396270a778ce500c5758c2f5d50c1fd850a92c684996612ab7c38637c61 |
| 29 |
-DIST mysql-connector-c-6.1.6-src.tar.gz 3475044 SHA256 2222433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 SHA512 2a3db4aec5b8e5357fa407d6e2b52534f7aa9c0b78c4ebe9a61e2e25dc5f7dc1f1962f6e6fd847107ce53ca369e0babe7118b947a87189495212596348cfd760 WHIRLPOOL 6a0a55a47a88606c12511f9fd155bafcf5d73b1ffa2c4877b838bca018f4a8a8f4427ac6af6e4c567eced7e1108dba4a613255f813ab481e8ea948b3a6cdff33 |
| 30 |
|
| 31 |
diff --git a/dev-db/mysql-connector-c/files/conn-c-includes.patch b/dev-db/mysql-connector-c/files/conn-c-includes.patch |
| 32 |
deleted file mode 100644 |
| 33 |
index fcde71f..0000000 |
| 34 |
--- a/dev-db/mysql-connector-c/files/conn-c-includes.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,15 +0,0 @@ |
| 37 |
-diff -aurN a/include/CMakeLists.txt b/include/CMakeLists.txt |
| 38 |
---- a/include/CMakeLists.txt 2015-07-14 13:06:04.424091000 -0400 |
| 39 |
-+++ b/include/CMakeLists.txt 2015-07-14 13:24:43.434091000 -0400 |
| 40 |
-@@ -55,6 +55,11 @@ |
| 41 |
- byte_order_generic_x86.h |
| 42 |
- little_endian.h |
| 43 |
- big_endian.h |
| 44 |
-+ my_thread_local.h |
| 45 |
-+ thr_cond.h |
| 46 |
-+ thr_lock.h |
| 47 |
-+ thr_mutex.h |
| 48 |
-+ thr_rwlock.h |
| 49 |
- ${HEADERS_GEN_CONFIGURE} |
| 50 |
- ) |
| 51 |
- |
| 52 |
|
| 53 |
diff --git a/dev-db/mysql-connector-c/files/mysql_com.patch b/dev-db/mysql-connector-c/files/mysql_com.patch |
| 54 |
deleted file mode 100644 |
| 55 |
index 36a7d5a..0000000 |
| 56 |
--- a/dev-db/mysql-connector-c/files/mysql_com.patch |
| 57 |
+++ /dev/null |
| 58 |
@@ -1,31 +0,0 @@ |
| 59 |
---- a/include/mysql_com.h 2014-06-10 23:10:43.000000000 -0400 |
| 60 |
-+++ b/include/mysql_com.h 2015-08-11 15:20:54.487091000 -0400 |
| 61 |
-@@ -179,7 +171,7 @@ |
| 62 |
- #define CLIENT_IGNORE_SIGPIPE 4096 /* IGNORE sigpipes */ |
| 63 |
- #define CLIENT_TRANSACTIONS 8192 /* Client knows about transactions */ |
| 64 |
- #define CLIENT_RESERVED 16384 /* Old flag for 4.1 protocol */ |
| 65 |
--#define CLIENT_RESERVED2 32768 /* Old flag for 4.1 authentication */ |
| 66 |
-+#define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */ |
| 67 |
- #define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */ |
| 68 |
- #define CLIENT_MULTI_RESULTS (1UL << 17) /* Enable/disable multi-results */ |
| 69 |
- #define CLIENT_PS_MULTI_RESULTS (1UL << 18) /* Multi-results in PS-protocol */ |
| 70 |
-@@ -226,7 +216,7 @@ |
| 71 |
- | CLIENT_IGNORE_SIGPIPE \ |
| 72 |
- | CLIENT_TRANSACTIONS \ |
| 73 |
- | CLIENT_RESERVED \ |
| 74 |
-- | CLIENT_RESERVED2 \ |
| 75 |
-+ | CLIENT_SECURE_CONNECTION \ |
| 76 |
- | CLIENT_MULTI_STATEMENTS \ |
| 77 |
- | CLIENT_MULTI_RESULTS \ |
| 78 |
- | CLIENT_PS_MULTI_RESULTS \ |
| 79 |
---- a/libmysql/client_settings.h 2015-02-25 16:09:49.000000000 -0500 |
| 80 |
-+++ b/libmysql/client_settings.h 2015-08-11 15:44:10.804091000 -0400 |
| 81 |
-@@ -31,7 +31,7 @@ |
| 82 |
- CLIENT_LONG_FLAG | \ |
| 83 |
- CLIENT_TRANSACTIONS | \ |
| 84 |
- CLIENT_PROTOCOL_41 | \ |
| 85 |
-- CLIENT_RESERVED2 | \ |
| 86 |
-+ CLIENT_SECURE_CONNECTION | \ |
| 87 |
- CLIENT_MULTI_RESULTS | \ |
| 88 |
- CLIENT_PS_MULTI_RESULTS | \ |
| 89 |
- CLIENT_PLUGIN_AUTH | \ |
| 90 |
|
| 91 |
diff --git a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch b/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch |
| 92 |
deleted file mode 100644 |
| 93 |
index 3a5f53e..0000000 |
| 94 |
--- a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch |
| 95 |
+++ /dev/null |
| 96 |
@@ -1,12 +0,0 @@ |
| 97 |
-diff -aurN a/cmake/ssl.cmake b/cmake/ssl.cmake |
| 98 |
---- a/cmake/ssl.cmake 2014-11-21 00:39:51.000000000 -0500 |
| 99 |
-+++ b/cmake/ssl.cmake 2015-01-27 08:45:36.771744344 -0500 |
| 100 |
-@@ -166,7 +166,7 @@ |
| 101 |
- # Encoded as MNNFFPPS: major minor fix patch status |
| 102 |
- FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" |
| 103 |
- OPENSSL_VERSION_NUMBER |
| 104 |
-- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" |
| 105 |
-+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" |
| 106 |
- ) |
| 107 |
- STRING(REGEX REPLACE |
| 108 |
- "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" |
| 109 |
|
| 110 |
diff --git a/dev-db/mysql-connector-c/metadata.xml b/dev-db/mysql-connector-c/metadata.xml |
| 111 |
deleted file mode 100644 |
| 112 |
index 7ebb10d..0000000 |
| 113 |
--- a/dev-db/mysql-connector-c/metadata.xml |
| 114 |
+++ /dev/null |
| 115 |
@@ -1,10 +0,0 @@ |
| 116 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 117 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 118 |
-<pkgmetadata> |
| 119 |
-<maintainer type="project"> |
| 120 |
- <email>mysql-bugs@g.o</email> |
| 121 |
- <name>MySQL</name> |
| 122 |
-</maintainer> |
| 123 |
-<use> |
| 124 |
-</use> |
| 125 |
-</pkgmetadata> |
| 126 |
|
| 127 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild |
| 128 |
deleted file mode 100644 |
| 129 |
index 622d084..0000000 |
| 130 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild |
| 131 |
+++ /dev/null |
| 132 |
@@ -1,65 +0,0 @@ |
| 133 |
-# Copyright 1999-2017 Gentoo Foundation |
| 134 |
-# Distributed under the terms of the GNU General Public License v2 |
| 135 |
- |
| 136 |
-EAPI=5 |
| 137 |
- |
| 138 |
-inherit cmake-multilib eutils |
| 139 |
- |
| 140 |
-MULTILIB_WRAPPED_HEADERS+=( |
| 141 |
- /usr/include/mysql/my_config.h |
| 142 |
-) |
| 143 |
- |
| 144 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
| 145 |
-HOMEPAGE="https://dev.mysql.com/downloads/connector/c/" |
| 146 |
-LICENSE="GPL-2" |
| 147 |
- |
| 148 |
-SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz" |
| 149 |
-S="${WORKDIR}/${P}-src" |
| 150 |
-KEYWORDS="~amd64 ~x86" |
| 151 |
- |
| 152 |
-SLOT="0/18" |
| 153 |
-IUSE="+ssl static-libs" |
| 154 |
- |
| 155 |
-CDEPEND=" |
| 156 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 157 |
- ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) |
| 158 |
- " |
| 159 |
-RDEPEND="${CDEPEND} |
| 160 |
- !dev-db/mysql[client-libs(+)] |
| 161 |
- !dev-db/mysql-cluster[client-libs(+)] |
| 162 |
- !dev-db/mariadb[client-libs(+)] |
| 163 |
- !dev-db/mariadb-connector-c[mysqlcompat] |
| 164 |
- !dev-db/mariadb-galera[client-libs(+)] |
| 165 |
- !dev-db/percona-server[client-libs(+)] |
| 166 |
- " |
| 167 |
-DEPEND="${CDEPEND} |
| 168 |
- >=dev-util/cmake-2.8.9 |
| 169 |
- " |
| 170 |
- |
| 171 |
-DOCS=( README Docs/ChangeLog ) |
| 172 |
- |
| 173 |
-src_prepare() { |
| 174 |
- epatch "${FILESDIR}/openssl-cmake-detection.patch" |
| 175 |
- epatch_user |
| 176 |
-} |
| 177 |
- |
| 178 |
-multilib_src_configure() { |
| 179 |
- mycmakeargs+=( |
| 180 |
- -DINSTALL_LAYOUT=RPM |
| 181 |
- -DINSTALL_LIBDIR=$(get_libdir) |
| 182 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
| 183 |
- -DWITH_DEFAULT_FEATURE_SET=OFF |
| 184 |
- -DENABLED_LOCAL_INFILE=ON |
| 185 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
| 186 |
- -DWITH_ZLIB=system |
| 187 |
- -DENABLE_DTRACE=OFF |
| 188 |
- -DWITH_SSL=$(usex ssl system bundled) |
| 189 |
- ) |
| 190 |
- cmake-utils_src_configure |
| 191 |
-} |
| 192 |
- |
| 193 |
-multilib_src_install_all() { |
| 194 |
- if ! use static-libs ; then |
| 195 |
- find "${ED}" -name "*.a" -delete || die |
| 196 |
- fi |
| 197 |
-} |
| 198 |
|
| 199 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild |
| 200 |
deleted file mode 100644 |
| 201 |
index f71a099..0000000 |
| 202 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild |
| 203 |
+++ /dev/null |
| 204 |
@@ -1,79 +0,0 @@ |
| 205 |
-# Copyright 1999-2017 Gentoo Foundation |
| 206 |
-# Distributed under the terms of the GNU General Public License v2 |
| 207 |
- |
| 208 |
-EAPI=5 |
| 209 |
-CMAKE_MIN_VERSION="2.8.12" |
| 210 |
- |
| 211 |
-inherit cmake-multilib eutils multilib |
| 212 |
- |
| 213 |
-MULTILIB_WRAPPED_HEADERS+=( |
| 214 |
- /usr/include/mysql/my_config.h |
| 215 |
-) |
| 216 |
- |
| 217 |
-# wrap the config script |
| 218 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
| 219 |
- |
| 220 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
| 221 |
-HOMEPAGE="https://dev.mysql.com/downloads/connector/c/" |
| 222 |
-LICENSE="GPL-2" |
| 223 |
- |
| 224 |
-SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz" |
| 225 |
-S="${WORKDIR}/${P}-src" |
| 226 |
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86" |
| 227 |
- |
| 228 |
-SUBSLOT="18" |
| 229 |
-SLOT="0/${SUBSLOT}" |
| 230 |
-IUSE="+ssl static-libs" |
| 231 |
- |
| 232 |
-CDEPEND=" |
| 233 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 234 |
- ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
| 235 |
- " |
| 236 |
-RDEPEND="${CDEPEND} |
| 237 |
- !dev-db/mysql[client-libs(+)] |
| 238 |
- !dev-db/mysql-cluster[client-libs(+)] |
| 239 |
- !dev-db/mariadb[client-libs(+)] |
| 240 |
- !dev-db/mariadb-connector-c[mysqlcompat] |
| 241 |
- !dev-db/mariadb-galera[client-libs(+)] |
| 242 |
- !dev-db/percona-server[client-libs(+)] |
| 243 |
- " |
| 244 |
-DEPEND="${CDEPEND}" |
| 245 |
- |
| 246 |
-DOCS=( README Docs/ChangeLog ) |
| 247 |
- |
| 248 |
-src_prepare() { |
| 249 |
- epatch "${FILESDIR}/openssl-cmake-detection.patch" \ |
| 250 |
- "${FILESDIR}/conn-c-includes.patch" \ |
| 251 |
- "${FILESDIR}/mysql_com.patch" |
| 252 |
- epatch_user |
| 253 |
-} |
| 254 |
- |
| 255 |
-multilib_src_configure() { |
| 256 |
- mycmakeargs+=( |
| 257 |
- -DINSTALL_LAYOUT=RPM |
| 258 |
- -DINSTALL_LIBDIR=$(get_libdir) |
| 259 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
| 260 |
- -DWITH_DEFAULT_FEATURE_SET=OFF |
| 261 |
- -DENABLED_LOCAL_INFILE=ON |
| 262 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
| 263 |
- -DWITH_ZLIB=system |
| 264 |
- -DENABLE_DTRACE=OFF |
| 265 |
- -DWITH_SSL=$(usex ssl system bundled) |
| 266 |
- ) |
| 267 |
- cmake-utils_src_configure |
| 268 |
-} |
| 269 |
- |
| 270 |
-multilib_src_install_all() { |
| 271 |
- if ! use static-libs ; then |
| 272 |
- find "${ED}" -name "*.a" -delete || die |
| 273 |
- fi |
| 274 |
-} |
| 275 |
- |
| 276 |
-pkg_preinst() { |
| 277 |
- if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then |
| 278 |
- elog "Due to ABI changes when switching between different client libraries," |
| 279 |
- elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient." |
| 280 |
- elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT}" |
| 281 |
- ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries" |
| 282 |
- fi |
| 283 |
-} |
| 284 |
|
| 285 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild |
| 286 |
deleted file mode 100644 |
| 287 |
index 280db7d..0000000 |
| 288 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild |
| 289 |
+++ /dev/null |
| 290 |
@@ -1,69 +0,0 @@ |
| 291 |
-# Copyright 1999-2017 Gentoo Foundation |
| 292 |
-# Distributed under the terms of the GNU General Public License v2 |
| 293 |
- |
| 294 |
-EAPI=5 |
| 295 |
- |
| 296 |
-inherit cmake-multilib eutils |
| 297 |
- |
| 298 |
-MULTILIB_WRAPPED_HEADERS+=( |
| 299 |
- /usr/include/mysql/my_config.h |
| 300 |
-) |
| 301 |
- |
| 302 |
-# wrap the config script |
| 303 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
| 304 |
- |
| 305 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
| 306 |
-HOMEPAGE="https://dev.mysql.com/downloads/connector/c/" |
| 307 |
-LICENSE="GPL-2" |
| 308 |
- |
| 309 |
-SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz" |
| 310 |
-S="${WORKDIR}/${P}-src" |
| 311 |
-KEYWORDS="~amd64 ~x86" |
| 312 |
- |
| 313 |
-SLOT="0/18" |
| 314 |
-IUSE="+ssl static-libs" |
| 315 |
- |
| 316 |
-CDEPEND=" |
| 317 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 318 |
- ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) |
| 319 |
- " |
| 320 |
-RDEPEND="${CDEPEND} |
| 321 |
- !dev-db/mysql[client-libs(+)] |
| 322 |
- !dev-db/mysql-cluster[client-libs(+)] |
| 323 |
- !dev-db/mariadb[client-libs(+)] |
| 324 |
- !dev-db/mariadb-connector-c[mysqlcompat] |
| 325 |
- !dev-db/mariadb-galera[client-libs(+)] |
| 326 |
- !dev-db/percona-server[client-libs(+)] |
| 327 |
- " |
| 328 |
-DEPEND="${CDEPEND} |
| 329 |
- >=dev-util/cmake-2.8.9 |
| 330 |
- " |
| 331 |
- |
| 332 |
-DOCS=( README Docs/ChangeLog ) |
| 333 |
- |
| 334 |
-src_prepare() { |
| 335 |
- epatch "${FILESDIR}/openssl-cmake-detection.patch" \ |
| 336 |
- "${FILESDIR}/conn-c-includes.patch" |
| 337 |
- epatch_user |
| 338 |
-} |
| 339 |
- |
| 340 |
-multilib_src_configure() { |
| 341 |
- mycmakeargs+=( |
| 342 |
- -DINSTALL_LAYOUT=RPM |
| 343 |
- -DINSTALL_LIBDIR=$(get_libdir) |
| 344 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
| 345 |
- -DWITH_DEFAULT_FEATURE_SET=OFF |
| 346 |
- -DENABLED_LOCAL_INFILE=ON |
| 347 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
| 348 |
- -DWITH_ZLIB=system |
| 349 |
- -DENABLE_DTRACE=OFF |
| 350 |
- -DWITH_SSL=$(usex ssl system bundled) |
| 351 |
- ) |
| 352 |
- cmake-utils_src_configure |
| 353 |
-} |
| 354 |
- |
| 355 |
-multilib_src_install_all() { |
| 356 |
- if ! use static-libs ; then |
| 357 |
- find "${ED}" -name "*.a" -delete || die |
| 358 |
- fi |
| 359 |
-} |
Archives