Pull in updated versions from master

8 files changed, 77 insertions, 51 deletions

diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 75d40e6..e1d3ad0 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,24 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mariadb-galera-10.0.19.tar.gz 56520261 SHA256 df5c0e8ff2db0dbf2490c52f5d9b509216e2d89bf6d340920aad2b41d4d1ae75 SHA512 9acba0d851c8bdfe0b28e3ec3dc9a21a41c8f283322d73a3c05ac10b9e9400302b9e6fe47d0d5ef73307254af715bc3ed144acaa325ce6c78841ddd14ee754c7 WHIRLPOOL 2c60ee6a82e8f6effed3b376a7647f0bc804de633d770bb215f37774bd7cd1f38b0ef173b68ec3f3eab9f59ffee77cb05668159873a5ebd863d0d96735f39edb
+DIST mariadb-galera-10.0.20.tar.gz 56558895 SHA256 f6b979cbae803d1b33e85407fcd2aaf19b07fb5e183726666e8c990f1f7d5ce8 SHA512 dbae146c798d08f624fcdac86d7f69aea2ebe8540f659004fee11dba4a0a6c234b7235544ae4adf3b58add989649533f86dbe1de4107eb7bbd433add42f55dad WHIRLPOOL 93ad52daae91463772a163a59beab57496102fc2cd23ba7f9b009875ea8cb7b854d8a0d857ddb90d6e3ec3e034ae8403eb7aedba55f9d2a97f72dbc999085f69
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iQJ8BAEBCABmBQJVeHTbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2ZvUQAMOSbnTMqHLmglDOZMrRyCbo
-FcYoazg8rEeQaGCsi3SXl53h3zpAkdDBlf2ngPTldUOaoxcsGEM/Ge8a8YWMqnZ0
-2PEF/wofWKFX6DhWovaLRhb3Z5FnKb0hL1oL2bTPiJv63A95fHfW2t7i93wPQKXt
-+DoFU6pRw+Det7CiPBXMZwkPRH7GBlbok7LswWvDSDVBEol9GuRDpU0sU4630L6k
-4hRqknyHg1QHlZGAlGLT7wDBslCB1+OqxH/cnIW6ep9PTl5eEedt56neFlLqd34w
-0JQejxFKV3ZUAt6BvRnONq2IaxxEsujc1iTSwMp2nPQp2CNJC7Wr/pIgciZf0rUc
-utcArE3+IuWPESNSOkfCsnBeEeMRSgzpxCkNCEwiiUfCfuE49iGaJUCbezUPi41b
-XF/KKpw2CMr67NeOxqJ2eTAYYc1Mk96InYu/lokAt0dCRfbsnhhp8FbAmA5iJWVO
-BtOBF3vvX6eKVgKae/Ktkxl6L0ES2yfcLX75FkrQbe0dEVAlvDz1y1aoKJD7QvrV
-Fl5JJne6EYmoinDmlkIUVUkcqsgdkpy/NLp5aceWrr73EbY2/62Ni1VryMEY0AmG
-E2+mnlQkCMV/pwIKBSMcPYsB4Bi5Pay6XAlRXbNWARM6uI/qCcunaKe8HfqfdONH
-+oUxEUEYtRI15Uw6R/Cg
-=pSAR
------END PGP SIGNATURE-----
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild
index 3b972ef..71b4908 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild,v 1.1 2015/05/18 20:07:51 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild,v 1.1 2015/06/29 17:06:14 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index e30a2b4..08e1d79 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,23 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mysql-cluster-gpl-7.2.19.tar.gz 25959966 SHA256 f4d8772108bbe30852129602f1d4106dc42adbe14d4bbc45065cb6e7314803b4 SHA512 2a30d6bdb82ff9b4c3bcdc2b44ed0707c2292efc45137ada62635b41424ecd4286b18718542fe2120e57636f998b38ac3768d4f9f6b018e65a82ef76d81a310e WHIRLPOOL 21cec46fdfcd3509f4dd01864976c19aefa2adc53212a0724e9b30bf0fa6d63be7d4395b68be13de942b1c399a174e8cfd3f65594921b70b7e6cec0d7dc95183
-DIST mysql-cluster-gpl-7.3.8.tar.gz 42400435 SHA256 eddcc2954ff7fbbc72b1266bd64a9548e9b9d7a4115d42b54c13257c226248ca SHA512 4118449bc9bd2c88caff1585ebfa6b2e2a85b960fa12bc50a00245d1a6d42b3411ee0b2e32b2b10afd46b97e01e5b4fad924dbed852b2ab49b43c123c649a2d3 WHIRLPOOL fc1c6cd68e1f1b0f0430c0374b24c41ba7df83f43897d71e023706228c63024dc10ad6a5eef1696a24a6898be4387a1e4cf47309cabf7abaebc1767ae66da773
+DIST mysql-cluster-gpl-7.2.20.tar.gz 25999156 SHA256 60ca80b10680b5048cd358ae543ad16e8e8c31395aaa69163bde923b22085874 SHA512 62fac1db476e08109885660d2e2728bb0c2c8144acb602fdb679d802bcdc459254349eb914ae600f51dca33f42cd9dfa0db9a21b07edb0d0c316497a62e1fc6f WHIRLPOOL 8f8787151648f34f3cfd64d05da793e40e8fe3d053f5cff72ecff7b799a536bf56ead2e19fd72620fda967b6903bc5ec01fec171144f581f32c4e0f0426573b5
+DIST mysql-cluster-gpl-7.3.9.tar.gz 42489084 SHA256 eba6e37313608514aa41b7f948ccaef3153bf46270f0153b0246492573621b78 SHA512 d7897b5b16ae9179c3ac93e078e55597b89cacaeb4c9ca4477eb8230eb6dbdddf220b55df9dc91b5600e43adcd0d9a1ab470bcc970c20eaa78cd8300ef9ee80e WHIRLPOOL cdfd11a78a52c6b69add0b468a3e87304fdacddb1eb856bdf4e64d28337b7530288fdc1c0a1e25523081bce42fada8a161cd186d20e765a793d4e7160a2b013b
 DIST mysql-extras-20150210-1758Z.tar.bz2 1494128 SHA256 1d82bc96e294b5479491fe2d8cf83f25f6b4d34c0033238848afde7cc7592e2c SHA512 0256cfe8af6f7c198d3e1aa15b6ac14363d4392422a379f24465e3e16dea75f3779bfe727fd74c404b126041bde2396ff521479c164b5d6c44a7340cad9fce33 WHIRLPOOL bde91051187f4f6f39a52d80d2a9648f9c05187ce200eea89c496cb9e99c70fe049f9f0b490ccfaaecd43081e6988841d94c3ede9fa4e9fb8773580f20047fbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQIcBAEBCAAGBQJU2lA/AAoJENH3ge/59KO2aDYQAJpBVUoCr+TwsbvFkx+Ar4Gf
