Version bump.

(Portage version: 2.2.0_alpha64/cvs/Linux x86_64)

3 files changed, 67 insertions, 19 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 43b94220b2a6..6e6aef788691 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.127 2011/09/29 10:34:15 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.128 2011/10/13 21:48:29 ssuominen Exp $
+
+*libffi-3.0.11_rc1 (13 Oct 2011)
+
+  13 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +libffi-3.0.11_rc1.ebuild:
+  Version bump.
 
   06 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -libffi-3.0.9.ebuild,
-  -libffi-3.0.10_rc8.ebuild:
-  remove old
+  -libffi-3.0.10_rc8.ebuild, -files/libffi-3.0.10-interix.patch:
+  old
 
 *libffi-3.0.10 (29 Aug 2011)
 
diff --git a/dev-libs/libffi/files/libffi-3.0.10-interix.patch b/dev-libs/libffi/files/libffi-3.0.10-interix.patch
deleted file mode 100644
index 92a7d1dc5d45..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.10-interix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-report:
-
-    http://sourceware.org/ml/libffi-discuss/2011/msg00131.html
-
-diff -ru libffi-3.0.10rc8.orig/src/closures.c libffi-3.0.10rc8/src/closures.c
---- libffi-3.0.10rc8.orig/src/closures.c	2011-05-10 08:45:31 +0200
-+++ libffi-3.0.10rc8/src/closures.c	2011-05-10 09:12:33 +0200
-@@ -172,7 +172,7 @@
- 
- #endif /* !FFI_MMAP_EXEC_SELINUX */
- 
--#elif defined (__CYGWIN__)
-+#elif defined (__CYGWIN__) || defined(__INTERIX)
- 
- #include <sys/mman.h>
- 
diff --git a/dev-libs/libffi/libffi-3.0.11_rc1.ebuild b/dev-libs/libffi/libffi-3.0.11_rc1.ebuild
new file mode 100644
index 000000000000..90d0731fe338
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.0.11_rc1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11_rc1.ebuild,v 1.1 2011/10/13 21:48:29 ssuominen Exp $
+
+EAPI=4
+
+MY_P=${P/_/-}
+
+inherit libtool multilib toolchain-funcs eutils
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions."
+HOMEPAGE="http://sourceware.org/libffi/"
+SRC_URI="ftp://sourceware.org/pub/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug static-libs test"
+
+RDEPEND=""
+DEPEND="test? ( dev-util/dejagnu )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# Detect and document broken installation of sys-devel/gcc in the build.log wrt #354903
+	if ! has_version dev-libs/libffi; then
+		local base="${T}/conftest"
+		echo 'int main() { }' > "${base}.c"
+		$(tc-getCC) -o "${base}" "${base}.c" -lffi >&/dev/null && \
+			ewarn "Found a copy of second libffi in your system. Uninstall it before continuing."
+	fi
+}
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog* README
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libffi.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.5
+}