From e0c59cef19fc304bafcdd6d51591766adf9ecbe2 Mon Sep 17 00:00:00 2001
From: Micah Cowan <micah@cowan.name>
Date: Fri, 26 Oct 2007 18:31:38 +0200
Subject: [PATCH] Remove vestiges of cvs-gnulib-checkout process.  Now we use
 git.

* build-aux/bootstrap: Remove support for now-unnecessary option,
--cvs-user, and envvars CVS_USER, CVS_RSH.
---
 ChangeLog           |  6 ++++++
 build-aux/bootstrap | 18 ------------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1ce0cac694..877b665385 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-24  Micah Cowan  <micah@cowan.name>
+
+	Remove vestiges of cvs-gnulib-checkout process.  Now we use git.
+	* build-aux/bootstrap: Remove support for now-unnecessary option,
+	--cvs-user, and envvars CVS_USER, CVS_RSH.
+
 2007-10-24  Jim Meyering  <meyering@redhat.com>
 
 	Avoid diagnostics from sha1sum when there is no cached checksum.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 889a2d2b13..0e2bd34fd1 100755
--- a/build-aux/bootstrap
+++ b/build-aux/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="$CVS_USER${CVS_USER+@}";;
-    *)
-      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 ||
-- 
2.30.2