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

2022-04-12 Thread Sam James
commit: 09e310df2857835d3298359785d695c5fb9d60ee
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 13 05:51:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 13 05:54:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e310df

dev-db/mysql-cluster: treeclean

Closes: https://bugs.gentoo.org/834113
Closes: https://bugs.gentoo.org/829342
Closes: https://bugs.gentoo.org/833523
Closes: https://bugs.gentoo.org/693564
Closes: https://bugs.gentoo.org/741548
Closes: https://bugs.gentoo.org/746710
Closes: https://bugs.gentoo.org/781281
Closes: https://bugs.gentoo.org/638856
Closes: https://bugs.gentoo.org/675986
Closes: https://bugs.gentoo.org/831445
Closes: https://bugs.gentoo.org/750776
Closes: https://bugs.gentoo.org/801697
Closes: https://bugs.gentoo.org/805521
Bug: https://bugs.gentoo.org/819660
Signed-off-by: Sam James  gentoo.org>

 dev-db/mysql-cluster/Manifest|   2 -
 dev-db/mysql-cluster/files/my.cnf-5.6| 139 
 dev-db/mysql-cluster/metadata.xml|  19 -
 dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild | 811 ---
 4 files changed, 971 deletions(-)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
deleted file mode 100644
index 02952f9c74ec..
--- a/dev-db/mysql-cluster/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 
4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4
 SHA512 
48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5
-DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B 
d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc
 SHA512 
2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05

diff --git a/dev-db/mysql-cluster/files/my.cnf-5.6 
b/dev-db/mysql-cluster/files/my.cnf-5.6
deleted file mode 100644
index df462ab69a14..
--- a/dev-db/mysql-cluster/files/my.cnf-5.6
+++ /dev/null
@@ -1,139 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration 
file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password  = your_password
-port   = 3306
-socket = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log= 
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server   = utf8
-user   = mysql
-port   = 3306
-socket = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file   = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error  = 
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir= @DATADIR@
-skip-external-locking
-key_buffer_size= 16M
-max_allowed_packet = 4M
-table_open_cache   = 400
-sort_buffer_size   = 512K
-net_buffer_length  = 16K
-read_buffer_size   = 256K
-read_rnd_buffer_size   = 512K
-myisam_sort_buffer_size= 8M
-lc_messages_dir= 
@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages= en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking

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

2022-03-13 Thread Sam James
commit: a4f93562b5d6754653c9cd29fcb401f30ffbbced
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 13 17:32:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 13 17:32:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f93562

dev-db/mysql-cluster: drop 7.2.34, 7.3.22

Clean up as much as we can, anyway, while last-rites pend.

Bug: https://bugs.gentoo.org/834113
Signed-off-by: Sam James  gentoo.org>

 dev-db/mysql-cluster/Manifest|   2 -
 dev-db/mysql-cluster/files/7.2.34-client.patch   |  25 -
 dev-db/mysql-cluster/files/my.cnf-5.5| 147 
 dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild | 796 --
 dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild | 811 ---
 5 files changed, 1781 deletions(-)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 0ebf0edc95ef..02952f9c74ec 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,4 +1,2 @@
-DIST mysql-cluster-gpl-7.2.34.tar.gz 25114728 BLAKE2B 
b9337cf8ae6742c58f92ae64b8a636c8e54e6db3be45b329a695700a55a89b77839a5417c949ae37b2897d3bbd1274e41efcacde735f40d1de9ae14b16dd4576
 SHA512 
b73a3d13665a6efdad1e0e18e61780d8b99621ab46269a98723b9ddd9526edb77b5418947cb88b8d287c73eba7659aced363d747df18596ac34eb701ec83623c
-DIST mysql-cluster-gpl-7.3.22.tar.gz 41356026 BLAKE2B 
055a3f8590f0e2e53f8620244bd2ca7d619ab5549de7b33c4d41d2fabd260d98eaabdc0169488a6d018bcafc4458433e21b65025827998a31e9abc1deb5101ae
 SHA512 
ccb9f3429e6ccb2dbb53d98f54abeae3c3128e65dc69c41918324630fef665f48d3c3af2d60bf1cce4e28c492e525c6bbc32cc8a39a9ea47988184adeafd5bd3
 DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 
4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4
 SHA512 
48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5
 DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B 
d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc
 SHA512 
2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05

diff --git a/dev-db/mysql-cluster/files/7.2.34-client.patch 
b/dev-db/mysql-cluster/files/7.2.34-client.patch
deleted file mode 100644
index fbf163bf250b..
--- a/dev-db/mysql-cluster/files/7.2.34-client.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b6c038d4366d003ae00120c96e39a892e5d675c1 Mon Sep 17 00:00:00 2001
-From: Tor Didriksen 
-Date: Wed, 18 Jul 2018 10:22:21 +0200
-Subject: [PATCH] Fix build break with modern compilers:
-
-client/mysql.cc: In function void build_completion_hash(bool, bool):
-client/mysql.cc:2674:37: error: invalid conversion from char to char* 
[-fpermissive]
-   field_names[i][num_fields*2]= '\0';

- client/mysql.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/mysql.cc b/client/mysql.cc
-index 8510361a54e..bc32a58f37e 100644
 a/client/mysql.cc
