Simplify build system. Apply fixes from bug 299367.

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

3 files changed, 15 insertions, 17 deletions

diff --git a/dev-ruby/parsetree/ChangeLog b/dev-ruby/parsetree/ChangeLog
index 253ead77e54f..dcdaf18baf4e 100644
--- a/dev-ruby/parsetree/ChangeLog
+++ b/dev-ruby/parsetree/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/parsetree
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/ChangeLog,v 1.30 2010/08/26 06:39:55 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/ChangeLog,v 1.31 2010/08/29 13:01:26 graaff Exp $
+
+  29 Aug 2010; Hans de Graaff <graaff@gentoo.org> parsetree-3.0.5-r2.ebuild:
+  Simplify build system. Apply fixes from bug 299367.
 
   26 Aug 2010; Hans de Graaff <graaff@gentoo.org> parsetree-3.0.5-r2.ebuild:
   Fix USE=doc.
diff --git a/dev-ruby/parsetree/Manifest b/dev-ruby/parsetree/Manifest
index 736acf6192c0..b69ae5d4d8b8 100644
--- a/dev-ruby/parsetree/Manifest
+++ b/dev-ruby/parsetree/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 DIST ParseTree-3.0.5.gem 50176 RMD160 62af98cb07164d35c6fa60b202b7b8a446968248 SHA1 b78d9625fa86e6a0d87aaaf5bbc0120a21792658 SHA256 084b6784980cebb89cb408a9e1b3cddd676695cb5f8ae627856e85cb1adaa7d0
 EBUILD parsetree-3.0.5-r1.ebuild 2168 RMD160 4972eaabb27d544c89b9e3e8c9c68ba41e3e5852 SHA1 7fac32bebff268c47faa90c2d976b151e734d064 SHA256 c2a8cd5f74ce0da5842034114a6a76c44aa374beaf020fec3f0263c3d1e7bc2d
-EBUILD parsetree-3.0.5-r2.ebuild 2363 RMD160 ca6a07550da8b26675590cfd80d32b99a553eef4 SHA1 2bff1dea0749aa3b8654f32098e762b5fcf7015f SHA256 6ffd8f03af1c20007f9c8e86c684057001f695ad7225540bebbdaec904e0f000
-MISC ChangeLog 4642 RMD160 22138ba51ab2c5058f63dc0a1c5dc4f508e53d75 SHA1 fb80fe47bde957e88f5c7712ec4956990de4b1f6 SHA256 6771c798a306eb677800e9e6cfb264a553d42e12a181c1959db866e130ad30d5
+EBUILD parsetree-3.0.5-r2.ebuild 2254 RMD160 31372cc1bf194a306ccd87ea329715c4aab8db1c SHA1 e646226dbf1af2c7bbd0036de871d5e52568f71b SHA256 0341654d304ae8780b833854cd77590c1fb3f8d3c9b43506a356bde5965a9235
+MISC ChangeLog 4774 RMD160 c01b0d2b061129bca988a72d77f92cbb75624241 SHA1 5e6604ce374f775e698fd60cd1e3e90bb6002ec8 SHA256 63371891de548510959d53a231c4ed810377026df1f75e2cdece9bac44bc5c4d
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkx2DEgACgkQZihJkut28St+BwEAsrVb6PRGclIqIhL8Pw9jRO9t
-RTRzQQ/mDMF3OcokvksBAL9oQDLnsKT9L2gYqtjkHY3qjp34sSgJ9KopzXQikwvu
-=c70p
+iF4EAREIAAYFAkx6WjMACgkQZihJkut28Ss80gD8CoNl5DZl/eDy4yuj7NtUGYiN
+71AvTEwfqAMwEYseI3QA/jluovp8qSC4+gnXwCUgzloVlXjCljKptOC7N6ywp8L4
+=IBIs
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/parsetree/parsetree-3.0.5-r2.ebuild b/dev-ruby/parsetree/parsetree-3.0.5-r2.ebuild
index d43c44b40eac..e2a5dfb0a909 100644
--- a/dev-ruby/parsetree/parsetree-3.0.5-r2.ebuild
+++ b/dev-ruby/parsetree/parsetree-3.0.5-r2.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/parsetree/parsetree-3.0.5-r2.ebuild,v 1.2 2010/08/26 06:39:55 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.5-r2.ebuild,v 1.3 2010/08/29 13:01:26 graaff Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 
-inherit ruby-fakegem
+inherit multilib ruby-fakegem
 
 DESCRIPTION="ParseTree extracts the parse tree for a Class or method and returns it as a s-expression."
 HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
@@ -44,7 +44,7 @@ all_ruby_prepare() {
 }
 
 src_compile() {
-	chmod 0755 ${WORKDIR/work/homedir} || die "Failed to fix permissions on home"
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
 	ruby-ng_src_compile
 }
 
@@ -52,20 +52,15 @@ each_ruby_compile() {
 	# The ruby extension uses RubyInline to use C code within Ruby;
 	# since it causes us no little pain, we'll do our best here to
 	# prebuild the extensions.
-	local orig_HOME="${HOME}"
-	export HOME="${T}/$(basename ${RUBY})"
-	mkdir -p "$HOME"
 
-	${RUBY} -Ilib -rparse_tree -e '' || die "Unable to load ${PN}"
+	INLINEDIR="${PWD}" ${RUBY} -Ilib -rparse_tree -e '' || die "Unable to load ${PN}"
 
 	mkdir lib/inline
-	cp "$HOME"/.ruby_inline/*.so lib/inline/ || die
-
-	export HOME="$orig_home"
+	cp .ruby_inline/*$(get_modname) lib/inline/ || die
 }
 
 src_test() {
-	chmod 0755 ${WORKDIR/work/homedir} || die "Failed to fix permissions on home"
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
 	ruby-ng_src_test
 }