gentoo resync : 10.11.2019

9 files changed, 98 insertions, 11 deletions

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 0ea36920fc8c..5b9a00093340 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -11,10 +11,12 @@ AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
 DIST libffi-3.3-rc1.tar.gz 1122483 BLAKE2B c849f3c20bfb899f6659303bc739e894b842a3e0d85138a73915eafb8b2fe25b8d491f7eb023c735a9acd83933a9aa6cec562ca035513d774f5754c22a786fea SHA512 e1421d1bff8b71433dc06f6397f2f47894180b4f85e0a80b465b3a3edb904921e74be19d8ea15ef40f13275050e4b2c1432b6059372127c74560a4c73f18e18f
-EBUILD libffi-3.2.1-r1.ebuild 2247 BLAKE2B af3fe29f0a3bed8dc2796651bee68f94133f1a3e7aebeab9fed8f2ab1e956e678e36dc746e5e19cb60707e0b8cc122a82c45229750b2b628a39c8d7665605fec SHA512 3d4f77b9d81d6963b34aed7a2677825187f811a49f0189114bdc94b358860913268dce3cbc27b9b4f862a23f18b226610f0c74c0d0ac54c1d3cac491b5dd89ac
-EBUILD libffi-3.2.1-r2.ebuild 2306 BLAKE2B 2aab5739ecccb926509487d44c113df73113f393c37ad55ab546b43172767ee93bf4e8d927831dc5d5ee406b4674cb73ca0a6b4503bf5190327cac9f2e2f42e7 SHA512 5f531fa8a5231a653e7a6dc1037cb6c3c37b7961a175d3ac3b346ac68f6030e266f1d8745e2ca29600965b03691146a545862a73ad59d189d5120509cc28278c
-EBUILD libffi-3.2.1-r3.ebuild 2358 BLAKE2B d9b06232210d47d8f46ec3d5ccecef1c01bdc434df74a521500dadb6879eb091c9954cff2277035676503318d50a8e30eb0d7626f1a1f2b0fa2f62a68646fb8f SHA512 6f05734cc0fdbdb82b869847c248aaae89aadd97f1aad87356002e020cf52464d0db311fdc37bebea8aa15aa4ccd3fa5c5017cabd1f6e18af06a7e49642f3ae1
-EBUILD libffi-3.2.1.ebuild 1946 BLAKE2B 064f5d08503166205bd4f7b655e36611703055e7b5a7e0313a406ffff6f20ca17f8ead0c5c4276e05b23cf6e73cd050b7953a2b279001359c96b30a106a7c5c1 SHA512 55c6e14e2a5ae1b9f1b2e3645fc8d4ddfa590b62d4fc1ad64b01de069e5c0b8bafedfdf3568239899141a20dbe3d87990f9890af9372b81f96c439e2141f3ef0
-EBUILD libffi-3.3_rc0.ebuild 2019 BLAKE2B 7f49078d36f4590c9aca7aa8a4b2c9b32a0f2504df9bc95ac8e7721b98123c081147e65efd05a33eae30bc34cdc47af5e0a37b4532b78b946f4724848a4a6a54 SHA512 48aca67191e74b74295be91611708c264479c976ca575c0b6948750264753486a4d917b343056b667359cf0bdd5d9b6ab30aa1ff893b7d6c34fba581b2234a0b
-EBUILD libffi-3.3_rc1.ebuild 1978 BLAKE2B 207a1164b7297f07a35744670b4fc1d237a81f0bf695012b769077ee0f9bf07349fcf8b18072e4b0e5a9a13bd10dbe00eef3b3d2598ffe1edbcc9aa204aa1399 SHA512 0cecab97db7b2e6f7d9d35f57043899c4403e30d0ab2707c2b5f44afe51f440bf544c2f5c4b90aab9381e2021b82e35baa8c4ae98dee502b6ddbcc70733659c3
-MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
+DIST libffi-3.3-rc2.tar.gz 1126497 BLAKE2B 40960c8e8bfb6b266192436a8cbfa7cf5d5e5290b753b3360f965ef28b99fa51fa887845b6a2646b02f4ca4c1472d381df0c63cb64d1412ace737a064c2bbf57 SHA512 d792fea8252e68178ba87a0a53087e46c126129e5c9094ea77ad1b4863e009904bd53f213eaa7f78133e7c5645c280a7523343a7e0b79607a61af90ded4cd36a
+EBUILD libffi-3.2.1-r1.ebuild 2272 BLAKE2B b954d489dbc91b6e96bfd6184c769721c07a5d42b724b28d7302aea956a787a31267e2fd3fcadc76cd4e5f5b987150da7dceef16cb2f8cd66312a8ad0e444b9c SHA512 ed2e6c8bb1fdb8fcfbb6462deb5488aa8551f431c20f96787eafb9e56ae909a3494203908aa79fbb504b8c27a3c57bdb4c085068abd79c14d6e50640a4c17927
+EBUILD libffi-3.2.1-r2.ebuild 2331 BLAKE2B eddb0fbdd95f528bdac1739e7d401eb595bac249d322e3f59a7409869d8a33cf19d29356c22286afec4fbfc2f05d5249fbc265c48f9b3332b87ef87aef43c6a5 SHA512 d802ce84be1a8da75315c2291f97a48d0cdb7f2f1f39b6bda9a1b52623e0c36c86405a7129fb168a759e6834aeabcb87e86a0af9314ebf0b92539901811b01b3
+EBUILD libffi-3.2.1-r3.ebuild 2386 BLAKE2B 5b3e0429fa498c23aeb3950604089cf51f677229085e7d60b0b02c3413ae3328f6cfd78bdc399bf973d4f56412fde4399ede5584357c92282ea003d1f1712145 SHA512 bf4dbcceecce19e59f197383deb95967482f408f7ee02e2a0f32bb3f62a1a73b1115c0c60774376671aeaa51d03d225d481730f13f4688c697ae74417261d82e
+EBUILD libffi-3.2.1.ebuild 1971 BLAKE2B c0f52976c95a892d9537d9834b4b1624f9ad99054990f3cb83548778eb05f882c79483be9ad900397e19c42d05c5d3038effaaffefc4a13f32d19d25ba07f23b SHA512 2d784dc96c51b78238a02de4570ef479aa54bca77e2b704f030c05a3e534285cb4dae44979c2c684b60aa030df5676a02ced2b3ad4e945e58697d8a872e46ba5
+EBUILD libffi-3.3_rc0.ebuild 2046 BLAKE2B ff84c9c3acd60f0fb191c0447987cdb3410e739456c94d8248e0a66b721fa74e5c5518a24a8edb008e1606e2d8b32b251154d9b6a8eeb84edb86c7b9bee9c4d6 SHA512 f8ca97d42cdb4da9c372424f64d4246fc85d0bbd8c2422a0c577e7d1db3759dc68c316a277b7fe6911ea1b8c56135a0297a01a4b59e5f3265f6bc3e79651f6e2
+EBUILD libffi-3.3_rc1.ebuild 2006 BLAKE2B ed7da466fbf5ff5d0736544ef4d656f869c57472289a4e130d44e4d77757947427c1ae1d603a3f5a972c3bda1cb4b2347d7a1655c70b236fc621275dc10ce346 SHA512 cebfc9c5c6aa0a0b99832d482afcef6f78f12cfe1b7c61b9dd353b7c120ae5b2c2317f5a6b2154d5e886e5f324381bfdfd15f52337732b204f00f4f72a83ced8
+EBUILD libffi-3.3_rc2.ebuild 2189 BLAKE2B 3317970c1d2b634eaa24f267efe66b1d2e25b41d2a016429ba4e1182f7fc4af89e50ddf220685831bb55e9e09550be7bbd640e3e33b94d9f32c4118af1aeed2c SHA512 7ae2bf15d3952120ac022578a41603fa93c8838415077882b716718df2e60763dc780d239f1ee90ca1b53be30508dc903d18d5a88e2c05cbc9b418224b0b2c26
+MISC metadata.xml 2034 BLAKE2B f63969afac51937e2c761f164de6a40addd97871037f20e4c6fa0da80bc67d6e7580d3a1eb51b943e0195bb7f480abbf461d00da6e2317eade55d2ceeb1cb3fa SHA512 c1c48a13ac9818b7e409180b27751f172800c217d1a37db954490478abb0a3e8b585631a25507b1ac85b11f41da95b15ecf139b6880801b6a8ea805749efc1bd
diff --git a/dev-libs/libffi/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
index 3d1b61e0fd72..e5cf6d05c70e 100644
--- a/dev-libs/libffi/libffi-3.2.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
diff --git a/dev-libs/libffi/libffi-3.2.1-r2.ebuild b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
index ef3e0d216648..103bb3c379fb 100644
--- a/dev-libs/libffi/libffi-3.2.1-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
diff --git a/dev-libs/libffi/libffi-3.2.1-r3.ebuild b/dev-libs/libffi/libffi-3.2.1-r3.ebuild
index 34d55005928a..f49ffaf9ea2f 100644
--- a/dev-libs/libffi/libffi-3.2.1-r3.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r3.ebuild
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index 8143d37df311..f94e70f728b8 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index 2033740cda01..e5b3dcaffd89 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -13,9 +13,11 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND=""
 BDEPEND="test? ( dev-util/dejagnu )"
