Merge updates from master

10 files changed, 99 insertions, 69 deletions

diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index b9a4804d3ee6..a5570f4bb735 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -1,3 +1,4 @@
 DIST did_you_mean-1.2.1.gem 20992 BLAKE2B e8827b3f6797145c1adf5fae2a681ad8f437c1dfcb746465c4bb0c59f61285c2f2a65d5e31e2a501da812baf52a2f1d78b81c2d74a194d7309778cece56c1752 SHA512 98a71ad3c4fe92efec50575e26723cd3b5c60b25cd24767a7aabdb4e2b343b131fe3677367c78995f07c513d39d47984af80bde0ec2f6aeafcb34be97f134b1b
 DIST did_you_mean-1.3.1.gem 24576 BLAKE2B 939dc676dd7ba5dc4b64e5796b59e2901b36e5b9e1d4ccdd8809fdd008a82377c6bbd35b8677fa273c2196615ad3b7a09cd3bb57267ba2dd9216f13cd0599aa2 SHA512 14e672540a93bcf89fb41e27cca31190f9c621c5fb669256a26ccd6c1042437a69911b7ee886305b23fa94fcd0979188b423cad88f87b0adbf6c9437ecffc84c
 DIST did_you_mean-1.4.0.gem 33792 BLAKE2B 9052b7ba7028f963595eeb79e668296b48db8659bd07c6e00076efc372f6c64eb3ad81981013bf0ae3c37b942a459146af96fa001ba225ebf1f5486d717a7a55 SHA512 bd8e47e5d0135807d1ec0a5dbf536649cbaca13fd056cefc6f57293b7869608ef92a8cdcbaf4a4c4453738ecbe8a6d8bc450826a8dadb46fc69560ed05a97f2d
+DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7ff7ddc49665762a83866634ccd0a440e5a3b351cff6d9d308e85de0490d56d7b675d582f090e0e4fb07186c197f SHA512 7fa4cce3fb895bf026788bb5d558f88d4ddb62b7cae1e284969dc4f0570e88871d5f103514da2c9d79399dcf10ffc845a594afc9c676e90cbca4d5a38d74d7f8
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild
new file mode 100644
index 000000000000..c7913abf6a0b
--- /dev/null
+++ b/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="'did you mean?'experience in Ruby"
+HOMEPAGE="https://github.com/yuki24/did_you_mean"
+
+LICENSE="MIT"
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/docile/Manifest b/dev-ruby/docile/Manifest
index 70955e28ea09..40963eebb4b8 100644
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@@ -1,2 +1,3 @@
 DIST docile-1.3.2.tar.gz 14684 BLAKE2B f24ce3ae857d249ce2fc32bcefa505b272327962755e000e51dd13531ad81a039c1da0e97774752cc03444fc3f44fa12212bbe61ff7886ebf5d44076785db3df SHA512 6bba8e8855e43acc3ad314ca500896b861865e4470618f98e720a11a26e226e30d8748096638027e213eeb54838fd1c3b2c9749701476d26cf8bc55c82c4f3ce
 DIST docile-1.3.3.tar.gz 15752 BLAKE2B 290af9553aba4b8b6ab058a1b1dbc4a36e840b3dc11e97db08408230679ab1095a5f6c03b133d9c02d2c1c9be75cf4d5cfa525bf5bd3c0705993df975ef152f3 SHA512 64e4f45616135f2089ecdb7282b7d1bed61cc5a1c8fa37e5ea70d8141d364760c62e06c650359d9cc107088fcfe4837d6bf35b492bd81c0207b037aa67d1d114
