Fix typing error in ffi.h.in (missing @@) wrt #511752 by Ryan Hill and Patrick Lauer

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 97 insertions, 10 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 06c6651061db..685bb550c45f 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.190 2014/05/29 04:51:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.191 2014/05/30 11:08:56 ssuominen Exp $
+
+*libffi-3.1-r3 (30 May 2014)
+
+  30 May 2014; Samuli Suominen <ssuominen@gentoo.org> +libffi-3.1-r3.ebuild,
+  +files/libffi-3.1-typing_error.patch:
+  Fix typing error in ffi.h.in (missing @@) wrt #511752 by Ryan Hill and
+  Patrick Lauer
 
   29 May 2014; Samuli Suominen <ssuominen@gentoo.org> -libffi-3.1-r1.ebuild,
   -libffi-3.1.ebuild:
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 96f0911c1242..f8e60892261e 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -2,21 +2,23 @@
 Hash: SHA256
 
 AUX libffi-3.0.13-emutramp_pax_proc.patch 911 SHA256 955aa3d87522cb220133fa853bd3a5a7af1fe7cf5cc6b9eb74ffffb9ac563aba SHA512 402712b21feec0f162758adad630ecc588596eaebd2e79bb86802f313e102b8ef6d08eca0580a1aae25dabec3e018c499e2ce1960edc6af9182f67cd8cc9b0e1 WHIRLPOOL 22f76ca6f909c80228958115a8db37fbe5f12e291cdbc1fad672a0903c54a7918e2cee37fdc263e9c350f3c79a7870cc8f7a05789668a8dc87cb8434a6e20f9c
-AUX libffi-3.1-execstack.patch 218 SHA256 fe316eeb5a602005978df42d709f34cfb7a2e61499081f2074f55095b33ca541 SHA512 3c020451e6873d6ed45d6126ba6c7581af7b1f1136373b2dbdd05a235a92ccc9e851274e6125d614880dfd9c9d80af9b329be229d06c7094775c5acd96182f95 WHIRLPOOL 69846b8fde104c133f13c67c643053a3b17cd87f8ba9b80897a324e8c9e7bb3611c0583394221d2456b7430d717bf0699d9814fb6acd3ba3fb502270f5914404
+AUX libffi-3.1-execstack.patch 277 SHA256 55e95096d8b2bd82188c62b1316c602738336c0a4b58ccce503936dfc436b1d9 SHA512 1365cb102e6ffacd89b399243cd89ddb29259e373d16fd500d9d98bd40edbd0d79b63df6fb9464247cc2f11628d5c692a25f1c6d9cef19feb857e1232c154d4f WHIRLPOOL 597c3cdb8a28dcc15d724fa4d184956bcd4118803070ba63c1d914eb1a3b4c9720f68404a05ba4ad7ad83714f79ee7856bb8921886511bc7d35b39f33b4b41f0
+AUX libffi-3.1-typing_error.patch 350 SHA256 2e134e7f347f392499ec9128b220cff467919dfc048922d72689816d9f40ea95 SHA512 6be05ec604da587ded9d50ba57153b7ca24ee52dbed132d08f8653032153d377b2e399b58010e3c84e2106f077696a0cc9507018687af2082aa5ce055ba5fa07 WHIRLPOOL e8613594118774abaa2d79b0cdcbfd57d1c3ca275543423cec70b368e604c78bc7162d582a5b654b378b60a1d765a12b418bd10f8a8693ccbc3e7fdf225be216
 DIST libffi-3.0.13.tar.gz 845747 SHA256 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c SHA512 fc47f5d25197c631754efe05a349edb556d072807ecef19b41f17c1a8f39c95221be64926fbd05b1f8439181df1ddff8fc01462ce3a26005b75159ddc27e6f6a WHIRLPOOL d5b14d48a7b35f7349ec938d0deac62db7022ac4d611ab13bc7a6a2766a47e210fc1663fc8c6d7ee48d421c06b66f558010829ac2c215620c76d0bf7650e1308
 DIST libffi-3.1.tar.gz 937214 SHA256 97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb SHA512 8994973d75facf5ad928c270e17b1a56e24d1543af75b93731a0048e747df27e4190a736b6dc2dca7d43de1d7e88891220304802c10fcccdcebee9c9ffd3d1b9 WHIRLPOOL 19c08cffd39c998fcd762b1e3767b4fd86915427226833411302bebd2d5bcf93d515e6df4a4cab11327595d3966e46442e457fbe09ae986b58bdfb2bb6adb913
 EBUILD libffi-3.0.13-r1.ebuild 2287 SHA256 1dcdf46337f8e607873440179bf0b044d97d3212426141266c98ba944d71d3a9 SHA512 bde4d9f8155bf3997ede4855358004d9adb4423feabac292fc144dd52c159b551dae2cbddd57d640cdbbb1b37e30aa787538accede3087ad460bc61f25942bcf WHIRLPOOL bd249b6b882aa00beb098931fd5fefed9717ee2bfa94c69bc840ce467d32a8a635765d2f6aef71fd35eacc91614b722cb035a24a754c942ed8cad7472165b152
 EBUILD libffi-3.1-r2.ebuild 2204 SHA256 5a1f5380bf9a5f0c1ca36d82c2a97c0dd19b5356ba2c2c834fbd6af85c4526cf SHA512 4b17aa99e0dfa32c23bd8d5149db7bb8b2ef14d04af585b333ff7a28790bbdb2d19ce5b187a88f773d5ae28be31bb9f942c1aa24c303656e8a14b0becd5831dc WHIRLPOOL 3a8fbffa48d3628992ffa040f82ceb01992b2a6b4fb5790f410b958593f9c5437dfe0dbf65135e5b47ae9bc74ad47d835905824353b1e24af8d4604c426d493f
