Revision bump. Drop rake-compiler dependency and compile code directly. This also fixes bug 523728. Drop bundled libffi.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 88 insertions, 2 deletions

diff --git a/dev-ruby/ffi/ChangeLog b/dev-ruby/ffi/ChangeLog
index 8f669f2440d3..b3c31aacf239 100644
--- a/dev-ruby/ffi/ChangeLog
+++ b/dev-ruby/ffi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ffi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ChangeLog,v 1.76 2014/09/24 23:57:09 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ChangeLog,v 1.77 2014/09/27 06:39:28 graaff Exp $
+
+*ffi-1.9.4-r1 (27 Sep 2014)
+
+  27 Sep 2014; Hans de Graaff <graaff@gentoo.org> +ffi-1.9.4-r1.ebuild:
+  Revision bump. Drop rake-compiler dependency and compile code directly. This
+  also fixes bug 523728. Drop bundled libffi.
 
   24 Sep 2014; Manuel Rüger <mrueg@gentoo.org> ffi-1.9.4.ebuild:
   Version bump.
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index f8fcc2c2d6ba..d2dd7c50e943 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ffi-git-1.4.0.tgz 889839 SHA256 696d58704ed002c32b53fb83db5cd985058a2839f04e7228e00ca60f06855948 SHA512 f99d47a450b90a1c10a5db54b0421b8a6a01564144443429fb8071940ef7020130b5b8f71c0198e0b15a6cbc61742b2cd3ef60a92f5c3cc4077e9c2074ac771c WHIRLPOOL 64300f19741ed59b44424cb68eac42cb886826d3019f533c8548c14e626cb5fa3c998337227c83a0e90a7e0700526e12e4e3a84b29fa6f2fdb2d98ca93693488
 DIST ffi-git-1.9.3.tgz 881344 SHA256 f8cc0a05b682eac330fbd0c4f76c9fbf6338a7c32bd3cb5b1619506678ce5c7a SHA512 56c5d4ab13f8ce4038a614470a82a3c723d90e6cc9cb3423efdcd8b1a5f4f3f9f01a0fe335fe088e207818f541184256e20f81fea24c1fe449ed3382e45f9af3 WHIRLPOOL ba412d79cea3f0077048d388bcc94ae25552aada3b5261e44f1ff30245c4cc531be86272b1e3eaf59c215b429aeaab7ad72804de9d31016acec2c6099679096a
 DIST ffi-git-1.9.4.tgz 895806 SHA256 1a619839e81ecdd6e40f03f6f8214beb701b7bc4a188b77f87d6dac3e8a3bd02 SHA512 094316fa71cd2b74a01b5b3c65c6e46f4cba242d43f99c366c297bcbe11d9444d19c32c6b3398e827500133df0cb5a40d44321eb8fae7422d235f964323f03bb WHIRLPOOL 7719b45aec85f38ed80d20a757865bf186672f27644f7a02c4e460a617ef716bcabcdcf5bb802921a907955683dc255c01ff08062aae95f9f18871155485fc58
 EBUILD ffi-1.4.0.ebuild 1283 SHA256 7ac4374ec4d6c8387f8759d1a6868c883cf49080bf46021dbeeccafedb8c4219 SHA512 ffaca73c278f727a15d833b02cf7bc41405dc15d488a5520f8a97c2091ab4ecd0d730107bc7845320559d395bbd2c2b4a98cdae8bd6fbb558c22c45dc0c50311 WHIRLPOOL 998173001f74439939d6a3fa8874935f6705caa6be53acfc8a20cfa379cf82485855c0003a1928e6fe7afe238b5855fb8b8512376c34fb6a5f22a28a5d44a2f3
 EBUILD ffi-1.9.3-r1.ebuild 1631 SHA256 daec8abed6e7ecf51f1f8f8550e863263ec1032af288af6335b3d54e3a893dd5 SHA512 35d667e57f86c0c134081d4445c0e357cf587270097a3aa377fa80a196e3cc7b08c8b54c73e41af0e69422ce8c6f9855484600e0791f98cfc2369c81bdda1dfe WHIRLPOOL 6111c8a6b048832c472d5dcb643e172e914488ef0f931cb230f2c71bf243f61e93c4d81a89bd0ad267fdfe7d3492c39aa0d62b15633d7b0c06d95a872309abed
 EBUILD ffi-1.9.3.ebuild 1618 SHA256 5c76157358fdf8bfe259a60c65c05192c29d283144fa6fb59101d8cc39d6fea6 SHA512 9a04b7f26819f31e4a8dfa76d1e993803c14e7ada994587e30bfb080a6f93d6b471e027277b0a6dcea5f8d5e02375f90d00736f9456140a2bd1b6dea534726ed WHIRLPOOL 7aa197a5d5ab5004c5d344b5366700c0f1aab62213fd53bb35297c699c61f61f517a0356cc761bdcd50a84a7c23fef5ef6a079a65a988f1b030fad7892d0a2dd
