gentoo resync : 03.11.2019

3 files changed, 65 insertions, 6 deletions

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 03e7567704b9..0ea36920fc8c 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -10,9 +10,11 @@ AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 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 2080 BLAKE2B 507e6e8f94ab4c3c21d268e699d1d7bf6c6203c2c66a36954f0b5e18fa85f79cf021b924d75206fe4aa748e2880ed27ad2c9c883eda7340541453cbc5de69f9a SHA512 0303f61e1a8a633b76dec8e61ee09508019eab8a48b8b4e55096bf53136584c370958e6016e6d3b6442f958bf3ec5824ae1473d1e6ae2fc68eef08ac8fdb962e
+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
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index ab6318f48edf..2033740cda01 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -13,7 +13,7 @@ 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"
 
 RDEPEND=""
@@ -56,10 +56,6 @@ multilib_src_configure() {
 		$(use_enable debug)
 }
 
-multilib_src_test() {
-	emake check RUNTESTFLAGS='-a -v'
-}
-
 multilib_src_install_all() {
 	find "${ED}" -name "*.la" -delete || die
 	einstalldocs
diff --git a/dev-libs/libffi/libffi-3.3_rc1.ebuild b/dev-libs/libffi/libffi-3.3_rc1.ebuild
new file mode 100644
index 000000000000..f926011c2803
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3_rc1.ebuild
@@ -0,0 +1,61 @@
+# 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"
+
+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
+}
+
+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
+}