From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 25 Feb 2011 19:50:52 +0000 (-0800)
Subject: dodoc: call doins, to reuse recursion code
X-Git-Tag: v2.1.9.42~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=99e2cbb94d89961cadf4aade5d8757279fc374e0;p=portage.git

dodoc: call doins, to reuse recursion code

This will fix broken recursion logic for bug #356461.
---

diff --git a/bin/ebuild-helpers/4/dodoc b/bin/ebuild-helpers/4/dodoc
deleted file mode 100755
index 617bae297..000000000
--- a/bin/ebuild-helpers/4/dodoc
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
-
-if [ $# -lt 1 ] ; then
-	die "${0##*/}: at least one argument needed"
-	exit 1
-fi
-
-dir="${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
-if [ ! -d "${dir}" ] ; then
-	install -d "${dir}"
-fi
-
-ret=0
-
-DOINSRECUR="n"
-
-if [[ "$1" == "-r" ]] ; then
-	DOINSRECUR="y"
-	shift
-fi
-
-for x in "$@" ; do
-
-	if [ -d "${x}" ] ; then
-		if [[ ${DOINSRECUR} == "n" ]] ; then
-			echo "!!! ${0##*/}: $x is a directory" 1>&2
-			((ret|=1))
-			continue
-		fi
-
-		find "${x}" -mindepth 1 -maxdepth 1 -exec \
-			env \
-				_E_DOCDESTTREE_="$(basename "${x}")" \
-				"${0}" -r {} \;
-
-	elif [ -s "${x}" ] ; then
-		install -m0644 "${x}" "${dir}" || ((ret|=1))
-	elif [ ! -e "${x}" ] ; then
-		echo "!!! ${0##*/}: $x does not exist" 1>&2
-		((ret|=1))
-	fi
-
-done
-
-[[ $ret -ne 0 ]] && die "${0##*/} failed"
-exit ${ret}
diff --git a/bin/ebuild-helpers/4/dodoc b/bin/ebuild-helpers/4/dodoc
new file mode 120000
index 000000000..35080ada3
--- /dev/null
+++ b/bin/ebuild-helpers/4/dodoc
@@ -0,0 +1 @@
+../doins
\ No newline at end of file
diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 51cac06b4..8055a37a7 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -16,6 +16,17 @@ else
 	DOINSRECUR=n
 fi
 
+if [[ ${0##*/} == dodoc ]] ; then
+	if [ $# -eq 0 ] ; then
+		# default_src_install may call dodoc with no arguments
+		# when DOC is defined but empty, so simply return
+		# sucessfully in this case.
+		exit 0
+	fi
+	export INSOPTIONS=-m0644
+	export INSDESTTREE=usr/share/doc/${PF}/${_E_DOCDESTTREE_}
+fi
+
 if [[ ${INSDESTTREE#${D}} != "${INSDESTTREE}" ]]; then
 	vecho "-------------------------------------------------------" 1>&2
 	vecho "You should not use \${D} with helpers." 1>&2