-MISC ChangeLog 25619 SHA256 53ce6948bfdfe6920bd74e91022209f0693583be3611cdcdd29573ea0482fc26 SHA512 9d21b2d1f50818931bdef1bd3f84156f39270993724eeb5e17046424080f9d4198541c57b1a206118c24a133c8db9a010eaf37df8bebedf68f7b4fc4d4a00ca2 WHIRLPOOL b0b277965831d742e61db2dc24447f0c89345f99efe279e4d1ebd0393015e5edccc0e85a6e0309b8021c75c0ff3f1ec3e9677e3f6e237d5bf0fed6f5e9e42983
+EBUILD libffi-3.1-r3.ebuild 2306 SHA256 1e3a945b009c8cc5bcf4cb8aef40e9fa82d44987a6673a7537ce0cf2338ff0f0 SHA512 f05e527ba2dedd40554f9fb9e8a535f3a2795dbc00f33819e483592233454c2063e505a826ed6d0c167d7057d030e726cce8c7237ea8919543e44b28c5f865ae WHIRLPOOL 2ccf2c81c5b733e51f6e49538909818430c1dfd59dacb5aa348ef762d619a703989ec765b381f2c429a6e8d656ce1ac246119101eb90e1ff75f529026c9afc8d
+MISC ChangeLog 25856 SHA256 a54e01f2fec2ac741455f8cc4df5728398e758e3536a074056d46d4a19f4fc5c SHA512 c24699ea5d80c213787b4d8a2014c80a20b39f23476f2c733e6a79ed08f4e6db96c0b2e818cbcca1eb99ca724a96f6c518301cf0262c39f9c870a1449101a7ec WHIRLPOOL 121977baeb1d432bf4090074a8e41755b381793c721db28a735295c31bdb19c2adabd805e65e4ec5a9cf311f353535091f3b183993f1b6e97b8718c81957f2e1
 MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJThrxYAAoJEEdUh39IaPFNfwAH/RFuuaoxWPje54tGSyti4+qH
