gentoo resync : 20.05.2018

2 files changed, 3 insertions, 3 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1b9dab9321db..ae7f81398b3a 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -10,7 +10,7 @@ DIST mariadb-10.0.35.tar.gz 66551252 BLAKE2B 69cc9c78f7c47a4b1760940cb0f395b4053
 DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd
 DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f SHA512 db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89
 DIST mariadb-10.1.33.tar.gz 65292094 BLAKE2B 3223f9476e946112f7c1d23cc82ff52636801244136343413ae00336173ec58bb4af8dc36e065f6cd27e9aa3f9f999b1d19f9257b928bd92555b34b614b9cf76 SHA512 1d30e06d0c19e338bfbbe6815cf5eee8e1b839b525950f7f54c7cf8f89034658a284df4756f54719ab0f55875546d4713b03bab7dd094ec13291732b069f737e
-DIST mariadb-10.2.14.tar.gz 72607526 BLAKE2B ca0c73e30e15265a7a1599d9bd4b64e030aaf92fcdbe18fda39eaf071c88c90b32a16ea5d9c63130e3853572a30a0c5870e6389e6dcb2a3eb690311cdb9bde3c SHA512 12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026
+DIST mariadb-10.2.15.tar.gz 73329750 BLAKE2B e588f54d1b8807df1a57b87831294c70a7d21ed73bba96487a091338ee94855c2b796c939057546b9437b2caf96600ef6f7e111557249adaa9e18795a5a35ade SHA512 7702af8787973b15784dc8a89f9d56765725a420e2e68f1924b67c88c134c7d83d3249dddd16707fa9e5f05ed747f813f16feefbb477e999a6698b1dcfb5a88f
 DIST mariadb-10.3.6.tar.gz 71064269 BLAKE2B 681150a26de95cc276276a9b8d0b2c6e4a842dac80f20c2e8b0caeec5823cb956feffb494d18b1f2832e220c392c437424813de7720fb83a5d5c1fca71a4aef9 SHA512 cf146752be5857e702a3c88f42c7b6be3117bd92ac304eb217f902c1ffe478dc3043d3cf6a9a9305b51babb3bafc2612a8e4f5dfa7731cfa53634014d86438d1
 DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807 SHA512 eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c
 DIST mysql-extras-20160721-1526Z.tar.bz2 301788 BLAKE2B 23ef75d0122e9e18382f708a86c61624e0437fad593b7f02ccb2b3939d710404e18e3b70617ed400e5f6947d3a92d2867a5f7d98bf61597442e99989f60ca4f7 SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d
@@ -23,7 +23,7 @@ EBUILD mariadb-10.0.35.ebuild 6762 BLAKE2B 847296154e6ad3e3f4ec37bb773755cd39581
 EBUILD mariadb-10.1.29.ebuild 7321 BLAKE2B 55e437ba42c4b02edb500952e54827c8a168c30e310ad1ca5373075a053dadcab325716bd2b9cea20d1fd8ee618604b45778e5fe7008a133dc7bf8bb20d4ab24 SHA512 e40f6a200fc6914603ff5b4ca8e4e4c645a169e79bc96904a67a264c0172b83b3c54ab4f8394ee7ccb560e468500692544201c07df97cf64c1907185fd3d4276
 EBUILD mariadb-10.1.31-r1.ebuild 7887 BLAKE2B 40d0cdfb1bd7813bff2978d543c044aba4ffbb606aa0f07627038d67727d60876cebf0b3ec1523e02448e7768e4406eabb6c2e82a022902479aab764f1a8aebe SHA512 76ccfb96e8ef0dbad814f75a1706da1c8ee9422521656b228b083fdd0a7d37216371bd9d683960dfb1bdcc2ee5423f48e30d1ae4403d5ccd22eadc70d351ba16
 EBUILD mariadb-10.1.33.ebuild 7963 BLAKE2B 87ae31bbd6039cae27d2b234468d43bf7677d598c284489398035550a579abf519535a8070be3e1cb2e3141c05da8bd160a77b8d55642248475dd9d215b2636f SHA512 3261f2f6fbb4ad0d9ffc9e3d8659d8680fe9e3697d56409e32e513957e6744cd25e8fc70a9a2479f69c6aecc4b4f3e0b0887b779d812a71481174ea7c577a10c
-EBUILD mariadb-10.2.14.ebuild 33201 BLAKE2B dcd14ebd20ac465d9d2c8796d91f286a8be5a391f43b5cbaf9495666426b1710636566cc91c715b36110664896d520a7fb95a4bf3a507b359e8cb6b67b145b85 SHA512 bf69499a82167ffa0741207b46ea3d31bd1a7410ee95a19819963daa87e0010b8b7b64fe34e1f90af07fbe687d72c2599f37f519843336b5ff62b13257048676
+EBUILD mariadb-10.2.15.ebuild 33226 BLAKE2B 8acea32e0ce9bd7e528aca32da8d9352ba539bd1e93cde48ba0b37d7d30c80dd69044b865dd9602f8c9cbd5790f21d88bfaa1ee609191c503f0ed9a1c7932e6d SHA512 23b6c91b50ce09fdda2f82a924796b53dd9e25ec2303720d727f5d1b3a59b3369bb55565a1f32da8484f33810efef3b9954873a96a8b72abf8bed6bf36296bf3
 EBUILD mariadb-10.3.6_rc.ebuild 33416 BLAKE2B 813c47e34181d8fae70c65e5383d22663d94de5b4535a43a852373ecba0b424ec9bee6fe38dd509c72bb6e31b31b5891363da5921dae6eff9e8309de884cce82 SHA512 5faf0b2745fb2961b38aa05655b2e63dbe184232c362250bda359e6eeeaf2778cd7ad8e5fc92a31cc4deb8e68332d6bf29b7f71b2ec6cf73e2b571caee954c6e
 EBUILD mariadb-5.5.60.ebuild 4254 BLAKE2B ee31137be4020cdb3626a93981eb2c667b4c9f8a543d52e272f4c2721f8ded71305a1caab6319a3a7cad25cbdf17a736abae3eb01062ffe5cc54c66da1b9703d SHA512 9d9ffc8ca65d6e4f7a64f4e6c1477096d46404d3a4401db1687ab5507452bbf4afb294667a2b01f7db8ba6953b8d935a40211fb006273462723846b960248920
 MISC metadata.xml 3172 BLAKE2B 9b546b51359c0881ee5ce452c89e788ff27300471433fb9d1eb28b3f72d47cd84787eac1d7fd536a8133aa56dd4dd9c1139afb4b3e83b463ce12b7d6cb0fa35f SHA512 143381d9443b778b4f8fb5545c6e8ac59e54eaba20458eecb757e292650a1fd5a470ded204f25c173f456cc222bd32f8b9885e00ecb00c9b4abfd639c9e98391
diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.15.ebuild
index 7509c5eddb28..4224e6c8cebe 100644
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.15.ebuild
@@ -109,7 +109,7 @@ COMMON_DEPEND="
 		innodb-lz4? ( app-arch/lz4 )
 		innodb-lzo? ( dev-libs/lzo )
 		innodb-snappy? ( app-arch/snappy )
-		mroonga? ( app-text/groonga-normalizer-mysql )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
 		numa? ( sys-process/numactl )
 		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
 		pam? ( virtual/pam:0= )