Removed the dodoc new testing features from head's version of dodoc.

2 files changed, 8 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b6da7b..753024f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.125 2005/05/15 09:37:49 jstubbs Exp $
+# $Id: ChangeLog,v 1.796.2.126 2005/05/15 11:04:21 jstubbs Exp $
 
   MAJOR CHANGES in 2.0.51:
     1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
     2. /var/cache/edb/world is now /var/lib/portage/world.
     3. /etc/portage/profile/virtuals is _USER_ configs only.
 
+*portage-2.0.51.22 (15 May 2005): Maintainence Release
+
+  15 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/dodoc: Removed the dodoc
+  new testing features from head's version of dodoc.
+
   15 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge: Made --newuse
   take priority over --usepkg.
 
diff --git a/bin/dodoc b/bin/dodoc
index 3d45eda..376cb30 100755
--- a/bin/dodoc
+++ b/bin/dodoc
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dodoc,v 1.6.2.1 2005/05/12 15:20:22 jstubbs Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dodoc,v 1.6.2.2 2005/05/15 11:04:21 jstubbs Exp $
 
 if [ $# -lt 1 ] ; then
 	echo "$0: at least one argument needed" 1>&2
@@ -13,13 +13,10 @@ if [ ! -d "${dir}" ] ; then
 	install -d "${dir}"
 fi
 
-PORTAGE_COMPRESS=${PORTAGE_COMPRESS:-gzip}
-PORTAGE_COMPRESS_FLAGS=${PORTAGE_COMPRESS_FLAGS:--9}
-
 for x in "$@" ; do
 	if [ -s "${x}" ] ; then
 		install -m0644 "${x}" "${dir}"
-		"${PORTAGE_COMPRESS}" ${PORTAGE_COMPRESS_FLAGS} -f "${dir}/${x##*/}"
+		gzip -f -9 "${dir}/${x##*/}"
 	elif [ ! -e "${x}" ] ; then
 		echo "dodoc: ${x} does not exist" 1>&2
 	fi