Add rdoc as a runtime dependency for the publish task. It is possible for packages to turn off the rdoc dependency, but the default is to enable it and simple initializing the Hoe object already requires it. Fixes bug 423883.

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

3 files changed, 16 insertions, 12 deletions

diff --git a/dev-ruby/hoe/ChangeLog b/dev-ruby/hoe/ChangeLog
index 3d73f044304c..d6b4b5418b6c 100644
--- a/dev-ruby/hoe/ChangeLog
+++ b/dev-ruby/hoe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/hoe
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.134 2012/06/25 07:23:24 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.135 2012/06/28 05:47:18 graaff Exp $
+
+  28 Jun 2012; Hans de Graaff <graaff@gentoo.org> hoe-2.13.0.ebuild:
+  Add rdoc as a runtime dependency for the publish task. It is possible for
+  packages to turn off the rdoc dependency, but the default is to enable it and
+  simple initializing the Hoe object already requires it. Fixes bug 423883.
 
   25 Jun 2012; Andreas Schuerch <nativemad@gentoo.org> hoe-2.12.5.ebuild:
   x86 stable, see bug 411507
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 0b3c87354455..74a66af7c8a4 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX hoe-2.10.0-test-fix.patch 756 RMD160 27ab29f32763455f47ba7e185ef7d07e463767a0 SHA1 0e6eaf86037882ae980d0a07230bf4a3360884ae SHA256 5de81cf392b8dbb0c2fe8d8dbcf03df06a359c534cf33aa4c5ded3978a9926b8
 AUX hoe-2.5.0-tests.patch 2155 RMD160 898487c6847136041b79d37127ba6ad5ebb3a28d SHA1 8dbd252b198d53ac874672f3394f5741e46fe8bf SHA256 872f08a36126c6fad69405eb529993fcef94d8134cee8f70294ddb4075fb1a54
@@ -11,15 +11,15 @@ DIST hoe-2.13.0.gem 122880 RMD160 5061a9669be053bd08edab388f50c84115c17540 SHA1
 DIST hoe-2.6.0.gem 114176 RMD160 16a250681d19fde968fa0a7fa2ef726192733931 SHA1 5f04eb4005025e84962c465e0c3d643b2fb2df46 SHA256 36d7009de42d23162c3c9b3355231906080868c07774db006c2dffd43b6fa723
 DIST hoe-2.8.0.gem 116736 RMD160 e38572d68d4105187e2e8437041d82e3899bc038 SHA1 88c11bd3c7ff1149d4508ebc2221c325b10e72bd SHA256 a2094978e0a5659d39266eebc0c56f753b7e25c9a81f633ca029cfc5a2af8b44
 EBUILD hoe-2.12.5.ebuild 1419 RMD160 7b8592353dd096075da5ca0ddcb988d9c4a438e8 SHA1 3f5413d892914f221d33e49c20c80bb25e8fccbd SHA256 0c97b75eace1b0b7b201d96f5004ab1796487120fce83e1ad92b6bcd7f5cb291
-EBUILD hoe-2.13.0.ebuild 1419 RMD160 623360b9a441d02c32873d61282ebcfd827ddf70 SHA1 6b97a578e6c101ab1c97b28f2b85c1fe80eff5be SHA256 d7176d3fa0a2f2e3e1c2c14f3b12350c9d267489171509d98260c76beb859da6
+EBUILD hoe-2.13.0.ebuild 1384 RMD160 90166558b81c53d79f6802d8509e3f8dd50aa02b SHA1 8445e522453204be1103eae7b46d89552a74a722 SHA256 61a0b530b47e5b3acc34f4dceceb0a8ec869fc32380b28f2f71be123b3674f6b
 EBUILD hoe-2.6.0-r1.ebuild 1358 RMD160 38decaee64fb97e7bf3a717d4426c0b1ab84f9e7 SHA1 3c6508b4230839f4915138747d905cda10795e6b SHA256 2d78deac7a68fa8c9c4acb3e0b441d548f4983ca8d1a9b320af53bda2d9de14c
 EBUILD hoe-2.8.0.ebuild 1450 RMD160 7526cbded38ad74f691d2a23b7b0c12a343a0c9c SHA1 a31fdb9068a3e112d8ba4fa8e3e2bc3279bd7009 SHA256 8257197a907fc879c8d9ce73ebc982f49e84677c503adf10dd5f5f704f9b5da5
-MISC ChangeLog 17028 RMD160 83f97a4ca64617cc51ecd152252bc40f2888e9b3 SHA1 7aa2bfdd6912f4946a377bc7bd89b3bbf1776210 SHA256 52641ef2270eea8efa702f0740530c8f925622f7a18e7b61f34e12de03057dab
+MISC ChangeLog 17327 RMD160 0afe5edc66f829554cc26bf05269d636de6ecd18 SHA1 a9aa4f2b5020b8b9572d9685efc84c7ef035256f SHA256 5ac9b5806d61bd1df3752a67297153f8c10aab2956c522cfb65aca2ccd97e682
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/oEUoACgkQakKUmsHeVLIGhwCfbAmt0XogSymRs8GByTj1EGq8
-Ss4An0mcQ2RNu7rEesuXvlKODfEX0Fgr
-=4ZL4
+iF4EAREIAAYFAk/r7/EACgkQiIP6VqMIqNevCQD/Q1GQB4L2vMSyOpCfXbM3W2vU
+Du3WEaErDaHGmQ0iD2QA/1C/VEksSEJS4U7BTkuN6UidDO+YO5fazXEQOY1LGmcI
+=Vc3P
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/hoe/hoe-2.13.0.ebuild b/dev-ruby/hoe/hoe-2.13.0.ebuild
index e41568789a5e..d3a5f41c7405 100644
--- a/dev-ruby/hoe/hoe-2.13.0.ebuild
+++ b/dev-ruby/hoe/hoe-2.13.0.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/hoe/hoe-2.13.0.ebuild,v 1.2 2012/05/26 09:43:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.13.0.ebuild,v 1.3 2012/06/28 05:47:18 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -22,15 +22,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
 # - also requires dev-ruby/hoe-seattlerb for 1.9;
 # - dev-ruby/gemcutter is an optional dependency at both runtime and
 #   test-time, at least for us;
 # - rubyforge is loaded at runtime when needed, so we don't strictly
 #   depend on it at runtime, but we need it for tests (for now);
-ruby_add_bdepend "test? ( dev-ruby/rdoc dev-ruby/minitest >=dev-ruby/rubyforge-2.0.4 )"
+ruby_add_bdepend "test? ( dev-ruby/minitest >=dev-ruby/rubyforge-2.0.4 )"
 
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7"
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7 >=dev-ruby/rdoc-3.10"
 
 all_ruby_prepare() {
 	# Make test regexp more lenient to cover the way we name the binaries.