[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/files/, dev-db/mysql-connector-c/

[Brian Evans]

commit:     326b50e8bb31240f7e21801b6fce6b6e83b4a316
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 18:50:48 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 19:34:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326b50e8

dev-db/mysql-connector-c: Drop old

Package-Manager: Portage-2.3.15, Repoman-2.3.6

 dev-db/mysql-connector-c/Manifest                  |  3 -
 .../mysql-connector-c/files/conn-c-includes.patch  | 15 ----
 .../files/openssl-cmake-detection.patch            | 12 ----
 .../mysql-connector-c-6.1.5.ebuild                 | 59 ----------------
 .../mysql-connector-c-6.1.6-r1.ebuild              | 67 ------------------
 .../mysql-connector-c-6.1.6-r2.ebuild              | 76 --------------------
 .../mysql-connector-c-6.1.9-r1.ebuild              | 80 ----------------------
 .../mysql-connector-c-6.1.9.ebuild                 | 73 --------------------
 8 files changed, 385 deletions(-)

diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 6a895e6d895..f276bb6a0be 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,4 +1 @@
 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
-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
-DIST mysql-connector-c-6.1.9-src.tar.gz 3494748 SHA256 4e808704443365ad5b649673d03eca8fbebc0a4da9f1f96616c6bd1b1901ab2b SHA512 3127d08428e820044e25ab5ebb741a128325be6ca0fca0300cab33891693e11e57d4ded5a25918a67d23cceb8a2c6ee99879ffb50c31bc4c2e225a9dba9674dc WHIRLPOOL 7f0cb1fa7bb0f77447f4884b567e7881d8d9c1dda2e27250838fe8a51ac4ddcb8f7aa683fe11a3f7f9545f90918b15fe9e033da138c86e5bd4f360164ebaeb2e

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 fcde71f3f4e..00000000000
--- 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/openssl-cmake-detection.patch b/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
deleted file mode 100644
index 3a5f53e7ba3..00000000000
--- 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/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 1813980a093..00000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
+++ /dev/null
@@ -1,59 +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="https://dev.mysql.com/get/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}"
-
-DOCS=( README Docs/ChangeLog )
-PATCHES=( "${FILESDIR}/openssl-cmake-detection.patch" )
-
-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-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
deleted file mode 100644
index b7b764fde62..00000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
+++ /dev/null
@@ -1,67 +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="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
-S="${WORKDIR}/${P}-src"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~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}"
-
-DOCS=( README Docs/ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}/openssl-cmake-detection.patch"
-	"${FILESDIR}/conn-c-includes.patch"
-	"${FILESDIR}/mysql_com.patch"
-)
-
-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 fccb70097d1..00000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
+++ /dev/null
@@ -1,76 +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
-
-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="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
-S="${WORKDIR}/${P}-src"
-KEYWORDS="~alpha ~amd64 ~arm ~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 )
-PATCHES=(
-	"${FILESDIR}/openssl-cmake-detection.patch"
-	"${FILESDIR}/conn-c-includes.patch"
-	"${FILESDIR}/mysql_com.patch"
-)
-
-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.9-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild
deleted file mode 100644
index 7a1da326d8a..00000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-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="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
-S="${WORKDIR}/${P}-src"
-KEYWORDS="~alpha ~amd64 ~arm ~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 )
-PATCHES=(
-	"${FILESDIR}/mysql_com.patch" )
-
-src_prepare() {
-	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
-	cmake-utils_src_prepare
-}
-
-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)
-		-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-		-DSHARED_LIB_PATCH_VERSION="0"
-	)
-	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.9.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.9.ebuild
deleted file mode 100644
index 2868be92897..00000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-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="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
-S="${WORKDIR}/${P}-src"
-KEYWORDS="~alpha ~amd64 ~arm ~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 )
-PATCHES=(
-	"${FILESDIR}/mysql_com.patch" )
-
-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
-}