commit:     498b00b0486c6d84265cf47608a45faee948533e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 23:19:57 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 23:22:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=498b00b0

dev-ruby/shorturl: build fix

Without fixing 'rake doc', the documentation is never built, and the
'doc' directory does not exist; this caused pushd/popd to fail.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild 
b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
index 6fe5b84..ae31b1e 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
@@ -7,7 +7,8 @@ EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_TASK_DOC="doc"
 
 RUBY_FAKEGEM_EXTRADOC="ChangeLog.txt README.rdoc TODO.rdoc"
 
@@ -31,7 +32,10 @@ each_ruby_test() {
 all_ruby_install() {
        all_fakegem_install
 
-       pushd doc &>/dev/null
-       dohtml -r .
-       popd &>/dev/null
+       if use doc; then
+               # If the doc build fails, the doc directory might not exist
+               pushd doc &>/dev/null || die "pushd doc failed"
+               dohtml -r .
+               popd &>/dev/null
+       fi
 }

Reply via email to