[PATCH] Remove old CVS-isms from bootstrap.

[Micah Cowan]

---
 ChangeLog |    5 +++++
 bootstrap |   23 +----------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9377791..33ec517 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-24  Micah Cowan  <address@hidden>
+
+       * bootstrap: Remove --cvs-user, CVS_USER, CVS_RSH; and "test -d
+       CVS" from version_controlled_file function.
+
 2007-10-24  Jim Meyering  <address@hidden>
 
        Avoid diagnostics from sha1sum when there is no cached checksum.
diff --git a/bootstrap b/bootstrap
index 889a2d2..7c165c3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -48,8 +48,6 @@ Options:
  --force                  Attempt to bootstrap even if the sources seem
                           not to have been checked out.
  --skip-po                Do not download po files.
- --cvs-user=USERNAME      Set the username to use when checking out
-                          sources from the gnulib repository.
 
 If the file bootstrap.conf exists in the current working directory, its
 contents are read as shell variables to configure the bootstrap.
@@ -159,8 +157,6 @@ do
     exit;;
   --gnulib-srcdir=*)
     GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
-  --cvs-user=*)
-    CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
   --skip-po)
     SKIP_PO=t;;
   --force)
@@ -226,20 +222,6 @@ case ${GNULIB_SRCDIR--} in
   if [ ! -d gnulib ]; then
     echo "$0: getting gnulib files..."
 
-    case ${CVS_AUTH-pserver} in
-    pserver)
-      CVS_PREFIX=':pserver:anonymous@';;
-    ssh)
-      CVS_PREFIX="address@hidden";;
-    *)
-      echo "$0: $CVS_AUTH: Unknown CVS access method" >&2
-      exit 1;;
-    esac
-
-    case $CVS_RSH in
-    '') CVS_RSH=ssh; export CVS_RSH;;
-    esac
-
     trap cleanup_gnulib 1 2 13 15
 
     git clone --depth 2 git://git.sv.gnu.org/gnulib ||
@@ -413,10 +395,7 @@ version_controlled_file() {
   dir=$1
   file=$2
   found=no
-  if test -d CVS; then
-    grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
-            grep '^/[^/]*/[0-9]' > /dev/null && found=yes
-  elif test -d .git; then
+  if test -d .git; then
     git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
   else
     echo "$0: no version control for $dir/$file?" >&2
-- 
1.5.2.5