-yoSUcKXN2BTVwJd2uB8QrnaU9gJuC9wmPygEgGL9sWQq9uGnJ0lpcDOSDDxKewyd
-az+yrMjXqkLg36eewC/6VJ50Cd3xkOWOZrUx+9PWAjSXC3foltsSA5wRQ6HSytgP
-N+OonEL8q+f0gM0aTfZ5pbaSDvD99DifdNkN53xPn7p9bMQKgZQD38+cfLuX0Mic
-4Ah87dE1t1PHvWdtT6jqarLmivwPMlPlu0C+GELwA9de0xtIuX7yrydMheEslugI
-zU57yfqCmsiKyw+COQcvygJnwDJ26zo1ZGv8uCwc69OhB4Jqck2PEmyiEQpcEbs=
-=6rcI
+iQEcBAEBCAAGBQJTiGZfAAoJEEdUh39IaPFNq8sH/33c1EbgtOqfgdTf17x7+i8+
+OWuevOpUvit4AFwNRZO1bLZRK/nT/EbU8OOSbFV6b5x2Rk/Yl9SzKgOCBN7nUrFH
+LhHb1RGRNVWkMMhmm+/s0+OsgopRrYwNz8Cj6dbvm/c4kFGV6I74Wxl3nFcMoOuN
+jiG5p7fOu6X6tBjZYpaW7NYWIM74Cd2sIBBIyclN8z4HXMQO2jDHanynTI3xMPCf
+YZ+qkdGY3Lc2FD+y/deI+GCrvfYcTJsGb7AgrXCNxY8zEfXz+6WZKbXRnNpqa4vq
+M2pLuu880aSVYBw1tNgqi9qbxJwS05XjWJrR2DNarujlrR2zOoKqNpPRa/+0upk=
+=F42K
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/files/libffi-3.1-execstack.patch b/dev-libs/libffi/files/libffi-3.1-execstack.patch
index 3a98d94aa595..6884a47012d5 100644
--- a/dev-libs/libffi/files/libffi-3.1-execstack.patch
+++ b/dev-libs/libffi/files/libffi-3.1-execstack.patch
@@ -1,4 +1,5 @@
 http://bugs.gentoo.org/511634
+http://sourceware.org/ml/libffi-discuss/2014/msg00058.html
 
 --- src/x86/win32.S
 +++ src/x86/win32.S
diff --git a/dev-libs/libffi/files/libffi-3.1-typing_error.patch b/dev-libs/libffi/files/libffi-3.1-typing_error.patch
new file mode 100644
index 000000000000..fc24006d5d32
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.1-typing_error.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/511752
+http://sourceware.org/ml/libffi-discuss/2014/msg00059.html
+
+--- include/ffi.h.in
++++ include/ffi.h.in
+@@ -221,7 +221,7 @@ typedef struct {
+ #endif
+ } ffi_cif;
+ 
+-#if HAVE_LONG_DOUBLE_VARIANT
++#if @HAVE_LONG_DOUBLE_VARIANT@
+ /* Used to adjust size/alignment of ffi types.  */
+ void ffi_prep_types (ffi_abi abi);
+ # endif
diff --git a/dev-libs/libffi/libffi-3.1-r3.ebuild b/dev-libs/libffi/libffi-3.1-r3.ebuild
new file mode 100644
index 000000000000..2a07611420aa
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.1-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.1-r3.ebuild,v 1.1 2014/05/30 11:08:56 ssuominen Exp $
+
+EAPI=5
+inherit eutils libtool multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions."
+HOMEPAGE="http://sourceware.org/libffi/"
+SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README"
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see http://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() {
+	epatch \
+		"${FILESDIR}"/${P}-execstack.patch \
+		"${FILESDIR}"/${P}-typing_error.patch
+
+	sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
+	# http://sourceware.org/ml/libffi-discuss/2014/msg00060.html
+	sed -i -e 's:@toolexeclibdir@:${libdir}:' libffi.pc.in || die #511726
+
+	epatch_user
+	elibtoolize
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+}