gentoo resync : 04.08.2018

4 files changed, 66 insertions, 9 deletions

diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index c69ce39f2274..521191426bbc 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,11 +1,11 @@
 DIST mysql2-0.3.21.gem 52736 BLAKE2B e0fe0d16c0816b7f849581d6ce0c657f64f2881ab28bced780be82e8017a5ded24cffc3641f2f386f5664cbc5e9ac4c6be4fab9cff818dc5910970968d7458a4 SHA512 782b7c13b4956ff9cb66b14701546b8da69ba5dbae8a7fbab6b8a083c7f3c2a15e590fe075f41d4ab85a68bf68963204fc2ab0f4a4f768ce41c822af1063317c
 DIST mysql2-0.4.10.gem 97792 BLAKE2B 4978a3fbc8e516e47907d73276b244e614248c031db7c0b7d76d20f1f845be11f7187795d3a989629ff849e2e1bd0454fd56bc7be6b692d9840838861bafdb4c SHA512 1f9c8eb1b120cfc940b3aa26b2dff54735ccdf54fd6e6745e347179d29803b4a4d1f3b80a86f92dd534089f625ffcd6055458f27aaefebe58f8332890a842b43
-DIST mysql2-0.5.0.gem 98816 BLAKE2B df99ea39a1a6e080ccbae3f79a17234507f0396438519564f758a3ab75b50729d70ee5586c1945876818321aa4d529c3802264b56deff0a47382b7d8b23b798b SHA512 d7026fd4e69558bb8150bb9f4053143cecf2af39c94db2d8b708b8ab936b20b3051844eb79e893c2c5880774b24c62d77444f258195887f4eb95ea558dd7e410
 DIST mysql2-0.5.1.gem 99328 BLAKE2B 1ed8d9688a78ee30f3f7b7a71317cbe92b39e2a1b6f9db710a328a4b9542ffcff4be9051c5fa440bbb93c1af56742755e4b70bbff895695102c126293b7d7ad7 SHA512 dd1934e4f8aa8a97b70dbe0f1436496892a155fa188930321e776d57ec72ec34f95f2665ad5db671fdba99304e279aa8a045dbc6126ab50d8cc2d84838bc145b
 DIST mysql2-0.5.2.gem 99328 BLAKE2B 0f1a0d4657e5933e14d445ceefc6ff605a8b07bc01686dd0a67e018c45857a92d25914e4f0aae1116ed1479583636cdbca2aaeb127b856b38052264d579991bf SHA512 6013b0c862f24f0c20b22c50a17390a7a22390e661d0f1afb613177febfbf854f63aea9bc9aa8defc9521896144fbc035a8e16b135abb47384453a23dfd99566
 EBUILD mysql2-0.3.21.ebuild 878 BLAKE2B bca3c425b169f6ddeaf900476c2c8ad1dfa1c6faebeace43dc69765c5668d52ca9fa2efcd09d0fab2abbe679d7a59c9db8180226476fe9abc065a54a83180ba8 SHA512 44b798edf111cf335bcb7a489f8c854392c07fdd3ea3e96b7cb81bc6f00489a785a40833edbdea2ba8d0cfad6389211e0d1e5131ff58260f17c629530a62ef11
+EBUILD mysql2-0.4.10-r1.ebuild 1100 BLAKE2B 3faf6d4b910ece292fefffa0518b7809ba665ceb55ce5a4b4b1b08193dc9320a68c36362939153e62e310ab34996ad528da9f587163200cbea2ce8689cbfe149 SHA512 14e0835ffd137e26cb7157a380932a99359fd7003f8e314f2b846d559a47e25966f129440bf64ad735d2773d8044044f4382dbee89c8dfad6ee55611577a032f
 EBUILD mysql2-0.4.10.ebuild 871 BLAKE2B 80eaa8d0541ab2ab4a2483e8779eb0ae3d6b9929be09b64f389d51dbaf13f2b98301dec8e41cec48d26c0a06375d2e1592c848cd57b252ad5351166b48228200 SHA512 f385ef153b9c0cef750687eb9bd772c0044c88cf85c60f359dbabfeec9b92be59c60503b9acb0d76e86efc25e878dbb5815ed1648fec9f44a5d9b1ca304fec4c
