gentoo resync : 22.05.2018

3 files changed, 21 insertions, 20 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ae7f81398b3a..9533d7cff980 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -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.15.ebuild 33226 BLAKE2B 8acea32e0ce9bd7e528aca32da8d9352ba539bd1e93cde48ba0b37d7d30c80dd69044b865dd9602f8c9cbd5790f21d88bfaa1ee609191c503f0ed9a1c7932e6d SHA512 23b6c91b50ce09fdda2f82a924796b53dd9e25ec2303720d727f5d1b3a59b3369bb55565a1f32da8484f33810efef3b9954873a96a8b72abf8bed6bf36296bf3
-EBUILD mariadb-10.3.6_rc.ebuild 33416 BLAKE2B 813c47e34181d8fae70c65e5383d22663d94de5b4535a43a852373ecba0b424ec9bee6fe38dd509c72bb6e31b31b5891363da5921dae6eff9e8309de884cce82 SHA512 5faf0b2745fb2961b38aa05655b2e63dbe184232c362250bda359e6eeeaf2778cd7ad8e5fc92a31cc4deb8e68332d6bf29b7f71b2ec6cf73e2b571caee954c6e
+EBUILD mariadb-10.2.15.ebuild 33299 BLAKE2B 1c01f3807fe432c9674a35b9520825a59968185535f0979e2b9480c7a4aeeceae137ab1924e23df46bb460234ab72bc9966a03fe3f0cf2d827828b53d6bd2871 SHA512 3edab06cfc79dc9f1b7c72b8c589b7462fadf6be1b5b59ba040da59bdce6e056fbce9c2dfbab2a39ae3076309e04cfbd6f3867adef4dce2b69cb4a9eb232bd6d
+EBUILD mariadb-10.3.6_rc.ebuild 33513 BLAKE2B ea0a62cdb5890604160bbb95bfa21872115acb71b0f8e04df555a04cb049b39550cee956bb36a7ae6ca40ce382184a57a2308e2d9c9b060ecaeaffbabcbe95d1 SHA512 0aa66f952cb3ea6f8d8114d3d132bec51cfaf29d8333a5832e48c2f11f37cd4c3ce177c677db2a90bf7f0ae219026acb414c6c3c01132e9887d6a186238df84d
 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.15.ebuild b/dev-db/mariadb/mariadb-10.2.15.ebuild
index 4224e6c8cebe..50b76de9c542 100644
--- a/dev-db/mariadb/mariadb-10.2.15.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.15.ebuild
@@ -80,20 +80,21 @@ COMMON_DEPEND="
 	jemalloc? ( dev-libs/jemalloc:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		client-libs? (
+	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+		kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+		yassl? ( net-libs/gnutls:0=[${MULTILIB_USEDEP},static-libs?] )
+		!yassl? (
 			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
 			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
 		)
-		!client-libs? (
+	)
+	!client-libs? ( >=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= )
 		)
 	)
-	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-		kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	)
-	!client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) )
 	sys-libs/ncurses:0=
 	!bindist? (
 		sys-libs/binutils-libs:0=
diff --git a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
index 685f4e5bf19b..5dce59437ddb 100644
--- a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
@@ -81,23 +81,23 @@ COMMON_DEPEND="
 	jemalloc? ( dev-libs/jemalloc:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		client-libs? (
-			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-		)
-		!client-libs? (
-			!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
 	client-libs? (
 		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
 		kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+		yassl? ( net-libs/gnutls:0=[${MULTILIB_USEDEP},static-libs?] )
+		!yassl? (
+			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		)
 	)
 	!client-libs? (
 		>=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=
 	!bindist? (
@@ -114,7 +114,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= )