+DIST docile-1.3.4.tar.gz 15726 BLAKE2B 93f37266dc7fe80f8d3863ac7c5293dbd0432a5917f4ab134a1ceea4bdfb40a6af2e045db0b690fa3ef2590f2c781ea003ca482521e271e21ee50aa95aa9a30c SHA512 4e191f0cc374a429a1bb3297c1baf1d337918a475c783a12ac4e4c5de8cc941d440c85d31f2d226736c9fe88c52698b54bd9897be9b497e96eaceef73a6f0f56
diff --git a/dev-ruby/docile/docile-1.3.4.ebuild b/dev-ruby/docile/docile-1.3.4.ebuild
new file mode 100644
index 000000000000..41f1cd91fffe
--- /dev/null
+++ b/dev-ruby/docile/docile-1.3.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+RUBY_FAKEGEM_GEMSPEC="docile.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Turns any Ruby object into a DSL"
+HOMEPAGE="https://ms-ati.github.io/docile/"
+SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
+	sed -i -e '/^unless on/,/^end/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index aef0eaa41ff3..372a06222f61 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,5 +1,4 @@
 DIST ffi-git-1.11.3.tgz 157081 BLAKE2B 57459d3aba7f54daf9c4d94993a083166efe5c37f3aa699279a07cac0ecdee533f54ee1ab36f7ee2a5cc43d0ebb386b8b3285102d98ffd18fa297e2e1b882283 SHA512 86a6a95aa5d4f005eb457fbe26b38e7b8618899db3de3459f3a01128aa7c488a47e50d13aef05ae83519178c80f2f7ed0a0280147d7e30aace13bbab82871f30
-DIST ffi-git-1.12.1.tgz 158108 BLAKE2B e5685e94ef0c1a1f5a5443fac4d9934fc3613219f27d08c635bf346d1312f765d9bc9bb987e736fb373f715d84489e410e2e13280acc501607b1274a6a4a63be SHA512 172540f5827ed87afd56d0da08705d714ab7e4ad1297f9de774cb8792fb8fbb90f9e697e280f13c25c5c14dc73b8ba8150fe3dfd5f31e3c70c195357709ce13a
 DIST ffi-git-1.12.2.tgz 158344 BLAKE2B 903825d7a6d77e26be47ec7e7991253e1ba58b0f0049fd812f8c26dee6eb31c17388dd5f23270e84cf53c02ab3a73c79ecca870814e14993496d1ca0e99a5390 SHA512 2590ff3fd704334fe00de10ec5e08184c350feac36418e08680def0b4742c488f8168fa82759317e93cc3d7969af366254aeb157c84d07565e1804ba1678d119
-DIST ffi-git-1.13.0.tgz 161537 BLAKE2B 2d113bb31fbd65fdaa397d2477ba8bb66a76c7a01e2753c33b04b81a5175a25acd3495d41e38995ed8161daff25094e0a45ae4b5d6666c7508840c21e5ba5c45 SHA512 6e90d79b1e60b237c20aa3e863f97797a310d651a52df67957b6a8e1e577b0d800f4e0b6b3ec6da77776214ae6a0b855ac23f6f5b3f9439b549a043a3789627a
 DIST ffi-git-1.13.1.tgz 161660 BLAKE2B b8a6c3f4b9bbd94378ab2adbf40c0bbf56883e34c6a1c12b9e1496069b8a4935b04012820699260f9cffd47efd78d7aa2d08e71a5bff9de740aa96ad11f499eb SHA512 f0077518c9ced54881e40a0047440edb4e40ba0ba89fc814a489bcbaf52e08e9a773e28f453f579162439e247151b994936695fe0b1ed5fb429d9bfd85b845ef
+DIST ffi-git-1.14.1.tgz 165025 BLAKE2B 020b3954ac08fc9fe077cc9116b21e40de8458eb79cc6ae1664d638c8a36df1e919cf6a603332f9513167b3f8d8bc342f04c2c1ee60fc9197d75de74fd69ca2e SHA512 8f3e97aa3fc3e5c404864d56b62d568ca464db741c1e526f971df4d96e61ebb8ce5899ecc207ba3d094efeaacd20633a250f2f072392a7369b179166bb780712
diff --git a/dev-ruby/ffi/ffi-1.13.0.ebuild b/dev-ruby/ffi/ffi-1.13.0.ebuild
deleted file mode 100644
index 54f91d863ceb..000000000000
--- a/dev-ruby/ffi/ffi-1.13.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ffi_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/ffi_c V=1
-	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.12.1.ebuild b/dev-ruby/ffi/ffi-1.14.1.ebuild
index 54f91d863ceb..4a1019bd5d0d 100644
--- a/dev-ruby/ffi/ffi-1.12.1.ebuild
+++ b/dev-ruby/ffi/ffi-1.14.1.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
+RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
+
 inherit multilib ruby-fakegem toolchain-funcs
 
 DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
@@ -22,8 +24,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
+RDEPEND+=" virtual/libffi:0="
+DEPEND+=" virtual/libffi"
 
 ruby_add_bdepend "dev-ruby/rake"
 
@@ -31,6 +33,8 @@ all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
 
+	sed -i -e '/require/c\require "./lib/ffi/version"' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Fix Makefile for tests
 	sed -i -e '/CCACHE :=/ s:^:#:' \
 		-e 's/-O2//' \
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 1ed6cba37c69..858e257aef73 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -2,3 +2,4 @@ DIST ox-2.12.1.tar.gz 202784 BLAKE2B b42a364e4e2c1bfbefd06bd0b5162838e473cbd4858
 DIST ox-2.13.2.tar.gz 208893 BLAKE2B 15e9fca55cb58c10d6336c1399048e72c059889da0b9df8050a6e4cd00393d11507768ed1cab23d452e792f4001a5935e70ba0be24186a1f96a43a7f272823fc SHA512 bc7d8d14c9e3a45529d8a4a32c01d7f51523f814407d437a7dfed0184fad16a9edf4a2b2317c28039613f8f0e0d367b42b4eb8fc00b01287b0154d520e37ce48
 DIST ox-2.13.3.tar.gz 207702 BLAKE2B 23e690fcbadb2f3903b50ff7cdaea397fa4a65503f3bf81ea9266f6f935ac08271bac4f514d080ce538666f05c94a7e3f3ecdc60ff412741233f599aa4aac863 SHA512 346513c696f6cb969429f20f1296f8ca999cbfed5ecd2ed8fd96b3bc5a0b512ff41237d6e5b616c100fa98d4606026f8ec9f4356e96831b1d1d7c968c2a22762
 DIST ox-2.13.4.tar.gz 207814 BLAKE2B 8a94569e6e10b92574fa330d60aacc069a558003c7b285cb1178dfe0e6cfe02a2590283249f7a1b5adc89b41c3414b1a919367889b0296cf909eeafd88cc8a27 SHA512 a97fef40eee3616bab32394340c452138fe1cf5cec92e6457c3b2ce8866f7e5b143ee7e0191af09d96128a2d7a0ee3eb58fbcea16074ce33db8a845867175423
+DIST ox-2.14.0.tar.gz 208213 BLAKE2B a5f99c8878efb9f87d8061d57ffb0afe26329b7e987c4de8c084a3453e35404fdfe29805d9a4cf60f3e30c39f47de5721a9d5c52b87660066ee484a30ef0837c SHA512 51bafbef13b1d3e0a5f27f69f9ca21b5774cb32f4b0d55e12ec5b94b1dad3febdfda37b43b84f599d7874f5ed28fa85d094a6f9c0087ca1d9b5d77b969c7de88
diff --git a/dev-ruby/ox/ox-2.13.4.ebuild b/dev-ruby/ox/ox-2.13.4.ebuild
index ca6de7a13bb8..dd9b6593b596 100644
--- a/dev-ruby/ox/ox-2.13.4.ebuild
+++ b/dev-ruby/ox/ox-2.13.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
 SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/ox/ox-2.14.0.ebuild b/dev-ruby/ox/ox-2.14.0.ebuild
new file mode 100644
index 000000000000..ca6de7a13bb8
--- /dev/null
+++ b/dev-ruby/ox/ox-2.14.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}