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

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     094ee79a18973e8a1a594605626654fff0400aa7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 01:08:48 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 01:09:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094ee79a

dev-db/mariadb: bump to v10.5.5

Closes: https://bugs.gentoo.org/737348
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-db/mariadb/Manifest                            |  2 +
 dev-db/mariadb/mariadb-10.1.38-r2.ebuild           |  1 +
 dev-db/mariadb/mariadb-10.1.45-r1.ebuild           |  1 +
 dev-db/mariadb/mariadb-10.1.46.ebuild              |  1 +
 dev-db/mariadb/mariadb-10.2.22-r2.ebuild           |  1 +
 dev-db/mariadb/mariadb-10.2.32-r2.ebuild           |  1 +
 dev-db/mariadb/mariadb-10.2.33.ebuild              |  1 +
 dev-db/mariadb/mariadb-10.3.23-r2.ebuild           |  1 +
 dev-db/mariadb/mariadb-10.3.24.ebuild              |  1 +
 dev-db/mariadb/mariadb-10.4.13-r2.ebuild           |  1 +
 dev-db/mariadb/mariadb-10.4.14.ebuild              |  1 +
 ...ariadb-10.4.14.ebuild => mariadb-10.5.5.ebuild} | 64 +++++++++++++---------
 dev-db/mariadb/mariadb-5.5.68-r1.ebuild            |  1 +
 dev-db/mariadb/metadata.xml                        |  2 +
 14 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index cb3f291fd88..28ed8c8c159 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -16,6 +16,8 @@ DIST mariadb-10.4.13-patches-03.tar.xz 5520 BLAKE2B 949b7f6ee5a9a6077424264e53d2
 DIST mariadb-10.4.13.tar.gz 80608459 BLAKE2B e9ada14da6ec7492311068549a5b6e5a66e1177312013b25472c084a21fbace543ec43b47f2e12190d45432648d508f311198521f42359561f8d75ea60f98205 SHA512 68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566
 DIST mariadb-10.4.14-patches-01.tar.xz 5512 BLAKE2B f32e1d383ffd99de431bc34c36101c71c5e631344527e96b80ca6bd0a68015b45a4c33d6f0518cb4aa2bcfd493b64b6607671450ca045243404c0d65ebbc66fd SHA512 201fe82cbcca705dba52b32405d463b5569d97a5ffd9fd2967ec7fc3c3ff305011b3d2c3c0e9f7c19aaac57b26661bd361f3b6da6f3812f25934ec18856c7051
 DIST mariadb-10.4.14.tar.gz 80789865 BLAKE2B fed455e906af9fe105f52cc7180a6b8d8839fdbffac079f2ced265741c2ab8010c78c0e75ff77740d45a2bd02a15c379bdb3a0237152848a0ce1a7aaac4cbf32 SHA512 c09817c1dd7962132bcf2886c97ad17ce43c00ee687724028e5f39f6a6a93877ae8695c2c795abba6a4f3bc40674f93a53d6d43f46788a4a8a42c4a65a22c91c
+DIST mariadb-10.5.5-patches-01.tar.xz 5540 BLAKE2B 6d88b3486d0a92dd62117e065a11e2789cb318385b936b471c101f166793019e1eda74d7e56faa29ce8158d24f9544aff28405ffdb70bf82e22747503099ed54 SHA512 486f518a0d7ee9b38a1aaa4b24ef3c30df285bf0864b5b88ac26f36274736ee14e683c4afc652713b7040c78faeffd495be05869b18ed9563f64f9dfbacfb636
+DIST mariadb-10.5.5.tar.gz 86880268 BLAKE2B 58430dd4e7199d674bbd4f7381a56129e067ed1bb30c171545fe9fac3a83f7db2c57cc1b577ef242deb99dd69e17a1d3cbf756031711d27b04c97a7e93e14c60 SHA512 09bed291b39142f8e2f40eabbb443f6f384368b331406a09fd92d3d27ecc75644219066850d89495ed65c6f0d3ac32d51e29e65375331dcc2de4801313178d45
 DIST mariadb-5.5.68.tar.gz 45969389 BLAKE2B 5b3a647649c614825adccbc83faa40ba330dae0a1f8005b2297cc6a44fbc00bf817f2d854af315f995e1065bd4d14a2f21a9cec44b5c78402524467d876d8157 SHA512 3419790aa88a7e2a5d80e56ca94683d22ca2d5d817dfe19904d11454f34cfc3b9d55e603295ea58580a3c9fe96a6c6f9b650e1058c4e8f2f2e82f09165436865
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
 DIST mysql-extras-20200523-1221Z.tar.bz2 345015 BLAKE2B 3ad0da663c31831d3b511b88df34b6a28bb781cfd88fd4479b43273aa15946e63c7ae43d5497207edc6cc53a72bd42b8ce2e2058dfb236afd940bd0282190e98 SHA512 8f7b39017efb08e1ae98c4c68728bc86f8427b88b2a22688abf6975c6706122086dc93289beb511bbaf17cd5a790c76406e81315a11830829efe9170ce4f6a42

