dev-ruby/grit: Take advantage of RUBY_S's github support.

(Portage version: 2.2.0_alpha55-r1/svn/Linux x86_64)

svn path=/sunrise/; revision=12424

diff --git a/dev-ruby/grit/ChangeLog b/dev-ruby/grit/ChangeLog
index 690b9d28ababd90e75e1ac63b34aa7ee7a4478b5..ffec48580ec5241bbb0af74583fa80d76576e6ab 100644 (file)
--- a/dev-ruby/grit/ChangeLog
+++ b/dev-ruby/grit/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Oct 2011; Nathan Phillip Brink <binki@gentoo.org> grit-2.4.1.ebuild:
+  Take advantage of RUBY_S's github support.
+
 *grit-2.4.1 (14 Sep 2011)
 
   14 Sep 2011; Nathan Phillip Brink <binki@gentoo.org> -grit-2.3.0.ebuild,

diff --git a/dev-ruby/grit/grit-2.4.1.ebuild b/dev-ruby/grit/grit-2.4.1.ebuild
index ce066b0e0284ae66507f25f28396c6af9a56a967..8979c86a265a45e4f194ef9c0c1767d5f4e4cf97 100644 (file)
--- a/dev-ruby/grit/grit-2.4.1.ebuild
+++ b/dev-ruby/grit/grit-2.4.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=4
 
 RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_S="mojombo-${PN}-*"
 USE_RUBY="ruby18"
 
 inherit eutils ruby-fakegem
@@ -28,13 +29,13 @@ ruby_add_bdepend "doc? ( virtual/ruby-rdoc )
 ruby_add_rdepend "dev-ruby/mime-types
        dev-ruby/diff-lcs"
 
-# Override fakegem's all_ruby_unpack() for github fix.
 all_ruby_unpack() {
        unpack ${A}
-       mv mojombo-${PN}-* "${S}" || die "Removing githubiness."
 
        # Tests require the grit directory to look like a git repo.
        if [[ -e ${P}.git ]]; then
-               mv ${P}.git "${S}"/.git || die "Inserting .git for tests."
+               # Expand RUBY_S in a manner similar to
+               # _ruby_invoke_environment().
+               eval mv ${P}.git $(eval ls -d ${RUBY_S})/.git || die "Inserting .git/ for tests."
        fi
 }