summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2017-06-09 09:20:46 -0400
committerBrian Evans <grknight@gentoo.org>2017-06-09 09:20:46 -0400
commit4985157e02c1aab8565d66adaa2670ef46a84308 (patch)
treefc653223e34e359a64e8e73659620686b66c7567
parentdev-db/mariadb: Update 10.2.6 (diff)
downloadmysql-4985157e02c1aab8565d66adaa2670ef46a84308.tar.gz
mysql-4985157e02c1aab8565d66adaa2670ef46a84308.tar.bz2
mysql-4985157e02c1aab8565d66adaa2670ef46a84308.zip
dev-db/mariadb: Adjust subslot back to 18 which is correct according to upstream
Package-Manager: Portage-2.3.6, Repoman-2.3.2 Manifest-Sign-Key: D1F781EFF9F4A3B6
-rw-r--r--dev-db/mariadb/ChangeLog5
-rw-r--r--dev-db/mariadb/mariadb-10.2.6.ebuild6
-rw-r--r--dev-db/mariadb/metadata.xml1
3 files changed, 9 insertions, 3 deletions
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 061dbd4..f626c3d 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 09 Jun 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild,
+ metadata.xml:
+ dev-db/mariadb: Adjust subslot back to 18 which is correct according to
+ upstream
+
31 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild:
dev-db/mariadb: Update 10.2.6
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index 47ab4c3..ed617c5 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
MY_EXTRAS_VER="live"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
-SUBSLOT="19"
+SUBSLOT="18"
MYSQL_PV_MAJOR="5.6"
inherit toolchain-funcs mysql-multilib-r1
@@ -14,7 +14,7 @@ HOMEPAGE="http://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
@@ -58,7 +58,6 @@ COMMON_DEPEND="
tokudb? ( app-arch/snappy )
)
>=dev-libs/libpcre-8.35:3=
- net-misc/curl[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
"
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
@@ -156,6 +155,7 @@ src_install() {
install_compat_symlink() {
use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
+ dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
}
multilib_foreach_abi install_compat_symlink
}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index c3a2d1f..1a80c3a 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -10,6 +10,7 @@
<description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else</description>
</maintainer>
<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="big-tables">Make tables contain up to 1.844E+19 rows</flag>
<flag name="cluster">Add support for NDB clustering (deprecated)</flag>
<flag name="community">Enables the community features from upstream.</flag>