Version bump, with patch to work on x86-64.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64

4 files changed, 111 insertions, 5 deletions

diff --git a/dev-ruby/ruby-prof/ChangeLog b/dev-ruby/ruby-prof/ChangeLog
index 37bae872d2d2..98579d0c421b 100644
--- a/dev-ruby/ruby-prof/ChangeLog
+++ b/dev-ruby/ruby-prof/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ruby-prof
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-prof/ChangeLog,v 1.9 2008/11/13 13:10:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-prof/ChangeLog,v 1.10 2008/12/01 09:10:22 flameeyes Exp $
+
+*ruby-prof-0.7.1 (01 Dec 2008)
+
+  01 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/ruby-prof-0.7.1-fix-amd64.patch, +ruby-prof-0.7.1.ebuild:
+  Version bump, with patch to work on x86-64.
 
   13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> ruby-prof-0.7.0.ebuild:
   Only disable the thread test instead of restricting tests, upstream is
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index 3fc5773862f3..f830637b7d6a 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ruby-prof-0.7.1-fix-amd64.patch 711 RMD160 37d6201960bb2d183a5377042eba468603f1bbbf SHA1 495a035ddd992cf359ee01d71dd19fd2a80d7076 SHA256 f31fab0d85f8f3813d0b7c506584809d29a1a7f069ffa3b47ba792a086297024
 DIST ruby-prof-0.6.0.gem 41472 RMD160 6c055bcd0355c6ee389642e42ec669696728115a SHA1 99f32de2eaac42cc1db36af7937f66e33851abf6 SHA256 f54719cb7f022669456b2304bcfca129d09ad05078a03881abaec7fab9b0cdc8
 DIST ruby-prof-0.7.0.tgz 61915 RMD160 e6745bad91d8ec7240a354ff554a2bfb00e23106 SHA1 c02a68191f541c2f25d551776b7595b7960e5d44 SHA256 fe8275dd824098768d2ca6ead33969247f5cba1f4f460d7ff2ea13be8e074efe
+DIST ruby-prof-0.7.1.tgz 63433 RMD160 e2dca1bb4324cc73644e98d37b4a4248a2cc4235 SHA1 45c17f01fbb6ad5f4cca33076e2811806d0f6443 SHA256 f49375d48cc1713d3762d324432253f6cb19f1a9de85f8cf0db5622810e76808
 EBUILD ruby-prof-0.6.0.ebuild 455 RMD160 155ea08de91fc700a594d8729cfa333dad54bbac SHA1 6d36a643c4aef95a8cfb12a34ef0b4d84326c4c7 SHA256 d017bbd851fa66db98155bc8658ef3a61d91fcbf3cdbe2857f17d64c90ef2c1a
 EBUILD ruby-prof-0.7.0.ebuild 1480 RMD160 49a8bd6ac707169059beece3dc3a50fafa5e1b14 SHA1 dd1414f4ad469bcf1cee7ef9676b3e0ce31e68ad SHA256 dce4442e446b50879bcedc477585b8eb35baf9749e01070cdf323091f9bd69cc
