Repoman cleanup pass 2.

(Portage version: 2.1.5.5)

8 files changed, 72 insertions, 67 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index b2108d7ce5a3..05e235676b07 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cvs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.125 2008/06/16 18:05:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.126 2008/06/16 18:11:58 robbat2 Exp $
+
+  16 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> cvs-1.11.20.ebuild,
+  cvs-1.11.21.ebuild, cvs-1.11.22.1.ebuild, cvs-1.12.12-r2.ebuild,
+  cvs-1.12.12-r3.ebuild, cvs-1.12.12-r4.ebuild, cvs-1.12.13-r1.ebuild:
+  Repoman cleanup pass 2.
 
   16 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> cvs-1.12.12-r2.ebuild:
   Repoman cleanups, first pass.
diff --git a/dev-util/cvs/cvs-1.11.20.ebuild b/dev-util/cvs/cvs-1.11.20.ebuild
index 3041b76b6daa..b53282bc1467 100644
--- a/dev-util/cvs/cvs-1.11.20.ebuild
+++ b/dev-util/cvs/cvs-1.11.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.20.ebuild,v 1.10 2005/07/23 11:33:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.20.ebuild,v 1.11 2008/06/16 18:11:58 robbat2 Exp $
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.cvshome.org/"
@@ -25,7 +25,7 @@ src_install() {
 	einstall || die
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
+	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
 
 	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
 		MINOR* NEWS PROJECTS README* TESTS TODO
@@ -36,11 +36,11 @@ src_install() {
 	fi
 
 	if use doc; then
-		dodoc ${DISTDIR}/cederqvist-${PV}.pdf
-		dodoc ${DISTDIR}/cederqvist-${PV}.ps
-		tar xjf ${DISTDIR}/cederqvist-${PV}.html.tar.bz2
+		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
+		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
+		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
 		dohtml -r cederqvist-${PV}.html/*
-		cd ${D}/usr/share/doc/${PF}/html/
+		cd "${D}"/usr/share/doc/${PF}/html/
 		ln -s cvs.html index.html
 	fi
 }
diff --git a/dev-util/cvs/cvs-1.11.21.ebuild b/dev-util/cvs/cvs-1.11.21.ebuild
index 47084d266d26..109c8f23e3da 100644
--- a/dev-util/cvs/cvs-1.11.21.ebuild
+++ b/dev-util/cvs/cvs-1.11.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.21.ebuild,v 1.1 2006/03/07 09:25:09 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.21.ebuild,v 1.2 2008/06/16 18:11:58 robbat2 Exp $
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.cvshome.org/"
@@ -25,7 +25,7 @@ src_install() {
 	einstall || die
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
+	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
 
 	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
 		MINOR* NEWS PROJECTS README* TESTS TODO
@@ -36,11 +36,11 @@ src_install() {
 	fi
 
 	if use doc; then
-		dodoc ${DISTDIR}/cederqvist-${PV}.pdf
-		dodoc ${DISTDIR}/cederqvist-${PV}.ps
-		tar xjf ${DISTDIR}/cederqvist-${PV}.html.tar.bz2
+		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
+		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
+		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
 		dohtml -r cederqvist-${PV}.html/*
-		cd ${D}/usr/share/doc/${PF}/html/
+		cd "${D}"/usr/share/doc/${PF}/html/
 		ln -s cvs.html index.html
 	fi
 }
diff --git a/dev-util/cvs/cvs-1.11.22.1.ebuild b/dev-util/cvs/cvs-1.11.22.1.ebuild
index 6623ed9caa5a..95bff650af7d 100644
--- a/dev-util/cvs/cvs-1.11.22.1.ebuild
+++ b/dev-util/cvs/cvs-1.11.22.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.22.1.ebuild,v 1.1 2006/09/30 23:22:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.22.1.ebuild,v 1.2 2008/06/16 18:11:58 robbat2 Exp $
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.cvshome.org/"
@@ -20,7 +20,7 @@ src_unpack() {
 	unpack ${A}
 	# remove a useless binary
 	einfo "Removing a compiled binary"
-	find ${S} -type f -name getdate -exec rm \{} \;
+	find "${S}" -type f -name getdate -exec rm \{} \;
 }
 
 src_compile() {
@@ -32,7 +32,7 @@ src_install() {
 	einstall || die
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
+	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
 
 	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
 		MINOR* NEWS PROJECTS README* TESTS TODO
@@ -43,11 +43,11 @@ src_install() {
 	fi
 
 	if use doc; then
-		dodoc ${DISTDIR}/cederqvist-${PV}.pdf
-		dodoc ${DISTDIR}/cederqvist-${PV}.ps
-		tar xjf ${DISTDIR}/cederqvist-${PV}.html.tar.bz2
+		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
+		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
+		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
 		dohtml -r cederqvist-${PV}.html/*
-		cd ${D}/usr/share/doc/${PF}/html/
+		cd "${D}"/usr/share/doc/${PF}/html/
 		ln -s cvs.html index.html
 	fi
 }
diff --git a/dev-util/cvs/cvs-1.12.12-r2.ebuild b/dev-util/cvs/cvs-1.12.12-r2.ebuild
index 6803483db2a4..4f0561108e3f 100644
--- a/dev-util/cvs/cvs-1.12.12-r2.ebuild
+++ b/dev-util/cvs/cvs-1.12.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r2.ebuild,v 1.14 2008/06/16 18:05:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r2.ebuild,v 1.15 2008/06/16 18:11:58 robbat2 Exp $
 
 inherit eutils pam
 
@@ -25,7 +25,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
 src_unpack() {
 	unpack ${P}.tar.bz2
 	use doc && unpack cederqvist-${PV}.html.tar.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.12.12-cvsbug-tmpfix.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
 }
 
 src_compile() {
@@ -43,7 +43,7 @@ src_install() {
 	einstall || die
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
+	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
 
 	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
 		MINOR* NEWS PROJECTS README* TESTS TODO
@@ -54,15 +54,15 @@ src_install() {
 	fi
 
 	if use doc; then
-		dodoc ${DISTDIR}/cederqvist-${PV}.pdf
-		dodoc ${DISTDIR}/cederqvist-${PV}.ps
-		tar xjf ${DISTDIR}/cederqvist-${PV}.html.tar.bz2
+		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
+		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
+		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
 		dohtml -r cederqvist-${PV}.html/*
-		cd ${D}/usr/share/doc/${PF}/html/
+		cd "${D}"/usr/share/doc/${PF}/html/
 		ln -s cvs.html index.html
 	fi
 
-	newpamd ${FILESDIR}/cvs.pam-include-1.12.12 cvs
+	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
 }
 
 src_test() {
diff --git a/dev-util/cvs/cvs-1.12.12-r3.ebuild b/dev-util/cvs/cvs-1.12.12-r3.ebuild
index 0eb9c34e9f9b..2d5cefa4d56c 100644
--- a/dev-util/cvs/cvs-1.12.12-r3.ebuild
+++ b/dev-util/cvs/cvs-1.12.12-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r3.ebuild,v 1.4 2006/03/30 18:34:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r3.ebuild,v 1.5 2008/06/16 18:11:58 robbat2 Exp $
 
 inherit eutils pam
 
@@ -25,8 +25,8 @@ DEPEND=">=sys-libs/zlib-1.1.4
 src_unpack() {
 	unpack ${P}.tar.bz2
 	use doc && unpack cederqvist-${PV}.html.tar.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-cvsbug-tmpfix.patch
-	epatch ${FILESDIR}/${P}-openat.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+	epatch "${FILESDIR}"/${P}-openat.patch
 }
 
 src_compile() {
@@ -46,7 +46,7 @@ src_install() {
 	einstall || die
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
+	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
 
 	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
 		MINOR* NEWS PROJECTS README* TESTS TODO
@@ -57,15 +57,15 @@ src_install() {
 	fi
 
 	if use doc; then
-		dodoc ${DISTDIR}/cederqvist-${PV}.pdf
-		dodoc ${DISTDIR}/cederqvist-${PV}.ps
-		tar xjf ${DISTDIR}/cederqvist-${PV}.html.tar.bz2
+		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
+		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
+		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
 		dohtml -r cederqvist-${PV}.html/*
-		cd ${D}/usr/share/doc/${PF}/html/
+		cd "${D}"/usr/share/doc/${PF}/html/
 		ln -s cvs.html index.html
 	fi
 
-	newpamd ${FILESDIR}/cvs.pam-include-1.12.12 cvs
+	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
 }
 
 src_test() {
diff --git a/dev-util/cvs/cvs-1.12.12-r4.ebuild b/dev-util/cvs/cvs-1.12.12-r4.ebuild
index 30d30fb70fec..6febb7ad194a 100644
--- a/dev-util/cvs/cvs-1.12.12-r4.ebuild
+++ b/dev-util/cvs/cvs-1.12.12-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r4.ebuild,v 1.15 2007/09/14 18:19:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r4.ebuild,v 1.16 2008/06/16 18:11:58 robbat2 Exp $
 
 inherit eutils pam
 
@@ -25,11 +25,11 @@ DEPEND=">=sys-libs/zlib-1.1.4
 src_unpack() {
 	unpack ${P}.tar.bz2
 	use doc && unpack cederqvist-${PV}.html.tar.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-cvsbug-tmpfix.patch
-	epatch ${FILESDIR}/${P}-openat.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-block-requests.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+	epatch "${FILESDIR}"/${P}-openat.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-block-requests.patch
 	cd "${S}"
-	epatch ${FILESDIR}/${P}-install-sh.patch
+	epatch "${FILESDIR}"/${P}-install-sh.patch
 	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
 }
 
@@ -50,7 +50,7 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
+	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
 
 	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
 		MINOR* NEWS PROJECTS README* TESTS TODO
@@ -60,18 +60,18 @@ src_install() {
 		doins cvs-format.el || die "doins failed"
 	fi
 
-	use server && newdoc ${FILESDIR}/cvs-1.12.12-cvs-custom.c cvs-custom.c
+	use server && newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
 
 	if use doc; then
-		dodoc ${DISTDIR}/cederqvist-${PV}.pdf
-		dodoc ${DISTDIR}/cederqvist-${PV}.ps
-		tar xjf ${DISTDIR}/cederqvist-${PV}.html.tar.bz2
+		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
+		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
+		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
 		dohtml -r cederqvist-${PV}.html/*
-		cd ${D}/usr/share/doc/${PF}/html/
+		cd "${D}"/usr/share/doc/${PF}/html/
 		ln -s cvs.html index.html
 	fi
 
-	newpamd ${FILESDIR}/cvs.pam-include-1.12.12 cvs
+	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
 }
 
 src_test() {
diff --git a/dev-util/cvs/cvs-1.12.13-r1.ebuild b/dev-util/cvs/cvs-1.12.13-r1.ebuild
index 47bf5abdae5d..b4bcd1b07a89 100644
--- a/dev-util/cvs/cvs-1.12.13-r1.ebuild
+++ b/dev-util/cvs/cvs-1.12.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13-r1.ebuild,v 1.5 2007/12/07 00:34:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13-r1.ebuild,v 1.6 2008/06/16 18:11:58 robbat2 Exp $
 
 inherit eutils pam
 
@@ -26,7 +26,7 @@ src_unpack() {
 	unpack ${P}.tar.bz2
 	use doc && unpack cederqvist-${PV}.html.tar.bz2
 	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
-	epatch ${FILESDIR}/${P}-openat.patch
+	epatch "${FILESDIR}"/${P}-openat.patch
 	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${P}-zlib.patch
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
@@ -35,7 +35,7 @@ src_unpack() {
 	#  ${S}/src/sanity.sh
 	# this one fails when the testpath path contains '.'
 	sed -i.orig -e '/newfile config3/s,a-z,a-z.,g' \
-	  ${S}/src/sanity.sh
+	  "${S}"/src/sanity.sh
 }
 
 src_compile() {
@@ -65,7 +65,7 @@ src_install() {
 
 	if use server; then
 	  insinto /etc/xinetd.d
-	  newins ${FILESDIR}/cvspserver.xinetd.d cvspserver || die "newins failed"
+	  newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
 	fi
 
 	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
@@ -77,15 +77,15 @@ src_install() {
 	fi
 
 	if use doc; then
-		dodoc ${DISTDIR}/cederqvist-${PV}.pdf
-		dodoc ${DISTDIR}/cederqvist-${PV}.ps
-		tar xjf ${DISTDIR}/cederqvist-${PV}.html.tar.bz2
+		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
+		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
+		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
 		dohtml -r cederqvist-${PV}.html/*
-		cd ${D}/usr/share/doc/${PF}/html/
+		cd "${D}"/usr/share/doc/${PF}/html/
 		ln -s cvs.html index.html
 	fi
 
-	newpamd ${FILESDIR}/cvs.pam-include-1.12.12 cvs
+	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
 }
 
 src_test() {
@@ -97,7 +97,7 @@ src_test() {
 		einfo "Only testing local mode. Please see ebuild for other modes."
 	fi
 
-	cd ${S}/src
+	cd "${S}"/src
 	export TESTDIR="${T}/tests-local"
 	mkdir -p "$TESTDIR"
 	# we only do the local tests by default
@@ -111,13 +111,13 @@ src_test() {
 	# We do not do this by default, as it is unsafe from a security point of
 	# view, and requires root level ssh changes.
 	if [ -n "$TEST_REMOTE_AND_PROXY" ]; then
-		cd ${S}/src
+		cd "${S}"/src
 		export TESTDIR="${T}/tests-remote"
 		mkdir -p "$TESTDIR"
 		make remotecheck || die "Some remote test failed."
 		mv -f check.log check.log-remote
 
-		cd ${S}/src
+		cd "${S}"/src
 		export TESTDIR="${T}/tests-proxy"
 		mkdir -p "$TESTDIR"
 		make proxycheck || die "Some proxy test failed."