commit: 877424deb0e0bae058e7887fa94f93d2ab8dfaf6 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Mon May 16 13:49:43 2016 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Mon May 16 13:49:43 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877424de
dev-ruby/json: fix USE=doc during bootstrap Add explicit dependencies on dev-ruby/rdoc for USE=doc. Normally these are satified by dev-lang/ruby, but this happens in PDEPEND. During an initial merge of ruby the order of dev-ruby/rdoc and dev-ruby/json is not defined so the emerging json may fail due to a missing rdoc. Fixes bug 572042 Package-Manager: portage-2.2.28 dev-ruby/json/json-1.8.2-r1.ebuild | 5 +++-- dev-ruby/json/json-1.8.3.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-ruby/json/json-1.8.2-r1.ebuild b/dev-ruby/json/json-1.8.2-r1.ebuild index 09faec6..46c28d6 100644 --- a/dev-ruby/json/json-1.8.2-r1.ebuild +++ b/dev-ruby/json/json-1.8.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,7 +25,8 @@ RDEPEND="${RDEPEND}" DEPEND="${DEPEND} dev-util/ragel" -ruby_add_bdepend "dev-ruby/rake" +ruby_add_bdepend "dev-ruby/rake + doc? ( dev-ruby/rdoc )" all_ruby_prepare() { # Avoid building the extension twice! diff --git a/dev-ruby/json/json-1.8.3.ebuild b/dev-ruby/json/json-1.8.3.ebuild index 99a81bc..92d75b8 100644 --- a/dev-ruby/json/json-1.8.3.ebuild +++ b/dev-ruby/json/json-1.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,7 +25,8 @@ RDEPEND="${RDEPEND}" DEPEND="${DEPEND} dev-util/ragel" -ruby_add_bdepend "dev-ruby/rake" +ruby_add_bdepend "dev-ruby/rake + doc? ( dev-ruby/rdoc )" all_ruby_prepare() { # Avoid building the extension twice!