gentoo christmass resync : 25.12.2020

3 files changed, 9 insertions, 70 deletions

diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 39304974ba65..bda38eabf3bd 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,11 +1,9 @@
 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
 EBUILD ffi-1.11.3.ebuild 1525 BLAKE2B 7c3dd8129f3cb30624d34415f180c7bbc62ce3df7912e122e933f48a0070ee36363b7b63f786e538f5a601ef14052f0884f51b6408809176ef4ce8216f873560 SHA512 ce485cb3b8dce947778aba34b3f084a2bf9bb1bbe63e6f8b6022f681d0f2c41e9a85d27d467ba106c02ac399c47327c17e9de9414902ecd8283bd91e155920da
-EBUILD ffi-1.12.1.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
 EBUILD ffi-1.12.2.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
-EBUILD ffi-1.13.0.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
 EBUILD ffi-1.13.1.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
+EBUILD ffi-1.14.1.ebuild 1650 BLAKE2B 6d1b252788a05461f219a73573729e2bc91b18dae0813fd9b0c318a04db64d265467b73fac2f3c46ca848d478d8e8a29f7f31bab3402e727bcc0fa6ba44bcbbc SHA512 5518fd284925220c972ca648d6549ce20da84707b793e11090d2ac70f6212dc3ccfeeb79d83c135513b6e55fbc9d13bb3c72e2407b96e9247a277bbe0595d5b8
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
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//' \