Avoid dependency on git. Add dependency on yard to build documentation since that is what is actually used. Avoid Rakefile with all its dependencies when building documentation, fixing bug 421669.

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

3 files changed, 18 insertions, 9 deletions

diff --git a/dev-ruby/rspec-core/ChangeLog b/dev-ruby/rspec-core/ChangeLog
index 6ad4226b23d7..5e443114a95c 100644
--- a/dev-ruby/rspec-core/ChangeLog
+++ b/dev-ruby/rspec-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rspec-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.25 2012/06/10 06:50:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.26 2012/06/29 07:59:18 graaff Exp $
+
+  29 Jun 2012; Hans de Graaff <graaff@gentoo.org> rspec-core-2.10.1.ebuild:
+  Avoid dependency on git. Add dependency on yard to build documentation since
+  that is what is actually used. Avoid Rakefile with all its dependencies when
+  building documentation, fixing bug 421669.
 
 *rspec-core-2.10.1 (10 Jun 2012)
 
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 485db6b4886f..98bf98d48a3f 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -4,15 +4,15 @@ Hash: SHA256
 AUX rspec-core-2.4.0-tests.patch 1723 RMD160 affdacd262211f480313684b582fb2d5606b7a38 SHA1 99502e4072e01589d3f12d46683834a6eca16faf SHA256 05accc191c798941e4918701b22ed5defce97460f32da96141ecb67486aee99f
 DIST rspec-core-2.10.1-git.tgz 150158 RMD160 06c89df4e5c1565623dfa78514cfd8a9ba0645c1 SHA1 305a5b0d2083d51bb038d6997d5b0a311b5a1db1 SHA256 393899dd493af4e5e19daf27b3ed8840d477d2756513836a91dbd0cd75045185
 DIST rspec-core-2.6.4.gem 122368 RMD160 05418671714576b86870e1d7b8265f8c47df8b74 SHA1 213e25e0c270a37273934fa72222785fc4a8932b SHA256 9d41146ee85fc8177d54331d72dfcd9ea71df41ed5d62bdbc1a027be496d903c
-EBUILD rspec-core-2.10.1.ebuild 2898 RMD160 1ac76ada1ba324867782bda7a217c86da70b496c SHA1 0e99996087f9f1b720f1cbd3ccce0cf6dd232a27 SHA256 9c25d1c6370d2f98721177f6a38013a62d13fafda06d86d167a5ecfe3195e065
+EBUILD rspec-core-2.10.1.ebuild 2983 RMD160 dcf89dc2eb3812bd3d8ff23e8b4ef795aed684fb SHA1 8f3143c640f154b2edaaf3564382038b9ba05a04 SHA256 239239493092478bf8175d1c4f32e66da5d9e7fb550be8b610a86c74cdc07cd9
 EBUILD rspec-core-2.6.4-r1.ebuild 2292 RMD160 41819d17c98aba766291416e40d41a360f0ebc46 SHA1 1219ac9de3545b934e3a6a853efffbcc5808ea43 SHA256 20f9d3dbf16688c494373f0902c2290d1391552ed1805dd8c134acf62795eae9
 EBUILD rspec-core-2.6.4.ebuild 2239 RMD160 2ec9c6c980da0d4a8374598ee359e5219c36ff48 SHA1 ce78aba5efaa4addfe53e9f6b4e38fd34be3cf09 SHA256 fd55da69fb4cd5252eeee1cc0705683ed704dc549901c2253a134f81bcdcc820
-MISC ChangeLog 3353 RMD160 8fe3131c147a8938010bc0ae4a3e32d014ddf7ce SHA1 02bc8050e4d1a4e36c4b286a61d570d97ac23dec SHA256 9e603721c67f0f6867224c688f5f115652e8f21d5facd30bd1d800a401a00ed3
+MISC ChangeLog 3633 RMD160 54ec1852b9ad36a9b149fa1c6825ced908985bbe SHA1 13c56f53c69204a9aa986529820afbd18ff1f27b SHA256 0b1fc4b2bb4fb61a1b2a080b44a7c4c58d21fdcc603b86aa62298ff72ab28b08
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/UQ7IACgkQiIP6VqMIqNcLbgD/e4Utn6OKFo2VDbFko2CIj8KI
-gQp26oIwyhlEKqBo+b0A/3tudrnidwMlx1W6h4rR5AHvz5B9O6ebf33dJ7uxSvNf
-=qJpq
+iF4EAREIAAYFAk/tYFsACgkQiIP6VqMIqNdwLQD/VQ/3mlQ9KBF2dFVEdefgv+8g
+63A5mw2WWrNOPs551zAA/jqBt5l8MOqUsYZqXXYyAe6w6+EAmWVB6lqrY5YcOkai
+=ztD3
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec-core/rspec-core-2.10.1.ebuild b/dev-ruby/rspec-core/rspec-core-2.10.1.ebuild
index 280f2c9f39bc..2dab2a21853b 100644
--- a/dev-ruby/rspec-core/rspec-core-2.10.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.10.1.ebuild,v 1.1 2012/06/10 06:50:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.10.1.ebuild,v 1.2 2012/06/29 07:59:18 graaff Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -37,6 +37,7 @@ ruby_add_bdepend "test? (
 		dev-ruby/rspec-expectations:2
 		dev-ruby/rspec-mocks:2
 	)"
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
 
 #	>=dev-ruby/cucumber-0.5.3
 #	>=dev-ruby/autotest-4.2.9 -> zentest-4.4.1
@@ -60,6 +61,9 @@ all_ruby_prepare() {
 	# also depends on this and fixing that is going to be fragile. This
 	# way we can at least install proper bin scripts.
 	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
 }
 
 each_ruby_prepare() {
@@ -76,7 +80,7 @@ each_ruby_prepare() {
 
 all_ruby_compile() {
 	if use doc ; then
-		RUBYLIB="${S}/lib" rake rdoc || die "Unable to create documentation."
+		yardoc || die
 	fi
 }