[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      13/09/14 19:00:10

  Modified:             ChangeLog eutils.eclass
  Log:
  Support EAPIs < 4 in einstalldocs properly.

Revision  Changes    Path
1.964                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.964&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.964&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.963&r2=1.964

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.963
retrieving revision 1.964
diff -u -r1.963 -r1.964
--- ChangeLog	13 Sep 2013 15:08:37 -0000	1.963
+++ ChangeLog	14 Sep 2013 19:00:10 -0000	1.964
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.963 2013/09/13 15:08:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.964 2013/09/14 19:00:10 mgorny Exp $
+
+  14 Sep 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+  Support EAPIs < 4 in einstalldocs properly.
 
   13 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Fail early on unreachable URLs. If ls-remote fails due to server being



1.427                eclass/eutils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.427&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.427&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.426&r2=1.427

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- eutils.eclass	13 Sep 2013 11:22:52 -0000	1.426
+++ eutils.eclass	14 Sep 2013 19:00:10 -0000	1.427
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.426 2013/09/13 11:22:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.427 2013/09/14 19:00:10 mgorny Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1648,22 +1648,35 @@
 einstalldocs() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local dodoc_opts=-r
+	has ${EAPI} 0 1 2 3 && dodoc_opts=
+
 	if ! declare -p DOCS &>/dev/null ; then
 		local d
 		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
 				THANKS BUGS FAQ CREDITS CHANGELOG ; do
-			[[ -s ${d} ]] && dodoc "${d}"
+			if [[ -s ${d} ]] ; then
+				dodoc "${d}" || die
+			fi
 		done
 	elif [[ $(declare -p DOCS) == "declare -a"* ]] ; then
-		[[ ${DOCS[@]} ]] && dodoc -r "${DOCS[@]}"
+		if [[ ${DOCS[@]} ]] ; then
+			dodoc ${dodoc_opts} "${DOCS[@]}" || die
+		fi
 	else
-		[[ ${DOCS} ]] && dodoc -r ${DOCS}
+		if [[ ${DOCS} ]] ; then
+			dodoc ${dodoc_opts} ${DOCS} || die
+		fi
 	fi
 
 	if [[ $(declare -p HTML_DOCS 2>/dev/null) == "declare -a"* ]] ; then
-		[[ ${HTML_DOCS[@]} ]] && dohtml -r "${HTML_DOCS[@]}"
+		if [[ ${HTML_DOCS[@]} ]] ; then
+			dohtml -r "${HTML_DOCS[@]}" || die
+		fi
 	else
-		[[ ${HTML_DOCS} ]] && dohtml -r ${HTML_DOCS}
+		if [[ ${HTML_DOCS} ]] ; then
+			dohtml -r ${HTML_DOCS} || die
+		fi
 	fi
 
 	return 0