update to EAPI 4. depend on dev-libs/libffi for fixing runtime error.

(Portage version: 2.1.10.3/cvs/Linux i686)

4 files changed, 57 insertions, 74 deletions

diff --git a/dev-scheme/c-wrapper/ChangeLog b/dev-scheme/c-wrapper/ChangeLog
index 5417c2d31478..c835bafaeffe 100644
--- a/dev-scheme/c-wrapper/ChangeLog
+++ b/dev-scheme/c-wrapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/c-wrapper
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/c-wrapper/ChangeLog,v 1.2 2009/08/16 07:12:45 hattya Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/c-wrapper/ChangeLog,v 1.3 2011/08/13 11:41:37 hattya Exp $
+
+  13 Aug 2011; Akinori Hattori <hattya@gentoo.org> -c-wrapper-0.5.6.ebuild,
+  c-wrapper-0.6.1.ebuild, +files/c-wrapper-system-libffi.diff:
+  update to EAPI 4. depend on dev-libs/libffi for fixing runtime error.
 
 *c-wrapper-0.6.1 (16 Aug 2009)
 
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.5.6.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.5.6.ebuild
deleted file mode 100644
index 5fbbfe66a53c..000000000000
--- a/dev-scheme/c-wrapper/c-wrapper-0.5.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/c-wrapper/c-wrapper-0.5.6.ebuild,v 1.1 2009/03/09 12:12:41 hattya Exp $
-
-IUSE="examples"
-
-DESCRIPTION="Foreign function interface for C and Objective-C libraries"
-HOMEPAGE="http://homepage.mac.com/naoki.koguro/prog/c-wrapper/"
-SRC_URI="http://homepage.mac.com/naoki.koguro/prog/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND=">=dev-scheme/gauche-0.8.14"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-
-	econf || die
-	emake -j1 || die
-
-}
-
-src_test() {
-
-	emake -j1 -s check || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	dodoc README ChangeLog
-	dohtml doc/*
-
-	if use examples; then
-		local d
-
-		for d in examples/*; do
-			docinto ${d}
-			dodoc ${d}/*
-		done
-	fi
-
-}
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild
index 5c882b9d4d5b..332ed8c2b44f 100644
--- a/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild
@@ -1,47 +1,40 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild,v 1.1 2009/08/16 07:12:45 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild,v 1.2 2011/08/13 11:41:37 hattya Exp $
 
-IUSE="examples"
+EAPI="4"
+
+inherit autotools eutils
 
 DESCRIPTION="Foreign function interface for C and Objective-C libraries"
 HOMEPAGE="http://homepage.mac.com/naoki.koguro/prog/c-wrapper/"
 SRC_URI="http://homepage.mac.com/naoki.koguro/prog/${PN}/${P}.tgz"
 
 LICENSE="MIT"
-KEYWORDS="~x86"
 SLOT="0"
+KEYWORDS="~x86"
+IUSE="examples"
 
-DEPEND=">=dev-scheme/gauche-0.8.14"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-
-	econf || die
-	emake -j1 || die
+RDEPEND="dev-scheme/gauche
+	dev-libs/libffi"
+DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-system-libffi.diff
+	eautoreconf
 }
 
 src_test() {
-
-	emake -j1 -s check || die
-
+	emake -j1 -s check
 }
 
 src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	dodoc README ChangeLog
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README
 	dohtml doc/*
 
 	if use examples; then
-		local d
-
-		for d in examples/*; do
-			docinto ${d}
-			dodoc ${d}/*
-		done
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
 	fi
-
 }
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff b/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff
new file mode 100644
index 000000000000..7ee9a4011ef3
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff
@@ -0,0 +1,33 @@
+--- c-wrapper-0.6.1.orig/configure.ac
++++ c-wrapper-0.6.1/configure.ac
+@@ -53,6 +53,7 @@
+ 
+ dnl Check for libraries
+ dnl Add your macro calls to check required libraries, if you have any.
++PKG_CHECK_MODULES([FFI], [libffi])
+ 
+ dnl Platform-dependent configuration.
+ AC_ARG_ENABLE(objc, [  --enable-objc           turn on Objective-C support])
+--- c-wrapper-0.6.1.orig/src/Makefile.in
++++ c-wrapper-0.6.1/src/Makefile.in
+@@ -20,9 +20,9 @@
+ GAUCHE_PACKAGE = @GAUCHE_PACKAGE@
+ INSTALL        = @GAUCHE_INSTALL@
+ 
+-CPPFLAGS       = -I./libffi/include -DGAUCHE_API_0_8_8 @CPPFLAGS@
++CPPFLAGS       = -DGAUCHE_API_0_8_8 @FFI_CFLAGS@ @CPPFLAGS@
+ LDFLAGS        = @LDFLAGS@
+-LIBS           = libffi/.libs/libffi.a @LIBS@
++LIBS           = @FFI_LIBS@ @LIBS@
+ 
+ YACC           = @YACC@
+ 
+@@ -38,7 +38,7 @@
+ SCMFILES  = 
+ HEADERS   = 
+ 
+-TARGET    = libffi/.libs/libffi.a $(ARCHFILES)
++TARGET    = $(ARCHFILES)
+ GENERATED = libffi
+ CONFIG_GENERATED = libffi/Makefile Makefile cwcompile
+