change DOCDESTTREE to _E_DOCDESTTREE_ to try and prevent abuse from ebuild writers (trunk r6347)

svn path=/main/branches/2.1.2/; revision=6902

3 files changed, 9 insertions, 8 deletions

diff --git a/bin/dodoc b/bin/dodoc
index 4139cb593..0c6b42a02 100755
--- a/bin/dodoc
+++ b/bin/dodoc
@@ -8,7 +8,7 @@ if [ $# -lt 1 ] ; then
 	exit 1 	
 fi
 
-dir="${D}usr/share/doc/${PF}/${DOCDESTTREE}"
+dir="${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
 if [ ! -d "${dir}" ] ; then
 	install -d "${dir}"
 fi
diff --git a/bin/dohtml b/bin/dohtml
index cdffad645..917ca1b52 100755
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -77,8 +77,8 @@ class OptionsClass:
 			self.PF = os.environ["PF"]
 		if os.environ.has_key("D"):
 			self.D = os.environ["D"]
-		if os.environ.has_key("DOCDESTTREE"):
-			self.DOCDESTTREE = os.environ["DOCDESTTREE"]
+		if os.environ.has_key("_E_DOCDESTTREE_"):
+			self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"]
 		
 		self.allowed_exts = [ 'png', 'gif', 'html', 'htm', 'jpg', 'css', 'js' ]
 		self.allowed_files = []
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 6ea33964c..a7d5fd871 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -354,7 +354,7 @@ umask 022
 export DESTTREE=/usr
 export INSDESTTREE=""
 export EXEDESTTREE=""
-export DOCDESTTREE=""
+export _E_DOCDESTTREE_=""
 export INSOPTIONS="-m0644"
 export EXEOPTIONS="-m0755"
 export LIBOPTIONS="-m0644"
@@ -848,11 +848,12 @@ exeinto() {
 
 docinto() {
 	if [ "$1" == "/" ]; then
-		export DOCDESTTREE=""
+		export _E_DOCDESTTREE_=""
+		eqawarn "QA Notice: invalid usage of docinto"
 	else
-		export DOCDESTTREE="$1"
-		if [ ! -d "${D}usr/share/doc/${PF}/${DOCDESTTREE}" ]; then
-			install -d "${D}usr/share/doc/${PF}/${DOCDESTTREE}"
+		export _E_DOCDESTTREE_="$1"
+		if [ ! -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then
+			install -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
 		fi
 	fi
 }