+EBUILD ffi-1.9.4-r1.ebuild 1735 SHA256 09efe2c0a36ababe3654cf963e32bcbb6d4d918959517e2da7324badb984992c SHA512 72fb2b6d2093d91f94f762ddf2f835b6aa0323150baa4f0f48e3a0332acce0fa8f1a53bd1e64e3f447dfed147771876af41d20da9b862e2ba0856148776007b5 WHIRLPOOL 2e92a4aa964c77c86996ec99e8c093c226d90ed647ee2b9c649a94eae586e0f130b1043e851460c2290d530ce8d69f3b38c386fd1249af993be18460d51b20d8
 EBUILD ffi-1.9.4.ebuild 1627 SHA256 53a6d8b24432fdbe3630c0c513321b6ee6eca46c0c8e47f7190a723c6cfa815a SHA512 74e959e24f29dcee6e6deb8b66b260f2dc58fde457cf6946641b6173167b570b4d6832abdd8e02f5b05e6ffcfc3fd8e32613359d948b5177b6e3960ca2e24568 WHIRLPOOL ffcab67f4fbe9c465b7511bf103372140d9e32731651a80cf18aabfb600e8e83f61cb778cd24e27b56d5458a7c3cd6f247b0a8ac02364b26703da9ae11fffb1a
-MISC ChangeLog 9779 SHA256 d6f3ac9ac9084c40a1076567f9c4b58ef070035e7951cb2dcc9e86b796698f2c SHA512 93e95331338ed1e8cbea1a2349244b3dbde92a55619d44dd249a46507d6fe014937d3f4873e60f7a299da6caddd5c9b02df67b58dea14ace260f2789ce5f8e9f WHIRLPOOL 6ae871d4377638e9d65845fd8afd6a09ddcc443cd5a3083543fad23709d82036ebad6eac59bbec261df476d9929c0a17bfcccee8e444be56100fe28d9e19b2e0
+MISC ChangeLog 10007 SHA256 5ff98049f438b42b13d30a60ede99f8f358cf3ba5562ff51c93386e9bb12cc28 SHA512 9fe20c2d8dfdd6166aff92f62fb84052d9098285233534c405481dec792193fce23556202bcb7398b7dcb4036d399796130ecb2bbf1ccbaccb951eeb054cda2a WHIRLPOOL 0800b8bf2baa9fc7fbda54fecf3c863c8a8021230525485965c640b3bb55bcaf070a45b009ad824793801ea3e2b9764fcdaf21e586fdac8c0bb8d0b43468a49b
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlQmW6kACgkQiIP6VqMIqNcS3wEAlpHBaHfBo+zeChtpE2/VXxFi
+4yyFoDurE6Nq0oFmiToA+wUUNge4TyW07m0B8jtKMbA/uqVNpIUxcwPQ7lsaOVbb
+=WfWf
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/ffi/ffi-1.9.4-r1.ebuild b/dev-ruby/ffi/ffi-1.9.4-r1.ebuild
new file mode 100644
index 000000000000..64927d6a587d
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.9.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.9.4-r1.ebuild,v 1.1 2014/09/27 06:39:28 graaff Exp $
+
+EAPI=5
+
+# jruby → unneeded, this is part of the standard JRuby distribution, and
+# would just install a dummy.
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="http://wiki.github.com/ffi/ffi"
+
+SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+
+RDEPEND+=" virtual/libffi"
+DEPEND+=" virtual/libffi"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+ruby_add_rdepend "virtual/ruby-threads"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ffi_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/ffi_c V=1
+	cp ext/ffi_c/ffi_c.so lib/ || die
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}