Always require rdoc since the hoe-based build system requires it. Thanks for naota...

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

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 6713efb024854abf627bd9342df813bbcc7e7c26..10faf79288ceaa87122ef9ebe6d4376b1fb41268 100644 (file)
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.65 2011/11/19 12:56:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.66 2011/11/21 20:31:23 graaff Exp $
+
+  21 Nov 2011; Hans de Graaff <graaff@gentoo.org> nokogiri-1.5.0-r2.ebuild:
+  Always require rdoc since the hoe-based build system requires it. Thanks for
+  naota for reporting in bug 389845.
 
 *nokogiri-1.5.0-r2 (19 Nov 2011)
 

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 51a4f5e967a278a297939912a56f549314544b73..c07ef43d6d7c95ed019695d59b4a121ec576379d 100644 (file)
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -7,14 +7,14 @@ DIST nokogiri-1.5.0.gem 187904 RMD160 ab4f6f9704f71899edb815f033e4f70560653b3c S
 DIST nokogiri-1.5.0.tgz 1968555 RMD160 c14cd53c8e3e0c4b74a056c2f47aa6fb8fb5820b SHA1 3cf32d8355d4558bfb372c92b28640925bec269f SHA256 9966fef1ff6369d0ea7a40ea9f5e42e2bc9ba83bb2e4e6bc817a1da95c55bf4e
 EBUILD nokogiri-1.4.4-r1.ebuild 1953 RMD160 de927e5dcafadafb88ef1fb9704c45c012af2d3a SHA1 7c70fae1bede7226ea06765e8bd518d2fc4671fc SHA256 b112defda7ca9f4d1a6c9a84af487a90bd6d49a8fcee87fa4d99b35732c5d375
 EBUILD nokogiri-1.5.0-r1.ebuild 3098 RMD160 7054d4e0f6e05cf9486ebb41f7bdba5775b83bd3 SHA1 32749cb8f9eef49b94a0888bf04b8e303b1176b4 SHA256 a957d4ec56df2f5427a46230c0160eab96d8ed013b8a6e6a62568e5fc40f3352
-EBUILD nokogiri-1.5.0-r2.ebuild 3179 RMD160 7ead917040c2c4d508a72de6ce1b6391df79e0d6 SHA1 2a5dcf6bf7b9a3274ad6c2b1d8ce7b1d4c0f62e1 SHA256 f89f9a6a45aef86f6afc0c582fa2f25455ad063a53d5c47c484995cad48b8cab
+EBUILD nokogiri-1.5.0-r2.ebuild 3170 RMD160 4b9d9d5c4e817c44dc9b7eddcdfe0f5f86d78fd5 SHA1 75dc1cd2f0cde90ff658387e57bc7e6c6f9d4450 SHA256 3cb36802fe196f37f986cea8bab9ddf76ce6e360f2a36478041dee02d5bacd29
 EBUILD nokogiri-1.5.0.ebuild 2225 RMD160 11e4b608711dbd4efe379c97dd3342bac82be17e SHA1 9f94c90ccd340ed634789b6cc6e8684173ecd6be SHA256 dab33ef2dc1515b03bb3e9ca34ba22d7a6f01720f18af8d464d7eaaeb85fbb32
-MISC ChangeLog 9841 RMD160 0eab321885de077d079fc40faaf443ca82eb2c55 SHA1 7e1a27c18700007b3d69e39d487cd73f3dc21ab4 SHA256 1dab631beef2fc30f5b047a50bd15399821dd03f19f0676f4631244f779191c4
+MISC ChangeLog 10034 RMD160 3c3f864ef01d0a7c06f0ff8bf113d80396692690 SHA1 1c8d2b43b995d45ffc2710df9b5bad2f2c152362 SHA256 e87383ec031063259c4992c4b462b2fc9336e00627669505a561d87c1026c253
 MISC metadata.xml 548 RMD160 f7ad1aa047983cec3f318daa55967b1f59a6cbcd SHA1 0efa90c1c82af2fe4fd5feca24263d6330e258b0 SHA256 b001ebe70b094bd1ddc9d3fa45fa754e23362feb325c7e74e97f8d4c815ded7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7Hp4kACgkQiIP6VqMIqNcM6gD/ZSYQAFy9Mg9gsdtgetLw/J45
-qMc7zMbTE/vpHlFL2aYA/AzXCUchTbR/T3ttW0tldrX/Px6TqVQAVvAX4mb3GA7D
-=KvPs
+iF4EAREIAAYFAk7KtSEACgkQiIP6VqMIqNewlgD/ZjF2TOnPfTKFjx7ib9f+iIWq
+GIe4LgG+67qAj+GMy3MA/i7McQi488qdLyAsHIQg79WasyP3odl1ciJ/bQVHMGXv
+=4wdL
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/nokogiri/nokogiri-1.5.0-r2.ebuild b/dev-ruby/nokogiri/nokogiri-1.5.0-r2.ebuild
index a06bc3c40e926caab0489e9b92a55ae52d8f2806..9aebd9712dde49efbe4154f83e18db1618a0503c 100644 (file)
--- a/dev-ruby/nokogiri/nokogiri-1.5.0-r2.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.0-r2.ebuild,v 1.1 2011/11/19 12:56:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.0-r2.ebuild,v 1.2 2011/11/21 20:31:23 graaff Exp $
 
 EAPI=4
 
@@ -35,8 +35,8 @@ ruby_add_bdepend "
        dev-ruby/rake-compiler
        dev-ruby/rexical
        dev-ruby/hoe
+       dev-ruby/rdoc
        dev-ruby/racc
-       doc? ( dev-ruby/rdoc )
        test? ( dev-ruby/minitest )"
 
 all_ruby_prepare() {