diff --git a/dev-db/mariadb/mariadb-10.1.38-r2.ebuild b/dev-db/mariadb/mariadb-10.1.38-r2.ebuild
index bfba9298006..b205f74ad1b 100644
--- a/dev-db/mariadb/mariadb-10.1.38-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r2.ebuild
@@ -124,6 +124,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.3
 	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
 	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
 	${COMMON_DEPEND}
 	server? ( galera? (

diff --git a/dev-db/mariadb/mariadb-10.1.45-r1.ebuild b/dev-db/mariadb/mariadb-10.1.45-r1.ebuild
index fc55747077f..616c340d5a8 100644
--- a/dev-db/mariadb/mariadb-10.1.45-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.45-r1.ebuild
@@ -101,6 +101,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.3
 	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
 	${COMMON_DEPEND}
 	server? (
 		galera? (

diff --git a/dev-db/mariadb/mariadb-10.1.46.ebuild b/dev-db/mariadb/mariadb-10.1.46.ebuild
index e9d43232481..fd560e8d61a 100644
--- a/dev-db/mariadb/mariadb-10.1.46.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.46.ebuild
@@ -99,6 +99,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.3
 	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
 	${COMMON_DEPEND}
 	server? (
 		galera? (

diff --git a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
index b5c367e1a8e..aca4c6dfa4c 100644
--- a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
@@ -121,6 +121,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.1
 	!dev-db/mariadb:10.3
 	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
 	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
 	!<virtual/mysql-5.6-r11
 	${COMMON_DEPEND}

diff --git a/dev-db/mariadb/mariadb-10.2.32-r2.ebuild b/dev-db/mariadb/mariadb-10.2.32-r2.ebuild
index ca39cb54e8e..7476d450f20 100644
--- a/dev-db/mariadb/mariadb-10.2.32-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.32-r2.ebuild
@@ -99,6 +99,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.1
 	!dev-db/mariadb:10.3
 	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
 	!<virtual/mysql-5.6-r11
 	${COMMON_DEPEND}
 	server? (

diff --git a/dev-db/mariadb/mariadb-10.2.33.ebuild b/dev-db/mariadb/mariadb-10.2.33.ebuild
index 9671215c778..636a95ff869 100644
--- a/dev-db/mariadb/mariadb-10.2.33.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.33.ebuild
@@ -98,6 +98,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.1
 	!dev-db/mariadb:10.3
 	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
 	!<virtual/mysql-5.6-r11
 	${COMMON_DEPEND}
 	server? (

diff --git a/dev-db/mariadb/mariadb-10.3.23-r2.ebuild b/dev-db/mariadb/mariadb-10.3.23-r2.ebuild
index f63ef5a0ee5..815d86f66db 100644
--- a/dev-db/mariadb/mariadb-10.3.23-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.23-r2.ebuild
@@ -99,6 +99,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.1
 	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
 	!<virtual/mysql-5.6-r11
 	${COMMON_DEPEND}
 	server? (

diff --git a/dev-db/mariadb/mariadb-10.3.24.ebuild b/dev-db/mariadb/mariadb-10.3.24.ebuild
index bb73a04a666..d32933c9d72 100644
--- a/dev-db/mariadb/mariadb-10.3.24.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.24.ebuild
@@ -98,6 +98,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.1
 	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
 	!<virtual/mysql-5.6-r11
 	${COMMON_DEPEND}
 	server? (

diff --git a/dev-db/mariadb/mariadb-10.4.13-r2.ebuild b/dev-db/mariadb/mariadb-10.4.13-r2.ebuild
index c3f5498cbf0..f879d6f9a0e 100644
--- a/dev-db/mariadb/mariadb-10.4.13-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.13-r2.ebuild
@@ -98,6 +98,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.1
 	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.5
 	!<virtual/mysql-5.6-r11
 	!<virtual/libmysqlclient-18-r1
 	${COMMON_DEPEND}

diff --git a/dev-db/mariadb/mariadb-10.4.14.ebuild b/dev-db/mariadb/mariadb-10.4.14.ebuild
index 6507572001a..2f7ec2673f4 100644
--- a/dev-db/mariadb/mariadb-10.4.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.14.ebuild
@@ -98,6 +98,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.1
 	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.5
 	!<virtual/mysql-5.6-r11
 	!<virtual/libmysqlclient-18-r1
 	${COMMON_DEPEND}

diff --git a/dev-db/mariadb/mariadb-10.4.14.ebuild b/dev-db/mariadb/mariadb-10.5.5.ebuild
similarity index 97%
copy from dev-db/mariadb/mariadb-10.4.14.ebuild
copy to dev-db/mariadb/mariadb-10.5.5.ebuild
index 6507572001a..225a5523321 100644
--- a/dev-db/mariadb/mariadb-10.4.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.5.ebuild
@@ -10,7 +10,7 @@ inherit eutils systemd flag-o-matic prefix toolchain-funcs \
 	multiprocessing java-pkg-opt-2 cmake
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.4.14-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.5-patches-01.tar.xz"
 
 SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
 	${PATCH_SET}"
@@ -18,11 +18,11 @@ SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
 HOMEPAGE="https://mariadb.org/"
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
-SLOT="10.4/${SUBSLOT:-0}"
-IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
+SLOT="10.5/${SUBSLOT:-0}"
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
 	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
-	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
 	test tokudb xml yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
@@ -42,29 +42,30 @@ S="${WORKDIR}/mysql"
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
 COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
+	>=dev-libs/libpcre-8.41-r1:3=
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	>=sys-libs/zlib-1.2.3:0=
-	kerberos? ( virtual/krb5 )
-	yassl? ( net-libs/gnutls:0= )
-	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
 	sys-libs/ncurses:0=
+	>=sys-libs/zlib-1.2.3:0=
 	!bindist? (
 		sys-libs/binutils-libs:0=
 		>=sys-libs/readline-4.1:0=
 	)
+	jemalloc? ( dev-libs/jemalloc:0= )
+	kerberos? ( virtual/krb5 )
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
 	server? (
+		app-arch/bzip2
+		app-arch/xz-utils
 		backup? ( app-arch/libarchive:0= )
+		columnstore? (
+			app-arch/snappy
+			dev-libs/boost:0=
+			dev-libs/libxml2:2=
+		)
 		cracklib? ( sys-libs/cracklib:0= )
 		extraengine? (
 			odbc? ( dev-db/unixODBC:0= )
@@ -77,31 +78,42 @@ COMMON_DEPEND="
 		numa? ( sys-process/numactl )
 		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
 		pam? ( sys-libs/pam:0= )
+		s3? ( net-misc/curl )
 		systemd? ( sys-apps/systemd:= )
 		tokudb? ( app-arch/snappy )
 	)
-	>=dev-libs/libpcre-8.41-r1:3=
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
 BDEPEND="virtual/yacc
 	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
 "
-DEPEND="static? ( sys-libs/ncurses[static-libs] )
+DEPEND="${COMMON_DEPEND}
 	server? (
 		extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) )
 		test? ( acct-group/mysql acct-user/mysql )
 	)
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	static? ( sys-libs/ncurses[static-libs] )
+"
+RDEPEND="${COMMON_DEPEND}
 	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
 	!dev-db/mariadb:0
 	!dev-db/mariadb:5.5
 	!dev-db/mariadb:10.1
 	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.4
 	!<virtual/mysql-5.6-r11
 	!<virtual/libmysqlclient-18-r1
-	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mysql )
 	server? (
+		columnstore? ( dev-db/mariadb-connector-c )
+		extraengine? ( jdbc? ( >=virtual/jre-1.6 ) )
 		galera? (
 			sys-apps/iproute2
 			=sys-cluster/galera-26*
@@ -109,7 +121,6 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 			sst-mariabackup? ( net-misc/socat[ssl] )
 		)
 		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
-		extraengine? ( jdbc? ( >=virtual/jre-1.6 ) )
 	)
 	perl? (
 		!dev-db/mytop
@@ -381,7 +392,8 @@ src_configure() {
 		if ! use extraengine ; then
 			mycmakeargs+=(
 				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO )
+				-DPLUGIN_FEDERATEDX=NO
+			)
 		fi
 
 		mycmakeargs+=(
@@ -394,6 +406,8 @@ src_configure() {
 			-DPLUGIN_CASSANDRA=NO
 			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
 			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_S3=$(usex s3 YES NO)
+			-DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
 			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
 			-DCONNECT_WITH_MYSQL=1
 			-DCONNECT_WITH_LIBXML2=$(usex xml)

diff --git a/dev-db/mariadb/mariadb-5.5.68-r1.ebuild b/dev-db/mariadb/mariadb-5.5.68-r1.ebuild
index c89f8fe71c5..017c5030683 100644
--- a/dev-db/mariadb/mariadb-5.5.68-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.68-r1.ebuild
@@ -100,6 +100,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.3
 	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
 	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
 	${COMMON_DEPEND}
 	perl? ( !dev-db/mytop

diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 3419b52226e..74d8b5649ce 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -8,6 +8,7 @@
 <use>
   <flag name="backup">Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption</flag>
   <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages</flag>
+  <flag name="columnstore">Build the ColumnStore storage engine</flag>
   <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="galera">Enables galera replication</flag>
   <flag name="innodb-lz4">Enables lz4 compression methods for InnoDB/XtraDB</flag>
@@ -28,6 +29,7 @@
   <flag name="sst-mariabackup">Add tools needed to support the mariabackup SST method</flag>
   <flag name="sst-xtrabackup">Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
+  <flag name="s3">Build the S3 storage engine</flag>
   <flag name="test">Install upstream testsuites for end use.</flag>
   <flag name="tokudb">Add support for TokuDB storage engine</flag>
   <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>