From e268cccc928db1d111975ea6ebb15a51cf81fecf Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Sat, 13 Aug 2011 11:41:37 +0000 Subject: [PATCH] update to EAPI 4. depend on dev-libs/libffi for fixing runtime error. Package-Manager: portage-2.1.10.3/cvs/Linux i686 --- dev-scheme/c-wrapper/ChangeLog | 8 +++- dev-scheme/c-wrapper/Manifest | 17 +++++-- dev-scheme/c-wrapper/c-wrapper-0.5.6.ebuild | 47 ------------------- dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild | 43 +++++++---------- .../files/c-wrapper-system-libffi.diff | 33 +++++++++++++ 5 files changed, 70 insertions(+), 78 deletions(-) delete mode 100644 dev-scheme/c-wrapper/c-wrapper-0.5.6.ebuild create mode 100644 dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff 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 -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/Manifest b/dev-scheme/c-wrapper/Manifest index e3c12636c462..be7f87416fde 100644 --- a/dev-scheme/c-wrapper/Manifest +++ b/dev-scheme/c-wrapper/Manifest @@ -1,6 +1,15 @@ -DIST c-wrapper-0.5.6.tgz 765958 RMD160 b1f185d91e891ed3be3a42570a12837b69658e33 SHA1 16d27f5067b7574c322830ab466a3d49935a14db SHA256 1ca9aa25668c3046585b0abb466160c1ef1d5281790154f7734dd019e75c38db +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX c-wrapper-system-libffi.diff 977 RMD160 35084b9f9e36b13abcc1ddff3a26578338905486 SHA1 e032cddb3b84e89ef939a70220fc9fc5c4ae5ee2 SHA256 ad85f1516907ae4f4360753a9329e924e31180aebd551dc816be06b637779300 DIST c-wrapper-0.6.1.tgz 843981 RMD160 b90db4d45fa887e8157425e6f3125c18dc6cfa97 SHA1 3b52496fa8151a409538d361e08b05ad9de16ac2 SHA256 d0f4037c29c149f385c12d7aa07deb5db7549029657fb60ee286f5942329d92b -EBUILD c-wrapper-0.5.6.ebuild 843 RMD160 c5090e0f7f5d300f05fcf45b658256136c1d063f SHA1 43171f7c505d328700b643e6ba0d75095931cbde SHA256 8ebd1f1b13bed05c191bc0a9a32140a5872d7a05bc9a6897958e21ea18b080ee -EBUILD c-wrapper-0.6.1.ebuild 843 RMD160 28dca5fcf036de63824e0cdfe8e7214f5feb6b54 SHA1 07ad8615d9561a3ddc628fc53de6a7d4f5c32484 SHA256 ce0fd09d79e6315d27d16f33cf2d2746c4a064afb01e9216542fffddd7cd933c -MISC ChangeLog 492 RMD160 2955526e958f2550090b224b7a18ef88c8dc6902 SHA1 6e62ed8f8e93ca7fe6bfc94ec585b6ae26a5fd4d SHA256 4c103609a6ae95d73be9c4c0126243788f0b9d8d92efd855e28c777519aabe6a +EBUILD c-wrapper-0.6.1.ebuild 884 RMD160 7bbdf540f40072055c51862c5d1ce15c2b9bd459 SHA1 bff0c4a8bbd4c609333ffa8e3f0de1e26fe60e94 SHA256 f63841e60edd4368e2999d0e134df7098ec744e451cabaaaaff6ac67e1b683ea +MISC ChangeLog 704 RMD160 77b6b3357debdaa6773870994bb7e09b57200a26 SHA1 591cd289f4e1ac6b62a45e79363ee0d8298655ec SHA256 0e46aeaf5a565d9a78409f8b13010be538e2572a90530a0593d5a3fd0347c7f6 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk5GYvwACgkQL46suuyRem1NkwCePUCFFJT15RKEiOd7sPZxAh38 +NuUAnRhuoXg8nwSrY2OYuyZe3u373bVO +=Jes8 +-----END PGP SIGNATURE----- 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 + -- 2.26.2