-+++ b/client/mysql.cc
-@@ -2671,7 +2671,7 @@ You can turn off this feature to get a quicker startup 
with -A\n\n");
- mysql_free_result(fields);
- break;
-   }
--  field_names[i][num_fields*2]= '\0';
-+  field_names[i][num_fields*2]= NULL;
-   j=0;
-   while ((sql_field=mysql_fetch_field(fields)))
-   {

diff --git a/dev-db/mysql-cluster/files/my.cnf-5.5 
b/dev-db/mysql-cluster/files/my.cnf-5.5
deleted file mode 100644
index edb71e86e85e..
--- a/dev-db/mysql-cluster/files/my.cnf-5.5
+++ /dev/null
@@ -1,147 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration 
file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password  = your_password
-port   = 3306
-socket = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2021-05-03 Thread Mikle Kolyada
commit: 7fc756dd93e378d0c89a5b3e0a0aba9e8c3d8a6e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May  3 08:09:57 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May  3 08:09:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc756dd

dev-db/mysql-cluster: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild | 15 ---
 dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild | 15 ---
 dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild | 15 ---
 3 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
index bd54a6729ec..31bc6c2f219 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/;
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bindist client-libs debug extraengine java jemalloc latin1 libressl
+IUSE="bindist client-libs debug extraengine java jemalloc latin1
+perl profiling selinux +server static static-libs systemtap tcmalloc
test yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
-RESTRICT="!bindist? ( bindist ) !test? ( test ) libressl? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
static? ( yassl )"
@@ -78,8 +77,7 @@ COMMON_DEPEND="
tcmalloc? ( dev-util/google-perftools:0= )
systemtap? ( >=dev-util/systemtap-1.3:0= )
!yassl? (
-   !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0= !>=dev-libs/openssl-1.1
)
>=sys-libs/zlib-1.2.3:0=
sys-libs/ncurses:0=
@@ -196,11 +194,6 @@ src_prepare() {
echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
fi
 
-   if use libressl ; then
-   sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-   "${S}/cmake/ssl.cmake" || die
-   fi
-
local plugin
local server_plugins=( semisync )
local test_plugins=( audit_null daemon_example fulltext )

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
index 7969b44c589..fdbc2cad350 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/;
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="client-libs debug extraengine jemalloc latin1 libressl numa
+IUSE="client-libs debug extraengine jemalloc latin1 numa
+perl profiling selinux +server static static-libs systemtap tcmalloc
test yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
static? ( yassl )"
@@ -80,8 +79,7 @@ COMMON_DEPEND="
tcmalloc? ( dev-util/google-perftools:0= )
systemtap? ( >=dev-util/systemtap-1.3:0= )
!yassl? (
-   !libressl? ( >=dev-libs/openssl-1.0.0:0= )
-   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/openssl-1.0.0:0=
)
>=sys-libs/zlib-1.2.3:0=
sys-libs/ncurses:0=
@@ -197,11 +195,6 @@ src_prepare() {
echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
fi
 
-   if use libressl ; then
-   sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-   "${S}/cmake/ssl.cmake" || die
-   fi
-
local plugin
local server_plugins=( semisync )
local test_plugins=( audit_null daemon_example fulltext )

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
index ad252c1349b..d78696ae60e 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/;
 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2021-05-01 Thread Sam James
commit: 250c27d2faf86754e313ed50e91ea5336059f4a8
Author: Sam James  gentoo  org>
AuthorDate: Sat May  1 18:19:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  1 18:24:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=250c27d2

dev-db/mysql-cluster: drop redundant USE=libressl in metadata.xml

It was/is a global USE flag anyway and these
didn't add anything.

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 dev-db/mysql-cluster/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-db/mysql-cluster/metadata.xml 
b/dev-db/mysql-cluster/metadata.xml
index c82ebfd6fc5..13a8c6dcbb3 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -9,7 +9,6 @@
   Build the client libraries from the server package 
instead of the C Connector packages (not recommended)
   Add support for alternative storage engines 
(Archive, CSV, Blackhole, Federated(X), Partition)
   Use LATIN1 encoding instead of UTF8
-  Enable SSL connections and crypto functions using 
dev-libs/libressl
   Enable NUMA support using sys-process/numactl 
(NUMA kernel support is also required)
   Add support for statement profiling (requires 
USE=community).
   Build the server program



[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2020-02-08 Thread David Seifert
commit: 2292b5fcd8723f63c2d6cb653d4045396b146868
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb  8 17:05:04 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb  8 17:05:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2292b5fc

dev-db/mysql-cluster: [QA] Remove unnecessary -DCMAKE_INSTALL_PREFIX arguments

Signed-off-by: David Seifert  gentoo.org>

 dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild | 1 -
 dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild | 1 -
 dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild | 1 -
 3 files changed, 3 deletions(-)

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
index 2bbb13d9644..048d9b67f19 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
@@ -238,7 +238,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
index 62a444045ec..9456b1c4a77 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -239,7 +239,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
index 366b4545eab..a4c51a22cc0 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
@@ -239,7 +239,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}



[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2019-08-18 Thread David Seifert
commit: 0d531686be231c28af8d9eec98f0d90bf5708a87
Author: David Seifert  gentoo  org>
AuthorDate: Sun Aug 18 12:25:10 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 18 12:36:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d531686

dev-db/mysql-cluster: [QA] Fix leading whitespace

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert  gentoo.org>

 dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild | 10 +-
 dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild | 14 +++---
 dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild | 14 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
index c4b0ad5dc5f..ee858318fdf 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
@@ -481,11 +481,11 @@ src_test() {
 
local t
for t in main.mysql_client_test \
-binlog.binlog_statement_insert_delayed 
main.information_schema \
-main.mysqld--help-notwin main.flush_read_lock_kill \
-sys_vars.plugin_dir_basic main.openssl_1 \
-main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
+   binlog.binlog_statement_insert_delayed 
main.information_schema \
+   main.mysqld--help-notwin 
main.flush_read_lock_kill \
+   sys_vars.plugin_dir_basic main.openssl_1 \
+   main.mysqlhotcopy_archive 
main.mysqlhotcopy_myisam \
+   ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
_disable_test  "$t" "False positives in Gentoo"
done
 

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
index 5a1a79830e0..16b657b8051 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -485,13 +485,13 @@ src_test() {
 
local t
for t in main.mysql_client_test \
-binlog.binlog_statement_insert_delayed 
main.information_schema \
-main.mysqld--help-notwin main.flush_read_lock_kill \
-sys_vars.plugin_dir_basic main.openssl_1 \
-   binlog.binlog_mysqlbinlog_filter \
-   perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-   funcs_1.is_columns_mysql funcs_1.is_tables_mysql 
funcs_1.is_triggers \
-main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+   binlog.binlog_statement_insert_delayed 
main.information_schema \
+   main.mysqld--help-notwin 
main.flush_read_lock_kill \
+   sys_vars.plugin_dir_basic main.openssl_1 \
+   binlog.binlog_mysqlbinlog_filter \
+   perfschema.binlog_edge_mix 
perfschema.binlog_edge_stmt \
+   funcs_1.is_columns_mysql 
funcs_1.is_tables_mysql funcs_1.is_triggers \
+   main.mysqlhotcopy_archive 
main.mysqlhotcopy_myisam ; do
_disable_test  "$t" "False positives in Gentoo"
done
 

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
index 520d6e2f99d..9e8f595ee07 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
@@ -485,13 +485,13 @@ src_test() {
 
local t
for t in main.mysql_client_test \
-binlog.binlog_statement_insert_delayed 
main.information_schema \
-main.mysqld--help-notwin main.flush_read_lock_kill \
-sys_vars.plugin_dir_basic main.openssl_1 \
-   binlog.binlog_mysqlbinlog_filter \
-   perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-   funcs_1.is_columns_mysql funcs_1.is_tables_mysql 
funcs_1.is_triggers \
-main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+   binlog.binlog_statement_insert_delayed 
main.information_schema \
+   main.mysqld--help-notwin 
main.flush_read_lock_kill \
+   sys_vars.plugin_dir_basic main.openssl_1 \
+   binlog.binlog_mysqlbinlog_filter \
+   perfschema.binlog_edge_mix 
perfschema.binlog_edge_stmt \
+   funcs_1.is_columns_mysql 
funcs_1.is_tables_mysql funcs_1.is_triggers \
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2019-04-27 Thread David Seifert
commit: d3cf1502c0071dbaf8dc1a429b2c55507ae37686
Author: David Seifert  gentoo  org>
AuthorDate: Sat Apr 27 16:35:03 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Apr 27 20:27:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3cf1502

dev-db/mysql-cluster: [QA] Fix USE=libressl semantics

Closes: https://bugs.gentoo.org/683984
Closes: https://github.com/gentoo/gentoo/pull/11843
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: David Seifert  gentoo.org>

 dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild | 3 +--
 dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
index 283dd6b1089..5a1a79830e0 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -32,8 +32,7 @@ IUSE="client-libs debug extraengine jemalloc latin1 libressl 
numa
 RESTRICT="libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
-   ?? ( yassl libressl )
-   static? ( yassl !libressl )"
+   static? ( yassl )"
 
 KEYWORDS="~amd64 ~x86"
 

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
index 787367f6f5f..520d6e2f99d 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
@@ -32,8 +32,7 @@ IUSE="client-libs debug extraengine jemalloc latin1 libressl 
numa
 RESTRICT="libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
-   ?? ( yassl libressl )
-   static? ( yassl !libressl )"
+   static? ( yassl )"
 
 KEYWORDS="~amd64 ~x86"
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2019-01-20 Thread Brian Evans
commit: f15392b08c5e03e9757368279fa9358e3856d2cb
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jan 21 00:24:53 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jan 21 00:24:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f15392b0

dev-db/mysql-cluster: Drop old

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mysql-cluster/Manifest|   5 -
 dev-db/mysql-cluster/metadata.xml|   6 -
 dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild | 126 ---
 dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild | 190 ---
 dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild | 190 ---
 5 files changed, 517 deletions(-)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 59b46cc17dc..0ebf0edc95e 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,9 +1,4 @@
-DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 BLAKE2B 
c0af2b85c9760636f35ab461997ac5e8e5d20085dbfef6e7a265931e743b288a4cdb8e282f7e9436daa8b9e060fe110f5522c640e2e2a7f0b54fe2686ebb751b
 SHA512 
ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881
 DIST mysql-cluster-gpl-7.2.34.tar.gz 25114728 BLAKE2B 
b9337cf8ae6742c58f92ae64b8a636c8e54e6db3be45b329a695700a55a89b77839a5417c949ae37b2897d3bbd1274e41efcacde735f40d1de9ae14b16dd4576
 SHA512 
b73a3d13665a6efdad1e0e18e61780d8b99621ab46269a98723b9ddd9526edb77b5418947cb88b8d287c73eba7659aced363d747df18596ac34eb701ec83623c
-DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 BLAKE2B 
25ca93a9bcc41fb03ba0e4d34a1c672ddee3db7ff76fcf483187483dec16d8bffaaf1ab0704b4bed6ebb57681768429f7088757769d6b23dfa757517eef767ea
 SHA512 
2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3
 DIST mysql-cluster-gpl-7.3.22.tar.gz 41356026 BLAKE2B 
055a3f8590f0e2e53f8620244bd2ca7d619ab5549de7b33c4d41d2fabd260d98eaabdc0169488a6d018bcafc4458433e21b65025827998a31e9abc1deb5101ae
 SHA512 
ccb9f3429e6ccb2dbb53d98f54abeae3c3128e65dc69c41918324630fef665f48d3c3af2d60bf1cce4e28c492e525c6bbc32cc8a39a9ea47988184adeafd5bd3
-DIST mysql-cluster-gpl-7.4.17.tar.gz 41691695 BLAKE2B 
9a9641a4962e625364fe9739d0954eeac8d773cb106e05c3cebd9ce94843246db679a1e81db383a861f9cec052193fa1ca80b34fb05d80ffbe248c29094476d2
 SHA512 
eaeab8b4c62e4b503210c269cf3147cb1fd3690e9bdb291a6bb46c874adf958166ccdf5b8766a09ec14d7fd63e3aff3e4b1f1527201e50e86e588507aa01767f
 DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 
4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4
 SHA512 
48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5
-DIST mysql-extras-20171108-2050Z.tar.bz2 313241 BLAKE2B 
83900f96392edb97c47007ba0faa4c259b7a3c6f17a7ed7161c7c632ac2466f9ab59777e6c17fdeeb8553650ea654633e3b10cf6f8e7692fbee4ebc5db495aea
 SHA512 
830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6
-DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B 
c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15
 SHA512 
dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e8011c0b6ddcadff1f737e3fa195badda
 DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B 
d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc
 SHA512 
2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05

diff --git a/dev-db/mysql-cluster/metadata.xml 
b/dev-db/mysql-cluster/metadata.xml
index 75d88ec7fb1..c82ebfd6fc5 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -7,15 +7,9 @@
   
 
   Build the client libraries from the server package 
instead of the C Connector packages (not recommended)
-  Add support for NDB clustering
-  Enables the community features from upstream.
-  Build embedded server (libmysqld)
   Add support for alternative storage engines 
(Archive, CSV, Blackhole, Federated(X), Partition)
   Use LATIN1 encoding instead of UTF8
   Enable SSL connections and crypto functions using 
dev-libs/libressl
-  Enable SSL connections and crypto functions using 
dev-libs/openssl
-  Raise the max index per table limit from 64 to 
128
-  Install client programs only, no server
   Enable NUMA support using sys-process/numactl 
(NUMA kernel support is also required)
   Add support for statement profiling (requires 
USE=community).
   Build the server program

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild 

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

2019-01-20 Thread Brian Evans
commit: 8a2e3eaf446f2ceff0d3406d00995a8fcc5ddbe4
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jan 21 00:21:46 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jan 21 00:21:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a2e3eaf

dev-db/mysql-cluster: Version bumps

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mysql-cluster/Manifest|   4 +
 dev-db/mysql-cluster/files/7.2.34-client.patch   |  25 +
 dev-db/mysql-cluster/metadata.xml|   1 +
 dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild | 804 ++
 dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild | 820 +++
 dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild | 820 +++
 6 files changed, 2474 insertions(+)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 85a2b3e987a..59b46cc17dc 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,5 +1,9 @@
 DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 BLAKE2B 
c0af2b85c9760636f35ab461997ac5e8e5d20085dbfef6e7a265931e743b288a4cdb8e282f7e9436daa8b9e060fe110f5522c640e2e2a7f0b54fe2686ebb751b
 SHA512 
ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881
+DIST mysql-cluster-gpl-7.2.34.tar.gz 25114728 BLAKE2B 
b9337cf8ae6742c58f92ae64b8a636c8e54e6db3be45b329a695700a55a89b77839a5417c949ae37b2897d3bbd1274e41efcacde735f40d1de9ae14b16dd4576
 SHA512 
b73a3d13665a6efdad1e0e18e61780d8b99621ab46269a98723b9ddd9526edb77b5418947cb88b8d287c73eba7659aced363d747df18596ac34eb701ec83623c
 DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 BLAKE2B 
25ca93a9bcc41fb03ba0e4d34a1c672ddee3db7ff76fcf483187483dec16d8bffaaf1ab0704b4bed6ebb57681768429f7088757769d6b23dfa757517eef767ea
 SHA512 
2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3
+DIST mysql-cluster-gpl-7.3.22.tar.gz 41356026 BLAKE2B 
055a3f8590f0e2e53f8620244bd2ca7d619ab5549de7b33c4d41d2fabd260d98eaabdc0169488a6d018bcafc4458433e21b65025827998a31e9abc1deb5101ae
 SHA512 
ccb9f3429e6ccb2dbb53d98f54abeae3c3128e65dc69c41918324630fef665f48d3c3af2d60bf1cce4e28c492e525c6bbc32cc8a39a9ea47988184adeafd5bd3
 DIST mysql-cluster-gpl-7.4.17.tar.gz 41691695 BLAKE2B 
9a9641a4962e625364fe9739d0954eeac8d773cb106e05c3cebd9ce94843246db679a1e81db383a861f9cec052193fa1ca80b34fb05d80ffbe248c29094476d2
 SHA512 
eaeab8b4c62e4b503210c269cf3147cb1fd3690e9bdb291a6bb46c874adf958166ccdf5b8766a09ec14d7fd63e3aff3e4b1f1527201e50e86e588507aa01767f
+DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 
4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4
 SHA512 
48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5
 DIST mysql-extras-20171108-2050Z.tar.bz2 313241 BLAKE2B 
83900f96392edb97c47007ba0faa4c259b7a3c6f17a7ed7161c7c632ac2466f9ab59777e6c17fdeeb8553650ea654633e3b10cf6f8e7692fbee4ebc5db495aea
 SHA512 
830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6
 DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B 
c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15
 SHA512 
dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e8011c0b6ddcadff1f737e3fa195badda
+DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B 
d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc
 SHA512 
2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05

diff --git a/dev-db/mysql-cluster/files/7.2.34-client.patch 
b/dev-db/mysql-cluster/files/7.2.34-client.patch
new file mode 100644
index 000..fbf163bf250
--- /dev/null
+++ b/dev-db/mysql-cluster/files/7.2.34-client.patch
@@ -0,0 +1,25 @@
+From b6c038d4366d003ae00120c96e39a892e5d675c1 Mon Sep 17 00:00:00 2001
+From: Tor Didriksen 
+Date: Wed, 18 Jul 2018 10:22:21 +0200
+Subject: [PATCH] Fix build break with modern compilers:
+
+client/mysql.cc: In function void build_completion_hash(bool, bool):
+client/mysql.cc:2674:37: error: invalid conversion from char to char* 
[-fpermissive]
+   field_names[i][num_fields*2]= '\0';
+---
+ client/mysql.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/mysql.cc b/client/mysql.cc
+index 8510361a54e..bc32a58f37e 100644
+--- a/client/mysql.cc
 b/client/mysql.cc
+@@ -2671,7 +2671,7 @@ You can turn off this feature to get a quicker startup 
with -A\n\n");
+ mysql_free_result(fields);
+ break;
+   }
+- 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2019-01-18 Thread Brian Evans
commit: 94ab9cc2a8389362dccdacba410d203d518c6791
Author: Brian Evans  gentoo  org>
AuthorDate: Sat Jan 19 03:47:34 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sat Jan 19 03:49:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ab9cc2

Revert "dev-db/mysql-cluster: Drop 7.2.31"

Don't randomly drop MySQL branches
This reverts commit dfc2edc9c1abb2182783c8a5f46afd266e9ce212.

Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mysql-cluster/Manifest|   2 +
 dev-db/mysql-cluster/metadata.xml|   4 +
 dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild | 126 +++
 3 files changed, 132 insertions(+)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 7ad8261ece4..85a2b3e987a 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,3 +1,5 @@
+DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 BLAKE2B 
c0af2b85c9760636f35ab461997ac5e8e5d20085dbfef6e7a265931e743b288a4cdb8e282f7e9436daa8b9e060fe110f5522c640e2e2a7f0b54fe2686ebb751b
 SHA512 
ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881
 DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 BLAKE2B 
25ca93a9bcc41fb03ba0e4d34a1c672ddee3db7ff76fcf483187483dec16d8bffaaf1ab0704b4bed6ebb57681768429f7088757769d6b23dfa757517eef767ea
 SHA512 
2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3
 DIST mysql-cluster-gpl-7.4.17.tar.gz 41691695 BLAKE2B 
9a9641a4962e625364fe9739d0954eeac8d773cb106e05c3cebd9ce94843246db679a1e81db383a861f9cec052193fa1ca80b34fb05d80ffbe248c29094476d2
 SHA512 
eaeab8b4c62e4b503210c269cf3147cb1fd3690e9bdb291a6bb46c874adf958166ccdf5b8766a09ec14d7fd63e3aff3e4b1f1527201e50e86e588507aa01767f
+DIST mysql-extras-20171108-2050Z.tar.bz2 313241 BLAKE2B 
83900f96392edb97c47007ba0faa4c259b7a3c6f17a7ed7161c7c632ac2466f9ab59777e6c17fdeeb8553650ea654633e3b10cf6f8e7692fbee4ebc5db495aea
 SHA512 
830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6
 DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B 
c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15
 SHA512 
dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e8011c0b6ddcadff1f737e3fa195badda

diff --git a/dev-db/mysql-cluster/metadata.xml 
b/dev-db/mysql-cluster/metadata.xml
index 4ff74764ebf..e769804157d 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -6,11 +6,15 @@
 MySQL
   
 
+  Add support for NDB clustering
+  Enables the community features from upstream.
   Build embedded server (libmysqld)
   Add support for alternative storage engines 
(Archive, CSV, Blackhole, Federated(X), Partition)
   Use LATIN1 encoding instead of UTF8
   Enable SSL connections and crypto functions using 
dev-libs/libressl
   Enable SSL connections and crypto functions using 
dev-libs/openssl
+  Raise the max index per table limit from 64 to 
128
+  Install client programs only, no server
   Enable NUMA support using sys-process/numactl 
(NUMA kernel support is also required)
   Add support for statement profiling (requires 
USE=community).
   Build the server program

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild
new file mode 100644
index 000..d5e946e39e0
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+MY_EXTRAS_VER="20171108-2050Z"
+BUILD="cmake"
+#fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE='20006_all_cmake_elib-mysql-cluster-5.5.37.patch 
20008_all_mysql-tzinfo-symlink.patch 
20019_all_mysql-5.5-mtr-perl-deprecation.patch 
20020_all_mysql-5.6-events_1-bug-78899.patch'
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='cluster extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+   local 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2019-01-18 Thread Thomas Deutschmann
commit: dfc2edc9c1abb2182783c8a5f46afd266e9ce212
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  8 09:10:41 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jan 19 03:36:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc2edc9

dev-db/mysql-cluster: Drop 7.2.31

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/10774
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-cluster/Manifest|   2 -
 dev-db/mysql-cluster/metadata.xml|   4 -
 dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild | 126 ---
 3 files changed, 132 deletions(-)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 85a2b3e987a..7ad8261ece4 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,5 +1,3 @@
-DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 BLAKE2B 
c0af2b85c9760636f35ab461997ac5e8e5d20085dbfef6e7a265931e743b288a4cdb8e282f7e9436daa8b9e060fe110f5522c640e2e2a7f0b54fe2686ebb751b
 SHA512 
ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881
 DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 BLAKE2B 
25ca93a9bcc41fb03ba0e4d34a1c672ddee3db7ff76fcf483187483dec16d8bffaaf1ab0704b4bed6ebb57681768429f7088757769d6b23dfa757517eef767ea
 SHA512 
2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3
 DIST mysql-cluster-gpl-7.4.17.tar.gz 41691695 BLAKE2B 
9a9641a4962e625364fe9739d0954eeac8d773cb106e05c3cebd9ce94843246db679a1e81db383a861f9cec052193fa1ca80b34fb05d80ffbe248c29094476d2
 SHA512 
eaeab8b4c62e4b503210c269cf3147cb1fd3690e9bdb291a6bb46c874adf958166ccdf5b8766a09ec14d7fd63e3aff3e4b1f1527201e50e86e588507aa01767f
-DIST mysql-extras-20171108-2050Z.tar.bz2 313241 BLAKE2B 
83900f96392edb97c47007ba0faa4c259b7a3c6f17a7ed7161c7c632ac2466f9ab59777e6c17fdeeb8553650ea654633e3b10cf6f8e7692fbee4ebc5db495aea
 SHA512 
830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6
 DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B 
c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15
 SHA512 
dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e8011c0b6ddcadff1f737e3fa195badda

diff --git a/dev-db/mysql-cluster/metadata.xml 
b/dev-db/mysql-cluster/metadata.xml
index e769804157d..4ff74764ebf 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -6,15 +6,11 @@
 MySQL
   
 
-  Add support for NDB clustering
-  Enables the community features from upstream.
   Build embedded server (libmysqld)
   Add support for alternative storage engines 
(Archive, CSV, Blackhole, Federated(X), Partition)
   Use LATIN1 encoding instead of UTF8
   Enable SSL connections and crypto functions using 
dev-libs/libressl
   Enable SSL connections and crypto functions using 
dev-libs/openssl
-  Raise the max index per table limit from 64 to 
128
-  Install client programs only, no server
   Enable NUMA support using sys-process/numactl 
(NUMA kernel support is also required)
   Add support for statement profiling (requires 
USE=community).
   Build the server program

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild
deleted file mode 100644
index d5e946e39e0..000
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_EXTRAS_VER="20171108-2050Z"
-BUILD="cmake"
-#fails to build with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE='20006_all_cmake_elib-mysql-cluster-5.5.37.patch 
20008_all_mysql-tzinfo-symlink.patch 
20019_all_mysql-5.5-mtr-perl-deprecation.patch 
20020_all_mysql-5.6-events_1-bug-78899.patch'
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2017-11-21 Thread Brian Evans
commit: 2308bef753a2a31f9d62d5e3fa44e5bed3df3656
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 21 19:33:37 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Nov 21 19:34:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2308bef7

dev-db/mysql-cluster: Fix building on gcc 7

Backport of commit c6a3a38050e112302534fa1392dc5649ca3d4f36.

Package-Manager: Portage-2.3.15, Repoman-2.3.6

 dev-db/mysql-cluster/Manifest| 9 +
 dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild | 3 ++-
 dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 5c29d7baf6d..85a2b3e987a 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,4 +1,5 @@
-DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 SHA256 
d798180114d8c1966abb86c798fc8230d50df478e73f1e2c6fbdb7ffb4cdd9ba SHA512 
ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881
 WHIRLPOOL 
c53a32c42f0a3c0c8848d20fa4d66f778926221ef381c8a26ccb60c07126a55af8c77f712cd71462b8345367c3c9e3d03b2b83b06f68b5bddd046328d755965b
-DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 SHA256 
53b6692d25ad85772c19593f8b098c9ad26b7d8acd4a74db5f8308567e214aad SHA512 
2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3
 WHIRLPOOL 
308ccc771acc72ec9558510edb5491a775a76afb5455cf98f942229d3d706a087aa38d97beb9bc2acbe3248c10893841764f08fdcb29ca47ca830c8c661cf369
-DIST mysql-cluster-gpl-7.4.17.tar.gz 41691695 SHA256 
f1966c721c7ed83b59f9ae2cc5e4df56071e358907deef2329d579d5c03601b1 SHA512 
eaeab8b4c62e4b503210c269cf3147cb1fd3690e9bdb291a6bb46c874adf958166ccdf5b8766a09ec14d7fd63e3aff3e4b1f1527201e50e86e588507aa01767f
 WHIRLPOOL 
1ad8b4b48ff4e4d0e5ada9f14c5d1fb4a23d8c211121ccc53f20051dfcecb0463d45c2b24178d87174f0950db6bb606e259144c4f1f9052759865644a9277f5a
-DIST mysql-extras-20171108-2050Z.tar.bz2 313241 SHA256 
a8ae0806728f5308f96fe07fe2348b9c72629968e6480ae45995ca0a3693b9aa SHA512 
830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6
 WHIRLPOOL 
7ea7aabe9fc93418297522529c2fb0cfe43c7c28019000c25e100838e8ac545cab0611a08f2931157b99acee9704c441832e037c28232079e57a0718ddb4591c
+DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 BLAKE2B 
c0af2b85c9760636f35ab461997ac5e8e5d20085dbfef6e7a265931e743b288a4cdb8e282f7e9436daa8b9e060fe110f5522c640e2e2a7f0b54fe2686ebb751b
 SHA512 
ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881
+DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 BLAKE2B 
25ca93a9bcc41fb03ba0e4d34a1c672ddee3db7ff76fcf483187483dec16d8bffaaf1ab0704b4bed6ebb57681768429f7088757769d6b23dfa757517eef767ea
 SHA512 
2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3
+DIST mysql-cluster-gpl-7.4.17.tar.gz 41691695 BLAKE2B 
9a9641a4962e625364fe9739d0954eeac8d773cb106e05c3cebd9ce94843246db679a1e81db383a861f9cec052193fa1ca80b34fb05d80ffbe248c29094476d2
 SHA512 
eaeab8b4c62e4b503210c269cf3147cb1fd3690e9bdb291a6bb46c874adf958166ccdf5b8766a09ec14d7fd63e3aff3e4b1f1527201e50e86e588507aa01767f
+DIST mysql-extras-20171108-2050Z.tar.bz2 313241 BLAKE2B 
83900f96392edb97c47007ba0faa4c259b7a3c6f17a7ed7161c7c632ac2466f9ab59777e6c17fdeeb8553650ea654633e3b10cf6f8e7692fbee4ebc5db495aea
 SHA512 
830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6
+DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B 
c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15
 SHA512 
dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e8011c0b6ddcadff1f737e3fa195badda

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
index e83b46f92f4..465e47e22e5 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-MY_EXTRAS_VER="20171108-2050Z"
+MY_EXTRAS_VER="20171121-1518Z"
 SUBSLOT="18"
 MYSQL_PV_MAJOR="5.6"
 #fails to build with ninja
@@ -27,6 +27,7 @@ PATCHES=(
"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
 #  "${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
+   "${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
"${MY_PATCH_DIR}"/3_all_mysql-cluster-multilib-property.patch
 )
 

diff --git 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2017-11-14 Thread Brian Evans
commit: 0f1cab192df470d70451daf924a14807e05d6d6e
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 14 13:48:02 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Nov 14 13:48:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1cab19

dev-db/mysql-cluster: Include dev-perl/JSON as a test dep

Bug: https://bugs.gentoo.org/637184
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild | 2 +-
 dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
index 01e3c5a9412..e83b46f92f4 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
@@ -15,7 +15,7 @@ IUSE="$IUSE numa"
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~amd64 ~x86"
 COMMON_DEPEND="numa? ( sys-process/numactl ) dev-libs/libevent:0= 
${JAVA_PKG_E_DEPEND}"
-DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 
) >=virtual/jdk-1.6"
+DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 
) >=virtual/jdk-1.6 test? ( dev-perl/JSON )"
 RDEPEND="${COMMON_DEPEND} !media-sound/amarok[embedded] >=virtual/jre-1.6"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
index 01e3c5a9412..e83b46f92f4 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
@@ -15,7 +15,7 @@ IUSE="$IUSE numa"
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~amd64 ~x86"
 COMMON_DEPEND="numa? ( sys-process/numactl ) dev-libs/libevent:0= 
${JAVA_PKG_E_DEPEND}"
-DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 
) >=virtual/jdk-1.6"
+DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 
) >=virtual/jdk-1.6 test? ( dev-perl/JSON )"
 RDEPEND="${COMMON_DEPEND} !media-sound/amarok[embedded] >=virtual/jre-1.6"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"



[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2017-11-11 Thread Brian Evans
commit: 926f9314afc813f90d67215a8c9d2fcacf8d765f
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Nov 12 02:19:02 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Nov 12 02:19:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=926f9314

dev-db/mysql-cluster: Convert 7.3.19 to mysql-multilib-r1 eclass

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild | 92 +---
 1 file changed, 68 insertions(+), 24 deletions(-)

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
index 7a18a355e0a..01e3c5a9412 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
@@ -1,38 +1,71 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 MY_EXTRAS_VER="20171108-2050Z"
 SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
 #fails to build with ninja
 CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
+inherit java-utils-2 mysql-multilib-r1
 # only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
+IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~amd64 ~x86"
+COMMON_DEPEND="numa? ( sys-process/numactl ) dev-libs/libevent:0= 
${JAVA_PKG_E_DEPEND}"
+DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 
) >=virtual/jdk-1.6"
+RDEPEND="${COMMON_DEPEND} !media-sound/amarok[embedded] >=virtual/jre-1.6"
 
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE=''
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
+PATCHES=(
+   "${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
+   "${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+   "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+   "${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+#  "${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
+   "${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
+   "${MY_PATCH_DIR}"/3_all_mysql-cluster-multilib-property.patch
+)
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/storage/ndb/ndb_types.h )
 
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
+pkg_setup() {
+   mysql-multilib-r1_pkg_setup
+   java-pkg_init
+}
+
 src_prepare() {
-   mysql-multilib_src_prepare
+   mysql-multilib-r1_src_prepare
+   java-utils-2_src_prepare
if use libressl ; then
sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
"${S}/cmake/ssl.cmake" || die
fi
 }
 
+src_configure() {
+   # validate_password plugin uses exceptions when it shouldn't yet (until 
5.7)
+   # disable until we see what happens with it
+   local MYSQL_CMAKE_NATIVE_DEFINES=(
+   -DWITHOUT_VALIDATE_PASSWORD=1
+   -DWITH_NUMA=$(usex numa ON OFF)
+   -DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
+   -DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
+   mysql-multilib-r1_src_configure
+}
+
+pkg_preinst() {
+   java-utils-2_pkg_preinst
+   mysql-multilib-r1_pkg_preinst
+}
+
 # Official test instructions:
 # USE='extraengine perl openssl' \
 # FEATURES='test userpriv -usersandbox' \
@@ -45,6 +78,14 @@ multilib_src_test() {
return 0;
fi
 
+   _disable_test() {
+   local rawtestname reason
+   rawtestname="${1}" ; shift
+   reason="${@}"
+   ewarn "test '${rawtestname}' disabled: '${reason}'"
+   echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+   }
+
local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
local retstatus_unit
local retstatus_tests
@@ -53,7 +94,7 @@ multilib_src_test() {
# localhost. Also causes weird failures.
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
 
-   if ! use "minimal" ; then
+   if use server ; then
 
if [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer 
supported by upstream. Tests MUST be run as non-root."
@@ -61,12 +102,6 @@ multilib_src_test() {
has usersandbox $FEATURES && eerror "Some tests may fail with 
FEATURES=usersandbox"
 
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-   addpredict /this-dir-does-not-exist/t9.MYI
-
-   # Run CTest (test-units)
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2017-11-10 Thread Brian Evans
commit: c19a2c08d57e727da20c625d82658875151920b6
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Nov 10 20:33:20 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Nov 10 20:33:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19a2c08

dev-db/mysql-cluster: Fix build issues and tests

The conversion to mysql-multilib-r1 was incomplete with the
required java eclasses

Closes: https://bugs.gentoo.org/637068
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild | 49 ++--
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
index f7d2b65e0eb..01e3c5a9412 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
@@ -8,15 +8,15 @@ MYSQL_PV_MAJOR="5.6"
 #fails to build with ninja
 CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit mysql-multilib-r1
+inherit java-utils-2 mysql-multilib-r1
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~amd64 ~x86"
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( 
sys-process/numactl )"
-RDEPEND="!media-sound/amarok[embedded]  numa? ( sys-process/numactl )"
+COMMON_DEPEND="numa? ( sys-process/numactl ) dev-libs/libevent:0= 
${JAVA_PKG_E_DEPEND}"
+DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 
) >=virtual/jdk-1.6"
+RDEPEND="${COMMON_DEPEND} !media-sound/amarok[embedded] >=virtual/jre-1.6"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
@@ -30,12 +30,20 @@ PATCHES=(
"${MY_PATCH_DIR}"/3_all_mysql-cluster-multilib-property.patch
 )
 
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/storage/ndb/ndb_types.h )
+
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
+pkg_setup() {
+   mysql-multilib-r1_pkg_setup
+   java-pkg_init
+}
+
 src_prepare() {
mysql-multilib-r1_src_prepare
+   java-utils-2_src_prepare
if use libressl ; then
sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
"${S}/cmake/ssl.cmake" || die
@@ -45,10 +53,19 @@ src_prepare() {
 src_configure() {
# validate_password plugin uses exceptions when it shouldn't yet (until 
5.7)
# disable until we see what happens with it
-   local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 
-DWITH_NUMA=$(usex numa ON OFF) )
+   local MYSQL_CMAKE_NATIVE_DEFINES=(
+   -DWITHOUT_VALIDATE_PASSWORD=1
+   -DWITH_NUMA=$(usex numa ON OFF)
+   -DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
+   -DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
mysql-multilib-r1_src_configure
 }
 
+pkg_preinst() {
+   java-utils-2_pkg_preinst
+   mysql-multilib-r1_pkg_preinst
+}
+
 # Official test instructions:
 # USE='extraengine perl openssl' \
 # FEATURES='test userpriv -usersandbox' \
@@ -61,6 +78,14 @@ multilib_src_test() {
return 0;
fi
 
+   _disable_test() {
+   local rawtestname reason
+   rawtestname="${1}" ; shift
+   reason="${@}"
+   ewarn "test '${rawtestname}' disabled: '${reason}'"
+   echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+   }
+
local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
local retstatus_unit
local retstatus_tests
@@ -91,6 +116,7 @@ multilib_src_test() {
# create symlink for the tests to find mysql_tzinfo_to_sql
ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
 
+   touch "${T}/disabled.def"
# These are failing in MySQL 5.5/5.6 for now and are believed 
to be
# false positives:
#
@@ -118,16 +144,16 @@ multilib_src_test() {
main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
perfschema.binlog_edge_mix \
perfschema.binlog_edge_stmt \
-   rpl.rpl_plugin_load ndb.ndb_tools_connect main.mysql \
-   main.mysql_upgrade unit_tests \
+   rpl.rpl_plugin_load main.mysql \
+   main.mysql_upgrade \
; do
-   mysql-multilib-r1_disable_test  "$t" "False 
positives in Gentoo"
+   _disable_test  "$t" "False positives in Gentoo"
done
# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
for t in \
-   ndb.ndbinfo \
+   ndb.ndbinfo 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2017-11-09 Thread Brian Evans
commit: 3fbbe7f7b2fe34873809e9786d4967f98296852f
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Nov  9 13:47:01 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Nov  9 13:47:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fbbe7f7

dev-db/mysql-cluster: Version bump for 7.4.17

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/mysql-cluster/Manifest|   1 +
 dev-db/mysql-cluster/metadata.xml|   2 +
 dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild | 162 +++
 3 files changed, 165 insertions(+)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 114b9619b26..5c29d7baf6d 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,3 +1,4 @@
 DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 SHA256 
d798180114d8c1966abb86c798fc8230d50df478e73f1e2c6fbdb7ffb4cdd9ba SHA512 
ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881
 WHIRLPOOL 
c53a32c42f0a3c0c8848d20fa4d66f778926221ef381c8a26ccb60c07126a55af8c77f712cd71462b8345367c3c9e3d03b2b83b06f68b5bddd046328d755965b
 DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 SHA256 
53b6692d25ad85772c19593f8b098c9ad26b7d8acd4a74db5f8308567e214aad SHA512 
2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3
 WHIRLPOOL 
308ccc771acc72ec9558510edb5491a775a76afb5455cf98f942229d3d706a087aa38d97beb9bc2acbe3248c10893841764f08fdcb29ca47ca830c8c661cf369
+DIST mysql-cluster-gpl-7.4.17.tar.gz 41691695 SHA256 
f1966c721c7ed83b59f9ae2cc5e4df56071e358907deef2329d579d5c03601b1 SHA512 
eaeab8b4c62e4b503210c269cf3147cb1fd3690e9bdb291a6bb46c874adf958166ccdf5b8766a09ec14d7fd63e3aff3e4b1f1527201e50e86e588507aa01767f
 WHIRLPOOL 
1ad8b4b48ff4e4d0e5ada9f14c5d1fb4a23d8c211121ccc53f20051dfcecb0463d45c2b24178d87174f0950db6bb606e259144c4f1f9052759865644a9277f5a
 DIST mysql-extras-20171108-2050Z.tar.bz2 313241 SHA256 
a8ae0806728f5308f96fe07fe2348b9c72629968e6480ae45995ca0a3693b9aa SHA512 
830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6
 WHIRLPOOL 
7ea7aabe9fc93418297522529c2fb0cfe43c7c28019000c25e100838e8ac545cab0611a08f2931157b99acee9704c441832e037c28232079e57a0718ddb4591c

diff --git a/dev-db/mysql-cluster/metadata.xml 
b/dev-db/mysql-cluster/metadata.xml
index 9dc67c64a89..0efe3d7675f 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -16,7 +16,9 @@
   Enable SSL connections and crypto functions using 
dev-libs/openssl
   Raise the max index per table limit from 64 to 
128
   Install client programs only, no server
+  Enable NUMA support using sys-process/numactl 
(NUMA kernel support is also required)
   Add support for statement profiling (requires 
USE=community).
+  Build the server program
   Build support for profiling and tracing using 
dev-util/systemtap
   Install upstream testsuites for end use.
   Enable SSL connections and crypto functions using the 
bundled yaSSL

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
new file mode 100644
index 000..f7d2b65e0eb
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_EXTRAS_VER="20171108-2050Z"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+#fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit mysql-multilib-r1
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE numa"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( 
sys-process/numactl )"
+RDEPEND="!media-sound/amarok[embedded]  numa? ( sys-process/numactl )"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+   "${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
+   "${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+   "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+   "${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+#  "${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
+   "${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
+   "${MY_PATCH_DIR}"/3_all_mysql-cluster-multilib-property.patch
+)
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+src_prepare() {
+   mysql-multilib-r1_src_prepare
+   if use libressl ; then
+   sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2017-11-08 Thread Brian Evans
commit: a04222a845814b0fb8713ba453a3a19d7e975546
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov  8 20:58:49 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Nov  8 20:58:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04222a8

dev-db/mysql-cluster: Drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/mysql-cluster/Manifest  |   3 -
 .../mysql-cluster/mysql-cluster-7.2.22-r1.ebuild   | 124 --
 .../mysql-cluster/mysql-cluster-7.3.11-r1.ebuild   | 143 -
 3 files changed, 270 deletions(-)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 806cfd9a2de..114b9619b26 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,6 +1,3 @@
-DIST mysql-cluster-gpl-7.2.22.tar.gz 26075142 SHA256 
404b80192c488791cedf6251e64bb01310b20f13fcdb28721e108e92985ae999 SHA512 
b3370725f17a5b6577c9822097b6c39e4375bdabca2a403bd45dfeb9fd5920c0e213c894eed33dadba69d9c066427ab5065c587869d82bf2e3438d3bdeb1aa8e
 WHIRLPOOL 
1275fc2a181011c5ea2ac392c94027f399a5ce4fd499ff23790bfad142b1c7d67bc421e7c6a4e64e6bb409f04016196417535d5704d21165c1120bf46ab68544
 DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 SHA256 
d798180114d8c1966abb86c798fc8230d50df478e73f1e2c6fbdb7ffb4cdd9ba SHA512 
ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881
 WHIRLPOOL 
c53a32c42f0a3c0c8848d20fa4d66f778926221ef381c8a26ccb60c07126a55af8c77f712cd71462b8345367c3c9e3d03b2b83b06f68b5bddd046328d755965b
-DIST mysql-cluster-gpl-7.3.11.tar.gz 42806929 SHA256 
6c8cfc99ccbf47cd4304996559de6fb330e9cdf754bec37ff7347be72e50c646 SHA512 
89e5b6e845b71ed6945529b7f515d3af96ec6daf79c0085f1d0ea6e4426f61eb3626b688e5edda668be4615df1b8cec4e71acdf0d21150fa2775c79ea09563e5
 WHIRLPOOL 
f03d3b62da793becd6aab775293e5963697f9b4147bf6d662274f689b1a48692b1f4de0ad196e74cb02a07ce2a69b608a4d420ad5dc153b20888ba69dc361dc4
 DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 SHA256 
53b6692d25ad85772c19593f8b098c9ad26b7d8acd4a74db5f8308567e214aad SHA512 
2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3
 WHIRLPOOL 
308ccc771acc72ec9558510edb5491a775a76afb5455cf98f942229d3d706a087aa38d97beb9bc2acbe3248c10893841764f08fdcb29ca47ca830c8c661cf369
-DIST mysql-extras-20151117-2040Z.tar.bz2 294183 SHA256 
2ca16597e869fb0fac4f6e48b779892569698ce83c898df3afaee63131f71833 SHA512 
8edbc6a3812d17a2f1a827459867c0747387ff72be86b12fe0e790afca5e4b70e4f23c4098bdb61afa20ef292e2c3b154f16577d5c11999a3e2eec9e43b8d09a
 WHIRLPOOL 
f0df653216857527ffa3d31f07ab1c470614b53350f5dbd965ba3bdc398f36f37b506537f1070b03a54203a3847f6557a2ae6757327ce852833fa026de7b518d
 DIST mysql-extras-20171108-2050Z.tar.bz2 313241 SHA256 
a8ae0806728f5308f96fe07fe2348b9c72629968e6480ae45995ca0a3693b9aa SHA512 
830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6
 WHIRLPOOL 
7ea7aabe9fc93418297522529c2fb0cfe43c7c28019000c25e100838e8ac545cab0611a08f2931157b99acee9704c441832e037c28232079e57a0718ddb4591c

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild
deleted file mode 100644
index 09d32b5a664..000
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_EXTRAS_VER="20151117-2040Z"
-BUILD="cmake"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-   local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-   local retstatus_unit
-   local retstatus_tests
-
-   # Bug #213475 - MySQL _will_ object strenously if your machine is named
-   # localhost. Also causes weird failures.
-   [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
-
-   if ! use "minimal" ; then
-
-   if [[ $UID -eq 0 ]]; then
-   die "Testing with FEATURES=-userpriv is no longer 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2017-11-08 Thread Brian Evans
commit: a01ebd2518aef6f69cc50db7b1ae6fc167e94077
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov  8 20:57:35 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Nov  8 20:57:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01ebd25

dev-db/mysql-cluster: Version bumps

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/mysql-cluster/Manifest|   3 +
 dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild | 126 
 dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild | 145 +++
 3 files changed, 274 insertions(+)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index cf3855e3c30..806cfd9a2de 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,3 +1,6 @@
 DIST mysql-cluster-gpl-7.2.22.tar.gz 26075142 SHA256 
404b80192c488791cedf6251e64bb01310b20f13fcdb28721e108e92985ae999 SHA512 
b3370725f17a5b6577c9822097b6c39e4375bdabca2a403bd45dfeb9fd5920c0e213c894eed33dadba69d9c066427ab5065c587869d82bf2e3438d3bdeb1aa8e
 WHIRLPOOL 
1275fc2a181011c5ea2ac392c94027f399a5ce4fd499ff23790bfad142b1c7d67bc421e7c6a4e64e6bb409f04016196417535d5704d21165c1120bf46ab68544
+DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 SHA256 
d798180114d8c1966abb86c798fc8230d50df478e73f1e2c6fbdb7ffb4cdd9ba SHA512 
ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881
 WHIRLPOOL 
c53a32c42f0a3c0c8848d20fa4d66f778926221ef381c8a26ccb60c07126a55af8c77f712cd71462b8345367c3c9e3d03b2b83b06f68b5bddd046328d755965b
 DIST mysql-cluster-gpl-7.3.11.tar.gz 42806929 SHA256 
6c8cfc99ccbf47cd4304996559de6fb330e9cdf754bec37ff7347be72e50c646 SHA512 
89e5b6e845b71ed6945529b7f515d3af96ec6daf79c0085f1d0ea6e4426f61eb3626b688e5edda668be4615df1b8cec4e71acdf0d21150fa2775c79ea09563e5
 WHIRLPOOL 
f03d3b62da793becd6aab775293e5963697f9b4147bf6d662274f689b1a48692b1f4de0ad196e74cb02a07ce2a69b608a4d420ad5dc153b20888ba69dc361dc4
+DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 SHA256 
53b6692d25ad85772c19593f8b098c9ad26b7d8acd4a74db5f8308567e214aad SHA512 
2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3
 WHIRLPOOL 
308ccc771acc72ec9558510edb5491a775a76afb5455cf98f942229d3d706a087aa38d97beb9bc2acbe3248c10893841764f08fdcb29ca47ca830c8c661cf369
 DIST mysql-extras-20151117-2040Z.tar.bz2 294183 SHA256 
2ca16597e869fb0fac4f6e48b779892569698ce83c898df3afaee63131f71833 SHA512 
8edbc6a3812d17a2f1a827459867c0747387ff72be86b12fe0e790afca5e4b70e4f23c4098bdb61afa20ef292e2c3b154f16577d5c11999a3e2eec9e43b8d09a
 WHIRLPOOL 
f0df653216857527ffa3d31f07ab1c470614b53350f5dbd965ba3bdc398f36f37b506537f1070b03a54203a3847f6557a2ae6757327ce852833fa026de7b518d
+DIST mysql-extras-20171108-2050Z.tar.bz2 313241 SHA256 
a8ae0806728f5308f96fe07fe2348b9c72629968e6480ae45995ca0a3693b9aa SHA512 
830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6
 WHIRLPOOL 
7ea7aabe9fc93418297522529c2fb0cfe43c7c28019000c25e100838e8ac545cab0611a08f2931157b99acee9704c441832e037c28232079e57a0718ddb4591c

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild
new file mode 100644
index 000..d5e946e39e0
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+MY_EXTRAS_VER="20171108-2050Z"
+BUILD="cmake"
+#fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE='20006_all_cmake_elib-mysql-cluster-5.5.37.patch 
20008_all_mysql-tzinfo-symlink.patch 
20019_all_mysql-5.5-mtr-perl-deprecation.patch 
20020_all_mysql-5.6-events_1-bug-78899.patch'
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='cluster extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+   local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+   local retstatus_unit
+   local retstatus_tests
+
+   # Bug #213475 - MySQL _will_ object strenously if your machine is named
+   # localhost. Also causes weird failures.
+   [[ 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2017-10-28 Thread Thomas Deutschmann
commit: 9ddb39a72d861f16653fd4630f0ae563d26b6601
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Oct 28 18:10:35 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Oct 28 18:10:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ddb39a7

dev-db/mysql-cluster: Security cleanup (bug #635708)

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild | 124 
 dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild | 143 ---
 2 files changed, 267 deletions(-)

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
deleted file mode 100644
index 264df842338..000
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_EXTRAS_VER="20151117-2040Z"
-BUILD="cmake"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-   local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-   local retstatus_unit
-   local retstatus_tests
-
-   # Bug #213475 - MySQL _will_ object strenously if your machine is named
-   # localhost. Also causes weird failures.
-   [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
-
-   if ! use "minimal" ; then
-
-   if [[ $UID -eq 0 ]]; then
-   die "Testing with FEATURES=-userpriv is no longer 
supported by upstream. Tests MUST be run as non-root."
-   fi
-   has usersandbox $FEATURES && eerror "Some tests may fail with 
FEATURES=usersandbox"
-
-   einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-   addpredict /this-dir-does-not-exist/t9.MYI
-
-   # Run CTest (test-units)
-   cmake-utils_src_test
-   retstatus_unit=$?
-   [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-   # Ensure that parallel runs don't die
-   export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-   # create directories because mysqladmin might right out of order
-   mkdir -p "${T}"/var-tests{,/log}
-
-   # These are failing in MySQL 5.5 for now and are believed to be
-   # false positives:
-   #
-   # main.information_schema, 
binlog.binlog_statement_insert_delayed,
-   # main.mysqld--help-notwin, ndb.ndbinfo, 
ndb_binlog.ndb_binlog_index
-   # fails due to USE=-latin1 / utf8 default
-   #
-   # main.mysql_client_test:
-   # segfaults at random under Portage only, suspect resource 
limits.
-   #
-   # sys_vars.plugin_dir_basic
-   # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-   # instead of MYSQL_LIBDIR/plugin
-   #
-   # main.flush_read_lock_kill
-   # fails because of unknown system variable 'DEBUG_SYNC'
-   #
-   # main.openssl_1
-   # error message changing
-   # -mysqltest: Could not open connection 'default': 2026 SSL 
connection
-   #  error: ASN: bad other signature confirmation
-   # +mysqltest: Could not open connection 'default': 2026 SSL 
connection
-   #  error: error:0001:lib(0):func(0):reason(1)
-   #
-
-   for t in main.mysql_client_test \
-   binlog.binlog_statement_insert_delayed 
main.information_schema \
-   main.mysqld--help-notwin main.flush_read_lock_kill \
-   sys_vars.plugin_dir_basic main.openssl_1 \
-   main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-   ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
-   mysql-v2_disable_test  "$t" "False positives in 
Gentoo"
-   done
-
-   # Run mysql tests
-   pushd "${TESTDIR}"
-
-   # run mysql-test 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2017-10-28 Thread Thomas Deutschmann
commit: f83155f18d53fdead7a4cd3679b612d112897252
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Oct 28 18:10:07 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Oct 28 18:10:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f83155f1

dev-db/mysql-cluster: Rev bump to fix CVE-2017-15945

Bug: https://bugs.gentoo.org/635708
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../mysql-cluster/mysql-cluster-7.2.22-r1.ebuild   | 124 ++
 .../mysql-cluster/mysql-cluster-7.3.11-r1.ebuild   | 143 +
 2 files changed, 267 insertions(+)

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild
new file mode 100644
index 000..09d32b5a664
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+MY_EXTRAS_VER="20151117-2040Z"
+BUILD="cmake"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+#EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='cluster extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+   local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+   local retstatus_unit
+   local retstatus_tests
+
+   # Bug #213475 - MySQL _will_ object strenously if your machine is named
+   # localhost. Also causes weird failures.
+   [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
+
+   if ! use "minimal" ; then
+
+   if [[ $UID -eq 0 ]]; then
+   die "Testing with FEATURES=-userpriv is no longer 
supported by upstream. Tests MUST be run as non-root."
+   fi
+   has usersandbox $FEATURES && eerror "Some tests may fail with 
FEATURES=usersandbox"
+
+   einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+   addpredict /this-dir-does-not-exist/t9.MYI
+
+   # Run CTest (test-units)
+   cmake-utils_src_test
+   retstatus_unit=$?
+   [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+   # Ensure that parallel runs don't die
+   export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+   # create directories because mysqladmin might right out of order
+   mkdir -p "${T}"/var-tests{,/log}
+
+   # These are failing in MySQL 5.5 for now and are believed to be
+   # false positives:
+   #
+   # main.information_schema, 
binlog.binlog_statement_insert_delayed,
+   # main.mysqld--help-notwin, ndb.ndbinfo, 
ndb_binlog.ndb_binlog_index
+   # fails due to USE=-latin1 / utf8 default
+   #
+   # main.mysql_client_test:
+   # segfaults at random under Portage only, suspect resource 
limits.
+   #
+   # sys_vars.plugin_dir_basic
+   # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+   # instead of MYSQL_LIBDIR/plugin
+   #
+   # main.flush_read_lock_kill
+   # fails because of unknown system variable 'DEBUG_SYNC'
+   #
+   # main.openssl_1
+   # error message changing
+   # -mysqltest: Could not open connection 'default': 2026 SSL 
connection
+   #  error: ASN: bad other signature confirmation
+   # +mysqltest: Could not open connection 'default': 2026 SSL 
connection
+   #  error: error:0001:lib(0):func(0):reason(1)
+   #
+
+   for t in main.mysql_client_test \
+   binlog.binlog_statement_insert_delayed 
main.information_schema \
+   main.mysqld--help-notwin main.flush_read_lock_kill \
+   sys_vars.plugin_dir_basic main.openssl_1 \
+   main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+   ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
+   mysql-v2_disable_test  "$t" "False positives in 
Gentoo"
+   done
+
+   # Run mysql tests
+   pushd 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2016-05-22 Thread Pacho Ramos
commit: dcd4c4cb38d5f642e2098c4ac1cf4047914b1e82
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May 22 19:28:13 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May 22 19:34:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd4c4cb

dev-db/mysql-cluster: Cleanup due to #408423

Package-Manager: portage-2.3.0_rc1

 dev-db/mysql-cluster/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-db/mysql-cluster/metadata.xml 
b/dev-db/mysql-cluster/metadata.xml
index 5427ac7..9dc67c6 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -5,10 +5,6 @@
 mysql-b...@gentoo.org
 MySQL
   
-  
-hasuf...@gentoo.org
-Libressl issues. Only assign if it's a direct Libressl issue. 
Do not directly assign for anything else.
-  
 
   Add support for NDB clustering
   Enables the community features from upstream.



[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2016-04-18 Thread Brian Evans
commit: 683a13e96004eefcbdf83842de2233bf28078e48
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Apr 18 18:30:48 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Apr 18 18:30:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=683a13e9

dev-db/mysql-cluster: Reorder maintainers after GLEP68 change

Package-Manager: portage-2.2.28

 dev-db/mysql-cluster/metadata.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-db/mysql-cluster/metadata.xml 
b/dev-db/mysql-cluster/metadata.xml
index 34d1214..5427ac7 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -1,14 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-hasuf...@gentoo.org
-Libressl issues. Only assign if it's a direct Libressl issue. 
Do not directly assign for anything else.
-  
-
+  
 mysql-b...@gentoo.org
 MySQL
   
+  
+hasuf...@gentoo.org
+Libressl issues. Only assign if it's a direct Libressl issue. 
Do not directly assign for anything else.
+  
 
   Add support for NDB clustering
   Enables the community features from upstream.



[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2016-04-18 Thread Patrice Clement
commit: 22343cfed10425c14e16b5590bf09b727872bdad
Author: Patrice Clement  gentoo  org>
AuthorDate: Mon Apr 18 06:34:55 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Apr 18 07:58:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22343cfe

dev-db/mysql-cluster: Fix metadata.xml file.

Package-Manager: portage-2.2.26

 dev-db/mysql-cluster/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-cluster/metadata.xml 
b/dev-db/mysql-cluster/metadata.xml
index 89e4dcb..34d1214 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -1,7 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
+
 hasuf...@gentoo.org
 Libressl issues. Only assign if it's a direct Libressl issue. 
Do not directly assign for anything else.
   



[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2015-11-18 Thread Brian Evans
commit: c44021af9abb7a871ff65789ccb2c4de20821882
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov 18 14:44:51 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Nov 18 14:44:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44021af

dev-db/mysql-cluster: Version bumps

Package-Manager: portage-2.2.25

 dev-db/mysql-cluster/Manifest|   3 +
 dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild | 125 
 dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild | 144 +++
 3 files changed, 272 insertions(+)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index b433e0d..65d8903 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,6 +1,9 @@
 DIST mysql-cluster-gpl-7.2.19.tar.gz 25959966 SHA256 
f4d8772108bbe30852129602f1d4106dc42adbe14d4bbc45065cb6e7314803b4 SHA512 
2a30d6bdb82ff9b4c3bcdc2b44ed0707c2292efc45137ada62635b41424ecd4286b18718542fe2120e57636f998b38ac3768d4f9f6b018e65a82ef76d81a310e
 WHIRLPOOL 
21cec46fdfcd3509f4dd01864976c19aefa2adc53212a0724e9b30bf0fa6d63be7d4395b68be13de942b1c399a174e8cfd3f65594921b70b7e6cec0d7dc95183
 DIST mysql-cluster-gpl-7.2.20.tar.gz 25999156 SHA256 
60ca80b10680b5048cd358ae543ad16e8e8c31395aaa69163bde923b22085874 SHA512 
62fac1db476e08109885660d2e2728bb0c2c8144acb602fdb679d802bcdc459254349eb914ae600f51dca33f42cd9dfa0db9a21b07edb0d0c316497a62e1fc6f
 WHIRLPOOL 
8f8787151648f34f3cfd64d05da793e40e8fe3d053f5cff72ecff7b799a536bf56ead2e19fd72620fda967b6903bc5ec01fec171144f581f32c4e0f0426573b5
+DIST mysql-cluster-gpl-7.2.22.tar.gz 26075142 SHA256 
404b80192c488791cedf6251e64bb01310b20f13fcdb28721e108e92985ae999 SHA512 
b3370725f17a5b6577c9822097b6c39e4375bdabca2a403bd45dfeb9fd5920c0e213c894eed33dadba69d9c066427ab5065c587869d82bf2e3438d3bdeb1aa8e
 WHIRLPOOL 
1275fc2a181011c5ea2ac392c94027f399a5ce4fd499ff23790bfad142b1c7d67bc421e7c6a4e64e6bb409f04016196417535d5704d21165c1120bf46ab68544
+DIST mysql-cluster-gpl-7.3.11.tar.gz 42806929 SHA256 
6c8cfc99ccbf47cd4304996559de6fb330e9cdf754bec37ff7347be72e50c646 SHA512 
89e5b6e845b71ed6945529b7f515d3af96ec6daf79c0085f1d0ea6e4426f61eb3626b688e5edda668be4615df1b8cec4e71acdf0d21150fa2775c79ea09563e5
 WHIRLPOOL 
f03d3b62da793becd6aab775293e5963697f9b4147bf6d662274f689b1a48692b1f4de0ad196e74cb02a07ce2a69b608a4d420ad5dc153b20888ba69dc361dc4
 DIST mysql-cluster-gpl-7.3.8.tar.gz 42400435 SHA256 
eddcc2954ff7fbbc72b1266bd64a9548e9b9d7a4115d42b54c13257c226248ca SHA512 
4118449bc9bd2c88caff1585ebfa6b2e2a85b960fa12bc50a00245d1a6d42b3411ee0b2e32b2b10afd46b97e01e5b4fad924dbed852b2ab49b43c123c649a2d3
 WHIRLPOOL 
fc1c6cd68e1f1b0f0430c0374b24c41ba7df83f43897d71e023706228c63024dc10ad6a5eef1696a24a6898be4387a1e4cf47309cabf7abaebc1767ae66da773
 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
 DIST mysql-extras-20150710-1911Z.tar.bz2 1494443 SHA256 
9a4755dce3c5b7dfebda87c2fd73eb7b94786be43a9bd97451a8134dc95e6983 SHA512 
9a42616dafba562dad5485ea16d8a2b7521668323414329052a64e32da606860af9c0d8a1bdc634afc0e55d1d2329297488c90ff712eac0eb74d8843ca9081aa
 WHIRLPOOL 
33ee7e5cc90a26722fa4f6ff7f8604ac1a1396a867a5ca45b81510cb26638fa57dc3f0e8f2471a8c05c26f5341765c2c370989fcb1602b30e7c05bc00b247e34
+DIST mysql-extras-20151117-2040Z.tar.bz2 294183 SHA256 
2ca16597e869fb0fac4f6e48b779892569698ce83c898df3afaee63131f71833 SHA512 
8edbc6a3812d17a2f1a827459867c0747387ff72be86b12fe0e790afca5e4b70e4f23c4098bdb61afa20ef292e2c3b154f16577d5c11999a3e2eec9e43b8d09a
 WHIRLPOOL 
f0df653216857527ffa3d31f07ab1c470614b53350f5dbd965ba3bdc398f36f37b506537f1070b03a54203a3847f6557a2ae6757327ce852833fa026de7b518d

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
new file mode 100644
index 000..b0939d6
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_EXTRAS_VER="20151117-2040Z"
+BUILD="cmake"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2015-11-18 Thread Brian Evans
commit: 220fb098fc9cd89d582ea826dd9425d7a30da127
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov 18 14:47:53 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Nov 18 14:47:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220fb098

dev-db/mysql-cluster: Drop old, security vulnerable versions

Package-Manager: portage-2.2.25

 dev-db/mysql-cluster/Manifest  |   6 -
 dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild   | 124 --
 dev-db/mysql-cluster/mysql-cluster-7.2.20.ebuild   | 124 --
 dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild| 142 
 dev-db/mysql-cluster/mysql-cluster-7.3.9-r1.ebuild | 143 -
 5 files changed, 539 deletions(-)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 65d8903..cf3855e 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,9 +1,3 @@
-DIST mysql-cluster-gpl-7.2.19.tar.gz 25959966 SHA256 
f4d8772108bbe30852129602f1d4106dc42adbe14d4bbc45065cb6e7314803b4 SHA512 
2a30d6bdb82ff9b4c3bcdc2b44ed0707c2292efc45137ada62635b41424ecd4286b18718542fe2120e57636f998b38ac3768d4f9f6b018e65a82ef76d81a310e
 WHIRLPOOL 
21cec46fdfcd3509f4dd01864976c19aefa2adc53212a0724e9b30bf0fa6d63be7d4395b68be13de942b1c399a174e8cfd3f65594921b70b7e6cec0d7dc95183
-DIST mysql-cluster-gpl-7.2.20.tar.gz 25999156 SHA256 
60ca80b10680b5048cd358ae543ad16e8e8c31395aaa69163bde923b22085874 SHA512 
62fac1db476e08109885660d2e2728bb0c2c8144acb602fdb679d802bcdc459254349eb914ae600f51dca33f42cd9dfa0db9a21b07edb0d0c316497a62e1fc6f
 WHIRLPOOL 
8f8787151648f34f3cfd64d05da793e40e8fe3d053f5cff72ecff7b799a536bf56ead2e19fd72620fda967b6903bc5ec01fec171144f581f32c4e0f0426573b5
 DIST mysql-cluster-gpl-7.2.22.tar.gz 26075142 SHA256 
404b80192c488791cedf6251e64bb01310b20f13fcdb28721e108e92985ae999 SHA512 
b3370725f17a5b6577c9822097b6c39e4375bdabca2a403bd45dfeb9fd5920c0e213c894eed33dadba69d9c066427ab5065c587869d82bf2e3438d3bdeb1aa8e
 WHIRLPOOL 
1275fc2a181011c5ea2ac392c94027f399a5ce4fd499ff23790bfad142b1c7d67bc421e7c6a4e64e6bb409f04016196417535d5704d21165c1120bf46ab68544
 DIST mysql-cluster-gpl-7.3.11.tar.gz 42806929 SHA256 
6c8cfc99ccbf47cd4304996559de6fb330e9cdf754bec37ff7347be72e50c646 SHA512 
89e5b6e845b71ed6945529b7f515d3af96ec6daf79c0085f1d0ea6e4426f61eb3626b688e5edda668be4615df1b8cec4e71acdf0d21150fa2775c79ea09563e5
 WHIRLPOOL 
f03d3b62da793becd6aab775293e5963697f9b4147bf6d662274f689b1a48692b1f4de0ad196e74cb02a07ce2a69b608a4d420ad5dc153b20888ba69dc361dc4
-DIST mysql-cluster-gpl-7.3.8.tar.gz 42400435 SHA256 
eddcc2954ff7fbbc72b1266bd64a9548e9b9d7a4115d42b54c13257c226248ca SHA512 
4118449bc9bd2c88caff1585ebfa6b2e2a85b960fa12bc50a00245d1a6d42b3411ee0b2e32b2b10afd46b97e01e5b4fad924dbed852b2ab49b43c123c649a2d3
 WHIRLPOOL 
fc1c6cd68e1f1b0f0430c0374b24c41ba7df83f43897d71e023706228c63024dc10ad6a5eef1696a24a6898be4387a1e4cf47309cabf7abaebc1767ae66da773
-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
-DIST mysql-extras-20150710-1911Z.tar.bz2 1494443 SHA256 
9a4755dce3c5b7dfebda87c2fd73eb7b94786be43a9bd97451a8134dc95e6983 SHA512 
9a42616dafba562dad5485ea16d8a2b7521668323414329052a64e32da606860af9c0d8a1bdc634afc0e55d1d2329297488c90ff712eac0eb74d8843ca9081aa
 WHIRLPOOL 
33ee7e5cc90a26722fa4f6ff7f8604ac1a1396a867a5ca45b81510cb26638fa57dc3f0e8f2471a8c05c26f5341765c2c370989fcb1602b30e7c05bc00b247e34
 DIST mysql-extras-20151117-2040Z.tar.bz2 294183 SHA256 
2ca16597e869fb0fac4f6e48b779892569698ce83c898df3afaee63131f71833 SHA512 
8edbc6a3812d17a2f1a827459867c0747387ff72be86b12fe0e790afca5e4b70e4f23c4098bdb61afa20ef292e2c3b154f16577d5c11999a3e2eec9e43b8d09a
 WHIRLPOOL 
f0df653216857527ffa3d31f07ab1c470614b53350f5dbd965ba3bdc398f36f37b506537f1070b03a54203a3847f6557a2ae6757327ce852833fa026de7b518d

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild
deleted file mode 100644
index efd8e05..000
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-MY_EXTRAS_VER="20150210-1758Z"
-BUILD="cmake"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/

2015-10-20 Thread Brian Evans
commit: e93c3b2c05c3bda4f115c260531d9942f98ba39d
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Oct 20 14:42:07 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Oct 20 14:52:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93c3b2c

dev-db/mysql-cluster: Add LibreSSL support

Package-Manager: portage-2.2.23

 dev-db/mysql-cluster/metadata.xml  | 7 +++
 dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild| 8 
 dev-db/mysql-cluster/mysql-cluster-7.3.9-r1.ebuild | 8 
 3 files changed, 23 insertions(+)

diff --git a/dev-db/mysql-cluster/metadata.xml 
b/dev-db/mysql-cluster/metadata.xml
index 0fd723f..3e4bee6 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -2,6 +2,10 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
 mysql
+  
+hasuf...@gentoo.org
+Libressl issues. Only assign if it's a direct Libressl issue. 
Do not directly assign for anything else.
+  
 
   Add support for NDB clustering
   Enables the community features from upstream.
@@ -9,10 +13,13 @@
   Add support for alternative storage engines 
(Archive, CSV, Blackhole, Federated(X), Partition)
   Use dev-libs/jemalloc for 
allocations.
   Use LATIN1 encoding instead of UTF8
+  Enable SSL connections and crypto functions using 
dev-libs/libressl
+  Enable SSL connections and crypto functions using 
dev-libs/openssl
   Raise the max index per table limit from 64 to 
128
   Install client programs only, no server
   Add support for statement profiling (requires 
USE=community).
   Build support for profiling and tracing using 
dev-util/systemtap
   Install upstream testsuites for end use.
+  Enable SSL connections and crypto functions using the 
bundled yaSSL
 
 

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild
index 4a10e32..1dcd358 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild
@@ -23,6 +23,14 @@ RDEPEND="!media-sound/amarok[embedded]"
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
+src_prepare() {
+   mysql-multilib_src_prepare
+   if use libressl ; then
+   sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+   "${S}/cmake/ssl.cmake" || die
+   fi
+}
+
 # Official test instructions:
 # USE='cluster extraengine perl ssl community' \
 # FEATURES='test userpriv -usersandbox' \

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.9-r1.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.9-r1.ebuild
index 20b5fee..c6e01f6 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.9-r1.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.9-r1.ebuild
@@ -24,6 +24,14 @@ RDEPEND="!media-sound/amarok[embedded]"
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
+src_prepare() {
+   mysql-multilib_src_prepare
+   if use libressl ; then
+   sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+   "${S}/cmake/ssl.cmake" || die
+   fi
+}
+
 # Official test instructions:
 # USE='cluster extraengine perl ssl community' \
 # FEATURES='test userpriv -usersandbox' \