-XVBnLSMqIo5RyRKjXGa4MdpzSn82Rrz9omCewkojbwjqpPFhnreqDpGSGoD12DcM
-+HKW1ygKK7X1rx0Y9w0AC/e+n1Nn/jht6u1YBCks7tp8WrNp3DxXGffc/dC5mcPa
-SxL622ElqQ7dQhEskx6fsg5pASa/18oxTwOz+3emSt29uVjJXJMnjp330M452tGw
-tTQE0bVmcpGZyuDES93j+Z3KqRjkJqdeI2X/ttCwKQH8xLV1hIhRTUUqp9Re8j4B
-HXNIGzxtEz1vXbn7rTAQM7mGJkKH74cJi2GOmiJlymad5pJdKPSQsFzKpEOSTPe0
-/qvk6aJELGukbEKvPE8Lso4QUud8achwtgamkUTHKp6aNcH/KpDtUArBevfz1a82
-fA0HU1/n5hPgNgjEO5tGltPbvjij9yc95bWbqEitm6tIMBza5hvbq2QlCjorhXaF
-wcE6Aar3KzObrngHCsf8nBQV1CaNrug1BrGBbEcMhbOwaHfs8Ne7WBzXOPP636tA
-DDgRKqb4jxvev/C8LqZ+7J287VnsPEIb1W0jRPAX7bYNkQY0aZLqED3xqFSCJhig
-Vp2BkWaK2H1yaudpCpmZy3DfI5nHMtnNDg+9urHwlSoUkHLnJhlIuQ7Fyi907EAX
-yiNcKpsXoVbtTIJ9/hw1
-=2/Xi
------END PGP SIGNATURE-----
+DIST mysql-extras-20150710-1911Z.tar.bz2 1494443 SHA256 9a4755dce3c5b7dfebda87c2fd73eb7b94786be43a9bd97451a8134dc95e6983 SHA512 9a42616dafba562dad5485ea16d8a2b7521668323414329052a64e32da606860af9c0d8a1bdc634afc0e55d1d2329297488c90ff712eac0eb74d8843ca9081aa WHIRLPOOL 33ee7e5cc90a26722fa4f6ff7f8604ac1a1396a867a5ca45b81510cb26638fa57dc3f0e8f2471a8c05c26f5341765c2c370989fcb1602b30e7c05bc00b247e34
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.20.ebuild
index 68c7c9d..f67e45e 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild,v 1.1 2015/02/10 18:15:07 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.20.ebuild,v 1.1 2015/07/10 20:37:23 grknight Exp $
 
 EAPI=4
 MY_EXTRAS_VER="20150210-1758Z"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
+#EPATCH_EXCLUDE=''
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="!media-sound/amarok[embedded]"
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.9.ebuild
index 367a72a..2293a34 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild,v 1.1 2015/02/10 18:15:07 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.9.ebuild,v 1.1 2015/07/10 20:37:23 grknight Exp $
 
 EAPI=5
-MY_EXTRAS_VER="20150210-1758Z"
+MY_EXTRAS_VER="20150710-1911Z"
 
 inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
 # only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index d8d7de8..5c0e7d8 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1 +1,2 @@
 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/mysql-connector-c-6.1.6.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild
new file mode 100644
index 0000000..289f2d6
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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
+	!dev-db/mysql-cluster
+	!dev-db/mariadb
+	!dev-db/mariadb-connector-c[mysqlcompat]
+	!dev-db/mariadb-galera
+	!dev-db/percona-server
+	"
+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/percona-server/percona-server-5.6.24.72.2.ebuild b/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild
index 820fd00..ef154e2 100644
--- a/dev-db/percona-server/percona-server-5.6.24.72.2.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.24.72.2.ebuild,v 1.1 2015/05/11 16:50:38 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild,v 1.1 2015/07/06 18:00:05 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20150113-1853Z"