Version bump, all patches applied upstream.

(Portage version: 2.2_rc60/cvs/Linux x86_64)

4 files changed, 8 insertions, 59 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 44a2b8b878d6..39bd9f915f58 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.89 2009/12/24 10:05:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.90 2009/12/25 14:30:40 ssuominen Exp $
+
+*libffi-3.0.9_rc6 (25 Dec 2009)
+
+  25 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +libffi-3.0.9_rc6.ebuild:
+  Version bump.
 
 *libffi-3.0.9_rc4 (24 Dec 2009)
 
diff --git a/dev-libs/libffi/files/libffi-3.0.9_rc4-revert_includedir.patch b/dev-libs/libffi/files/libffi-3.0.9_rc4-revert_includedir.patch
deleted file mode 100644
index 73040754e356..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.9_rc4-revert_includedir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Revert change between 3.0.9rc3 and 3.0.9rc4 for pkg-config --cflags-only-I to
-return correct path and to avoid gcc's directory.
-
---- include/Makefile.am
-+++ include/Makefile.am
-@@ -5,8 +5,5 @@
- DISTCLEANFILES=ffitarget.h
- EXTRA_DIST=ffi.h.in ffi_common.h
- 
--# Where generated headers like ffitarget.h get installed.
--gcc_version   := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
--toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
--
--toollibffi_HEADERS = ffi.h ffitarget.h
-+includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+nodist_includes_HEADERS = ffi.h ffitarget.h 
diff --git a/dev-libs/libffi/libffi-3.0.9_rc4.ebuild b/dev-libs/libffi/libffi-3.0.9_rc4.ebuild
deleted file mode 100644
index af8a63414494..000000000000
--- a/dev-libs/libffi/libffi-3.0.9_rc4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.9_rc4.ebuild,v 1.1 2009/12/24 10:05:32 ssuominen Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="a portable, high level programming interface to various calling conventions."
-HOMEPAGE="http://sourceware.org/libffi/"
-SRC_URI="ftp://sources.redhat.com/pub/${PN}/${P/_}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug static-libs test"
-
-RDEPEND=""
-DEPEND="test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${P/_}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/ACLOCAL_AMFLAGS/d' Makefile.am || die
-	epatch "${FILESDIR}"/${P}-revert_includedir.patch \
-		"${FILESDIR}"/libffi-3.0.8-autoconf-2.64.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog* README
-}
diff --git a/dev-libs/libffi/libffi-3.0.9_rc3.ebuild b/dev-libs/libffi/libffi-3.0.9_rc6.ebuild
index b06cfb04a931..e0ddc152dc14 100644
--- a/dev-libs/libffi/libffi-3.0.9_rc3.ebuild
+++ b/dev-libs/libffi/libffi-3.0.9_rc6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.9_rc3.ebuild,v 1.1 2009/10/30 12:57:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.9_rc6.ebuild,v 1.1 2009/12/25 14:30:40 ssuominen Exp $
 
 inherit libtool