* [gentoo-commits] proj/portage-utils:master commit in: tests/quse/, /, tests/source/, tests/quse/portdir/profiles/desc/, tests/qlist/, ...
@ 2014-03-10 6:00 Mike Frysinger
0 siblings, 0 replies; only message in thread
From: Mike Frysinger @ 2014-03-10 6:00 UTC (permalink / raw
To: gentoo-commits
commit: 6ff528ccd32dd31403daf42e304678f4d4449c41
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 9 20:18:37 2014 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 9 20:18:37 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage-utils.git;a=commit;h=6ff528cc
build: convert all cvs references to git
---
.cvsignore | 44 -----------------------------
.gitignore | 2 --
Makefile | 40 +++++++++++++-------------
Makefile.am | 4 ---
README | 19 +++++++------
applets.h | 5 ++--
configure.ac | 2 +-
cvsignore-to-gitignore.sh | 9 ------
libq/atom_compare.c | 5 ++--
libq/atom_explode.c | 5 ++--
libq/basename.c | 3 +-
libq/prelink.c | 3 +-
libq/safe_io.c | 3 +-
libq/scandirat.c | 5 ++--
libq/vdb.c | 5 ++--
libq/virtuals.c | 7 ++---
libq/xarray.c | 5 ++--
libq/xchdir.c | 3 +-
libq/xgetcwd.c | 3 +-
libq/xreadlink.c | 3 +-
libq/xsystem.c | 3 +-
main.c | 19 +++++++------
main.h | 5 ++--
make-tarball.sh | 28 ++++++++++--------
porting.h | 5 ++--
q.c | 6 ++--
qatom.c | 7 ++---
qcache.c | 6 +---
qcheck.c | 6 ++--
qdepends.c | 6 ++--
qfile.c | 6 ++--
qglsa.c | 6 ++--
qgrep.c | 6 ++--
qlist.c | 6 ++--
qlop.c | 6 ++--
qmerge.c | 8 ++----
qpkg.c | 6 ++--
qsearch.c | 6 ++--
qsize.c | 6 ++--
qsync | 1 -
qtbz2.c | 6 ++--
quse.c | 6 ++--
qxpak.c | 6 ++--
template.c | 7 ++---
tests/atom_compare/.cvsignore | 4 ---
tests/atom_explode/.cvsignore | 6 ----
tests/atom_explode/.gitignore | 1 -
tests/atom_explode/test.c | 5 ++--
tests/init.sh | 2 +-
tests/install/.cvsignore | 1 -
tests/mkdir/.cvsignore | 1 -
tests/mkdir/test.c | 5 ++--
tests/qlist/dotest | 4 +--
tests/quse/dotest | 1 -
tests/quse/portdir/profiles/desc/elibc.desc | 3 +-
tests/source/dotest | 1 -
tests/tests.h | 5 ++--
57 files changed, 128 insertions(+), 259 deletions(-)
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 75310f6..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,44 +0,0 @@
-*bz2
-*~
-*.o
-
-*.patch
-*.orig
-*.rej
-*.diff
-portage-utils-*
-contrib
-
-aclocal.m4
-autom4te.cache
-build
-config.h
-config.h.in
-configure
-autotools
-Makefile.in
-
-*.old.c
-q
-qatom
-qcache
-qcheck
-qdepends
-qfile
-qglsa
-qgrep
-qlist
-qlop
-qmerge
-qpkg
-qsearch
-qsize
-quse
-qxpak
-
-a.out
-core
-.gdb_history
-.gdbinit
-
-.git
diff --git a/.gitignore b/.gitignore
index 24681b5..79ad336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,3 @@ a.out
core
.gdb_history
.gdbinit
-
-CVS
diff --git a/Makefile b/Makefile
index bda2deb..2889fe2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-# Copyright 2005-2008 Gentoo Foundation
+# Copyright 2005-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v 1.77 2014/02/18 07:31:33 vapier Exp $
####################################################################
check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
@@ -37,7 +36,9 @@ endif
ifdef PV
CPPFLAGS += -DVERSION=\"$(PV)\"
else
-PV := cvs
+PV := git
+VCSID := $(shell git describe --tags HEAD)
+CPPFLAGS += -DVCSID='"$(VCSID)"'
endif
ifndef PF
PF := portage-utils-$(PV)
@@ -100,24 +101,21 @@ testclean:
cd tests && $(MAKE) clean
install: all
- -$(MKDIR) $(PREFIX)/bin/
+ $(MKDIR) $(PREFIX)/bin/
$(CP) q $(PREFIX)/bin/
- if [ ! -d CVS ] ; then \
- $(MKDIR) $(PREFIX)/share/man/man1/ ; \
- for mpage in $(wildcard man/*.1) ; do \
- [ -e $$mpage ] \
- && cp $$mpage $(PREFIX)/share/man/man1/ || : ;\
- done ; \
- $(MKDIR) $(PREFIX)/share/doc/$(PF) ; \
- for doc in $(DOCS) ; do \
- cp $$doc $(PREFIX)/share/doc/$(PF)/ ; \
- done ; \
- fi
- (cd $(PREFIX)/bin/ ; \
- for applet in $(APPLETS); do \
- [ ! -e "$$applet" ] && ln -s q $${applet} ; \
- done \
- )
+
+ set -e ; \
+ for applet in $(filter-out q,$(APPLETS)) ; do \
+ ln -sf q $(PREFIX)/bin/$${applet} ; \
+ done
+
+ifneq ($(wildcard man/*.1),)
+ $(MKDIR) $(PREFIX)/share/man/man1/
+ cp $(wildcard man/*.1) $(PREFIX)/share/man/man1/
+endif
+
+ $(MKDIR) $(PREFIX)/share/doc/$(PF)
+ cp $(DOCS) $(PREFIX)/share/doc/$(PF)/
man: q
./man/mkman.py
@@ -138,7 +136,7 @@ EXTRA_DIST = \
$(SRC) \
qglsa.c \
$(wildcard libq/*.c *.h libq/*.h) \
- $(shell find tests -type f '!' -ipath '*/CVS/*')
+ $(shell find tests -type f)
MAKE_MULTI_LINES = $(patsubst %,\\\\\n\t%,$(sort $(1)))
# 2nd level of indirection here is so the $(find) doesn't pick up
# files in EXTRA_DIST that get cleaned up ...
diff --git a/Makefile.am b/Makefile.am
index 54ed990..2be96c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -143,7 +143,6 @@ EXTRA_DIST += \
quse.c \
qxpak.c \
tests/Makefile \
- tests/atom_compare/.cvsignore \
tests/atom_compare/.gitignore \
tests/atom_compare/Makefile \
tests/atom_compare/atom-compare.py \
@@ -151,7 +150,6 @@ EXTRA_DIST += \
tests/atom_compare/static.q.good \
tests/atom_compare/static.q.tests \
tests/atom_compare/static.tests \
- tests/atom_explode/.cvsignore \
tests/atom_explode/.gitignore \
tests/atom_explode/Makefile \
tests/atom_explode/atom-explode.py \
@@ -160,11 +158,9 @@ EXTRA_DIST += \
tests/atom_explode/dotest \
tests/atom_explode/test.c \
tests/init.sh \
- tests/install/.cvsignore \
tests/install/.gitignore \
tests/install/Makefile \
tests/install/dotest \
- tests/mkdir/.cvsignore \
tests/mkdir/.gitignore \
tests/mkdir/Makefile \
tests/mkdir/dotest \
diff --git a/README b/README
index 8ab2ce2..cf45a7d 100644
--- a/README
+++ b/README
@@ -1,9 +1,11 @@
-# Copyright 2005-2006 Gentoo Foundation
+# Copyright 2005-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-projects/portage-utils/README,v 1.23 2007/01/22 05:38:49 solar Exp $
Contact:
- portage-utils@gentoo.org
+ Please file bugs at:
+ https://bugs.gentoo.org/enter_bug.cgi?product=Portage%20Development&format=guided
+ Use Component of "Third-Party Tools".
+
Current developer list:
solar@gentoo.org
vapier@gentoo.org
@@ -21,10 +23,9 @@ Current developer list:
q: Finished 20655 entries in 203.664252 seconds
-- Fetching via anoncvs.
-The cvs module for gentoo-projects is mirrored. You may download a
-pretty recent copy using the following command. Note: that this is not
-the official cvs server but rather a mirror so it lags about a hour or
-so behind the real tree which is hosted on cvs.gentoo.org
+- Fetching via anon git:
+
+ git clone git://git.overlays.gentoo.org/proj/portage-utils.git
-cvs -d:pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot -q co -R gentoo-projects/portage-utils
+You can view it online via gitweb:
+ http://git.overlays.gentoo.org/gitweb/?p=proj/portage-utils.git
diff --git a/applets.h b/applets.h
index 772a59e..d546600 100644
--- a/applets.h
+++ b/applets.h
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/applets.h,v 1.28 2011/12/19 04:28:35 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifndef _QAPPLETS_H_
diff --git a/configure.ac b/configure.ac
index 85f21c8..29063cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.65])
-AC_INIT([portage-utils], [cvs])
+AC_INIT([portage-utils], [git])
AC_CONFIG_AUX_DIR([autotools])
AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip silent-rules -Wall])
AM_SILENT_RULES([yes]) # AM_INIT_AUTOMAKE([silent-rules]) is broken atm
diff --git a/cvsignore-to-gitignore.sh b/cvsignore-to-gitignore.sh
deleted file mode 100755
index 93a21cd..0000000
--- a/cvsignore-to-gitignore.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-find -name .cvsignore | \
-while read c ; do
- g=${c/cvs/git}
- sed \
- -e 's:[.]git:CVS:' \
- ${c} > ${g}
-done
diff --git a/libq/atom_compare.c b/libq/atom_compare.c
index 41cb115..65bb043 100644
--- a/libq/atom_compare.c
+++ b/libq/atom_compare.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2008 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/atom_compare.c,v 1.8 2013/04/29 04:38:16 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2008 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
const char * const booga[] = {"!!!", "!=", "==", ">", "<"};
diff --git a/libq/atom_explode.c b/libq/atom_explode.c
index 8795706..a674197 100644
--- a/libq/atom_explode.c
+++ b/libq/atom_explode.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2008 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/atom_explode.c,v 1.27 2013/04/29 04:38:16 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2008 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
typedef enum { VER_ALPHA=0, VER_BETA, VER_PRE, VER_RC, VER_NORM, VER_P } atom_suffixes;
diff --git a/libq/basename.c b/libq/basename.c
index e480429..dcf3cce 100644
--- a/libq/basename.c
+++ b/libq/basename.c
@@ -1,7 +1,6 @@
/*
- * Copyright 2010 Gentoo Foundation
+ * Copyright 2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/basename.c,v 1.1 2010/07/19 00:25:13 vapier Exp $
*/
static const char *_basename(const char *filename)
diff --git a/libq/prelink.c b/libq/prelink.c
index eebabef..de7b205 100644
--- a/libq/prelink.c
+++ b/libq/prelink.c
@@ -1,7 +1,6 @@
/*
- * Copyright 2011 Gentoo Foundation
+ * Copyright 2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/prelink.c,v 1.4 2012/08/13 22:23:35 robbat2 Exp $
*/
#include <signal.h>
diff --git a/libq/safe_io.c b/libq/safe_io.c
index 6cf39bf..059bcac 100644
--- a/libq/safe_io.c
+++ b/libq/safe_io.c
@@ -1,9 +1,8 @@
/*
* utility funcs
*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/safe_io.c,v 1.3 2011/12/19 04:41:58 vapier Exp $
*/
#include <stdio.h>
diff --git a/libq/scandirat.c b/libq/scandirat.c
index 0a84828..65d1012 100644
--- a/libq/scandirat.c
+++ b/libq/scandirat.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2011 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/scandirat.c,v 1.8 2014/02/16 21:14:24 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2011 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#if !defined(HAVE_SCANDIRAT)
diff --git a/libq/vdb.c b/libq/vdb.c
index a016c23..2a57bce 100644
--- a/libq/vdb.c
+++ b/libq/vdb.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2011 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/vdb.c,v 1.7 2014/02/17 06:31:10 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2011 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
/*
diff --git a/libq/virtuals.c b/libq/virtuals.c
index d4f4ae7..8d8da03 100644
--- a/libq/virtuals.c
+++ b/libq/virtuals.c
@@ -1,12 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v 1.28 2014/02/18 07:26:13 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
- *
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v 1.28 2014/02/18 07:26:13 vapier Exp $
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#include <stdio.h>
diff --git a/libq/xarray.c b/libq/xarray.c
index c5c3f4d..b4c3857 100644
--- a/libq/xarray.c
+++ b/libq/xarray.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2003-2007 Gentoo Foundation
+ * Copyright 2003-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xarray.c,v 1.1 2011/10/03 16:18:25 vapier Exp $
*
* Copyright 2003-2007 Ned Ludd - <solar@gentoo.org>
- * Copyright 2004-2007 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2004-2014 Mike Frysinger - <vapier@gentoo.org>
*/
typedef struct {
diff --git a/libq/xchdir.c b/libq/xchdir.c
index ec694ab..b127e9c 100644
--- a/libq/xchdir.c
+++ b/libq/xchdir.c
@@ -1,9 +1,8 @@
/*
* utility funcs
*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xchdir.c,v 1.1 2010/01/13 18:17:26 vapier Exp $
*/
#include <unistd.h>
diff --git a/libq/xgetcwd.c b/libq/xgetcwd.c
index 966616e..876e17c 100644
--- a/libq/xgetcwd.c
+++ b/libq/xgetcwd.c
@@ -1,9 +1,8 @@
/*
* utility funcs
*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xgetcwd.c,v 1.1 2010/01/13 18:48:01 vapier Exp $
*/
#include <unistd.h>
diff --git a/libq/xreadlink.c b/libq/xreadlink.c
index 579978a..b580dbd 100644
--- a/libq/xreadlink.c
+++ b/libq/xreadlink.c
@@ -1,9 +1,8 @@
/*
* utility funcs
*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xreadlink.c,v 1.1 2010/01/13 19:11:03 vapier Exp $
*/
#include <unistd.h>
diff --git a/libq/xsystem.c b/libq/xsystem.c
index 969d76a..e688c5d 100644
--- a/libq/xsystem.c
+++ b/libq/xsystem.c
@@ -1,9 +1,8 @@
/*
* utility funcs
*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xsystem.c,v 1.3 2014/02/18 06:52:17 vapier Exp $
*/
#include <stdlib.h>
diff --git a/main.c b/main.c
index 38a447e..2fd242f 100644
--- a/main.c
+++ b/main.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2013 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.232 2014/02/25 21:30:50 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2013 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#include "porting.h"
@@ -102,7 +101,7 @@ void no_colors(void)
case 0x1: portroot = optarg; break; \
case 'v': ++verbose; break; \
case 'q': ++quiet; if (freopen("/dev/null", "w", stderr)) { /* ignore errors */ } break; \
- case 'V': version_barf( applet ## _rcsid ); break; \
+ case 'V': version_barf(); break; \
case 'h': applet ## _usage(EXIT_SUCCESS); break; \
case 'C': no_colors(); break; \
default: applet ## _usage(EXIT_FAILURE); break;
@@ -156,14 +155,18 @@ static void usage(int status, const char *flags, struct option const opts[],
exit(status);
}
-static void version_barf(const char *Id)
+static void version_barf(void)
{
#ifndef VERSION
-# define VERSION "cvs"
+# define VERSION "git"
#endif
- printf("portage-utils-%s: compiled on %s\n%s\n"
+#ifndef VCSID
+# define VCSID "<unknown>"
+#endif
+ printf("portage-utils-%s: compiled on %s\n"
+ "vcs id: %s\n"
"%s written for Gentoo by <solar and vapier @ gentoo.org>\n",
- VERSION, __DATE__, Id, argv0);
+ VERSION, __DATE__, VCSID, argv0);
exit(EXIT_SUCCESS);
}
diff --git a/main.h b/main.h
index 43f219c..0b125ac 100644
--- a/main.h
+++ b/main.h
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.h,v 1.17 2014/02/18 04:32:04 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifndef _q_static
diff --git a/make-tarball.sh b/make-tarball.sh
index 92f6f32..143a927 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -3,40 +3,46 @@
set -e
if ! . /etc/init.d/functions.sh 2>/dev/null ; then
- einfo() { echo " * $*"; }
- eerror() { echo " * $*" 1>&2; }
+ einfo() { printf ' * %b\n' "$*"; }
+ eerror() { einfo "$@" 1>&2; }
fi
+die() { eerror "$@"; exit 1; }
v() { printf '\t%s\n' "$*"; "$@"; }
: ${MAKE:=make}
if [[ $# -ne 1 ]] ; then
- eerror "Usage: $0 <ver>" 1>&2
- exit 1
+ die "Usage: $0 <ver>"
fi
-ver="$1"
-[[ "$ver" == "snap" ]] && ver=$(date -u +%Y%m%d)
+case $1 in
+snap) ver=$(date -u +%Y%m%d) ;;
+git) ver="HEAD" ;;
+*)
+ ver="v$1"
+ if ! git describe --tags "${ver}" >&/dev/null ; then
+ die "Please create the tag first: git tag ${ver}"
+ fi
+ ;;
+esac
p="portage-utils-$ver"
rm -rf "${p}"
mkdir "${p}"
-einfo "Checking out clean cvs sources ..."
-cp -a CVS "${p}"/
+einfo "Checking out clean git sources ..."
+git archive "${ver}" | tar xf - -C "${p}"
cd "${p}"
-v cvs -Q up
einfo "Building autotools ..."
-sed -i "/^AC_INIT/s:cvs:${ver}:" configure.ac
+sed -i "/^AC_INIT/s:git:${ver}:" configure.ac
sed -i "1iPV := ${ver}" Makefile
LC_ALL=C ${MAKE} -s autotools >/dev/null
rm -rf autom4te.cache
cd ..
einfo "Generating tarball ..."
-find "${p}" -type d -name CVS -prune -print0 | xargs -0 rm -rf
tar cf - "${p}" | xz > "${p}".tar.xz
rm -r "${p}"
du -b "${p}".tar.*
diff --git a/porting.h b/porting.h
index f36d6b7..352d3bf 100644
--- a/porting.h
+++ b/porting.h
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2013 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/porting.h,v 1.2 2014/02/16 21:14:24 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2013 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*
* All the junk in one trunk!
*/
diff --git a/q.c b/q.c
index a4a0012..849f7ad 100644
--- a/q.c
+++ b/q.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/q.c,v 1.53 2014/02/25 21:30:50 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#define Q_FLAGS "irmM:" COMMON_FLAGS
@@ -22,7 +21,6 @@ static const char * const q_opts_help[] = {
"Module path",
COMMON_OPTS_HELP
};
-static const char q_rcsid[] = "$Id: q.c,v 1.53 2014/02/25 21:30:50 vapier Exp $";
#define q_usage(ret) usage(ret, Q_FLAGS, q_long_opts, q_opts_help, lookup_applet_idx("q"))
static APPLET lookup_applet(const char *applet)
diff --git a/qatom.c b/qatom.c
index 610b98e..25eee8e 100644
--- a/qatom.c
+++ b/qatom.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2008 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qatom.c,v 1.10 2013/04/29 04:38:16 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2008 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qatom
@@ -18,8 +17,6 @@ static const char * const qatom_opts_help[] = {
"Compare two atoms",
COMMON_OPTS_HELP
};
-
-static const char qatom_rcsid[] = "$Id: qatom.c,v 1.10 2013/04/29 04:38:16 vapier Exp $";
#define qatom_usage(ret) usage(ret, QATOM_FLAGS, qatom_long_opts, qatom_opts_help, lookup_applet_idx("qatom"))
int qatom_main(int argc, char **argv)
diff --git a/qcache.c b/qcache.c
index e8eedd0..d0bab3b 100644
--- a/qcache.c
+++ b/qcache.c
@@ -1,7 +1,6 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcache.c,v 1.48 2014/02/18 07:30:30 vapier Exp $
*
* Copyright 2006 Thomas A. Cort - <tcort@gentoo.org>
*/
@@ -34,7 +33,6 @@ static struct option const qcache_long_opts[] = {
{"not", no_argument, NULL, 'n'},
COMMON_LONG_OPTS
};
-
static const char * const qcache_opts_help[] = {
"match pkgname",
"match catname",
@@ -46,8 +44,6 @@ static const char * const qcache_opts_help[] = {
"list packages that aren't keyworded on a given arch.",
COMMON_OPTS_HELP
};
-
-static const char qcache_rcsid[] = "$Id: qcache.c,v 1.48 2014/02/18 07:30:30 vapier Exp $";
#define qcache_usage(ret) usage(ret, QCACHE_FLAGS, qcache_long_opts, qcache_opts_help, lookup_applet_idx("qcache"))
/********************************************************************/
diff --git a/qcheck.c b/qcheck.c
index 0cb5afe..4791430 100644
--- a/qcheck.c
+++ b/qcheck.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2011 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.59 2014/01/07 19:48:45 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2011 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qcheck
@@ -36,7 +35,6 @@ static const char * const qcheck_opts_help[] = {
"Undo prelink when calculating checksums",
COMMON_OPTS_HELP
};
-static const char qcheck_rcsid[] = "$Id: qcheck.c,v 1.59 2014/01/07 19:48:45 vapier Exp $";
#define qcheck_usage(ret) usage(ret, QCHECK_FLAGS, qcheck_long_opts, qcheck_opts_help, lookup_applet_idx("qcheck"))
#define qcprintf(fmt, args...) if (!state->bad_only) printf(_(fmt), ## args)
diff --git a/qdepends.c b/qdepends.c
index b6c0d1c..eba8304 100644
--- a/qdepends.c
+++ b/qdepends.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2013 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.67 2014/02/18 07:26:14 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2013 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qdepends
@@ -32,7 +31,6 @@ static const char * const qdepends_opts_help[] = {
"Pretty format specified depend strings",
COMMON_OPTS_HELP
};
-static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.67 2014/02/18 07:26:14 vapier Exp $";
#define qdepends_usage(ret) usage(ret, QDEPENDS_FLAGS, qdepends_long_opts, qdepends_opts_help, lookup_applet_idx("qdepends"))
static char qdep_name_only = 0;
diff --git a/qfile.c b/qfile.c
index 0c8dfc2..174cb7d 100644
--- a/qfile.c
+++ b/qfile.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qfile.c,v 1.66 2013/04/29 05:32:43 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qfile
@@ -36,7 +35,6 @@ static const char * const qfile_opts_help[] = {
"Exact match (used with --exclude)",
COMMON_OPTS_HELP
};
-static const char qfile_rcsid[] = "$Id: qfile.c,v 1.66 2013/04/29 05:32:43 vapier Exp $";
#define qfile_usage(ret) usage(ret, QFILE_FLAGS, qfile_long_opts, qfile_opts_help, lookup_applet_idx("qfile"))
#define qfile_is_prefix(path, prefix, prefix_length) \
diff --git a/qglsa.c b/qglsa.c
index 642fb87..4ac3d19 100644
--- a/qglsa.c
+++ b/qglsa.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qglsa.c,v 1.14 2012/10/28 04:16:19 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qglsa
@@ -30,7 +29,6 @@ static const char * const qglsa_opts_help[] = {
"Mark specified GLSAs as fixed",
COMMON_OPTS_HELP
};
-static const char qglsa_rcsid[] = "$Id: qglsa.c,v 1.14 2012/10/28 04:16:19 vapier Exp $";
#define qglsa_usage(ret) usage(ret, QGLSA_FLAGS, qglsa_long_opts, qglsa_opts_help, lookup_applet_idx("qglsa"))
static char *qglsa_load_list(void);
diff --git a/qgrep.c b/qgrep.c
index b30d0c3..982672d 100644
--- a/qgrep.c
+++ b/qgrep.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v 1.32 2012/10/28 04:16:19 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
* Copyright 2005 Petteri Räty - <betelgeuse@gentoo.org>
*/
@@ -47,7 +46,6 @@ static const char * const qgrep_opts_help[] = {
"Print <arg> lines of trailing context",
COMMON_OPTS_HELP
};
-static const char qgrep_rcsid[] = "$Id: qgrep.c,v 1.32 2012/10/28 04:16:19 vapier Exp $";
#define qgrep_usage(ret) usage(ret, QGREP_FLAGS, qgrep_long_opts, qgrep_opts_help, lookup_applet_idx("qgrep"))
char qgrep_name_match(const char*, const int, depend_atom**);
diff --git a/qlist.c b/qlist.c
index 3d3b8f3..5e2c365 100644
--- a/qlist.c
+++ b/qlist.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.75 2013/04/29 05:10:35 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
* Copyright 2005 Martin Schlemmer - <azarah@gentoo.org>
*/
@@ -41,7 +40,6 @@ static const char * const qlist_opts_help[] = {
/* "query filename for pkgname", */
COMMON_OPTS_HELP
};
-static const char qlist_rcsid[] = "$Id: qlist.c,v 1.75 2013/04/29 05:10:35 vapier Exp $";
#define qlist_usage(ret) usage(ret, QLIST_FLAGS, qlist_long_opts, qlist_opts_help, lookup_applet_idx("qlist"))
_q_static queue *filter_dups(queue *sets)
diff --git a/qlop.c b/qlop.c
index 55e2254..21e272d 100644
--- a/qlop.c
+++ b/qlop.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlop.c,v 1.62 2013/04/21 04:28:10 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qlop
@@ -52,7 +51,6 @@ static const char * const qlop_opts_help[] = {
"Read emerge logfile instead of " QLOP_DEFAULT_LOGFILE,
COMMON_OPTS_HELP
};
-static const char qlop_rcsid[] = "$Id: qlop.c,v 1.62 2013/04/21 04:28:10 vapier Exp $";
#define qlop_usage(ret) usage(ret, QLOP_FLAGS, qlop_long_opts, qlop_opts_help, lookup_applet_idx("qlop"))
#define QLOP_LIST 0x01
diff --git a/qmerge.c b/qmerge.c
index 8d77b7e..3aab0ce 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.139 2014/02/18 07:26:14 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qmerge
@@ -51,7 +50,6 @@ static struct option const qmerge_long_opts[] = {
{"debug", no_argument, NULL, 128},
COMMON_LONG_OPTS
};
-
static const char * const qmerge_opts_help[] = {
"Fetch package and newest Packages metadata",
"Fetch package (skipping Packages)",
@@ -66,8 +64,6 @@ static const char * const qmerge_opts_help[] = {
"Run shell funcs with `set -x`",
COMMON_OPTS_HELP
};
-
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.139 2014/02/18 07:26:14 vapier Exp $";
#define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
char search_pkgs = 0;
diff --git a/qpkg.c b/qpkg.c
index 5b5ca81..512a4b9 100644
--- a/qpkg.c
+++ b/qpkg.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qpkg.c,v 1.38 2012/10/28 04:16:19 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qpkg
@@ -26,7 +25,6 @@ static const char * const qpkg_opts_help[] = {
"alternate package directory",
COMMON_OPTS_HELP
};
-static const char qpkg_rcsid[] = "$Id: qpkg.c,v 1.38 2012/10/28 04:16:19 vapier Exp $";
#define qpkg_usage(ret) usage(ret, QPKG_FLAGS, qpkg_long_opts, qpkg_opts_help, lookup_applet_idx("qpkg"))
extern char pretend;
diff --git a/qsearch.c b/qsearch.c
index 4889412..e1285a3 100644
--- a/qsearch.c
+++ b/qsearch.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsearch.c,v 1.42 2012/10/28 04:31:20 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qsearch
@@ -30,7 +29,6 @@ static const char * const qsearch_opts_help[] = {
"Show homepage info",
COMMON_OPTS_HELP
};
-static const char qsearch_rcsid[] = "$Id: qsearch.c,v 1.42 2012/10/28 04:31:20 vapier Exp $";
#define qsearch_usage(ret) usage(ret, QSEARCH_FLAGS, qsearch_long_opts, qsearch_opts_help, lookup_applet_idx("qsearch"))
int qsearch_main(int argc, char **argv)
diff --git a/qsize.c b/qsize.c
index f43994b..3cecccb 100644
--- a/qsize.c
+++ b/qsize.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsize.c,v 1.39 2011/12/18 01:17:14 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qsize
@@ -32,7 +31,6 @@ static const char * const qsize_opts_help[] = {
"Ignore regexp string",
COMMON_OPTS_HELP
};
-static const char qsize_rcsid[] = "$Id: qsize.c,v 1.39 2011/12/18 01:17:14 vapier Exp $";
#define qsize_usage(ret) usage(ret, QSIZE_FLAGS, qsize_long_opts, qsize_opts_help, lookup_applet_idx("qsize"))
int qsize_main(int argc, char **argv)
diff --git a/qsync b/qsync
index ff37175..838d997 100755
--- a/qsync
+++ b/qsync
@@ -1,5 +1,4 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-projects/portage-utils/qsync,v 1.8 2010/12/04 11:09:51 vapier Exp $
get_portage_var() {
local var=$1 val
diff --git a/qtbz2.c b/qtbz2.c
index 4f9f24c..9208097 100644
--- a/qtbz2.c
+++ b/qtbz2.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qtbz2.c,v 1.22 2014/02/16 21:14:24 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qtbz2
@@ -46,7 +45,6 @@ static const char * const qtbz2_opts_help[] = {
"Write files to stdout",
COMMON_OPTS_HELP
};
-static const char qtbz2_rcsid[] = "$Id: qtbz2.c,v 1.22 2014/02/16 21:14:24 vapier Exp $";
#define qtbz2_usage(ret) usage(ret, QTBZ2_FLAGS, qtbz2_long_opts, qtbz2_opts_help, lookup_applet_idx("qtbz2"))
static char tbz2_stdout = 0;
diff --git a/quse.c b/quse.c
index 8ddc91d..8ee37f4 100644
--- a/quse.c
+++ b/quse.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v 1.67 2013/04/21 04:28:10 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_quse
@@ -35,7 +34,6 @@ static const char * const quse_opts_help[] = {
"Only show package name",
COMMON_OPTS_HELP
};
-static const char quse_rcsid[] = "$Id: quse.c,v 1.67 2013/04/21 04:28:10 vapier Exp $";
#define quse_usage(ret) usage(ret, QUSE_FLAGS, quse_long_opts, quse_opts_help, lookup_applet_idx("quse"))
int quse_describe_flag(unsigned int ind, unsigned int argc, char **argv);
diff --git a/qxpak.c b/qxpak.c
index 2d1a7ad..9a2e11b 100644
--- a/qxpak.c
+++ b/qxpak.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qxpak.c,v 1.27 2014/02/16 21:14:24 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qxpak
@@ -46,7 +45,6 @@ static const char * const qxpak_opts_help[] = {
"Write files to stdout",
COMMON_OPTS_HELP
};
-static const char qxpak_rcsid[] = "$Id: qxpak.c,v 1.27 2014/02/16 21:14:24 vapier Exp $";
#define qxpak_usage(ret) usage(ret, QXPAK_FLAGS, qxpak_long_opts, qxpak_opts_help, lookup_applet_idx("qxpak"))
typedef struct {
diff --git a/template.c b/template.c
index b732161..eff93e8 100644
--- a/template.c
+++ b/template.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2010 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/template.c,v 1.15 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifdef APPLET_qtemp
@@ -16,8 +15,6 @@ static struct option const qtemp_long_opts[] = {
static const char * const qtemp_opts_help[] = {
COMMON_OPTS_HELP
};
-
-static const char qtemp_rcsid[] = "$Id: template.c,v 1.15 2011/02/21 01:33:47 vapier Exp $";
#define qtemp_usage(ret) usage(ret, QTEMP_FLAGS, qtemp_long_opts, qtemp_opts_help, lookup_applet_idx("qtemp"))
int qtemp_main(int argc, char **argv)
diff --git a/tests/atom_compare/.cvsignore b/tests/atom_compare/.cvsignore
deleted file mode 100644
index 5a05417..0000000
--- a/tests/atom_compare/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-basic
-portage
-static
-static.q
diff --git a/tests/atom_explode/.cvsignore b/tests/atom_explode/.cvsignore
deleted file mode 100644
index 2f93b55..0000000
--- a/tests/atom_explode/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.cvsignore
-basic
-e
-q
-me
-py
diff --git a/tests/atom_explode/.gitignore b/tests/atom_explode/.gitignore
index 2f93b55..1c2c5c6 100644
--- a/tests/atom_explode/.gitignore
+++ b/tests/atom_explode/.gitignore
@@ -1,4 +1,3 @@
-.cvsignore
basic
e
q
diff --git a/tests/atom_explode/test.c b/tests/atom_explode/test.c
index 330c92b..d9e80e7 100644
--- a/tests/atom_explode/test.c
+++ b/tests/atom_explode/test.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2013 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/tests/atom_explode/test.c,v 1.14 2013/09/29 22:42:36 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2013 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#include "tests/tests.h"
diff --git a/tests/init.sh b/tests/init.sh
index a3f8033..8fafdd7 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -23,7 +23,7 @@ setup_env() {
: ${ab:=${atb}/tests/${a}}
: ${as:=${ats}/tests/${a}}
- if [[ -z ${GOOD} ]] && [[ -d ${ats}/.git || -d ${ats}/CVS ]] ; then
+ if [[ -z ${GOOD} ]] && [[ -d ${ats}/.git ]] ; then
eval $(eval_ecolors) 2>/dev/null
fi
}
diff --git a/tests/install/.cvsignore b/tests/install/.cvsignore
deleted file mode 100644
index bca70f3..0000000
--- a/tests/install/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-q
diff --git a/tests/mkdir/.cvsignore b/tests/mkdir/.cvsignore
deleted file mode 100644
index 28ce6a8..0000000
--- a/tests/mkdir/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-m
diff --git a/tests/mkdir/test.c b/tests/mkdir/test.c
index 4d2808d..0575eac 100644
--- a/tests/mkdir/test.c
+++ b/tests/mkdir/test.c
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2013 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/tests/mkdir/test.c,v 1.3 2013/09/29 22:42:36 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2013 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#include "tests/tests.h"
diff --git a/tests/qlist/dotest b/tests/qlist/dotest
index c77f439..5ee4bb6 100755
--- a/tests/qlist/dotest
+++ b/tests/qlist/dotest
@@ -17,7 +17,7 @@ test() {
}
# simple install check
-test 01 "qlist -IC | grep -v CVS"
+test 01 "qlist -IC"
# simple files list
test 02 "qlist -C --showdebug cpio"
@@ -35,7 +35,7 @@ test 05 "qlist -C --showdebug mtools -o"
test 06 "qlist -C --showdebug mtools -s"
# SLOT test
-test 07 "qlist -ICS | grep -v CVS"
+test 07 "qlist -ICS"
# showdebug test #1
test 08 "qlist -C cpio"
diff --git a/tests/quse/dotest b/tests/quse/dotest
index 139e881..44fe143 100755
--- a/tests/quse/dotest
+++ b/tests/quse/dotest
@@ -97,7 +97,6 @@ for arch in $arches; do
for ebuild in $(awk '{print $1}' < arch.${arch}) ; do cp $PORTDIR/$ebuild ./$ebuild; done ;
quse -CKe ${arch} | awk '{print $1}' | cut -d / -f 1-2 | uniq | while read cpn ; do cp -a $PORTDIR/$cpn/files ./$cpn/; done ;
cp -a $PORTDIR/{eclass,profiles,licences} . ; sync ;
- find . -type d -name CVS | while read foo; do rm $foo/* ; sync ; rmdir $foo ; done ;
mksquashfs ./ ../PORTDIR-${arch}.squashfs -noappend -e arch.${arch} ;
rm -rf *-*
cd -
diff --git a/tests/quse/portdir/profiles/desc/elibc.desc b/tests/quse/portdir/profiles/desc/elibc.desc
index d6fd440..7c6e780 100644
--- a/tests/quse/portdir/profiles/desc/elibc.desc
+++ b/tests/quse/portdir/profiles/desc/elibc.desc
@@ -1,6 +1,5 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-projects/portage-utils/tests/quse/portdir/profiles/desc/elibc.desc,v 1.1 2011/02/28 17:54:09 vapier Exp $
# This file contains descriptions of ELIBC USE_EXPAND flags.
diff --git a/tests/source/dotest b/tests/source/dotest
index 2db78c2..cff4ddf 100755
--- a/tests/source/dotest
+++ b/tests/source/dotest
@@ -19,7 +19,6 @@ prune=(
'('
-type d -a
'('
- -name CVS -o
-name tests -o
-name autotools -o
-name autom4te.cache -o
diff --git a/tests/tests.h b/tests/tests.h
index cff6746..cf96cf2 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -1,10 +1,9 @@
/*
- * Copyright 2005-2013 Gentoo Foundation
+ * Copyright 2005-2014 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/tests/tests.h,v 1.1 2013/09/29 22:42:36 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005-2013 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2014 Mike Frysinger - <vapier@gentoo.org>
*/
#ifndef _TESTS_H
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-10 6:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-10 6:00 [gentoo-commits] proj/portage-utils:master commit in: tests/quse/, /, tests/source/, tests/quse/portdir/profiles/desc/, tests/qlist/, Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox