Merge updates from master

3 files changed, 70 insertions, 2 deletions

diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 9cfee2782ccf..73361f3308af 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -5,3 +5,4 @@ DIST ffi-git-1.14.1.tgz 165025 BLAKE2B 020b3954ac08fc9fe077cc9116b21e40de8458eb7
 DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308bdd01720d7ea4b63690d42ff6e93f2d48de7132f5d82b275b30672b0bf1ac586b713994b68e98da4cf71a481 SHA512 20fffab047d810ddea1d4d2b66a563adf5787a0602a26cc59724090d393852ae57464a8c7b5a47ca0534efc453bb06d2f8fbf00a203a7060cd3ac78b683119f5
 DIST ffi-git-1.15.0.tgz 167263 BLAKE2B 441b234ff8b5c65cb409451df60c8bfb5d4e071383e637b7864087ac144705d8f0dfdfb442971c4c98b0e1ed7c18b763c198f6d9c151b16de2a876a3466c369a SHA512 be1c6d85b91ad3148fe79628596fb800d40c1e1efc6efb67ab78c88a71b6f978492f6e571a9c9768956e9d4f3b5940df0de1620f30d63a2dd76e0fe31d357e78
 DIST ffi-git-1.15.1.tgz 167429 BLAKE2B 6012234f7145c5b291dd03f37d36c51b3ca0d14779b24c02da325b2075564a210566e64eb54caf4c32b4bbfe0c032f4d2c0a316c8c0cf559e14cbe6a922ebd7b SHA512 1e2cd70a8b921c6840b8b990d79819e2bc12f82c2bbef9952a59026de093002d1356642f6637f6bd7b0c94a6205401d88db6b83d1a479b4591c1041ca76f8e5a
+DIST ffi-git-1.15.3.tgz 167804 BLAKE2B a0d040cd87a0606ebf618bb1e5bf5189e03fa30d2a3681c8dcf2b075b8cba40fbc5d130d78bae0f31d1c20319299f106653576cdb89f355090df5de0c10d916b SHA512 25cf025aa51c5389c99f47043443d33859ce91e50d057dbd49b376b81b2d81c0d158785e9d7d8efba53b9ff450e49d43b475ad2c870822635d8350592f3bb3ce
diff --git a/dev-ruby/ffi/ffi-1.15.3.ebuild b/dev-ruby/ffi/ffi-1.15.3.ebuild
new file mode 100644
index 000000000000..244b9737ea49
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.15.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
+
+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/v${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 ~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
+
+	sed -e '/require/c\require "./lib/ffi/version"' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/^  lfs/,/^  end/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || 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_compile() {
+	each_fakegem_compile
+
+	${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/rcairo/rcairo-1.16.6.ebuild b/dev-ruby/rcairo/rcairo-1.16.6.ebuild
index ff61e4edeb3b..7b11ca38811a 100644
--- a/dev-ruby/rcairo/rcairo-1.16.6.ebuild
+++ b/dev-ruby/rcairo/rcairo-1.16.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ IUSE=""
 
 SLOT="0"
 LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="${RDEPEND}
 	>=x11-libs/cairo-1.2.0[svg]"