gentoo resync : 22.04.2018

5 files changed, 4 insertions, 8 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ff140961fcb1..2efa61ca639d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -28,9 +28,9 @@ EBUILD mariadb-10.1.24-r1.ebuild 7175 BLAKE2B 6d92e08b3197423710e91f0f56e1fff64b
 EBUILD mariadb-10.1.29.ebuild 7305 BLAKE2B b5828f97361eb989638654f3399e1a036c12356c5cb90c2e62caf1055497b6f0e1c4f3587d1fe599d2da4cb1059c5aa676109e0aad88306d8136753c22c87854 SHA512 a0b25e416d701f557a017c4b6c454c6359406da3c43da0dda3c892020961b27888412582a892fedce4484c4412ce774fab45f868074b7ac053ba530339288337
 EBUILD mariadb-10.1.31-r1.ebuild 7804 BLAKE2B 67d90c7ef1ef2f1f93be7772a7d7495f0c7f3d24079ea2c4784357cd269b3e154a03ae9d9e96a68e10ee466adf41fdfaf509f3c7a497d990e1f38abcdab22d35 SHA512 b307c86ff8908afd2ad7b3969f7e98b3397407e0df669a1d0ae75d8a7cf29ba59c1ac556d182284f86fbb722f758f022e1877ec33ecfae449302448b803a0f18
 EBUILD mariadb-10.1.32.ebuild 7746 BLAKE2B e180454e92e0d59b5d4aa2c4bebd4df0e7dbdc4cee8f48b008efaba06086a7a221d89926356afc97187386527a332d7f59c0d15e1dbe8ae113050354026e4c72 SHA512 f54f62ac128d9b03bef2f67eb2e35cdcf85f22b212388263c86bbf16108196cb689c08f67d7fe2cc1c259921357bf6aac364954a321e45ff710fb58493399c85
