gentoo resync : 08.10.2021

7 files changed, 49 insertions, 78 deletions

diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 7cc7d4a4e5f1..a413a31af271 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,11 +1,10 @@
-DIST ffi-git-1.11.3.tgz 157081 BLAKE2B 57459d3aba7f54daf9c4d94993a083166efe5c37f3aa699279a07cac0ecdee533f54ee1ab36f7ee2a5cc43d0ebb386b8b3285102d98ffd18fa297e2e1b882283 SHA512 86a6a95aa5d4f005eb457fbe26b38e7b8618899db3de3459f3a01128aa7c488a47e50d13aef05ae83519178c80f2f7ed0a0280147d7e30aace13bbab82871f30
+AUX ffi-1.14.2-32bit-long-double.patch 701 BLAKE2B d8a3f2a00f8b93f42953bf5317cf6ae45ed662c81b993f83b728125d6fae15c6f75d11e0f76b0f46912b1c52c849764d3393a09c3ac1e35f3557e97bd3662364 SHA512 9cfe4e1c80e08c672eee30fe3b170d667e72cc2e047f4edd1e9573bfe6d4dca315a84baa54855756631f90c04fee59a417f286df95662f6abcfd3728c1b1a4d7
 DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308bdd01720d7ea4b63690d42ff6e93f2d48de7132f5d82b275b30672b0bf1ac586b713994b68e98da4cf71a481 SHA512 20fffab047d810ddea1d4d2b66a563adf5787a0602a26cc59724090d393852ae57464a8c7b5a47ca0534efc453bb06d2f8fbf00a203a7060cd3ac78b683119f5
 DIST ffi-git-1.15.1.tgz 167429 BLAKE2B 6012234f7145c5b291dd03f37d36c51b3ca0d14779b24c02da325b2075564a210566e64eb54caf4c32b4bbfe0c032f4d2c0a316c8c0cf559e14cbe6a922ebd7b SHA512 1e2cd70a8b921c6840b8b990d79819e2bc12f82c2bbef9952a59026de093002d1356642f6637f6bd7b0c94a6205401d88db6b83d1a479b4591c1041ca76f8e5a
 DIST ffi-git-1.15.3.tgz 167804 BLAKE2B a0d040cd87a0606ebf618bb1e5bf5189e03fa30d2a3681c8dcf2b075b8cba40fbc5d130d78bae0f31d1c20319299f106653576cdb89f355090df5de0c10d916b SHA512 25cf025aa51c5389c99f47043443d33859ce91e50d057dbd49b376b81b2d81c0d158785e9d7d8efba53b9ff450e49d43b475ad2c870822635d8350592f3bb3ce
 DIST ffi-git-1.15.4.tgz 167917 BLAKE2B 0694bc5baed1a902a444d75ca534f38c61e56db17e542311f78edad07cc40566aaced5849766b2cce2fdbb531a7ae5ccc3d2506d5871f15c382bbdb3a8302af3 SHA512 3278dd217669b5467e3e0b92b5879fea745c955be52de4096ee490efbfac4ad887018c07ecb5dcd8b0fefd8a02144740c2aba74a1e545d798e73f64f69c7cd79
