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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 22 insertions, 73 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++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 6a85d719089e..719074a616ef 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 AUX mysql-connector-c++-1.1.0-disable-tests.patch 602 SHA256 c2c117c621172e93c6c52bdb9c684aa3bbbb39c1a808d709511308382ae9a1a6 SHA512 e051583d286797c4307aeaab8c719b1ee3588358e669258d49e559b96be38ed6d07bb4c8e1368b7568d489c21a020f14a3e2b99fb4407223f7c9241001f5f579 WHIRLPOOL 15fe13c64fdfae5286b6f21c2a8442f71a60e7c52c693cabd1bd6ef50401c8c19df2d76ae1d2fd9d1e82e7b43d991fc9361735ab16250eb4c229a405d7c8ee38
 AUX mysql-connector-c++-1.1.0-fix-cmake.patch 3713 SHA256 272b7807f4b17293d39a6161075abc4d6c220cc5873c297254d0049d8c65d44d SHA512 12ad034d8ebaef2a1dfbce10bf9d7b20566fb466ca5be832a4513e78379cd1206a188d25d6b90b6c4a5ae11edb8d4f23a101b82d6ee450371bf352e8e515c617 WHIRLPOOL 0b1d03e6f66f6b129a0edc19b38d908cbc4befa8f47fd954e623684119aea14f0ee1e79e7dad4827e5a3cd5ff25823602d305041d13ab7200ba803ae6bbaedad
-DIST mysql-connector-c++-1.1.0.tar.gz 467089 SHA256 dfb8933dada706a1b3188b162fc5a9686b5ed46323bf09548ce291e8dd4545e2 SHA512 d329c4596fa32d213a3c2208d0230bb566efa7978ffbd6938c93d4564bc43ab301085760861c4eb559b13b94ac85c91fab0a83110299ee1f2f7df5fc50d2358b WHIRLPOOL 5dbfe1b46ba735dcf23397e4236322b41ce7773012bb9707ef4f9aafaef765a492d60f0db7e6c181d048baada6f1594fac13c75a6a8da6896831b8bed989c900
 DIST mysql-connector-c++-1.1.1.tar.gz 492659 SHA256 31c3e4f637153bd270812dffc6a50708dfc686a8afa7ea1c88a9dfda0d8af52e SHA512 d6b34fd4aeaf1032870d6de4f57ae92230790a3661c24af4ffed30f715f9a1941d0d063abbc0d703c15697c054731af6e39240d6dd70459371f25435595ec903 WHIRLPOOL f9fddb59df913a728769824aa7cc39b9ba55b1d3de56048148bf5ca37a366772f34a85bae58f0d5efead4010b0aac7ab5b897bd4a0db113e99fdf4898a31d26c
