Use the just-compiled runtime to avoid bootstrapping problems.

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

diff --git a/dev-lang/rubinius/ChangeLog b/dev-lang/rubinius/ChangeLog
index 9a2d116e222bf7449db169d20157e73ca30b3990..a9baf56bd3e512dcddb36e74e6260d23e904f38e 100644 (file)
--- a/dev-lang/rubinius/ChangeLog
+++ b/dev-lang/rubinius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/rubinius
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rubinius/ChangeLog,v 1.7 2011/10/21 06:55:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rubinius/ChangeLog,v 1.8 2011/10/23 13:38:11 graaff Exp $
+
+  23 Oct 2011; Hans de Graaff <graaff@gentoo.org>
+  rubinius-1.2.4.20110705.ebuild:
+  Use the just-compiled runtime to avoid bootstrapping problems.
 
   21 Oct 2011; Hans de Graaff <graaff@gentoo.org>
   rubinius-1.2.4.20110705.ebuild:

diff --git a/dev-lang/rubinius/Manifest b/dev-lang/rubinius/Manifest
index 94346e0a53327e4e4fffe65835f259201eb7cd3e..3c85431a9742f5e42060f48942805a7d1fbf4104 100644 (file)
--- a/dev-lang/rubinius/Manifest
+++ b/dev-lang/rubinius/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc
 DIST rubinius-1.2.4-20110705.tar.gz 9880126 RMD160 015540347989167a7f953c6c02ca6b6524d21fa2 SHA1 c39c4fb1e62e0fb418453811636177e6ccf6a936 SHA256 d474fb6f50292bff5211aaa80b1cead1fb3ed5c7c49223c51fddb8ffc5c3f23d
-EBUILD rubinius-1.2.4.20110705.ebuild 1983 RMD160 1e5d6fce86831356b79d8dc4a1a10612ca925ac4 SHA1 e7be43b97fd21b456f3a4796befcfdee96e934bd SHA256 6cad9b562a88c1cc1f518097dc969fe151732fe109bc17c4feb94c05cd4cec19
-MISC ChangeLog 747 RMD160 50dcc00b9d5cb98251bba7993c66d8c3929f6c74 SHA1 9d9abb2a3b1e67ed71011dd35388632ade131891 SHA256 e50445e914384559a6a99cacf78217a8b996a490275f95038fd7850aff02ef88
+EBUILD rubinius-1.2.4.20110705.ebuild 2029 RMD160 6c1a1968ce8768bc9fda2f7aa4df7440841df745 SHA1 5565e5066607e304671c1fb80166bf0a48620ff9 SHA256 aa4758eba7f6faa08d685ac85f3b8302cffc9480523cd76ab365a4c068b4bc17
+MISC ChangeLog 897 RMD160 73903fa4d1a78eab72a201b97e742c976335a4ac SHA1 9aa408f39027d671c8c54346b593165e6240f04d SHA256 b6147ff290676ddc8bbe5c2de7f059d5a788c0e1c648f4b1fad323acd0cf73d4
 MISC metadata.xml 159 RMD160 eb364108353c7843cf1c01fba92129aaa46a0334 SHA1 0734f4c292968932afc57d0aa3a681c0b75b7bfc SHA256 abab7965b1f41e0acf6b54c554945c1c9fa35b5afab848d784dc58c298bc4679
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6hF2UACgkQiIP6VqMIqNfbrQD/bD6GbuVmdRc7p01+yRAmy79N
-mWb5xq30g71Z2E8+HckA/RFJrViVt0STL3BJzDPsKHDG4cuqV42CRQMtORS8mRwK
-=Vkqx
+iF4EAREIAAYFAk6kGM4ACgkQiIP6VqMIqNfaQAD9HQmHWIFwIceBMUNY7jb89+oq
+YI2I/IZCrPdyV6NgisAA/2TtIX6Y3sNQ6ELecAjEW+JDfVWIVxe10pEdM1TqVvOc
+=fVvh
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/rubinius/rubinius-1.2.4.20110705.ebuild b/dev-lang/rubinius/rubinius-1.2.4.20110705.ebuild
index 0891ad8a1124d7086977d6ed472d4d17f31029e2..19ed0f5d0d5bc291d8a761136a32b38b86ad0dea 100644 (file)
--- a/dev-lang/rubinius/rubinius-1.2.4.20110705.ebuild
+++ b/dev-lang/rubinius/rubinius-1.2.4.20110705.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rubinius/rubinius-1.2.4.20110705.ebuild,v 1.2 2011/10/21 06:55:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rubinius/rubinius-1.2.4.20110705.ebuild,v 1.3 2011/10/23 13:38:11 graaff Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib versionator
@@ -67,5 +67,5 @@ src_install() {
 
        insinto /${librbx}/${minor_version}/site
        doins "${FILESDIR}/auto_gem.rb" || die "Couldn't install rbx auto_gem.rb"
-       bin/rbx compile "${D}/${librbx}/${minor_version}/site/auto_gem.rb" || die "Couldn't bytecompile auto_gem.rb"
+       RBX_RUNTIME="${S}/runtime" RBX_LIB="${S}/lib" bin/rbx compile "${D}/${librbx}/${minor_version}/site/auto_gem.rb" || die "Couldn't bytecompile auto_gem.rb"
 }