-MISC ChangeLog 1815 RMD160 dd0b9ee3ac112d89ec8eb447e145e57e44f575e7 SHA1 d706edbaf6daca4138b882e05cc502e3b0158918 SHA256 8d7cec40ba0a012583bc4fd627ca7c82fe878cd437a73a08adfd7b7e0396288f
+EBUILD ruby-prof-0.7.1.ebuild 1624 RMD160 96e5f4d5851ed20a3d99f1e5e4d06a3b7b8c9e26 SHA1 643f5926eac2cd65ccdc3fe87000ae37a92c358f SHA256 8f7a496b2fb8e3c335b8c7588596f3489b6da5e218a2ae4c0bdc3e768b90de44
+MISC ChangeLog 2018 RMD160 46f9f4ec23c311124819c0f2bebf82f60d5928c1 SHA1 c2e576a15d521e1e518d9473cff99fd6771e153d SHA256 9a5e8af85d4842f886db4c22093f1ccdfe6476ed16a3e7d6e3f3b4853ed5610d
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkcJzAACgkQAiZjviIA2XjzHwCfZ3Ui/OZC4W1h1YsZqcieoHd0
-I2oAn10fqrzxgc/e3K7uMdCsDwAF5+QV
-=+JRr
+iEYEARECAAYFAkkzqgQACgkQAiZjviIA2XhprACeLu2lPcUSsRzYv5Al9bcJSRMG
+xDAAoKEycmIgfeTCLolcvXoi8jJeenk+
+=AbPb
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-prof/files/ruby-prof-0.7.1-fix-amd64.patch b/dev-ruby/ruby-prof/files/ruby-prof-0.7.1-fix-amd64.patch
new file mode 100644
index 000000000000..bb2908d2d8ca
--- /dev/null
+++ b/dev-ruby/ruby-prof/files/ruby-prof-0.7.1-fix-amd64.patch
@@ -0,0 +1,24 @@
+Index: ruby-prof-0.7.1/ext/measure_cpu_time.h
+===================================================================
+--- ruby-prof-0.7.1.orig/ext/measure_cpu_time.h
++++ ruby-prof-0.7.1/ext/measure_cpu_time.h
+@@ -33,13 +33,16 @@ static unsigned long long cpu_frequency;
+ 
+ #if defined(__GNUC__)
+ 
++#include <stdint.h>
++
+ static prof_measure_t
+ measure_cpu_time()
+ {
+ #if defined(__i386__) || defined(__x86_64__) 
+-    unsigned long long x;
+-    __asm__ __volatile__ ("rdtsc" : "=A" (x));
+-    return x;
++    uint32_t a, d;
++    __asm__ volatile("rdtsc\n\t"
++                 : "=a" (a), "=d" (d));
++    return ((uint64_t)d << 32) + a;
+ #elif defined(__powerpc__) || defined(__ppc__)
+     unsigned long long x, y;
+ 
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.7.1.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.7.1.ebuild
new file mode 100644
index 000000000000..9805e156b6b2
--- /dev/null
+++ b/dev-ruby/ruby-prof/ruby-prof-0.7.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2008 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.7.1.ebuild,v 1.1 2008/12/01 09:10:22 flameeyes Exp $
+
+inherit ruby
+
+DESCRIPTION="A module for profiling Ruby code"
+HOMEPAGE="http://rubyforge.org/projects/ruby-prof/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/ruby"
+DEPEND="${RDEPEND}
+	test? ( dev-ruby/rake )
+	doc? ( dev-ruby/rake )"
+
+USE_RUBY="ruby18"
+
+src_unpack() {
+	ruby_src_unpack
+
+	# The thread testing in 0.7.1 and earlier versions is broken, it
+	# has to be tested for the next versions, since upstream is
+	# looking for a solution.
+	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"
+
+	epatch "${FILESDIR}/${P}-fix-amd64.patch"
+}
+
+src_compile() {
+	cd "${S}/ext"
+	ruby_econf || die "ruby_econf failed"
+	ruby_emake || die "ruby_emake failed"
+
+	if use doc; then
+		rake rdoc || die "rake rdoc failed"
+	fi
+}
+
+src_test() {
+	rake test || die "rake test failed"
+}
+
+src_install() {
+	dobin bin/ruby-prof || die "dobin failed"
+
+	cd "${S}"/lib
+	doruby -r * || die "doruby failed"
+
+	cd "${S}"/ext
+	ruby_einstall || die "ruby_einstall failed"
+
+	cd "${S}"
+
+	dodoc README CHANGES || die "dodoc failed"
+
+	if use doc; then
+		dohtml -r doc/* || die "dohtml failed"
+	fi
+
+
+	for dir in examples rails rails/example rails/environment; do
+		docinto "$dir"
+		dodoc "$dir"/* || die "dodoc $dir failed"
+	done
+}