-EBUILD mysql-connector-c++-1.1.0-r1.ebuild 1622 SHA256 fe6f34f051c560ea4c222a5fc2c5c6913065ad31acc8782c90a7523e5447e1ae SHA512 b41f747be4a4753c28099e9c4babc1cd590894026d17d80615b10d54002e1bb66ada49ba5676b6e84134686334c4017cf4f5ce18d2b17e4fbf428213832af679 WHIRLPOOL a027354757c52f6c64234989d08b130037039249de6d5238cbdf7e08c70ac7f231ef9b5e20d97f3fe0630cfd3f4fd2018b428ce8e1f1166f02a4d758494a6b9b
-EBUILD mysql-connector-c++-1.1.1.ebuild 1646 SHA256 708c350b9ff9034c5eb4c299bd04165ddf417f59a8d13dfef432c256d415166d SHA512 918e8213653a780978f9793a2296cd9cb74713c1dec20f9d97113ca8526d83618376b32b62f1d32b438c4c185e676b8ca97675b64a67f9aad6fdab39eeba9874 WHIRLPOOL 62ee497b41636698e3bcac9e227b0e9d51a303cb588c81747b2040461f2933aef627b01f9ed6c3e6b568c08d5c1d41a876748756b31a4e6b24f35186f27798bf
-MISC ChangeLog 2745 SHA256 373957eb9719195fe519ef906c2c95c0123a4324af779ea227b5fc6585e46f43 SHA512 9bd14514d7e77477da8f2f3993683e2d5a1baa193987fcc171246a82dfccc7c92a660f30c2e5ef3d828967927a93fa1f39b339a86532cba03096bdc9f67c60d2 WHIRLPOOL b3d2b273a73e19eb6a5f82c58816723b3df3eba26dd340b872a7d5b209427c71330e262a9edf50bd42a198bdec2031858f885878f6bea030284a3a0463f102fd
+EBUILD mysql-connector-c++-1.1.1.ebuild 1644 SHA256 b7f47474fcd487d99ee7729859b2745763087be00554f1f48ef530319f0d1f94 SHA512 fc6aae7f987c40410536f448aed39f2a1a2f0d82de2c050ae061c1912c0d150e49fafad3fade04442bfa2ca36e3d0a876aedabac28b5b481aa190a8ec4189be0 WHIRLPOOL a6c8e82b2642c98944990cecb10575c79d3c703cf06c1996b7bd27b102a23960c4428f0fc09aef2eb5d06ad072c94198880b8dc24f7fe2dc938134aee30a0fa4
+MISC ChangeLog 2936 SHA256 f53821627967692cdb126171eee0b70a013e2a485976e5a58f4f6ac7402e3f14 SHA512 9f1d4dfc56b9681c645fa796563798d3603209a31f8719df079cd542221766cc51249bd9242289b28d42f131eea26c3f339b96412fd1555fbe115b7f92ac49f0 WHIRLPOOL de00a33b0e0fe82215e6b526ff92c46c7e3fd0564d959cc46f58d29a2dca9c161568e38ffa26e759e789ffff04eddda0a4ac8cc668425661810af1f70cf6c317
 MISC metadata.xml 379 SHA256 68c4224500ba7d9320df110796456903e67f3463e896d3d362bbb2dbc9297d5f SHA512 38dfb6422555aae7e7fc6fa0502ef1e516152c27648ebec6aecaa4a4151600d49c38e9440346a1367e98fb5402e835960c2580db52edd006120440da60936ec5 WHIRLPOOL de6cf09619cf6341515a0f9b5cf4d1beaab7c1bf50032186be18dae6530d1d944b5593f67f39b69046e341cf6d300228b3bc8800017c9714ed32332bd355127d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDDOeUACgkQkKaRLQcq0GJhUQCeOQSMJddoehDIFvgEs6zkcp4g
-v0QAnRcXA3Fy4OxnLTbKlGSmJDjKUI5V
-=0GJE
+iQIcBAEBCAAGBQJQ0IouAAoJEOSiRoyO7jvoyC8QAJdlquCyGlGrA8Re2LvDgFMY
+gotYeyq2DdKTkz09n639EhXk4ognfQ0gKPKydO1bEJcmPaUEpzJpn1WfVbkrsXe3
+lzTJlXytaLGyU3dGNb+hKtt+4Qe38N5qQqAtEbcT12CNjeMq6NhoVrSp9jQPISWo
+pTI8xYg4pi/DaEMfdbWG1yshjUsOSSE5LCnMu060WIvy60qXcm0LoTY8W7GaWAI1
+2z6q1k7t4NOx8M+WJBsEvicTli6ZuwMe6ye8TPM7vAVLWnaWo+dWru6s9JEiH7Pu
+TXXazZLifLEZUj+CNf02NsZSZ2L8VADIDBhI6xM07LqJXqd9+4nI7bA27ld3+wbn
+Bszr1VAIkF0VtzrnCxTAesnTvm5E4vj8DB3I87kyrBqHHUopjfW6wFcUTNWkH4kc
+MYqLCOwVzdNAgpX4iySZ6WmtLGuuU6TAcvJVrVYrJ+aceUeIebkZRsGsoRdLHoa4
+hgqeCSsuAXAPGM3+g/U2Xk2SAtZ1YfF4+iSeHkTlqC1UwWdDJrJWkG8zqdD33l+a
+/sm+veCJ7jtXDvWrFLGlAAFy/ABboHx/K+eWlUK8d+LTceJINksjTMQ8rMbvycHz
+xG6hSSkmab1PBac0qvKV+azw9wXeVdI/sDjEGs7ISrwlPm4SU+T83hfIc3JwWYm+
+AYNuDvTRt/E9Wl1BSbo2
+=+9Nf
 -----END PGP SIGNATURE-----
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