Match require path to where the shared object actually is, fixes bug 316523.

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

3 files changed, 84 insertions, 5 deletions

diff --git a/dev-ruby/ruby-prof/ChangeLog b/dev-ruby/ruby-prof/ChangeLog
index 47f68f0fb601..98971fc4fae3 100644
--- a/dev-ruby/ruby-prof/ChangeLog
+++ b/dev-ruby/ruby-prof/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/ruby-prof
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-prof/ChangeLog,v 1.26 2010/08/08 17:55:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-prof/ChangeLog,v 1.27 2010/08/08 18:03:58 graaff Exp $
+
+*ruby-prof-0.8.2-r1 (08 Aug 2010)
+
+  08 Aug 2010; Hans de Graaff <graaff@gentoo.org>
+  +ruby-prof-0.8.2-r1.ebuild:
+  Match require path to where the shared object actually is, fixes bug
+  316523.
 
   08 Aug 2010; Hans de Graaff <graaff@gentoo.org> -ruby-prof-0.7.10.ebuild,
   -ruby-prof-0.8.1.ebuild:
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index ce2a7611a04f..4c16f5ff1833 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -3,13 +3,14 @@ Hash: SHA256
 
 AUX ruby-prof-0.7.2+glibc-2.8.patch 360 RMD160 5c469b8c0a966825dccf46aa629de03204b8f830 SHA1 471ee971e10cc8bbc7f0ad2f5ea74fcc3d575af3 SHA256 07271e64f4c70ffbf58aa2bf007b66f0578a5b1287f41197ca670f2191276ac4
 DIST ruby-prof-0.8.2.gem 63488 RMD160 98687c57c4a39c533cb7781e1dfc146ebdf2dd4a SHA1 ccd4f7d3c1a83856631316f9b10823ac825fe1ce SHA256 f622f47be1f6a2d916c6f6a42c21bce591816b264df97c7d83dca3c5441644eb
+EBUILD ruby-prof-0.8.2-r1.ebuild 2101 RMD160 d213d83cd9d291680bd8eb6919ccc38168347363 SHA1 6a0a1c6184575ea177d6be5cea686b8eb25fcd78 SHA256 32e4dfef583dbf3521117d97dac03c5e4d3a2b92ece43e157b5847fdebc5bb5e
 EBUILD ruby-prof-0.8.2.ebuild 1897 RMD160 3cbbd3264ac91edb4f792a69c6e096cde34baa76 SHA1 2afa92bb62e583b3ca38740a31cf774a397e5159 SHA256 000cea495ffe2209eb18d464633af890c2242940f344bb30f8200b01cec119f8
-MISC ChangeLog 4530 RMD160 bbbbf300dfd1a36b2eb466c8e999d55387d2d3cf SHA1 65121106a97a7e50fe43113e9821f4a2356f192d SHA256 392bfe309024298654b7fc3509697296c82e00eba2355f369e314247a033e5e4
+MISC ChangeLog 4727 RMD160 02935f632193709a66878503977c7b5c29a7d171 SHA1 45109bb193f4de1c87dae802434bc3d8a0231f17 SHA256 f59b4874d7cc1a93fe8cac8d3759c1bc70cff5a78373246aec1db536e6339aab
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkxe730ACgkQZihJkut28Sv8RgD9GfQe/g/BpoDeUITwGzgK3E7Y
-R4QGOUK0yndctrrg/sYA/RHPrT0eSt9PnRoNisYwn4EoDwdd3JZf7ock8hK7N1cl
-=0CzE
+iF4EAREIAAYFAkxe8ZUACgkQZihJkut28Sv9zAEAyGeYhRyHf6Sl9E6rjLLmRxfa
+RVGP/hdTbTzAe+MoApMA/j0Pr/sfqVW0S8W6uWfn/o+IG8t907lezrBZxy2pMbfL
+=7g/J
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.8.2-r1.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..664bd9cd3f1b
--- /dev/null
+++ b/dev-ruby/ruby-prof/ruby-prof-0.8.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-prof/ruby-prof-0.8.2-r1.ebuild,v 1.1 2010/08/08 18:03:58 graaff Exp $
+
+EAPI=2
+
+# jruby → not compatible, since it uses an extension
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_EXTRADOC="README CHANGES"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A module for profiling Ruby code"
+HOMEPAGE="http://rubyforge.org/projects/ruby-prof/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
+
+all_ruby_prepare() {
+	# The thread testing in 0.8.1 and earlier versions is broken, it
+	# has to be tested for the next versions, since upstream is
+	# looking for a solution. The problem is that it's _very_
+	# timing-dependent.
+	rm "${S}"/test/thread_test.rb \
+		|| die "unable to remove broken test unit"
+	sed -i -e '/thread_test/d' \
+		test/test_suite.rb || die "unable to remove broken test reference"
+
+	# We install the shared object in lib, not ext.
+	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby19)
+			# On ruby 1.9 this test fails badly, so we disable it
+			# until upstream can fix the related bug:
+			# http://redmine.ruby-lang.org/issues/show/2012
+			sed -i -e '/^  def test_flat_string_with_numbers/,/^  end/ s:^:#:' \
+				test/printers_test.rb || die "Unable to disable test_flat_string_with_numbers"
+			;;
+	esac
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	# gem ships with prebuild files
+	emake -Cext/ruby_prof clean || die "clean failed"
+	emake -Cext/ruby_prof || die "build failed"
+
+	mkdir lib/ruby_prof || die "unable to create directory for shared object"
+	cp ext/ruby_prof/*$(get_modname) lib/ruby_prof || die "copy of extension failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for dir in examples rails rails/example rails/environment; do
+		docinto "$dir"
+		dodoc "$dir"/* || die "dodoc $dir failed"
+	done
+}