-EBUILD ffi-1.11.3.ebuild 1514 BLAKE2B e9f0371a43b379abe302818e5cf837022f049bd66396554fe90abbf36754a8ae350733ea258df8a90e07165db6af5b250867396c3995202555ed6561f2f9a575 SHA512 f4e8db2b0a3e73d050178bfd92a5227ad74575e3f3ba6eed5f6be25fc33651adad54e8b6527532e713136a065e2385ef574b3e010dc5c08c930082e88ea32798
-EBUILD ffi-1.14.2.ebuild 1570 BLAKE2B 6d3ca83aa059fdb6d0ff44fa4f1c42da59ed88d7d25881930419600697618676dd63f6596f08a5f1df163ab466081c6ee13d4f9632631aa1e83253e286352ca3 SHA512 27b77a053e0f45cdb7bc523a5fb2a8c2e68743e0ea962b06e9196dfd780f2ccf88cd0de3e2b374a34afb99fdc845e0eb9d4d219b486ed0b2249de949a7bac25e
-EBUILD ffi-1.15.1.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
-EBUILD ffi-1.15.3.ebuild 1672 BLAKE2B a3850132e42565dcf3924a963b93b82f85b6e5f3823804b46ea5515472dbd570cbca4c32c7ee7b876308803af1574f23ed3cfbd3bb4c7338e2bb39eaeb23bcab SHA512 9c2e6a4a257f6835ebd73028437b0dc0bc70549d1fff73404d0d3de65ecb2169478cb9df47c44f08f168e7109aa10a84fe474ff443c42dba5f972002a3f254c3
-EBUILD ffi-1.15.4.ebuild 1665 BLAKE2B aae4bfe7dff7f3c27c246f274b221401bb5e647bf9b46f8f24e6707cfa0bbf0d799527c3e93869976e15e43bbdb3ca6b877a8deb87f2341d0a8fc7b7618432b5 SHA512 cd4ed5ae4f05867a4e806e466312198323360edf40cdd7d5b2f39455d7e1cf54a7b728774d57fe077fc6e8786742012c3fb7e0fd10cbf073b8e871bc08614b8e
+EBUILD ffi-1.14.2-r1.ebuild 1635 BLAKE2B ef999eedbb4c80ef9d64e04c21f7b8abdf390bf1189fd4c24683934930323fd71cefd70d734c76e8b908473d5167463a3da73b1bfbb2d15ddbbca6f4214b30c5 SHA512 fb9af61383048819156d2a2919c487a41bc30e67a4bf6602cd6e9c9383e63ae001f8c26c3b4562bf011234c4d16b187d418ff667ac17126ac9f265dcafdfb84e
+EBUILD ffi-1.15.1-r1.ebuild 1731 BLAKE2B 45b4105438974b881c87a8b3816511bf36a3628ddbe2c51de674035e79060fe93f8ff10dd1eb94eeb6489775e67f4b43d3f76e3cee7169e33e1dd7c340a422ad SHA512 c917cd89095105b05dc036f6a1331f596ad7fafc4dd38dc1d050925bfbda8c1e9bdfd3103e7efd86d8f4819a47f74f85227207a5e206f0de39acd73521682ea3
+EBUILD ffi-1.15.3-r1.ebuild 1738 BLAKE2B 23a9aab4109842cfbd7594da2da91b08de3f1bb77dd44d0832cc00dee1accdc7e752da1627a3a325bb8ea6d7d0db6a0b4a56cbc9de9e3f8e91e09b40a6631db6 SHA512 6377fadfa25732fe421b52be1230c25940527acb79f91e00cd202d20a609ea35a85de299c0a10bb314ff037e9d42dc194f4ff574da7039f3cb70d035e986ef79
+EBUILD ffi-1.15.4-r1.ebuild 1731 BLAKE2B 8ef7962bf3415957c6c685d4d0c4e91853ac9086c677dddffab0165489f70af803f1d25c71ebaf5c91ce979035dc904a121636e4fae72fca7c0d3be759a0963a SHA512 d8250be6b4b7df40e28443dceee3654686a8866e52687dfda7b6779fc96c9dce8aa6285a8bbd536d841568df44eb42713702b1cecf257254803337a424768911
 MISC metadata.xml 334 BLAKE2B 02ad2c909797d4aaf2a23497611777a790000683866cfbd9d12c4b19cca6de902e219584c4edc85c46b4b0dc51c63e770506a077a4c1052b46f8df19a9588c15 SHA512 e72dc6ce177ad3881f5465f10cd44ca6740b7603ab4e55cfa9e6088be3c6615abeefaee4b717e76fab2850c64d66eee626115544e10709f64c4187f1987bcfe3
diff --git a/dev-ruby/ffi/ffi-1.11.3.ebuild b/dev-ruby/ffi/ffi-1.11.3.ebuild
deleted file mode 100644
index 1961e20d6fcf..000000000000
--- a/dev-ruby/ffi/ffi-1.11.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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 ~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.14.2.ebuild b/dev-ruby/ffi/ffi-1.14.2-r1.ebuild
index 38868b674422..10c95ec49b55 100644
--- a/dev-ruby/ffi/ffi-1.14.2.ebuild
+++ b/dev-ruby/ffi/ffi-1.14.2-r1.ebuild
@@ -24,13 +24,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 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"
+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"
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/ffi-1.15.1.ebuild b/dev-ruby/ffi/ffi-1.15.1-r1.ebuild
index 244b9737ea49..76ba9f8c1a8d 100644
--- a/dev-ruby/ffi/ffi-1.15.1.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.1-r1.ebuild
@@ -26,11 +26,15 @@ 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"
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/ffi-1.15.3.ebuild b/dev-ruby/ffi/ffi-1.15.3-r1.ebuild
index 92b209d828be..67d86c924a08 100644
--- a/dev-ruby/ffi/ffi-1.15.3.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.3-r1.ebuild
@@ -26,11 +26,15 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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"
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/ffi-1.15.4.ebuild b/dev-ruby/ffi/ffi-1.15.4-r1.ebuild
index d79112dff229..dc92b96f4e08 100644
--- a/dev-ruby/ffi/ffi-1.15.4.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.4-r1.ebuild
@@ -26,11 +26,15 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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"
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch b/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch
new file mode 100644
index 000000000000..7373a8c28cda
--- /dev/null
+++ b/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/815130
+https://github.com/ffi/ffi/commit/315d66e7b0768856d589e15bf597f4816d5cd524
+
+From 0ef7a9d7d22c9a7779def3f8c7f0166d996a2401 Mon Sep 17 00:00:00 2001
+From: xtkoba <69125751+xtkoba@users.noreply.github.com>
+Date: Wed, 29 Sep 2021 19:24:44 +0900
+Subject: [PATCH] Keep `LONGDOUBLE_ADJ >= sizeof(long double)`
+
+--- a/ext/ffi_c/Call.c
++++ b/ext/ffi_c/Call.c
+@@ -71,7 +71,7 @@
+ #define FLOAT32_ADJ (4)
+ #define FLOAT64_ADJ (8)
+ #define ADDRESS_ADJ (sizeof(void *))
+-#define LONGDOUBLE_ADJ (ffi_type_longdouble.alignment)
++#define LONGDOUBLE_ADJ (ffi_type_longdouble.alignment > sizeof(long double) ? ffi_type_longdouble.alignment : sizeof(long double))
+ 
+ #endif /* USE_RAW */
+