diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-08-15 15:06:09 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-08-15 15:06:09 +0000 |
| commit | 011be19ddca66c2bf140172da59e71c3d066643a (patch) | |
| tree | 90f32afc885cc822cbc25cd993a3fda2452e6ba9 | |
| parent | Masked =sys-fs/udev-188 because of missing patches (bug #431534) (diff) | |
| download | gentoo-2-011be19ddca66c2bf140172da59e71c3d066643a.tar.gz gentoo-2-011be19ddca66c2bf140172da59e71c3d066643a.tar.bz2 gentoo-2-011be19ddca66c2bf140172da59e71c3d066643a.zip | |
Make sure not to test for use doc if it's not there.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/ruby-fakegem.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c4b340c50509..9b6fe4233760 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.370 2012/08/14 21:10:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.371 2012/08/15 15:06:09 flameeyes Exp $ + + 15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> ruby-fakegem.eclass: + Make sure not to test for use doc if it's not there. 14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> ruby-fakegem.eclass: Add support for documentation recipes as well, and implement an rdoc recipe. diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index 74280b9d63dc..aedfe04915fd 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -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/eclass/ruby-fakegem.eclass,v 1.35 2012/08/14 21:10:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.36 2012/08/15 15:06:09 flameeyes Exp $ # @ECLASS: ruby-fakegem.eclass # @MAINTAINER: @@ -273,7 +273,7 @@ ruby_fakegem_genspec() { # so better taking this into consideration. local quoted_description=${DESCRIPTION//\"/\\\"} cat - > $1 <<EOF -# generated by ruby-fakegem.eclass $Revision: 1.35 $ +# generated by ruby-fakegem.eclass $Revision: 1.36 $ Gem::Specification.new do |s| s.name = "${RUBY_FAKEGEM_NAME}" s.version = "${RUBY_FAKEGEM_VERSION}" @@ -323,7 +323,7 @@ ruby_fakegem_binwrapper() { #!${rubycmd} # This is a simplified version of the RubyGems wrapper # -# Generated by ruby-fakegem.eclass $Revision: 1.35 $ +# Generated by ruby-fakegem.eclass $Revision: 1.36 $ require 'rubygems' @@ -341,7 +341,7 @@ EOF # Build documentation for the package if indicated by the doc USE flag # and if there is a documetation task defined. all_fakegem_compile() { - if use doc; then + if [[ -n ${RUBY_FAKEGEM_DOCDIR} ]] && use doc; then case ${RUBY_FAKEGEM_RECIPE_DOC} in rake) rake ${RUBY_FAKEGEM_TASK_DOC} || die "failed to (re)build documentation" |