8 files changed, 56 insertions, 62 deletions
diff --git a/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild b/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild
index 7dff9fbf7d18..a2811be622f6 100644
--- a/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild
+++ b/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.txt"
 RUBY_FAKEGEM_GEMSPEC="imagesize.gemspec"
diff --git a/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild b/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild
index 95783e9f9782..9369e3d0cfdd 100644
--- a/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild
+++ b/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/inflecto/inflecto-0.0.2.ebuild b/dev-ruby/inflecto/inflecto-0.0.2.ebuild
deleted file mode 100644
index 42f33dc3e1cf..000000000000
--- a/dev-ruby/inflecto/inflecto-0.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Inflector for ruby"
-HOMEPAGE="https://github.com/mbj/inflecto"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/itextomml/Manifest b/dev-ruby/itextomml/Manifest
index cfc6e7216d49..07424ad820a8 100644
--- a/dev-ruby/itextomml/Manifest
+++ b/dev-ruby/itextomml/Manifest
@@ -1,2 +1 @@
-DIST itextomml-1.6.0.gem 125952 BLAKE2B 9422d7a7f0a872dc60fce6f5d217c8c085785787d40b1f976a0f3df04f49d8de37a6fb658d8960b27f27dec03401a013b51a9ebe2446f5deecd70cfab00a7756 SHA512 cabff2d8d36cea6b280c4c928675e368e02ce346870c2d933ebb5554722e729ef7a05132776d29e4a62f0fa89ef1ad2fdd729ac97a35d7aed6da24f90de75839
 DIST itextomml-1.6.1.gem 126976 BLAKE2B f66395ebc75f57b845897c9ec3cdabd93a67fd93561ad6fa2284c449518d4da08b3d4cb20529149b006228f0200ed73d3edca23fdc6cc943e0cdb4d09a14b47c SHA512 c122562e54618a2eda090c061d4b65c3d55cbd5325eb7f9d13249959219eeed75be5e172a1d2b8bdcc30eafc7700150eff3b7b09aaa2e5b9dd143f9e5752cd8e
diff --git a/dev-ruby/itextomml/itextomml-1.6.0.ebuild b/dev-ruby/itextomml/itextomml-1.6.0.ebuild
deleted file mode 100644
index e1e1d94cfb46..000000000000
--- a/dev-ruby/itextomml/itextomml-1.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Native Ruby bindings to itex2MML, which converts itex equations to MathML"
-HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
-
-LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-#Tests don't fail here
-RESTRICT="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext
-	cp ext/itex2MML$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/test_itextomml.rb || die
-}
diff --git a/dev-ruby/itextomml/itextomml-1.6.1.ebuild b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
index a6eb145fd8c5..57fb3df7e1f6 100644
--- a/dev-ruby/itextomml/itextomml-1.6.1.ebuild
+++ b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_EXTRADOC="README"
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index 38b38a14806c..916c65d17788 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,2 +1,3 @@
 DIST mysql2-0.5.3.20210920.tar.gz 114492 BLAKE2B 589ee721838f956f90474e859d0dd2e8cf11c8622a8f89410929f9c52c82c240a5a7eea7e6b132e0212dd6e9cd13c5ca950e6cacac368d158aeca9feacc98a7c SHA512 3bec768b69ecc3b54db84048b633602e80f09c4b4631daf1fbd81810c33038410f6112b467ab7ac86051ba91e4660abb3546e55cb52d26b96531f3305b43871f
 DIST mysql2-0.5.3.gem 74240 BLAKE2B 9de25a34173ab952f6842f01d9207405c8bc6ed5937fdf66de4062129fc20f425635956f6d12f78466c8c341c49916f7d00df845f84a4101d34a98b1585b9919 SHA512 59a0ee00261b09e8bbfc586a6f75af840a465a94fd8c9463a3d7767e5ea6b7e64507c9571fb90c6d0cdde3cfff560c97fbf3f3c32b3916aca852ef5c41e1bce9
+DIST mysql2-0.5.4.tar.gz 116463 BLAKE2B 9c9ad00d813d69b6790d9a0c6c05979892d1b8bedb54e95326bf2250479a93958797fa845d60e29b5a8efcb416a80a94be66535e641d30c92b64d50c5f62c3b5 SHA512 89958220d2f5454351f4e4b93099e12355cb0a8c36824125650f2366b15cdb3e1aa208f60beb348834cd2ee6fa36aac4102581c16fe1b6bd4f2136cc1a8b5c99
diff --git a/dev-ruby/mysql2/mysql2-0.5.4.ebuild b/dev-ruby/mysql2/mysql2-0.5.4.ebuild
new file mode 100644
index 000000000000..c37cd71d63a4
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.5.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mysql2/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/mysql2
+
+RUBY_FAKEGEM_GEMSPEC="mysql2.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+SRC_URI="https://github.com/brianmario/mysql2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~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}"
+
+all_ruby_prepare() {
+	sed -i -e '/s.version/ s/Mysql2::VERSION/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+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
+}