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

[Ian Delaney]

commit:     c2fb26c472f5bb1a697d9ebc5a69257bb9cb6d27
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 03:13:07 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 03:25:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2fb26c4

dev-db/mysql-connector-c++: Taking ownership of package

Set sublsots for deps in -1.1.3, update to virtual/libmysqlclient
in -1.1.6, rm old, closes bug #556900

Package-Manager: portage-2.2.20.1

 dev-db/mysql-connector-c++/Manifest                |  2 -
 dev-db/mysql-connector-c++/metadata.xml            |  6 +--
 .../mysql-connector-c++-1.1.1.ebuild               | 63 ----------------------
 .../mysql-connector-c++-1.1.3.ebuild               |  6 +--
 .../mysql-connector-c++-1.1.5.ebuild               | 62 ---------------------
 .../mysql-connector-c++-1.1.6.ebuild               |  2 +-
 6 files changed, 7 insertions(+), 134 deletions(-)

diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index e17d5fc..c19c10b 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,4 +1,2 @@
-DIST mysql-connector-c++-1.1.1.tar.gz 492659 SHA256 31c3e4f637153bd270812dffc6a50708dfc686a8afa7ea1c88a9dfda0d8af52e SHA512 d6b34fd4aeaf1032870d6de4f57ae92230790a3661c24af4ffed30f715f9a1941d0d063abbc0d703c15697c054731af6e39240d6dd70459371f25435595ec903 WHIRLPOOL f9fddb59df913a728769824aa7cc39b9ba55b1d3de56048148bf5ca37a366772f34a85bae58f0d5efead4010b0aac7ab5b897bd4a0db113e99fdf4898a31d26c
 DIST mysql-connector-c++-1.1.3.tar.gz 496226 SHA256 4b1516f183f29c011c1677d5a9b174d0f5c3b761d2e8056e79690c55c01ea690 SHA512 c03a4ae25e9d189a5114ab630bef6edaefd1aee809dbb1ec26b765f5e84b93fbe17e5f7357a4fe2a95c179cd2028b676151df4baf4e3da7515543ecc0834afd7 WHIRLPOOL 5f04231cec63de16c2a076143b2e0409544ebdf600d7423f63c8c2db45f1b63048e1da108a9f374dda6b6ff0d4c13b509190390e797f4674e14284acbaa9e2e5
-DIST mysql-connector-c++-1.1.5.tar.gz 519440 SHA256 f3696726da29d56e0daad7046b30aa51444360a3ff112c079eb942929eb1cce8 SHA512 6e6e6ed7f7496d5d51f6709a7fb47b8031d5639b0729a439056466ae24e4e24d419fad19c54571e0485f3717d7a07ccd840795724a8b79deb8e93c59d447595b WHIRLPOOL 8c0be70301454d130797d6dd74da5f29a77f543bf4c2353e53b6ebfa8c9f8282850ba6266d4988e7d305c5be14d64b41133ad05ded2f70662235f254f76d75ea
 DIST mysql-connector-c++-1.1.6.tar.gz 522236 SHA256 ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447 SHA512 e940b6ee090f792bad8acbbfa3dacd46310ac40c7993c4097eeebb6be4b792d3f1856574e603a71e2795773db97169f47c9ed76a127654472370c726bcb291c7 WHIRLPOOL b3027423cf2e250f1fd7340b58ff5ff55ce771c91cc435e37cddd156f681621206438b6329a49df760dce660ef983b3cf3e5060af527668de64ed06e69830d12

diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml
index 306a658..5b748c4 100644
--- a/dev-db/mysql-connector-c++/metadata.xml
+++ b/dev-db/mysql-connector-c++/metadata.xml
@@ -7,8 +7,8 @@
 <flag name='gcov'>Build coverage support</flag>
 </use>
 	<maintainer>
-		<email>h.mth@×××.de</email>
-		<description>Proxied developer. Please CC on bugs.</description>
-		<name>Hanno Meyer-Thurow</name>
+		<email>idella4@g.o</email>
+		<name>Ian Delnaeny</name>
+		<description>Maintainer / developer</description>
 	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild
deleted file mode 100644
index dac3673..0000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils cmake-utils flag-o-matic multilib
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-IUSE="debug examples gcov static-libs"
-
-DEPEND=">=virtual/mysql-5.1
-	dev-libs/boost
-	dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-fix-cmake.patch"
-	"${FILESDIR}/${PN}-1.1.0-disable-tests.patch"
-)
-
-src_configure() {
-	# native lib/wrapper needs this!
-	append-flags "-fno-strict-aliasing"
-
-	local mycmakeargs=(
-		"-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF"
-		"-DMYSQLCPPCONN_ICU_ENABLE=OFF"
-		$(cmake-utils_use debug MYSQLCPPCONN_TRACE_ENABLE)
-		$(cmake-utils_use gcov MYSQLCPPCONN_GCOV_ENABLE)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# static lib has wrong name so we need to rename it
-	if use static-libs; then
-		mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
-			"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
-	else
-		rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
-	fi
-
-	# docs are installed poorly
-	rm -rf "${ED}"/usr/{ANNOUNCEMENT,COPYING,README}
-	dodoc ANNOUNCEMENT README
-
-	# examples
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*
-	fi
-}

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
index ab50a1a..b72f0ac 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
@@ -16,9 +16,9 @@ SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 sparc x86"
 IUSE="debug examples gcov static-libs"
 
-DEPEND=">=virtual/mysql-5.1
-	dev-libs/boost
-	dev-libs/openssl:0"
+DEPEND=">=virtual/mysql-5.1:=
+	dev-libs/boost:0=
+	dev-libs/openssl:0="
 RDEPEND="${DEPEND}"
 
 PATCHES=(

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.5.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.5.ebuild
deleted file mode 100644
index 98c1aeb..0000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils flag-o-matic multilib
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug examples gcov static-libs"
-
-DEPEND=">=virtual/mysql-5.5:0=
-	dev-libs/boost:0=
-	dev-libs/openssl:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.5-fix-cmake.patch"
-	"${FILESDIR}/${PN}-1.1.5-fix-mariadb.patch"
-)
-
-src_configure() {
-	# native lib/wrapper needs this!
-	append-flags "-fno-strict-aliasing"
-
-	local mycmakeargs=(
-		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
-		-DMYSQLCPPCONN_ICU_ENABLE=OFF
-		$(cmake-utils_use debug MYSQLCPPCONN_TRACE_ENABLE)
-		$(cmake-utils_use gcov MYSQLCPPCONN_GCOV_ENABLE)
-		-DINSTALL_DOCS="/usr/share/doc/${PF}"
-		-DMYSQL_CXX_LINKAGE=0
-		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# static lib has wrong name so we need to rename it
-	if use static-libs; then
-		mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
-			"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
-	else
-		rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*
-	fi
-}

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
index a4248cb..38e0ba2 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug examples gcov static-libs"
 
-DEPEND=">=virtual/mysql-5.5:0=
+DEPEND="virtual/libmysqlclient:=
 	dev-libs/boost:0=
 	dev-libs/openssl:0="
 RDEPEND="${DEPEND}"