commit: f3927611324921951c1c7cbc877913b4d8fc3df5
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 20:57:35 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 20:57:35 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f3927611
dev-db/mariadb: Add dependency and USE for app-arch/snappy; Update Manifest
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/metadata.xml | 1 +
eclass/mysql-cmake.eclass | 4 ++++
eclass/mysql-multilib.eclass | 4 ++++
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index bfb286e..e5d3bb1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,7 +1,7 @@
DIST mariadb-10.0.19.tar.gz 56224123 SHA256
2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512
bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3
WHIRLPOOL
d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.0.21.tar.gz 56216903 SHA256
4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512
75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f
WHIRLPOOL
b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
-DIST mariadb-10.1.5.tar.gz 53573071 SHA256
af8788bfbb842338882e505612f86ef53a25968663a1519185ecf3de3b1efe83 SHA512
50f742be033c3ddb4399391aea6237269981baaf8018dbb646bebf10eec98b8519cea2df300d4abda3dc6ba21631b59ad48220e1028bb2cb113c911145d0913f
WHIRLPOOL
b7586e165f2c0372bdbbad49eb97f6877ab19118378ae8cc0166c3bc3a7a53d663eca606155f40c78dca7d672ddb9d9c005d929b1980c9230d709fca7f697c8e
DIST mariadb-10.1.6.tar.gz 53777046 SHA256
492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959 SHA512
756dc18de6cada952e41b994afeda0cd952d851929c99cae5476111915e6678fa4899ef9950857413eb8b6ce113070b5d2171a2c01d29b27195b1e2515dc13eb
WHIRLPOOL
23630af399cd96e5c0d937a2cae31db76a6773026f189be6856fc30179c7649d265ef8bddd2ea8ee0d10f31deee725074af774879b8e33fa6688cab92a2bb1c0
+DIST mariadb-10.1.7.tar.gz 53812743 SHA256
5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512
4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a
WHIRLPOOL
2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d
DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
WHIRLPOOL
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
WHIRLPOOL
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.12.tar.gz 26880808 SHA256
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
WHIRLPOOL
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 01c1e4d..0f1b981 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -17,6 +17,7 @@ dev-db/mariadb
<flag name='galera'>Enables galera replication</flag>
<flag name='innodb-lz4'>Enables lz4 compression methods for
InnoDB/XtraDB</flag>
<flag name='innodb-lzo'>Enables lzo compression methods for
InnoDB/XtraDB</flag>
+ <flag name='innodb-snappy'>Enables snappy compression methods for
InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for
allocations.</flag>
<flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
<flag name='libevent'>Use libevent for connection handling</flag>
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 9556ac2..675a986 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -236,6 +236,10 @@ configure_cmake_standard() {
$(cmake-utils_use_with innodb-lzo
INNODB_LZO) )
fi
+ if in_iuse innodb-snappy ; then
+ mycmakeargs+=( $(cmake-utils_use_with innodb-snappy
INNODB_SNAPPY) )
+ fi
+
if mysql_version_is_at_least "10.1.2" ; then
mycmakeargs+=( $(mysql-cmake_use_plugin cracklib
CRACKLIB_PASSWORD_CHECK ) )
fi
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 6f7b583..35f5d69 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -231,6 +231,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]];
then
# Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default
as they are system libraries
mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4
innodb-lzo"
+ # It can also compress with app-arch/snappy
+ mysql_version_is_at_least "10.1.7" && IUSE="${IUSE} innodb-snappy"
+
# 10.1.2 introduces a cracklib password checker
mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} cracklib"
fi
@@ -364,6 +367,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ;
then
"
mysql_version_is_at_least "10.1.2" && DEPEND="${DEPEND} cracklib? (
sys-libs/cracklib:0= )"
+ mysql_version_is_at_least "10.1.7" && DEPEND="${DEPEND} innodb-snappy?
( app-arch/snappy )"
fi
if [[ ${PN} == "percona-server" ]] ; then
