Respect ruby's LDFLAGS and explicitly link against the right shared library. Fixes bug 334373.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 84 insertions, 7 deletions

diff --git a/dev-ruby/ruby-inline/ChangeLog b/dev-ruby/ruby-inline/ChangeLog
index 794c1e46c8d4..ad1f16727d97 100644
--- a/dev-ruby/ruby-inline/ChangeLog
+++ b/dev-ruby/ruby-inline/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/ruby-inline
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-inline/ChangeLog,v 1.25 2010/05/23 20:49:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-inline/ChangeLog,v 1.26 2010/08/28 13:15:41 graaff Exp $
+
+*ruby-inline-3.8.4-r2 (28 Aug 2010)
+
+  28 Aug 2010; Hans de Graaff <graaff@gentoo.org>
+  +ruby-inline-3.8.4-r2.ebuild, +files/ruby-inline-3.8.4-ldflags.patch:
+  Respect ruby's LDFLAGS and explicitly link against the right shared
+  library. Fixes bug 334373.
 
 *ruby-inline-3.8.4-r1 (23 May 2010)
 
diff --git a/dev-ruby/ruby-inline/Manifest b/dev-ruby/ruby-inline/Manifest
index a8bf4ea5d6b1..75ab572a76ff 100644
--- a/dev-ruby/ruby-inline/Manifest
+++ b/dev-ruby/ruby-inline/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX ruby-inline-3.8.4-gentoo.patch 2166 RMD160 604ef0cc018e37e9962c1ae8640cc51e55f72fcd SHA1 c1b8c3a363aa7c76ca8df0e058f7034f6881fbdd SHA256 22ee2a71d82bae991d58a59cb81331e840210de0e51a8d25ffed2bd20b6ff258
+AUX ruby-inline-3.8.4-ldflags.patch 458 RMD160 1fe3b82bc5fc5706985e088f1e21e1c1014ba758 SHA1 aea54da6d91acf43f22d2af54659c81bf181ea18 SHA256 447d732528ff9883b59325373f42455f0c3a372e8c5bd7d879424d9c46b8e727
 DIST RubyInline-3.8.4.gem 28160 RMD160 c89dedd0dddd77351e6113486b38a8722e56bee7 SHA1 5f334b2ca63a464ff260de0cafd2f55741344020 SHA256 58a7899dd5db81070cae58f3c9e1083117abf533d7ccb4addc16d40bd5aadc7e
 EBUILD ruby-inline-3.8.4-r1.ebuild 1361 RMD160 2bf67cd7476d4ff15128c3dc875425ac69792338 SHA1 0d8e35e7f41f9d000f50e0d4579ac455bd91c7e0 SHA256 c80c5bdfc0a9ae62411910984da405c2022d4d72d1e671987e5b3eca86c79095
+EBUILD ruby-inline-3.8.4-r2.ebuild 1582 RMD160 65c4390502af16aabf697b813e6804cca077b508 SHA1 e042c398b00705b3effd7605e7622f880bafa563 SHA256 2c7c8d534b97bd18e993d6307937efb8fed588c9434d282e4864649038199df0
 EBUILD ruby-inline-3.8.4.ebuild 967 RMD160 630c3c891fc25c2ff09e53b140b6eea93d3def4c SHA1 0fd4f12d543ea58a8d9e4ecc31f79ae23ef6ae5a SHA256 76adb2c59defbf1ca69f9eaa5adb5b45e9a572c67a17f410c7134f9365f90101
-MISC ChangeLog 3878 RMD160 59d4281c3c077e5884b98076ca4c3f344f57f954 SHA1 0913bfbcc7c8286852edc7e7fd3f30a48b504db6 SHA256 2237452ad6f2fcc303d9d64f84bab233625da982fa0a9a2abcc51814dfc21667
+MISC ChangeLog 4134 RMD160 91340a02f62f478cc4960df69da27ce16a21fa99 SHA1 02177c6843f5a2ca5309a032ead54c6668cd0edd SHA256 8df40f6bc1f07ad93534e6a09d1ce7565d90d099c4d79cddcf58ae68154f3926
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkv5lIoACgkQAiZjviIA2Xh3hgCfbRbdUB6a2XCDlsA/gj5Q30Uq
-y7cAoMcYelzXtL8UeFN3jIXMtyLTb/xF
-=XKPT
+iF4EAREIAAYFAkx5DAkACgkQZihJkut28SsuuQD8D9T85A3SBvOQ2j+pSkosYcW0
+R4aXfQEUMWH4zyNJNQIA/jSMMusewvRBatQhiM8UfyQay/nr8pFtSFnjVTl/u1JF
+=+j2F
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-inline/files/ruby-inline-3.8.4-ldflags.patch b/dev-ruby/ruby-inline/files/ruby-inline-3.8.4-ldflags.patch
new file mode 100644
index 000000000000..6f20b500cad9
--- /dev/null
+++ b/dev-ruby/ruby-inline/files/ruby-inline-3.8.4-ldflags.patch
@@ -0,0 +1,11 @@
+--- lib/inline.rb.~1~	2010-08-28 14:49:06.866480357 +0200
++++ lib/inline.rb	2010-08-28 15:05:14.553732182 +0200
+@@ -577,6 +577,8 @@
+                   "-L#{Config::CONFIG['libdir']}",
+                   '-o', so_name.inspect,
+                   File.expand_path(src_name).inspect,
++                  Config::CONFIG['LDFLAGS'],
++                  Config::CONFIG['LIBRUBYARG_SHARED'],
+                   libs,
+                   crap_for_windoze ].join(' ')
+ 
diff --git a/dev-ruby/ruby-inline/ruby-inline-3.8.4-r2.ebuild b/dev-ruby/ruby-inline/ruby-inline-3.8.4-r2.ebuild
new file mode 100644
index 000000000000..b966034f1772
--- /dev/null
+++ b/dev-ruby/ruby-inline/ruby-inline-3.8.4-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-inline/ruby-inline-3.8.4-r2.ebuild,v 1.1 2010/08/28 13:15:41 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ree18 ruby19"
+
+RUBY_FAKEGEM_NAME="RubyInline"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows to embed C/C++ in Ruby code"
+HOMEPAGE="http://www.zenspider.com/ZSS/Products/RubyInline/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend dev-ruby/zentest
+
+ruby_add_bdepend "
+	doc? (
+		dev-ruby/hoe
+		dev-ruby/hoe-seattlerb
+	)
+	test? (
+		dev-ruby/hoe
+		dev-ruby/hoe-seattlerb
+		virtual/ruby-test-unit
+	)"
+
+all_ruby_prepare() {
+	# we have to patch the code so that it takes the RUBY_DESCRIPTION
+	# into consideration, to avoid loading Ruby-Enterprise (REE18)
+	# objects in MRI and vice-versa; we're a bit “greedier” since we
+	# will rebuild objects even when just switching versions, but
+	# it'll be better this way than being too conservatives.
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	# Respect ruby's (and thus Gentoo's) LDFLAGS, and explicitly link
+	# against the ruby shared library to avoid confusion and potential
+	# crashes when later using the shared object.
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc example.rb example2.rb demo/*.rb || die
+}