diff --git a/dev-libs/libffi/libffi-3.3_rc1.ebuild b/dev-libs/libffi/libffi-3.3_rc1.ebuild
index f926011c2803..aeadeb0dc4bf 100644
--- a/dev-libs/libffi/libffi-3.3_rc1.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc1.ebuild
@@ -16,6 +16,8 @@ SLOT="0/7" # SONAME=libffi.so.7
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND=""
 BDEPEND="test? ( dev-util/dejagnu )"
diff --git a/dev-libs/libffi/libffi-3.3_rc2.ebuild b/dev-libs/libffi/libffi-3.3_rc2.ebuild
new file mode 100644
index 000000000000..8e60ade28961
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3_rc2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7" # SONAME=libffi.so.7
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel static-libs test test-bhaible"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+		local base="${T}"/conftest
+		echo 'int main() { }' > "${base}".c
+		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+		if [ $? -eq 0 ]; then
+			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+			die "The system is in inconsistent state with unknown libffi installed."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if ! use test-bhaible; then
+		# These tests are very heavyweight (hours of runtime)
+		rm -v testsuite/libffi.bhaible/bhaible.exp || die
+	fi
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		--includedir="${EPREFIX}"/usr/$(get_libdir)/${P}/include \
+		--disable-multi-os-directory \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 6e9a28c5ac88..ee959783eead 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -35,6 +35,7 @@
 	</longdescription>
 	<use>
 		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+		<flag name="test-bhaible">Run extended regression tests (very slow).</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>