diff options
author | 2018-10-16 21:39:57 -0400 | |
---|---|---|
committer | 2018-10-16 21:39:57 -0400 | |
commit | 66cbe1efb8709b058a5dfae9ffc69c8d0677027d (patch) | |
tree | 12dda2a64079dd46e5b46d809be5331f37c80faa | |
parent | dev-db/mariadb-connector-c: Drop cmake-multilib and old builds (diff) | |
download | mysql-66cbe1efb8709b058a5dfae9ffc69c8d0677027d.tar.gz mysql-66cbe1efb8709b058a5dfae9ffc69c8d0677027d.tar.bz2 mysql-66cbe1efb8709b058a5dfae9ffc69c8d0677027d.zip |
Drop old mysql-connector-c which is in ::gentoo
Signed-off-by: Brian Evans <grknight@gentoo.org>
-rw-r--r-- | dev-db/mysql-connector-c/Manifest | 2 | ||||
-rw-r--r-- | dev-db/mysql-connector-c/files/conn-c-includes.patch | 15 | ||||
-rw-r--r-- | dev-db/mysql-connector-c/files/mysql_com.patch | 31 | ||||
-rw-r--r-- | dev-db/mysql-connector-c/files/openssl-cmake-detection.patch | 12 | ||||
-rw-r--r-- | dev-db/mysql-connector-c/metadata.xml | 10 | ||||
-rw-r--r-- | dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild | 65 | ||||
-rw-r--r-- | dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild | 79 | ||||
-rw-r--r-- | dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild | 69 |
8 files changed, 0 insertions, 283 deletions
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest deleted file mode 100644 index 5c0e7d8..0000000 --- a/dev-db/mysql-connector-c/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mysql-connector-c-6.1.5-src.tar.gz 3455028 SHA256 278f2b40f3980079bc7ad247cb2bf08967ce56ef79da468ae26ff2e2a560be66 SHA512 be47ed70865744ff9ecb9376972208504327514f03635e54c05e81d324bcf9ba777300a12738d8ca32b95c9c31d734dc9f6ebb7bb24fd11821560a6b0f09bb56 WHIRLPOOL bfdd17908cae63ef5b5006bdf28432bb12738044fe99960fdddab6da527ab41211a48396270a778ce500c5758c2f5d50c1fd850a92c684996612ab7c38637c61 -DIST mysql-connector-c-6.1.6-src.tar.gz 3475044 SHA256 2222433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 SHA512 2a3db4aec5b8e5357fa407d6e2b52534f7aa9c0b78c4ebe9a61e2e25dc5f7dc1f1962f6e6fd847107ce53ca369e0babe7118b947a87189495212596348cfd760 WHIRLPOOL 6a0a55a47a88606c12511f9fd155bafcf5d73b1ffa2c4877b838bca018f4a8a8f4427ac6af6e4c567eced7e1108dba4a613255f813ab481e8ea948b3a6cdff33 diff --git a/dev-db/mysql-connector-c/files/conn-c-includes.patch b/dev-db/mysql-connector-c/files/conn-c-includes.patch deleted file mode 100644 index fcde71f..0000000 --- a/dev-db/mysql-connector-c/files/conn-c-includes.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -aurN a/include/CMakeLists.txt b/include/CMakeLists.txt ---- a/include/CMakeLists.txt 2015-07-14 13:06:04.424091000 -0400 -+++ b/include/CMakeLists.txt 2015-07-14 13:24:43.434091000 -0400 -@@ -55,6 +55,11 @@ - byte_order_generic_x86.h - little_endian.h - big_endian.h -+ my_thread_local.h -+ thr_cond.h -+ thr_lock.h -+ thr_mutex.h -+ thr_rwlock.h - ${HEADERS_GEN_CONFIGURE} - ) - diff --git a/dev-db/mysql-connector-c/files/mysql_com.patch b/dev-db/mysql-connector-c/files/mysql_com.patch deleted file mode 100644 index 36a7d5a..0000000 --- a/dev-db/mysql-connector-c/files/mysql_com.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/include/mysql_com.h 2014-06-10 23:10:43.000000000 -0400 -+++ b/include/mysql_com.h 2015-08-11 15:20:54.487091000 -0400 -@@ -179,7 +171,7 @@ - #define CLIENT_IGNORE_SIGPIPE 4096 /* IGNORE sigpipes */ - #define CLIENT_TRANSACTIONS 8192 /* Client knows about transactions */ - #define CLIENT_RESERVED 16384 /* Old flag for 4.1 protocol */ --#define CLIENT_RESERVED2 32768 /* Old flag for 4.1 authentication */ -+#define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */ - #define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */ - #define CLIENT_MULTI_RESULTS (1UL << 17) /* Enable/disable multi-results */ - #define CLIENT_PS_MULTI_RESULTS (1UL << 18) /* Multi-results in PS-protocol */ -@@ -226,7 +216,7 @@ - | CLIENT_IGNORE_SIGPIPE \ - | CLIENT_TRANSACTIONS \ - | CLIENT_RESERVED \ -- | CLIENT_RESERVED2 \ -+ | CLIENT_SECURE_CONNECTION \ - | CLIENT_MULTI_STATEMENTS \ - | CLIENT_MULTI_RESULTS \ - | CLIENT_PS_MULTI_RESULTS \ ---- a/libmysql/client_settings.h 2015-02-25 16:09:49.000000000 -0500 -+++ b/libmysql/client_settings.h 2015-08-11 15:44:10.804091000 -0400 -@@ -31,7 +31,7 @@ - CLIENT_LONG_FLAG | \ - CLIENT_TRANSACTIONS | \ - CLIENT_PROTOCOL_41 | \ -- CLIENT_RESERVED2 | \ -+ CLIENT_SECURE_CONNECTION | \ - CLIENT_MULTI_RESULTS | \ - CLIENT_PS_MULTI_RESULTS | \ - CLIENT_PLUGIN_AUTH | \ diff --git a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch b/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch deleted file mode 100644 index 3a5f53e..0000000 --- a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aurN a/cmake/ssl.cmake b/cmake/ssl.cmake ---- a/cmake/ssl.cmake 2014-11-21 00:39:51.000000000 -0500 -+++ b/cmake/ssl.cmake 2015-01-27 08:45:36.771744344 -0500 -@@ -166,7 +166,7 @@ - # Encoded as MNNFFPPS: major minor fix patch status - FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" - OPENSSL_VERSION_NUMBER -- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" -+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" - ) - STRING(REGEX REPLACE - "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" diff --git a/dev-db/mysql-connector-c/metadata.xml b/dev-db/mysql-connector-c/metadata.xml deleted file mode 100644 index 7ebb10d..0000000 --- a/dev-db/mysql-connector-c/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>mysql-bugs@gentoo.org</email> - <name>MySQL</name> -</maintainer> -<use> -</use> -</pkgmetadata> 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 deleted file mode 100644 index 622d084..0000000 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-multilib eutils - -MULTILIB_WRAPPED_HEADERS+=( - /usr/include/mysql/my_config.h -) - -DESCRIPTION="C client library for MariaDB/MySQL" -HOMEPAGE="https://dev.mysql.com/downloads/connector/c/" -LICENSE="GPL-2" - -SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz" -S="${WORKDIR}/${P}-src" -KEYWORDS="~amd64 ~x86" - -SLOT="0/18" -IUSE="+ssl static-libs" - -CDEPEND=" - sys-libs/zlib:=[${MULTILIB_USEDEP}] - ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) - " -RDEPEND="${CDEPEND} - !dev-db/mysql[client-libs(+)] - !dev-db/mysql-cluster[client-libs(+)] - !dev-db/mariadb[client-libs(+)] - !dev-db/mariadb-connector-c[mysqlcompat] - !dev-db/mariadb-galera[client-libs(+)] - !dev-db/percona-server[client-libs(+)] - " -DEPEND="${CDEPEND} - >=dev-util/cmake-2.8.9 - " - -DOCS=( README Docs/ChangeLog ) - -src_prepare() { - epatch "${FILESDIR}/openssl-cmake-detection.patch" - epatch_user -} - -multilib_src_configure() { - mycmakeargs+=( - -DINSTALL_LAYOUT=RPM - -DINSTALL_LIBDIR=$(get_libdir) - -DWITH_DEFAULT_COMPILER_OPTIONS=OFF - -DWITH_DEFAULT_FEATURE_SET=OFF - -DENABLED_LOCAL_INFILE=ON - -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" - -DWITH_ZLIB=system - -DENABLE_DTRACE=OFF - -DWITH_SSL=$(usex ssl system bundled) - ) - cmake-utils_src_configure -} - -multilib_src_install_all() { - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} 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 deleted file mode 100644 index f71a099..0000000 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -CMAKE_MIN_VERSION="2.8.12" - -inherit cmake-multilib eutils multilib - -MULTILIB_WRAPPED_HEADERS+=( - /usr/include/mysql/my_config.h -) - -# wrap the config script -MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) - -DESCRIPTION="C client library for MariaDB/MySQL" -HOMEPAGE="https://dev.mysql.com/downloads/connector/c/" -LICENSE="GPL-2" - -SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz" -S="${WORKDIR}/${P}-src" -KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86" - -SUBSLOT="18" -SLOT="0/${SUBSLOT}" -IUSE="+ssl static-libs" - -CDEPEND=" - sys-libs/zlib:=[${MULTILIB_USEDEP}] - ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - " -RDEPEND="${CDEPEND} - !dev-db/mysql[client-libs(+)] - !dev-db/mysql-cluster[client-libs(+)] - !dev-db/mariadb[client-libs(+)] - !dev-db/mariadb-connector-c[mysqlcompat] - !dev-db/mariadb-galera[client-libs(+)] - !dev-db/percona-server[client-libs(+)] - " -DEPEND="${CDEPEND}" - -DOCS=( README Docs/ChangeLog ) - -src_prepare() { - epatch "${FILESDIR}/openssl-cmake-detection.patch" \ - "${FILESDIR}/conn-c-includes.patch" \ - "${FILESDIR}/mysql_com.patch" - epatch_user -} - -multilib_src_configure() { - mycmakeargs+=( - -DINSTALL_LAYOUT=RPM - -DINSTALL_LIBDIR=$(get_libdir) - -DWITH_DEFAULT_COMPILER_OPTIONS=OFF - -DWITH_DEFAULT_FEATURE_SET=OFF - -DENABLED_LOCAL_INFILE=ON - -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" - -DWITH_ZLIB=system - -DENABLE_DTRACE=OFF - -DWITH_SSL=$(usex ssl system bundled) - ) - cmake-utils_src_configure -} - -multilib_src_install_all() { - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} - -pkg_preinst() { - if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then - elog "Due to ABI changes when switching between different client libraries," - elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient." - elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT}" - ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries" - fi -} 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 deleted file mode 100644 index 280db7d..0000000 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-multilib eutils - -MULTILIB_WRAPPED_HEADERS+=( - /usr/include/mysql/my_config.h -) - -# wrap the config script -MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) - -DESCRIPTION="C client library for MariaDB/MySQL" -HOMEPAGE="https://dev.mysql.com/downloads/connector/c/" -LICENSE="GPL-2" - -SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz" -S="${WORKDIR}/${P}-src" -KEYWORDS="~amd64 ~x86" - -SLOT="0/18" -IUSE="+ssl static-libs" - -CDEPEND=" - sys-libs/zlib:=[${MULTILIB_USEDEP}] - ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) - " -RDEPEND="${CDEPEND} - !dev-db/mysql[client-libs(+)] - !dev-db/mysql-cluster[client-libs(+)] - !dev-db/mariadb[client-libs(+)] - !dev-db/mariadb-connector-c[mysqlcompat] - !dev-db/mariadb-galera[client-libs(+)] - !dev-db/percona-server[client-libs(+)] - " -DEPEND="${CDEPEND} - >=dev-util/cmake-2.8.9 - " - -DOCS=( README Docs/ChangeLog ) - -src_prepare() { - epatch "${FILESDIR}/openssl-cmake-detection.patch" \ - "${FILESDIR}/conn-c-includes.patch" - epatch_user -} - -multilib_src_configure() { - mycmakeargs+=( - -DINSTALL_LAYOUT=RPM - -DINSTALL_LIBDIR=$(get_libdir) - -DWITH_DEFAULT_COMPILER_OPTIONS=OFF - -DWITH_DEFAULT_FEATURE_SET=OFF - -DENABLED_LOCAL_INFILE=ON - -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" - -DWITH_ZLIB=system - -DENABLE_DTRACE=OFF - -DWITH_SSL=$(usex ssl system bundled) - ) - cmake-utils_src_configure -} - -multilib_src_install_all() { - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} |