Remove vestiges of cvs-gnulib-checkout process. Now we use git.

* bootstrap: Remove support for now-unnecessary option, --cvs-user,
and envvars CVS_USER, CVS_RSH.

2007-10-24  Micah Cowan  <micah@cowan.name>

2 files changed, 6 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index b70dd9130..063960da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-10-24  Micah Cowan  <micah@cowan.name>
 
+	Remove vestiges of cvs-gnulib-checkout process.  Now we use git.
+	* bootstrap: Remove support for now-unnecessary option, --cvs-user,
+	and envvars CVS_USER, CVS_RSH.
+
+2007-10-24  Micah Cowan  <micah@cowan.name>
+
 	Tell xgettext that "ARG1 % ARG2" is not a C format string.
 	* src/expr.c (usage): Add a comment to override xgettext's default
 	behavior, which would classify "ARG1 % ARG2" as a fprintf-style
diff --git a/bootstrap b/bootstrap
index 889a2d2b1..0e2bd34fd 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="$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 ||