-EBUILD mysql2-0.5.0.ebuild 871 BLAKE2B b99de7c0d899f18b2e830d87ea5d77c87f02b2e426991d127bb56fd7b60ebb1b8446cc15c4c0ca72c7e5da93a51f3b073f766756cb49ea886af99a9c6e19b8f9 SHA512 a193c8d5e8895e75ee5a57ba55a11cd8d6d30aec0982c22ed593202e3bee9d6110b49be900a53787442f22e5df5b4c9ecf0c3515c29427df983aefea40f42cc5
 EBUILD mysql2-0.5.1.ebuild 871 BLAKE2B b99de7c0d899f18b2e830d87ea5d77c87f02b2e426991d127bb56fd7b60ebb1b8446cc15c4c0ca72c7e5da93a51f3b073f766756cb49ea886af99a9c6e19b8f9 SHA512 a193c8d5e8895e75ee5a57ba55a11cd8d6d30aec0982c22ed593202e3bee9d6110b49be900a53787442f22e5df5b4c9ecf0c3515c29427df983aefea40f42cc5
+EBUILD mysql2-0.5.2-r1.ebuild 1102 BLAKE2B 32b20e40969d6ef5f448c6250a382360811ad695a078819a021362dd91746bb1e9c650df64229790dd0a10c3826bab893c3f8fc368505508ea225d196bac5488 SHA512 becb37f9a6f0ad589485b8939f1092f90dd5723f251985f2efe1e82c5134c5a48c9fe87386e727d99cbd24994bebf27d390793a9d8c2003860ef3d28602a5097
 EBUILD mysql2-0.5.2.ebuild 864 BLAKE2B 0b11d1fbbf05babce69c0b7ffbaa363a97b8e5961c844de072cb83185b3824e51ce78a2adfe003e9cbd5563d151839ea428f60b2eee80636897051a297b45123 SHA512 c03098a3bcd4b9a73a45ddfb922af6caac8535bb6430091db5cfe2100e4f4a1c0af6e0e4c3979ddbc885f5c9e7c50c0aa9f54b7aaab24defe86bd3f731ef1413
-MISC metadata.xml 343 BLAKE2B bf8e16e6c78aa725f0741afe277ecff850b36195bfdde74fd12ca635ee73d79fedd7169a9b538c5fe30bc6baa20af480504246f7ef2605ceb71c3f912e40f978 SHA512 85af4758bf547b6dd927391d7bc68e23df8fb7997a02bae7b9ac3ff05bb14421f5f25cfb9f908a1483875966d576c358f7926fd91df228e02a5784d729353ad1
+MISC metadata.xml 413 BLAKE2B 1fdeec661490aaea22676fa4af618fd6458c8bf67c61ea0233f1c68629e89cfdb5f8c29572b9d75c4dc010b1a774b0c703fb6ef4cce1e3e1649452ac0e0aac75 SHA512 1e2e76b14e8c3b44693f0a1d9f83d8b1c95f4eb65490c914fc925fafcfda58fab2764c8b54a87a8e347d53ddb8ce9ce6ca2a08564c97bddae0d0cba0719dfb73
diff --git a/dev-ruby/mysql2/metadata.xml b/dev-ruby/mysql2/metadata.xml
index 91fbcba571b0..9ee135bb6b8f 100644
--- a/dev-ruby/mysql2/metadata.xml
+++ b/dev-ruby/mysql2/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
     <remote-id type="github">brianmario/mysql2</remote-id>
   </upstream>
+  <use>
+    <flag name="mariadb">Use mariadb bindings</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
new file mode 100644
index 000000000000..bdeffdfd19b9
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+
+LICENSE="MIT"
+SLOT="0.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
+
+MDEPEND="mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c )"
+DEPEND="${DEPEND} ${MDEPEND}"
+RDEPEND="${RDEPEND} ${MDEPEND}"
+
+each_ruby_configure() {
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config=${config} || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/mysql2
+	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
+}
diff --git a/dev-ruby/mysql2/mysql2-0.5.0.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
index c72134dcd7ca..a0b5b7bc3cc9 100644
--- a/dev-ruby/mysql2/mysql2-0.5.0.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 # Tests require a live MySQL database but should all pass.
 RUBY_FAKEGEM_TASK_TEST=""
@@ -18,14 +18,24 @@ HOMEPAGE="https://github.com/brianmario/mysql2"
 
 LICENSE="MIT"
 SLOT="0.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
 
-DEPEND="${DEPEND} virtual/libmysqlclient"
-RDEPEND="${RDEPEND} virtual/libmysqlclient:="
+MDEPEND="mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c )"
+DEPEND="${DEPEND} ${MDEPEND}"
+RDEPEND="${RDEPEND} ${MDEPEND}"
 
 each_ruby_configure() {
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
 }
 
 each_ruby_compile() {