Version bump, patch up to actually build types.conf (sent upstream).

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

4 files changed, 50 insertions, 9 deletions

diff --git a/dev-ruby/ffi/ChangeLog b/dev-ruby/ffi/ChangeLog
index e939db16552f..c27e1e05c04e 100644
--- a/dev-ruby/ffi/ChangeLog
+++ b/dev-ruby/ffi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ffi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ChangeLog,v 1.3 2010/02/15 13:55:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ChangeLog,v 1.4 2010/02/16 11:01:26 flameeyes Exp $
+
+*ffi-0.6.2 (16 Feb 2010)
+
+  16 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org> -ffi-0.6.1.ebuild,
+  +ffi-0.6.2.ebuild, +files/ffi-0.6.2-genRakefile.patch:
+  Version bump, patch up to actually build types.conf (sent upstream).
 
 *ffi-0.6.1 (15 Feb 2010)
 
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 5f21a8ee9e21..2fce25f01476 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ffi-git-0.6.1.tgz 827292 RMD160 70de70707a98c672bbeb88aef457ecbea426a8ca SHA1 d3efa8304fee1dd5cdab1331716d0385f411bedc SHA256 f9774e233bd66b56760ec09e99416031e5e3fc7c9dbc7c3323b722b74d266ede
-EBUILD ffi-0.6.1.ebuild 1045 RMD160 792b4b496c25ce34a533e8f6417e27b7c03b6887 SHA1 e1e8fe28d86f51066cacbeba52d1b39675c88851 SHA256 5fc04f1c4c9b20709fd40f4dc189f85d37a2ac666810aaf7e3452ebd3e25204f
-MISC ChangeLog 851 RMD160 6ecd861a8d52cc0f7f7999a521039a17415ecc1b SHA1 193e5d643ff3fd026b82db98e5f389cdbe714ac2 SHA256 2d1b1f3f111b3daf99f93a96a1ddb8afca0e45d5627777d6c2efc7348880ee06
+AUX ffi-0.6.2-genRakefile.patch 1077 RMD160 f9ecd165a7edf0d57b0af0f2c57981f900a8520a SHA1 287280cf52e4693c10d9bc99e22f268d4d77b94a SHA256 8308034efc1c5bcd0928133d022e91906b2356c5d3a5d52ea84895788a3ca797
+DIST ffi-git-0.6.2.tgz 827323 RMD160 a4f9096de7dad28ee450ba071cfdd523bf960b78 SHA1 b30efc56131a667a909e887f2a9654512ed3279b SHA256 f952deb4af99ee2864fc513a1a928957600da8e9ecced7c780c8bc58e1270538
+EBUILD ffi-0.6.2.ebuild 1185 RMD160 c704d95debebedce25bee49859ae5dc7ed235dcf SHA1 350ce9d9b8f61374b593e3ae32e5494b9ba82a81 SHA256 e1c3b3b90874b29bd9f553c8c5ae46dd17ec43f95437349c9e2d55c06b9ebba3
+MISC ChangeLog 1081 RMD160 db8f336a23e2090dd822254b1fdb33f5ee3575f5 SHA1 a2c9ae4a419970389f38b922cb7c9cdfabf80e99 SHA256 a19406f491528e06e14d7af21332d9ec35e9836342027683d4220983a5a3b938
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt5Uk4ACgkQAiZjviIA2Xip1QCgnEDvjEACEsqWy5dH0C7plO5y
-F0AAnRIjsqBvwGvnnGDZzbP61mQFTYlx
-=JHW/
+iEYEARECAAYFAkt6eucACgkQAiZjviIA2Xg+nwCgk794FKz4mmoUzJcuWuVQdi1X
+TNEAoMqlEs6D4thoysQc8oA+5tDN9KVg
+=YOgv
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ffi/ffi-0.6.1.ebuild b/dev-ruby/ffi/ffi-0.6.2.ebuild
index c5431464f1bc..d9ebe3d30975 100644
--- a/dev-ruby/ffi/ffi-0.6.1.ebuild
+++ b/dev-ruby/ffi/ffi-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-0.6.1.ebuild,v 1.1 2010/02/15 13:55:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-0.6.2.ebuild,v 1.1 2010/02/16 11:01:26 flameeyes Exp $
 
 EAPI=2
 
@@ -20,7 +20,7 @@ DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
 HOMEPAGE="http://wiki.github.com/ffi/ffi"
 
 SRC_URI="http://github.com/${PN}/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/${PN}-${PN}-392fae5"
+S="${WORKDIR}/${PN}-${PN}-7abe057"
 
 IUSE=""
 LICENSE="BSD"
@@ -32,8 +32,13 @@ DEPEND="${RDEPEND}"
 
 ruby_add_bdepend dev-ruby/rake-compiler
 
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-genRakefile.patch
+}
+
 each_ruby_compile() {
 	${RUBY} -S rake compile || die "compile failed"
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/ffi/files/ffi-0.6.2-genRakefile.patch b/dev-ruby/ffi/files/ffi-0.6.2-genRakefile.patch
new file mode 100644
index 000000000000..f18eea51aba0
--- /dev/null
+++ b/dev-ruby/ffi/files/ffi-0.6.2-genRakefile.patch
@@ -0,0 +1,29 @@
+From 1d2ac1eae074af39b447a5bd7fe8a668e60517fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Tue, 16 Feb 2010 11:48:22 +0100
+Subject: [PATCH 1/2] Use the __FILE__ value to find the proper path for the ffi code.
+
+This replace the old code that relied on the RUBYLIBDIR environment
+variable and the position of the current work directory.
+---
+ gen/Rakefile |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gen/Rakefile b/gen/Rakefile
+index f97f845..2f5bdb9 100644
+--- a/gen/Rakefile
++++ b/gen/Rakefile
+@@ -1,6 +1,8 @@
+ require 'fileutils'
+-require "#{File.join(ENV['RUBYLIBDIR'], 'ffi', 'tools', 'types_generator.rb')}"
+-types_conf = File.join(ENV['RUBYLIBDIR'], 'ffi', 'types.conf') 
++require 'pathname'
++require Pathname.new(__FILE__).dirname + "../lib/ffi/tools/types_generator.rb"
++types_conf = (Pathname.new(__FILE__).dirname + "../lib/ffi/types.conf").to_s
++
+ file types_conf do |task|
+   options = {}
+   FileUtils.mkdir_p(File.dirname(task.name), { :mode => 0755 })
+-- 
+1.7.0
+