diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-17 14:15:23 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-17 14:15:23 +0000 |
| commit | 1399b87a44f04773217bb1a1095b90040f4453e5 (patch) | |
| tree | ec65a3d18de0650f59f65a18d3fcc3a28a69a0d1 /dev-ruby/rake | |
| parent | Version bump. (diff) | |
| download | historical-1399b87a44f04773217bb1a1095b90040f4453e5.tar.gz historical-1399b87a44f04773217bb1a1095b90040f4453e5.tar.bz2 historical-1399b87a44f04773217bb1a1095b90040f4453e5.zip | |
Fix bug #297237: remember to load rake from the build directory since it might not be installed. Also make sure to respect the doc USE flag (slipped away in the previous fixes).
Package-Manager: portage-2.2_rc59/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/rake')
| -rw-r--r-- | dev-ruby/rake/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-ruby/rake/Manifest | 10 | ||||
| -rw-r--r-- | dev-ruby/rake/rake-0.8.7-r2.ebuild | 10 |
3 files changed, 18 insertions, 10 deletions
diff --git a/dev-ruby/rake/ChangeLog b/dev-ruby/rake/ChangeLog index 6e34aeab5ec6..af1c16007d0a 100644 --- a/dev-ruby/rake/ChangeLog +++ b/dev-ruby/rake/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/rake # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/ChangeLog,v 1.86 2009/12/16 17:51:49 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/ChangeLog,v 1.87 2009/12/17 14:15:23 flameeyes Exp $ + + 17 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> + rake-0.8.7-r2.ebuild: + Fix bug #297237: remember to load rake from the build directory since it + might not be installed. Also make sure to respect the doc USE flag + (slipped away in the previous fixes). 16 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> rake-0.8.7-r2.ebuild: diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest index cb244f2e831d..4d5cab32b93e 100644 --- a/dev-ruby/rake/Manifest +++ b/dev-ruby/rake/Manifest @@ -5,14 +5,14 @@ AUX rake.bash-completion 1354 RMD160 a0ed1aac9fce4a866ed0bacf5d6b3585abaf8a2a SH DIST rake-0.8.7.gem 104960 RMD160 1c41208b3bf8fba5a89a7b156eb862c4cf6278f0 SHA1 91daad079d404b68a7dd179716b9fdd0c195144c SHA256 10b37bdad695497c98aa8d7632e2aa5a589ddae2abaa42d24e5950de4ffde10f DIST rake-0.8.7.tgz 103104 RMD160 02c95d2ef492694091d48e19735f3f7b8e8b98f0 SHA1 97d223be50ebbaa49900923693cbfb4918a8e570 SHA256 43e209ccc3d320bd422fcffbd5654b80a110b9fea81d1d5f029715a35f5770cc EBUILD rake-0.8.7-r1.ebuild 566 RMD160 0b97a5cb36002a18adea792900ac922fa99ff6a6 SHA1 2da9d3025d6e5837dd35abad49b51f70ce5bd992 SHA256 4a067e18fca7000267eae3b1bbd781e93693c126991cf561e0017a96c3895002 -EBUILD rake-0.8.7-r2.ebuild 1020 RMD160 1bc9c853b24fbd64bc94c4ea7eb7462453c38ff1 SHA1 e637ed16ed97873a4a117855730c881f7fdccf98 SHA256 82f49dc1850941f21e6d06696a0286465da93037c0355fae9ca1797988404be4 +EBUILD rake-0.8.7-r2.ebuild 1064 RMD160 7f1b0fc02dd1677a3c1924368efa352cc448a0d8 SHA1 7285ff298c15309a9dcf089b7df9282a448f538b SHA256 5f3bf4bbdbdc2f27589730e2b4c0e347357f24c0f2cda716552ee1ab83ebe188 EBUILD rake-0.8.7.ebuild 428 RMD160 902e7a93a48421465036a3ddcdc386a709288e7d SHA1 43746061c7f32b99eab93d2cab94f621c4b8a077 SHA256 471b293d2ee6dee50a908138a7bd06a8c5f18e73f9327766116f44a345449c2f -MISC ChangeLog 10571 RMD160 fa257c0ec40725d04ef63ae1f3f40562388d4401 SHA1 fae6135c42a5dfd0eb4bb87f9cbf25e64640b33e SHA256 ea21f89d3548f29d3b7cf3d1853df54cea44696d4eaaec8d5300a3612ced92fa +MISC ChangeLog 10836 RMD160 bd632155fcba4dab1bc061c375a6f813217be5ec SHA1 29f4dfd584ad41069857431d3ddd32513ac6eaf6 SHA256 899c38d4f166d1714bfa047834439cc91114de4d203f7ed928503ab52e03fab3 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkspHjUACgkQAiZjviIA2XgjYACfTEyd/j+NXVl4c8VXWmrXTxj6 -mWMAnjoH/Vxi4DDFjIKOXLJCJtWHuoLk -=e/vc +iEYEARECAAYFAksqPQIACgkQAiZjviIA2XgWmACfeFAGGKZJBnInYmyX4Yu4Lk1M +qtkAoOZLFgn1Ajd3hKbkBlfaCUCOP7Gh +=Q7au -----END PGP SIGNATURE----- diff --git a/dev-ruby/rake/rake-0.8.7-r2.ebuild b/dev-ruby/rake/rake-0.8.7-r2.ebuild index e1e259360778..fa0c1f596e46 100644 --- a/dev-ruby/rake/rake-0.8.7-r2.ebuild +++ b/dev-ruby/rake/rake-0.8.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.8.7-r2.ebuild,v 1.3 2009/12/16 17:51:49 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.8.7-r2.ebuild,v 1.4 2009/12/17 14:15:23 flameeyes Exp $ EAPI=2 USE_RUBY="ruby18 ruby19 jruby" @@ -17,18 +17,20 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tgz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="bash-completion" +IUSE="bash-completion doc" #ruby_add_bdepend test dev-ruby/flexmock RESTRICT="test" all_ruby_compile() { - bin/rake rdoc || die "doc generation failed" + if use doc; then + ruby -Ilib bin/rake rdoc || die "doc generation failed" + fi } each_ruby_test() { - ${RUBY} bin/rake test || die "tests failed" + ${RUBY} -Ilib bin/rake test || die "tests failed" } all_ruby_install() { |