Version bump.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 68 insertions, 2 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 7fbf25ce8df9..44a2b8b878d6 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.88 2009/12/20 16:16:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.89 2009/12/24 10:05:32 ssuominen Exp $
+
+*libffi-3.0.9_rc4 (24 Dec 2009)
+
+  24 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +libffi-3.0.9_rc4.ebuild, +files/libffi-3.0.9_rc4-revert_includedir.patch:
+  Version bump.
 
   20 Dec 2009; Raúl Porcel <armin76@gentoo.org> libffi-3.0.8.ebuild:
   m68k stable
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index e01b9c87fa7b..9fd607efc6a2 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,9 +1,12 @@
 AUX libffi-3.0.8-arm.patch 1840 RMD160 2a437a9f900a34e9b7438898f97864c811d87957 SHA1 e9cb79b4b508533c096ac2b2636a91bd11a562b4 SHA256 d3c73acb96f9b46491b8f085e73b14d8c6cde7760538ff133e178ebbc1b574fd
 AUX libffi-3.0.8-autoconf-2.64.patch 370 RMD160 4d92f991d6b9ab0b965f310dcd3836c265e52db3 SHA1 9ecb24c97b24cdb2ba0c4e07d339f0826ae0fb53 SHA256 ee184a3830735cf20249279f4929498af6004f89f3dd720cd4cdb1c272917e98
 AUX libffi-3.0.8-fbsd.patch 866 RMD160 ac8c5a157bf3faf5d54ef2bab8822cec5656aaef SHA1 d460fd0a55365f0b4befbdb2c2259399dd875e44 SHA256 5c50d84ba3e6312c046efa5ac8bed0c6b9b719ae98196f7841511f62dccb568d
+AUX libffi-3.0.9_rc4-revert_includedir.patch 602 RMD160 e46157ffa34a8fb9b413be73362213aa5716fefb SHA1 0d79eb9a256d0b5d53600216ca057dde789476d2 SHA256 bad356ff91443d0e71b0ef027aade2c505da8c54a031c7fb61558f71193c873e
 DIST libffi-3.0.8.tar.gz 722834 RMD160 4144f64e79ebf95161a6afd58ceaeef8372b5e57 SHA1 ce44d10c39d9a37479c8777e206cac0f36c48712 SHA256 2c7c5b88a68fb362262889ba25ef25dc27864b7bbf03547a8a36b8d567569406
 DIST libffi-3.0.9rc3.tar.gz 693589 RMD160 4fbbed22efaa96d8df5929469f1caf874cd17cb8 SHA1 9b4a1f3c8aca9b1e296f1a943c302e6a6b09405a SHA256 3bc2f7700283e35436e6292946c5f29c8f710b9d0f1b0fe2677c23112385c73a
+DIST libffi-3.0.9rc4.tar.gz 655222 RMD160 ac4505c4f047841e6a84e8b77fb68d4dd72ecab8 SHA1 939c5f570e58b08c56f00fc17992f4d2bab5334b SHA256 e863c7d86c94b5811fb0f865f12e31a4bf71a4cfee5fe72b49230eeabe3d5453
 EBUILD libffi-3.0.8.ebuild 1046 RMD160 bef02212f2db72e51c02831cfff1b8fac4b213a4 SHA1 ad7485afe12f864c0bd82feafec54c78a74d24df SHA256 adce8ecd350fa0bea5ef58889ffd93d86e493817f9587b0360923f4b17277eba
 EBUILD libffi-3.0.9_rc3.ebuild 838 RMD160 5412e1d60148b0d79a26068da2faa97b659be15a SHA1 701478b1f9c9359be829fd2335b7c18e2cae2ada SHA256 6021a258ea6d6fe01a8e07bdeaf10531f1ca51bba797f6f3a7280c69b97111e7
-MISC ChangeLog 12131 RMD160 9c2e9ac0dd2862837ca840211a2e070ec82470aa SHA1 59015578dc41a0bd308ea1babcdd0c64b62d28ad SHA256 93d546dacbe0729f2426dab52f2d3b597428168534eb1e3d61532aeb398924b8
+EBUILD libffi-3.0.9_rc4.ebuild 1001 RMD160 41be9d49d6710db97b6bcd0e404ff0c2e961a045 SHA1 bc99a644213e7dd8b5c6b3f54c2f0d8af9039ca8 SHA256 75004188218063636fdcaa273db6977c5e3446be2df974981d5526ed4ce11d88
+MISC ChangeLog 12314 RMD160 08a8fe136bcc915bafe34127be19198c2e1ce5c8 SHA1 0556779cf37cf099872b3908304a39ebc40ce6c6 SHA256 63cc0f44f66597affcbcfb4e1885946dcd7451f0569ae249150b191688c173f0
 MISC metadata.xml 1761 RMD160 c6d44282237252575e5f648797c963555b019c0a SHA1 d036b0d8abfee3c87e07dd4b631952c6fe4e2d02 SHA256 a3f4cbcf148c89db193d4e9b1c7db706a7fbbfeebf7576c15e3eeb0722c21776
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
new file mode 100644
index 000000000000..73040754e356
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.0.9_rc4-revert_includedir.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..af8a63414494
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.0.9_rc4.ebuild
@@ -0,0 +1,41 @@
+# 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
+}