Stabilise 1.1.1 on amd64 x86 ppc and ppc64, drop older.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 7 insertions, 66 deletions

diff --git a/dev-db/mysql-connector-c++/ChangeLog b/dev-db/mysql-connector-c++/ChangeLog
index 52807ba700b8..0b8791a48ec4 100644
--- a/dev-db/mysql-connector-c++/ChangeLog
+++ b/dev-db/mysql-connector-c++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql-connector-c++
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.14 2012/12/08 12:55:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.15 2012/12/18 15:22:21 scarabeus Exp $
+
+  18 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -mysql-connector-c++-1.1.0-r1.ebuild, mysql-connector-c++-1.1.1.ebuild:
+  Stabilise 1.1.1 on amd64 x86 ppc and ppc64, drop older.
 
   08 Dec 2012; Markus Meier <maekke@gentoo.org>
   mysql-connector-c++-1.1.1.ebuild:
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild
deleted file mode 100644
index 7340ff20b3b6..000000000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild,v 1.5 2012/03/08 14:56:31 ranger Exp $
-
-EAPI=4
-
-inherit eutils cmake-utils flag-o-matic multilib
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="http://forge.mysql.com/wiki/Connector_C++"
-URI_DIR="Connector-C++"
-SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 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}/${P}-fix-cmake.patch"
-	"${FILESDIR}/${P}-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.1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild
index aed3b3ef3726..30bfc36f2439 100644
--- 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild,v 1.2 2012/12/08 12:55:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild,v 1.3 2012/12/18 15:22:21 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 IUSE="debug examples gcov static-libs"
 
 DEPEND=">=virtual/mysql-5.1