-EBUILD mariadb-10.2.12.ebuild 32528 BLAKE2B 4fc6c74390c572d2fac693286149078338034c8159dbeb292cd4699753920efce67ae5550868ef9dcddfa73dafad2d4aa9277466d367841eab99afe5f2d187c4 SHA512 df8e91f637b349eab91877de631cdac730629c481c3798b147af135a8609bdb7c3838de530a75b9cb791e609a332653f218642df5937a741f9e2781a4c5bb190
-EBUILD mariadb-10.2.13.ebuild 33174 BLAKE2B 957cd928349050eae31cb51067df474b6fda0457a2dab5e17e801022ba09908f661b01b38f69c56f44f66f498108e173901a6f4790850b002e1fdb4102f43a5b SHA512 33343971992cbe5f9cca8590c21abdc87c5a7b9e470bae452b740d31d99aece817d37ecd7e867f7d915434a7ac7efa8b6963caf6598815eb565e348b57074f22
-EBUILD mariadb-10.2.14.ebuild 33041 BLAKE2B 82c222dcc2e21cc79b75ded7b25948494751c2837018914d405316a09bcff54dbec3711d8b4c143e9ff0efdb097bea8aba3de7a14d5ec48b64273f85bf65cc41 SHA512 4573d2572e86e9fc7f0d0f515643843d4fddd8cd0d6065a83ca7008b926879538dc19ec567b6b545b7c54db55125436734cd432cade654abbecad90a555ce978
-EBUILD mariadb-10.3.5_rc.ebuild 33141 BLAKE2B 9e2513c8563236c4eeea6bf8e26e0ff42df1604a12cf6e179318cfbf7fc6370343544f445a279d7211f8276b22e58c90c1c49b92e4f32c0b216b3dd3729524a5 SHA512 e140f029cfa1fdb80470678110ff20005a4902dc3ab7053e67deb665a1531b91327c41c80217e89e291498547c5eb0f0994024055b8c9de012325c31d6b9df13
+EBUILD mariadb-10.2.12.ebuild 32462 BLAKE2B bc420743a09e2349535536d85d323f1c6bde584b11da0faf9d80ff39820b0535686b7f4b5568a5091354ed88959190e0b66508068d47ed01e5f47742450cd1f9 SHA512 92da852d9aefbb1d5245943a0b86073aa013df5f491d4228a85795e450468d59caebd4e7812c4c065b8f9b65d86b8b3a5c16295b2d4a99e39897d48e7900081b
+EBUILD mariadb-10.2.13.ebuild 33108 BLAKE2B 5100ee8a36ea788132c9f121614b950a5d54e43d963339c438a5f59829265e3408e4bd1b4ba8f1fb125d72579795cef232bd72c2c16a58f97f0c5244f2923d97 SHA512 195c6c6d01a7e6a945a6a8880449bec22170008d285c95b5ec6c9473ca1ff4ec99d64d0b4d45b46e67ac3ac992b233ddf0306a286709cadaa21347b5cfc82aad
+EBUILD mariadb-10.2.14.ebuild 32975 BLAKE2B b3f098cee05860692a98570d301d6ace6a404d0cb380eed6a3cf07d8006740f6926c863653dab7e90bf07b1947026fecfd531cf9996ad238425b4dd4b6d65bcc SHA512 f610df3ab3a171e78e469571cc009e16c9dc37bbcb66d1681d4df48a444bde79462045c6d2b1f49ce7608174693f004fc82e1c6358a84fb75866ddb114c89c63
+EBUILD mariadb-10.3.5_rc.ebuild 33075 BLAKE2B 6ecdfe057de4996adac5e4b3f5e6cd50d33f7c4285e65a3947231859c5a496b47a87e76aba605cde08947001611ea182dcc1ce956c169aea20d1cfd5cc69f0ce SHA512 23a353acdab8349bb063634e7510d9608ce5ae3f3d700ce0007129d875643df336057269f41b92b24d2b8480bcb4cb2faa6d0da84afc00f64fa3e189874ce25e
 EBUILD mariadb-5.5.59.ebuild 4220 BLAKE2B 15d84c6e8405e0f2339a1fa2c1dac8c5cb5d070f083219e5b0b6b6f59b83a5d147f049a7874f4109bea38a295be86f560faa6bf21b8665a2696a9ef4ff09ad08 SHA512 0397ba6f08cdedcb3812b61044d6d58b42db9009747fd1a0af53e450d530b56bbb748ffdd0a9c3de7dc535f9e4566e2513a7ea01fe893f250b9a31fa074de5e1
 MISC metadata.xml 3172 BLAKE2B 9b546b51359c0881ee5ce452c89e788ff27300471433fb9d1eb28b3f72d47cd84787eac1d7fd536a8133aa56dd4dd9c1139afb4b3e83b463ce12b7d6cb0fa35f SHA512 143381d9443b778b4f8fb5545c6e8ac59e54eaba20458eecb757e292650a1fd5a470ded204f25c173f456cc222bd32f8b9885e00ecb00c9b4abfd639c9e98391
diff --git a/dev-db/mariadb/mariadb-10.2.12.ebuild b/dev-db/mariadb/mariadb-10.2.12.ebuild
index 51e0d67ccb02..29a68b7734cc 100644
--- a/dev-db/mariadb/mariadb-10.2.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.12.ebuild
@@ -113,7 +113,6 @@ DEPEND="virtual/yacc
 	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
 	${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
 	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
 	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
 	!<virtual/mysql-5.6-r9
diff --git a/dev-db/mariadb/mariadb-10.2.13.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild
index cc2988c75ed4..c9a11e7250ca 100644
--- a/dev-db/mariadb/mariadb-10.2.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.13.ebuild
@@ -121,7 +121,6 @@ DEPEND="virtual/yacc
 	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
 	${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
 	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
 	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
 	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild
index 389572cc9c8e..86c88b6342e4 100644
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild
@@ -119,7 +119,6 @@ DEPEND="virtual/yacc
 	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
 	${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
 	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
 	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
 	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
index 0fcf8f32eb3c..33cd1b5332c0 100644
--- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
@@ -116,7 +116,6 @@ DEPEND="virtual/yacc
 	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
 	${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
 	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
 	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
 	server? ( !prefix? ( dev-db/mysql-init-scripts ) )