[gentoo-commits] proj/portage:master commit in: man/, bin/, doc/package/ebuild/eapi/

[gentoo-commits] proj/portage:master commit in: man/, bin/, doc/package/ebuild/eapi/

[Zac Medico]

commit:     cba45f5b8f7d38993c7e93050a3771fd57fa8564
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 23:27:32 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 23:27:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cba45f5b

_eapi4_src_install: handle empty DOCS like PMS

This will fix bug #355635.

---
 bin/ebuild.sh                     |    2 +-
 doc/package/ebuild/eapi/4.docbook |    2 +-
 man/ebuild.5                      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index d0cf84d..8abdec9 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -671,7 +671,7 @@ _eapi4_src_install() {
 		emake DESTDIR="${D}" install
 	fi
 
-	if [[ -z $DOCS ]] ; then
+	if ! declare -p DOCS &>/dev/null ; then
 		local d
 		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
 				THANKS BUGS FAQ CREDITS CHANGELOG ; do

diff --git a/doc/package/ebuild/eapi/4.docbook b/doc/package/ebuild/eapi/4.docbook
index c379d11..83ba0dd 100644
--- a/doc/package/ebuild/eapi/4.docbook
+++ b/doc/package/ebuild/eapi/4.docbook
@@ -263,7 +263,7 @@ src_install() {
 		emake DESTDIR="${D}" install
 	fi
 
-	if [[ -z $DOCS ]] ; then
+	if ! declare -p DOCS &amp;>/dev/null ; then
 		local d
 		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
 				THANKS BUGS FAQ CREDITS CHANGELOG ; do

diff --git a/man/ebuild.5 b/man/ebuild.5
index dd6a31b..1067f82 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -700,7 +700,7 @@ src_install() {
         emake DESTDIR="${D}" install
     fi
 
-    if [[ \-z $DOCS ]] ; then
+    if ! declare -p DOCS &>/dev/null ; then
         local d
         for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \\
                 THANKS BUGS FAQ CREDITS CHANGELOG ; do