Repoman cleanup pass 2.

Package-Manager: portage-2.1.5.5

9 files changed, 80 insertions, 75 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/Manifest b/dev-util/cvs/Manifest
index 02b7d254c7d7..42c7093632c4 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -29,13 +29,13 @@ DIST cvs-1.11.22.1.tar.bz2 2952428 RMD160 2377c94833ea34edc88ba5e1d1860cac4300e4
 DIST cvs-1.12.12.tar.bz2 3197171 RMD160 7275686576957e016b4f671ad5d52d8961d2d7d2 SHA1 402e81a3d231535a97e4b4f438c0b68920e57d0c SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc
 DIST cvs-1.12.13.1.tar.bz2 4075630 RMD160 7e281fe8f63805c2fa76dad18b2c537e77cea8b2 SHA1 125e8de8162fd67b6a117a8784690105832a4bf0 SHA256 de7f374d8c4ac414c04e8d44ce9a5d3da919825a6a332d747e299dc7a80c2218
 DIST cvs-1.12.13.tar.bz2 3911104 RMD160 ba3048e3e2d99ae78f6a759889b615acf65dd487 SHA1 93a8dacc6ff0e723a130835713235863f1f5ada9 SHA256 78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e
-EBUILD cvs-1.11.20.ebuild 1519 RMD160 c089652f52f090df29e06e024a971d0d3bd31ccf SHA1 d883e7c8dee6365a031e42fa7c25fdbd93a86748 SHA256 6c76f56db0c976bb870fa8a903550f850faadb5a49bfbb15393d8a83228d4bac
-EBUILD cvs-1.11.21.ebuild 1521 RMD160 7943c9398e84879379054f94fd1bdf96f05397b4 SHA1 22fe0e84c9bbb453dc84b3d040469a849361694b SHA256 753226d3b5fe2a17723ee54ed765db4477c8b1ae99d60fd263b67a76a8d34609
-EBUILD cvs-1.11.22.1.ebuild 1712 RMD160 133ede173542aa28bf0d432768d0b08f268d3da5 SHA1 732c2d70967c41d721f49140e3eb01102eaa522c SHA256 46a1596b5e2740030ce9a7f6fbeab94bcac713b62707a1eb04061ef0f6b80736
-EBUILD cvs-1.12.12-r2.ebuild 1943 RMD160 bbfbdcff7e2874aeb00d10e8701770d6478fd159 SHA1 c907682dc205dc30dedfb71e1e1fd08d106b4527 SHA256 ff257f4893af69fa7222c7fe253ea72d811ccf87240f0936e4967e60acf4c770
-EBUILD cvs-1.12.12-r3.ebuild 2069 RMD160 7b6f8512ad06cce6548b93cbf704a93c430a1a70 SHA1 88dc70fa0e32d797918fad36cfa1b9a4fb8cc208 SHA256 482b7fca761039136f8d133d72b871a5517a923c0f5931c8e40fb2f81209a668
-EBUILD cvs-1.12.12-r4.ebuild 2369 RMD160 0d070778e1e6a80f30489bfaab5300eac9c02aa1 SHA1 f07e6c7fa02380b88f57f99dcff7b5068aa112f3 SHA256 d6f7c1744b611c557a0205cc4d594da9fdbf09c645757d5b2226008994e3a10c
-EBUILD cvs-1.12.13-r1.ebuild 3960 RMD160 13a38a702bb994cbe05a97a2478013ccc8d58f32 SHA1 8b632d8bbd27cec650d8611bb88ee56f867c4660 SHA256 b0c00d9ca2ab1864e28c40417e4798edcaf1637e3da8b266300c1ce0d58524c5
+EBUILD cvs-1.11.20.ebuild 1530 RMD160 7bbbfe753ef2ab8aedc6e012cd02616c1bb34897 SHA1 cc2f3a068ebcfbb955cc5e3d5ed6348670b62e1d SHA256 a8d922582a5b97363f093a1652cee59efbccc113968c88608b6f85ee052479f4
+EBUILD cvs-1.11.21.ebuild 1533 RMD160 c3a77c54fd462780ec7bdbc66db05a9dc3f80b2a SHA1 189002d08154b4a649e29e4bcc55c1668c60e113 SHA256 eb57c9bce8fa710b112a9c5e8c2a18c358eabf06c7c95c9b471c903f691d76cf
+EBUILD cvs-1.11.22.1.ebuild 1724 RMD160 edc7a2033f772a41e87807c670c82cae7cc140f2 SHA1 de38d3a2fabe8f990ca18f35891c2f25cce07c6e SHA256 6525e4f33c6f227694468f723274a6fe6adc0222c3e3c034b309a23a85b3d9b3
+EBUILD cvs-1.12.12-r2.ebuild 1957 RMD160 651ac5b15443522e7d7ec40abc895def46ba5cb1 SHA1 b83794f632313eeb19efb802e52310303e3846b6 SHA256 68fece868a8e5b4d6cd40b9b9cef9d094d30e3a43550048b4800869b2fc9951d
+EBUILD cvs-1.12.12-r3.ebuild 2083 RMD160 fa07d30926b1988612357c5b21e4fc4fa7e603d8 SHA1 a04253c163b1335553e22fb91adbfa09542d5fd7 SHA256 f2ec676a6553cf75c99bc6c8bc7fa01b8471ef0c0ca3ddb8e6c7fa647fd829be
+EBUILD cvs-1.12.12-r4.ebuild 2390 RMD160 8cf24960136d2aac5b36abccc887ca63f7b05d56 SHA1 9ec607fdc5bc8156d96e036f76d192700b113756 SHA256 dcd0d28d66aa4218cee6d65554f97e8bb7aac214683cd5de91ee0af3d07b2f6a
+EBUILD cvs-1.12.13-r1.ebuild 3982 RMD160 83a7c84eb1ddab91ac81fed1773e2e955ffbab97 SHA1 5252e96f5742b077aeeee6e4e91b8b92c682e30e SHA256 cc9af957ad66fe8e08ef329d28b24d75f58ee6a133c6926cf203fc5e9c1d1806
 EBUILD cvs-1.12.13.1.ebuild 4652 RMD160 97430461b6e00ab6a492d4d8933d82d6b591cddf SHA1 673d5b84e6ff3fbf9a0393fa171a95f138104075 SHA256 37f0bc2657a70c720da0c9522412c3a2816af40ffa338914bd61aadd4e2127a4
-MISC ChangeLog 16496 RMD160 485810c173608c1b0b20ad46e90e7e8012795ef8 SHA1 66b550233547e6b491ffcca81ed823499a2bd055 SHA256 5a51f72bf6550254fedf6730c06df65cd6d5dfdb6d193e9a207514d683a38962
+MISC ChangeLog 16734 RMD160 f66bd290ec218ec7cdaa7b53fc60f6a54f95125a SHA1 5dd4cce40b2c8225093810c6ab74411660a744a5 SHA256 b2801051a94ed60ede44de1cc11fa65cfdb3bffaf6359035ff3c3938e5faaad7
 MISC metadata.xml 162 RMD160 4860626303bc1113a855a556455d3bdc9f21db79 SHA1 92320acf140a0b265e4e502238e53f194bf89670 SHA256 932a0c3bfb1ea371074cdf017dae98bb229959e68e98d4d19378564db2cfa3d3
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."