several changes, new ebuilds, cleaned old ebuilds/files, fixed a few scripts for webapp stuff

Package-Manager: portage-2.0.51.19

23 files changed, 136 insertions, 654 deletions

diff --git a/www-apps/viewcvs/ChangeLog b/www-apps/viewcvs/ChangeLog
index 9d711db4f7c8..33ae6e2cf17a 100644
--- a/www-apps/viewcvs/ChangeLog
+++ b/www-apps/viewcvs/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for www-apps/viewcvs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.13 2005/05/23 02:15:23 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.14 2005/05/24 02:34:59 ramereth Exp $
+
+*viewcvs-1.0_pre20050523 (24 May 2005)
+*viewcvs-0.9.3 (24 May 2005)
+
+  24 May 2005; Lance Albertson <ramereth@gentoo.org>
+  -files/viewcvs-0.9.2.patch, files/postinstall-en.txt, files/reconfig,
+  -viewcvs-0.9.2-r3.ebuild, -viewcvs-0.9.2-r4.ebuild,
+  -viewcvs-0.9.2_p20030430.ebuild, -viewcvs-0.9.2_p20030430-r1.ebuild,
+  -viewcvs-0.9.2_p20030430-r2.ebuild, -viewcvs-0.9.2_p20040831.ebuild,
+  -viewcvs-0.9.2_p20041207.ebuild, +viewcvs-0.9.3.ebuild,
+  +viewcvs-1.0_pre20050523.ebuild:
+  Several changes
+  * Added two new ebuilds that support webapp-config
+  * Added a new snapshot ebuild based off of the 1.0 branch
+  * Cleaned up old ebuilds and files
+  * fixed reconfig script
+  * fixed the postinstall file
 
   23 May 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml:
   Adding myself as maintainer to help with the package
diff --git a/www-apps/viewcvs/Manifest b/www-apps/viewcvs/Manifest
index cef0df749e4a..51a0092c3c7b 100644
--- a/www-apps/viewcvs/Manifest
+++ b/www-apps/viewcvs/Manifest
@@ -1,22 +1,11 @@
-MD5 7931b1afe9c3ae7c0345c61f39019974 ChangeLog 4807
+MD5 5147eb3ffe4ca15f92f067d90326b141 ChangeLog 5516
 MD5 fa8daabae86da3beefbc3ea1e5ccd42c metadata.xml 779
-MD5 d4be9b9587fb3ba56b11c3eea3437028 viewcvs-0.9.2-r3.ebuild 2776
-MD5 7e5c309216b00abdd5d51cae387732d9 viewcvs-0.9.2_p20030430-r1.ebuild 2412
-MD5 0b24dbbf17a48fa287b61c6629b69b8a viewcvs-0.9.2_p20030430-r2.ebuild 1257
-MD5 c6d53afae4b75c5d30e3da0d71c2c0f6 viewcvs-0.9.2_p20030430.ebuild 2333
-MD5 11f7a4918520883f4237ed7069dfc451 viewcvs-0.9.2_p20040831.ebuild 2418
-MD5 b892eaf33b2fe3c89548614ddeb5fab5 viewcvs-0.9.2-r4.ebuild 2863
 MD5 b417773c48e9c98dc386f0e3032ec6a7 viewcvs-0.9.2_p20041207-r1.ebuild 2519
-MD5 ebb372a1d2cb625d712975d9a52a4576 viewcvs-0.9.2_p20041207.ebuild 2412
-MD5 07a07f1a89e77c9f093ade7e395ffe3b files/digest-viewcvs-0.9.2-r3 65
-MD5 fbac846bcd488f255dc57fdd27ba99df files/digest-viewcvs-0.9.2_p20030430 69
-MD5 fbac846bcd488f255dc57fdd27ba99df files/digest-viewcvs-0.9.2_p20030430-r1 69
-MD5 fbac846bcd488f255dc57fdd27ba99df files/digest-viewcvs-0.9.2_p20030430-r2 69
-MD5 db9223dd117bcf0933c71e4d5598ceba files/digest-viewcvs-0.9.2_p20040831 69
-MD5 39d356a0537a0b8cdee280b47feb6413 files/postinstall-en.txt 416
-MD5 af9b030c39a014066d0fa7e2cd18636c files/reconfig 437
-MD5 07a07f1a89e77c9f093ade7e395ffe3b files/digest-viewcvs-0.9.2-r4 65
-MD5 48783b2b9bd95be9a4eb1525a0bf708a files/digest-viewcvs-0.9.2_p20041207 69
+MD5 fcfd270b3bfc3b3f6356301f1e8d60e0 viewcvs-0.9.3.ebuild 1490
+MD5 83a56445ee45ffa95c2d2aec561a8bab viewcvs-1.0_pre20050523.ebuild 1526
+MD5 63be22bf657c7d52e524b1a74c92cf2c files/digest-viewcvs-1.0_pre20050523 69
+MD5 1ebd12b88a2c6a6964c0d02b5c82911a files/digest-viewcvs-0.9.3 65
+MD5 89a3020fe203e1890130d12494a20509 files/postinstall-en.txt 383
+MD5 3129186d18deb406cadbf1642b3e1f56 files/reconfig 558
 MD5 48783b2b9bd95be9a4eb1525a0bf708a files/digest-viewcvs-0.9.2_p20041207-r1 69
-MD5 9ac90900c491e917c037819a688ea54c files/viewcvs-0.9.2.patch 1295
 MD5 550579a3a648e62d01ec4c3c3ee47327 files/viewcvs-CAN-2004-1062.patch 341
diff --git a/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r3 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r3
deleted file mode 100644
index 7ee3ce69fbbc..000000000000
--- a/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7857b1ed05240ad1f691ea40044daf2 viewcvs-0.9.2.tar.gz 140063
diff --git a/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r4 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r4
deleted file mode 100644
index 7ee3ce69fbbc..000000000000
--- a/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7857b1ed05240ad1f691ea40044daf2 viewcvs-0.9.2.tar.gz 140063
diff --git a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20030430 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20030430
deleted file mode 100644
index 60c9db1f8b57..000000000000
--- a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20030430
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4ddcb02e47f3255d38d8f541ab6c985f viewcvs-20030430.tar.bz2 191735
diff --git a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20030430-r1 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20030430-r1
deleted file mode 100644
index 60c9db1f8b57..000000000000
--- a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20030430-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4ddcb02e47f3255d38d8f541ab6c985f viewcvs-20030430.tar.bz2 191735
diff --git a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20030430-r2 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20030430-r2
deleted file mode 100644
index 60c9db1f8b57..000000000000
--- a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20030430-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4ddcb02e47f3255d38d8f541ab6c985f viewcvs-20030430.tar.bz2 191735
diff --git a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20040831 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20040831
deleted file mode 100644
index 8d4954399ef4..000000000000
--- a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20040831
+++ /dev/null
@@ -1 +0,0 @@
-MD5 692a22591bc229daae695adb2474d71e viewcvs-20040831.tar.bz2 205993
diff --git a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20041207 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20041207
deleted file mode 100644
index b49145e38456..000000000000
--- a/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20041207
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86315155b4e24072e414f719178cbde5 viewcvs-20041207.tar.bz2 340385
diff --git a/www-apps/viewcvs/files/digest-viewcvs-0.9.3 b/www-apps/viewcvs/files/digest-viewcvs-0.9.3
new file mode 100644
index 000000000000..7bcd2f682fda
--- /dev/null
+++ b/www-apps/viewcvs/files/digest-viewcvs-0.9.3
@@ -0,0 +1 @@
+MD5 8be527279feaaa6ecf184bcf714e2f22 viewcvs-0.9.3.tar.gz 140215
diff --git a/www-apps/viewcvs/files/digest-viewcvs-1.0_pre20050523 b/www-apps/viewcvs/files/digest-viewcvs-1.0_pre20050523
new file mode 100644
index 000000000000..4bc3c6f3c07e
--- /dev/null
+++ b/www-apps/viewcvs/files/digest-viewcvs-1.0_pre20050523
@@ -0,0 +1 @@
+MD5 86fcff190a838b976b76bbf8652c2a7c viewcvs-20050523.tar.bz2 339195
diff --git a/www-apps/viewcvs/files/postinstall-en.txt b/www-apps/viewcvs/files/postinstall-en.txt
index 9f5864cf48f2..9c29f1481854 100644
--- a/www-apps/viewcvs/files/postinstall-en.txt
+++ b/www-apps/viewcvs/files/postinstall-en.txt
@@ -1,9 +1,9 @@
 If you are using Apache, consider adding something like this to your
 apache.conf:
 
-ScriptAlias /viewcvs /var/www/localhost/cgi-bin/viewcvs/viewcvs.cgi
-ScriptAlias /cvsquery /var/www/localhost/cgi-bin/viewcvs/cvsquery.cgi
+ScriptAlias /viewcvs /var/www/${VHOST_ROOT}/cgi-bin/viewcvs/viewcvs.cgi
+ScriptAlias /cvsquery /var/www/${VHOST_ROOT}/cgi-bin/viewcvs/cvsquery.cgi
 
 Before using viewcvs, be sure to configure it properly. 
 Edit ${VHOST_ROOT}/${PN}/viewcvs.conf and ${VHOST_ROOT}/${PN}/cvsgraph.conf to
-suit your needs. Consult the two .dist files for a start.
+suit your needs.
diff --git a/www-apps/viewcvs/files/reconfig b/www-apps/viewcvs/files/reconfig
index 5e0e616b08a6..e90865ac787a 100644
--- a/www-apps/viewcvs/files/reconfig
+++ b/www-apps/viewcvs/files/reconfig
@@ -1,10 +1,13 @@
 #!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/files/reconfig,v 1.3 2005/05/24 02:34:59 ramereth Exp $
+
 if [ $1 = "start" -o $1 = "install" ]; then
-	find ${VHOST_CGIBINDIR}/${PN} ${VHOST_ROOT}/${PN} -type f | xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_CGIBINDIR}/${PN}/lib\"|g
-	s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/${PN}/viewcvs.conf\",g
-	s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${VHOST_ROOT}/${PN},g" -i
+	find ${VHOST_CGIBINDIR}/viewcvs ${VHOST_ROOT}/viewcvs -type f \
+	| xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_ROOT}/viewcvs/lib\"|g
+	s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/viewcvs/viewcvs.conf\",g
+	s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${VHOST_ROOT}/viewcvs,g" -i
 	
 elif [ $1 = "clean" ]; then
-	rm -rf ${VHOST_CGIBINDIR}/${PN}
-	rm -rf ${VHOST_ROOT}/${PN}/templates
+	rm -rf ${VHOST_CGIBINDIR}/viewcvs
+	rm -rf ${VHOST_ROOT}/viewcvs/templates
 fi
diff --git a/www-apps/viewcvs/files/viewcvs-0.9.2.patch b/www-apps/viewcvs/files/viewcvs-0.9.2.patch
deleted file mode 100644
index 4986836eb6b8..000000000000
--- a/www-apps/viewcvs/files/viewcvs-0.9.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- viewcvs.py.orig	2004-10-20 15:03:41.000000000 +0200
-+++ viewcvs.py	2004-10-20 16:37:35.000000000 +0200
-@@ -2455,10 +2455,17 @@ def generate_tarball_header(out, name, s
- def generate_tarball(out, relative, directory, tag, stack=[]):
-   subdirs = [ ]
-   rcs_files = [ ]
-+  if relative == 'CVSROOT' and cfg.options.hide_cvsroot:
-+    return
-+
-   for file, pathname, isdir in get_file_data(directory):
-     if pathname == _UNREADABLE_MARKER:
-       continue
-     if isdir:
-+      if file == 'CVSROOT' and relative.find('/') == -1 and cfg.options.hide_cvsroot:
-+        continue
-+      if relative.find('/') == -1 and cfg.is_forbidden(file):
-+        continue
-       subdirs.append(file)
-     else:
-       rcs_files.append(file)
-@@ -2583,6 +2590,16 @@ def main():
-            '</body></html>\n')
-     return
- 
-+  if where == 'CVSROOT' and cfg.options.hide_cvsroot:
-+    print "Status: 400"
-+    http_header()
-+    print ('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">\n'
-+           '<html><head>\n<title>400 Bad Request</title>\n'
-+           '</head><body>\n'
-+           '<H1>Bad Request</H1>\n Listing of CVSROOT is disallowed.<p>\n'
-+           '</body></html>\n')
-+    return
-+
-   ### look for GZIP binary
- 
-   # if we have a directory and the request didn't end in "/", then redirect
diff --git a/www-apps/viewcvs/viewcvs-0.9.2-r3.ebuild b/www-apps/viewcvs/viewcvs-0.9.2-r3.ebuild
deleted file mode 100644
index 4225b41451d6..000000000000
--- a/www-apps/viewcvs/viewcvs-0.9.2-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.2-r3.ebuild,v 1.1 2004/08/15 15:52:50 stuart Exp $
-
-PDATE=${PV/0.9.2_p/}
-DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
-HOMEPAGE="http://viewcvs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PDATE}.tar.gz"
-
-LICENSE="viewcvs"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="apache2"
-
-DEPEND=""
-RDEPEND=">=app-text/rcs-5.7
-	>=dev-util/cvs-1.11
-	sys-apps/diffutils
-	net-www/apache"
-
-WWW="/var/www/localhost/viewcvs"
-
-doinstall() {
-	# start_location=$1
-	# end_location=$2
-	# mode=$3
-	if [ -d $1 ]; then
-		install -o root -d ${D}/$2
-		for f in ${1}/*
-		do
-			doinstall ${f} ${f/${1}/${2}} $3
-		done
-	else
-		sed -e "{ s,\(^#!.*$\),#!/usr/bin/python,; \
-		s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${WWW},; \
-		s,\(^LIBRARY_DIR\)\(.*\$\),\1 = \"${WWW}/lib\",; \
-		s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${WWW}/viewcvs.conf\",}" ${1} >${1}.cpy
-
-		install -o root -m $3 ${1}.cpy ${D}/$2
-		rm ${1}.cpy
-	fi
-}
-
-src_install() {
-	cd ${S}
-	install -o root -d ${D}/${WWW}/cgi
-
-	doinstall cgi/viewcvs.cgi ${WWW}/cgi/viewcvs.cgi 755
-	doinstall cgi/query.cgi ${WWW}/cgi/query.cgi 755
-	doinstall standalone.py ${WWW}/standalone.py 755
-	doinstall tools/loginfo-handler ${WWW}/loginfo-handler 755
-	doinstall tools/cvsdbadmin ${WWW}/cvsdbadmin 755
-	doinstall tools/make-database ${WWW}/make-database 755
-
-	insinto /etc/viewcvs
-	doinstall cgi/viewcvs.conf.dist ${WWW}/viewcvs.conf 644
-	doinstall cgi/cvsgraph.conf.dist ${WWW}/cvsgraph.conf 644
-
-	doinstall lib ${WWW}/lib 644
-	doinstall templates ${WWW}/templates 644
-
-	doinstall website ${WWW}/doc 644
-
-	dosym ${WWW}/viewcvs.conf /etc/viewcvs/viewcvs.conf
-	dosym ${WWW}/cvsgraph.conf /etc/viewcvs/cvsgraph.conf
-
-	cat <<EOF >apache.conf
-# Enables ViewCVS in /var/www/localhost/viewcvs and creates an alias to /viewcvs
-# Configuration of ViewCVS could be done in /etc/viewcvs/
-
-ScriptAlias /viewcvs /var/www/localhost/viewcvs/cgi/viewcvs.cgi
-ScriptAlias /cvsquery /var/www/localhost/viewcvs/cgi/cvsquery.cgi
-
-<Directory /var/www/localhost/viewcvs/cgi>
-	Options ExecCGI
-	<IfModule mod_access.c>
-		Order allow,deny
-		Allow from all
-	</IfModule>
-</Directory>
-EOF
-
-	if use apache2; then
-		cp apache.conf 47_viewcvs.conf
-		insinto /etc/apache2/conf/modules.d
-		doins 47_viewcvs.conf
-	fi
-
-	dodoc INSTALL TODO CHANGES README apache.conf
-}
-
-pkg_postinst() {
-	ewarn "Before using viewcvs make sure you configure it correctly."
-	einfo "There is a sample apache integration configuration file in the"
-	einfo "documentation directory named: apache.conf"
-	einfo "If you're using apache2 this configuration is already done for"
-	einfo "you in /etc/apache2/conf/modules.d/47_viewcvs.conf"
-}
diff --git a/www-apps/viewcvs/viewcvs-0.9.2-r4.ebuild b/www-apps/viewcvs/viewcvs-0.9.2-r4.ebuild
deleted file mode 100644
index 6f2a734f4d3e..000000000000
--- a/www-apps/viewcvs/viewcvs-0.9.2-r4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.2-r4.ebuild,v 1.1 2004/12/07 15:01:33 stuart Exp $
-
-PDATE=${PV/0.9.2_p/}
-DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
-HOMEPAGE="http://viewcvs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PDATE}.tar.gz"
-
-LICENSE="viewcvs"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="apache2"
-
-DEPEND=""
-RDEPEND=">=app-text/rcs-5.7
-	>=dev-util/cvs-1.11
-	sys-apps/diffutils
-	net-www/apache"
-
-WWW="/var/www/localhost/viewcvs"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}/lib
-	patch < ${FILESDIR}/viewcvs-${PV}.patch
-}
-
-doinstall() {
-	# start_location=$1
-	# end_location=$2
-	# mode=$3
-	if [ -d $1 ]; then
-		install -o root -d ${D}/$2
-		for f in ${1}/*
-		do
-			doinstall ${f} ${f/${1}/${2}} $3
-		done
-	else
-		sed -e "{ s,\(^#!.*$\),#!/usr/bin/python,; \
-		s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${WWW},; \
-		s,\(^LIBRARY_DIR\)\(.*\$\),\1 = \"${WWW}/lib\",; \
-		s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${WWW}/viewcvs.conf\",}" ${1} >${1}.cpy
-
-		install -o root -m $3 ${1}.cpy ${D}/$2
-		rm ${1}.cpy
-	fi
-}
-
-src_install() {
-	cd ${S}
-	install -o root -d ${D}/${WWW}/cgi
-
-	doinstall cgi/viewcvs.cgi ${WWW}/cgi/viewcvs.cgi 755
-	doinstall cgi/query.cgi ${WWW}/cgi/query.cgi 755
-	doinstall standalone.py ${WWW}/standalone.py 755
-	doinstall tools/loginfo-handler ${WWW}/loginfo-handler 755
-	doinstall tools/cvsdbadmin ${WWW}/cvsdbadmin 755
-	doinstall tools/make-database ${WWW}/make-database 755
-
-	insinto /etc/viewcvs
-	doinstall cgi/viewcvs.conf.dist ${WWW}/viewcvs.conf 644
-	doinstall cgi/cvsgraph.conf.dist ${WWW}/cvsgraph.conf 644
-
-	doinstall lib ${WWW}/lib 644
-	doinstall templates ${WWW}/templates 644
-
-	doinstall website ${WWW}/doc 644
-
-	dosym ${WWW}/viewcvs.conf /etc/viewcvs/viewcvs.conf
-	dosym ${WWW}/cvsgraph.conf /etc/viewcvs/cvsgraph.conf
-
-	cat <<EOF >apache.conf
-# Enables ViewCVS in /var/www/localhost/viewcvs and creates an alias to /viewcvs
-# Configuration of ViewCVS could be done in /etc/viewcvs/
-
-ScriptAlias /viewcvs /var/www/localhost/viewcvs/cgi/viewcvs.cgi
-ScriptAlias /cvsquery /var/www/localhost/viewcvs/cgi/cvsquery.cgi
-
-<Directory /var/www/localhost/viewcvs/cgi>
-	Options ExecCGI
-	<IfModule mod_access.c>
-		Order allow,deny
-		Allow from all
-	</IfModule>
-</Directory>
-EOF
-
-	if use apache2; then
-		cp apache.conf 47_viewcvs.conf
-		insinto /etc/apache2/conf/modules.d
-		doins 47_viewcvs.conf
-	fi
-
-	dodoc INSTALL TODO CHANGES README apache.conf
-}
-
-pkg_postinst() {
-	ewarn "Before using viewcvs make sure you configure it correctly."
-	einfo "There is a sample apache integration configuration file in the"
-	einfo "documentation directory named: apache.conf"
-	einfo "If you're using apache2 this configuration is already done for"
-	einfo "you in /etc/apache2/conf/modules.d/47_viewcvs.conf"
-}
diff --git a/www-apps/viewcvs/viewcvs-0.9.2_p20030430-r1.ebuild b/www-apps/viewcvs/viewcvs-0.9.2_p20030430-r1.ebuild
deleted file mode 100644
index 07175227e1cb..000000000000
--- a/www-apps/viewcvs/viewcvs-0.9.2_p20030430-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.2_p20030430-r1.ebuild,v 1.2 2004/08/26 08:00:05 rl03 Exp $
-
-PDATE=${PV/0.9.2_p/}
-DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
-HOMEPAGE="http://viewcvs.sourceforge.net/"
-SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
-
-LICENSE="viewcvs"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( ( >=app-text/rcs-5.7
-	>=dev-util/cvs-1.11 )
-	dev-util/subversion )
-	sys-apps/diffutils
-	net-www/apache"
-S=${WORKDIR}/${PN}
-
-WWW="/var/www/localhost/viewcvs"
-CONFFILE="/etc/viewcvs/viewcvs.conf"
-
-doinstall() {
-	# start_location=$1
-	# end_location=$2
-	# mode=$3
-	if [ -d $1 ]; then
-		install -o root -d ${D}/$2
-		for f in ${1}/*
-		do
-			doinstall ${f} ${f/${1}/${2}} $3
-		done
-	else
-		sed -e "{ s,\(^#!.*$\),#!/usr/bin/python,; \
-		s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${WWW},; \
-		s,\(^LIBRARY_DIR\)\(.*\$\),\1 = \"${WWW}/lib\",; \
-		s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${CONFFILE}\",}" ${1} >${1}.cpy
-
-		install -o root -m $3 ${1}.cpy ${D}/$2
-		rm ${1}.cpy
-	fi
-}
-
-src_install() {
-	cd ${S}
-	install -o root -d ${D}/${WWW}/cgi
-
-	doinstall cgi/viewcvs.cgi ${WWW}/cgi/viewcvs.cgi 755
-	doinstall cgi/query.cgi ${WWW}/cgi/query.cgi 755
-	doinstall standalone.py ${WWW}/standalone.py 755
-	mkdir -p ${D}/`dirname ${CONFFILE}`
-	doinstall cgi/viewcvs.conf.dist ${CONFFILE} 644
-	doinstall cgi/cvsgraph.conf.dist `dirname ${CONFFILE}`/cvsgraph.conf 644
-	doinstall tools/loginfo-handler ${WWW}/loginfo-handler 755
-	doinstall tools/cvsdbadmin ${WWW}/cvsdbadmin 755
-	doinstall tools/make-database ${WWW}/make-database 755
-
-	doinstall lib ${WWW}/lib 644
-	doinstall templates `dirname ${CONFFILE}`/templates 644
-
-	dohtml -r website/*
-	dosym /usr/share/doc/${PF}/html /etc/viewcvs/doc
-
-	cat <<EOF >apache.conf
-ScriptAlias /viewcvs /var/www/localhost/viewcvs/cgi/viewcvs.cgi
-ScriptAlias /cvsquery /var/www/localhost/viewcvs/cgi/cvsquery.cgi
-
-<Directory /var/www/localhost/viewcvs/cgi>
-	Options ExecCGI
-	<IfModule mod_access.c>
-		Order allow,deny
-		Allow from all
-	</IfModule>
-</Directory>
-EOF
-	dodoc INSTALL TODO CHANGES README apache.conf
-}
-
-pkg_postinst() {
-	ewarn "Before using viewcvs make sure you configure it correctly"
-	einfo "There is a sample apache integration configuration file in the"
-	einfo "documentation directory named: apache.conf"
-}
diff --git a/www-apps/viewcvs/viewcvs-0.9.2_p20030430-r2.ebuild b/www-apps/viewcvs/viewcvs-0.9.2_p20030430-r2.ebuild
deleted file mode 100644
index c6365da3ad95..000000000000
--- a/www-apps/viewcvs/viewcvs-0.9.2_p20030430-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.2_p20030430-r2.ebuild,v 1.2 2004/08/30 19:45:27 rl03 Exp $
-
-inherit webapp
-
-PDATE=${PV/0.9.2_p/}
-DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
-HOMEPAGE="http://viewcvs.sourceforge.net/"
-SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
-
-LICENSE="viewcvs"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="|| ( ( >=app-text/rcs-5.7
-	>=dev-util/cvs-1.11 )
-	dev-util/subversion )
-	sys-apps/diffutils
-	net-www/apache"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-	dodir ${MY_CGIBINDIR}/${PN} ${MY_HOSTROOTDIR}/${PN}
-
-	cp cgi/viewcvs.cgi cgi/query.cgi standalone.py tools/loginfo-handler tools/cvsdbadmin tools/make-database ${D}/${MY_CGIBINDIR}/${PN}
-	cp -R lib ${D}/${MY_CGIBINDIR}/${PN}
-	cp -R templates ${D}/${MY_HOSTROOTDIR}/${PN}
-	cp cgi/viewcvs.conf.dist cgi/cvsgraph.conf.dist ${D}/${MY_HOSTROOTDIR}/${PN}
-
-	chmod +x ${D}/${MY_CGIBINDIR}/${PN}/*
-	dohtml -r website/*
-	dosym /usr/share/doc/${PF}/html ${MY_HTDOCSDIR}/doc
-
-	dodoc INSTALL TODO CHANGES README
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig
-	webapp_src_install
-}
diff --git a/www-apps/viewcvs/viewcvs-0.9.2_p20030430.ebuild b/www-apps/viewcvs/viewcvs-0.9.2_p20030430.ebuild
deleted file mode 100644
index d66e4708fdc8..000000000000
--- a/www-apps/viewcvs/viewcvs-0.9.2_p20030430.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.2_p20030430.ebuild,v 1.3 2004/10/04 21:14:50 pvdabeel Exp $
-
-PDATE=${PV/0.9.2_p/}
-DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
-HOMEPAGE="http://viewcvs.sourceforge.net/"
-SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
-
-LICENSE="viewcvs"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-text/rcs-5.7
-	>=dev-util/cvs-1.11
-	sys-apps/diffutils
-	net-www/apache"
-S=${WORKDIR}/${PN}
-
-WWW="/var/www/localhost/viewcvs"
-CONFFILE="/etc/viewcvs/viewcvs.conf"
-
-doinstall() {
-	# start_location=$1
-	# end_location=$2
-	# mode=$3
-	if [ -d $1 ]; then
-		install -o root -d ${D}/$2
-		for f in ${1}/*
-		do
-			doinstall ${f} ${f/${1}/${2}} $3
-		done
-	else
-		sed -e "{ s,\(^#!.*$\),#!/usr/bin/python,; \
-		s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${WWW},; \
-		s,\(^LIBRARY_DIR\)\(.*\$\),\1 = \"${WWW}/lib\",; \
-		s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${CONFFILE}\",}" ${1} >${1}.cpy
-
-		install -o root -m $3 ${1}.cpy ${D}/$2
-		rm ${1}.cpy
-	fi
-}
-
-src_install() {
-	cd ${S}
-	install -o root -d ${D}/${WWW}/cgi
-
-	doinstall cgi/viewcvs.cgi ${WWW}/cgi/viewcvs.cgi 755
-	doinstall cgi/query.cgi ${WWW}/cgi/query.cgi 755
-	doinstall standalone.py ${WWW}/standalone.py 755
-	mkdir -p ${D}/`dirname ${CONFFILE}`
-	doinstall cgi/viewcvs.conf.dist ${CONFFILE} 644
-	doinstall cgi/cvsgraph.conf.dist `dirname ${CONFFILE}`/cvsgraph.conf 644
-	doinstall tools/loginfo-handler ${WWW}/loginfo-handler 755
-	doinstall tools/cvsdbadmin ${WWW}/cvsdbadmin 755
-	doinstall tools/make-database ${WWW}/make-database 755
-
-	doinstall lib ${WWW}/lib 644
-	doinstall templates `dirname ${CONFFILE}`/templates 644
-
-	dohtml -r website/*
-	cat <<EOF >apache.conf
-ScriptAlias /viewcvs /var/www/localhost/viewcvs/cgi/viewcvs.cgi
-ScriptAlias /cvsquery /var/www/localhost/viewcvs/cgi/cvsquery.cgi
-
-<Directory /var/www/localhost/viewcvs/cgi>
-	Options ExecCGI
-	<IfModule mod_access.c>
-		Order allow,deny
-		Allow from all
-	</IfModule>
-</Directory>
-EOF
-	dodoc INSTALL TODO CHANGES README apache.conf
-}
-
-pkg_postinst() {
-	ewarn "Before using viewcvs make sure you configure it correctly"
-	einfo "There is a sample apache integration configuration file in the"
-	einfo "documentation directory named: apache.conf"
-}
diff --git a/www-apps/viewcvs/viewcvs-0.9.2_p20040831.ebuild b/www-apps/viewcvs/viewcvs-0.9.2_p20040831.ebuild
deleted file mode 100644
index 12769884c402..000000000000
--- a/www-apps/viewcvs/viewcvs-0.9.2_p20040831.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.2_p20040831.ebuild,v 1.3 2004/10/04 21:14:50 pvdabeel Exp $
-
-PDATE=${PV/0.9.2_p/}
-DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
-HOMEPAGE="http://viewcvs.sourceforge.net/"
-SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
-
-LICENSE="viewcvs"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( ( >=app-text/rcs-5.7
-	>=dev-util/cvs-1.11 )
-	dev-util/subversion )
-	sys-apps/diffutils
-	net-www/apache"
-S=${WORKDIR}/${PN}
-
-WWW="/var/www/localhost/viewcvs"
-CONFFILE="/etc/viewcvs/viewcvs.conf"
-
-doinstall() {
-	# start_location=$1
-	# end_location=$2
-	# mode=$3
-	if [ -d $1 ]; then
-		install -o root -d ${D}/$2
-		for f in ${1}/*
-		do
-			doinstall ${f} ${f/${1}/${2}} $3
-		done
-	else
-		sed -e "{ s,\(^#!.*$\),#!/usr/bin/python,; \
-		s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${WWW},; \
-		s,\(^LIBRARY_DIR\)\(.*\$\),\1 = \"${WWW}/lib\",; \
-		s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${CONFFILE}\",}" ${1} >${1}.cpy
-
-		install -o root -m $3 ${1}.cpy ${D}/$2
-		rm ${1}.cpy
-	fi
-}
-
-src_install() {
-	cd ${S}
-	install -o root -d ${D}/${WWW}/cgi
-
-	doinstall www/cgi/viewcvs.cgi ${WWW}/cgi/viewcvs.cgi 755
-	doinstall www/cgi/query.cgi ${WWW}/cgi/query.cgi 755
-	doinstall standalone.py ${WWW}/standalone.py 755
-	mkdir -p ${D}/`dirname ${CONFFILE}`
-	doinstall viewcvs.conf.dist ${CONFFILE} 644
-	doinstall cvsgraph.conf.dist `dirname ${CONFFILE}`/cvsgraph.conf 644
-	doinstall tools/loginfo-handler ${WWW}/loginfo-handler 755
-	doinstall tools/cvsdbadmin ${WWW}/cvsdbadmin 755
-	doinstall tools/make-database ${WWW}/make-database 755
-
-	doinstall lib ${WWW}/lib 644
-	doinstall templates `dirname ${CONFFILE}`/templates 644
-
-	dohtml -r website/*
-	dosym /usr/share/doc/${PF}/html /etc/viewcvs/doc
-
-	cat <<EOF >apache.conf
-ScriptAlias /viewcvs /var/www/localhost/viewcvs/cgi/viewcvs.cgi
-ScriptAlias /cvsquery /var/www/localhost/viewcvs/cgi/cvsquery.cgi
-
-<Directory /var/www/localhost/viewcvs/cgi>
-	Options ExecCGI
-	<IfModule mod_access.c>
-		Order allow,deny
-		Allow from all
-	</IfModule>
-</Directory>
-EOF
-	dodoc INSTALL TODO CHANGES README apache.conf
-}
-
-pkg_postinst() {
-	ewarn "Before using viewcvs make sure you configure it correctly"
-	einfo "There is a sample apache integration configuration file in the"
-	einfo "documentation directory named: apache.conf"
-}
diff --git a/www-apps/viewcvs/viewcvs-0.9.2_p20041207.ebuild b/www-apps/viewcvs/viewcvs-0.9.2_p20041207.ebuild
deleted file mode 100644
index 39521a357590..000000000000
--- a/www-apps/viewcvs/viewcvs-0.9.2_p20041207.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.2_p20041207.ebuild,v 1.2 2004/12/08 08:25:09 sejo Exp $
-
-PDATE=${PV/0.9.2_p/}
-DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
-HOMEPAGE="http://viewcvs.sourceforge.net/"
-SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
-
-LICENSE="viewcvs"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( ( >=app-text/rcs-5.7
-	>=dev-util/cvs-1.11 )
-	dev-util/subversion )
-	sys-apps/diffutils
-	net-www/apache"
-S=${WORKDIR}/${PN}
-
-WWW="/var/www/localhost/viewcvs"
-CONFFILE="/etc/viewcvs/viewcvs.conf"
-
-doinstall() {
-	# start_location=$1
-	# end_location=$2
-	# mode=$3
-	if [ -d $1 ]; then
-		install -o root -d ${D}/$2
-		for f in ${1}/*
-		do
-			doinstall ${f} ${f/${1}/${2}} $3
-		done
-	else
-		sed -e "{ s,\(^#!.*$\),#!/usr/bin/python,; \
-		s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${WWW},; \
-		s,\(^LIBRARY_DIR\)\(.*\$\),\1 = \"${WWW}/lib\",; \
-		s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${CONFFILE}\",}" ${1} >${1}.cpy
-
-		install -o root -m $3 ${1}.cpy ${D}/$2
-		rm ${1}.cpy
-	fi
-}
-
-src_install() {
-	cd ${S}
-	install -o root -d ${D}/${WWW}/cgi
-
-	doinstall www/cgi/viewcvs.cgi ${WWW}/cgi/viewcvs.cgi 755
-	doinstall www/cgi/query.cgi ${WWW}/cgi/query.cgi 755
-	doinstall standalone.py ${WWW}/standalone.py 755
-	mkdir -p ${D}/`dirname ${CONFFILE}`
-	doinstall viewcvs.conf.dist ${CONFFILE} 644
-	doinstall cvsgraph.conf.dist `dirname ${CONFFILE}`/cvsgraph.conf 644
-	doinstall tools/loginfo-handler ${WWW}/loginfo-handler 755
-	doinstall tools/cvsdbadmin ${WWW}/cvsdbadmin 755
-	doinstall tools/make-database ${WWW}/make-database 755
-
-	doinstall lib ${WWW}/lib 644
-	doinstall templates `dirname ${CONFFILE}`/templates 644
-
-	dohtml -r website/*
-	dosym /usr/share/doc/${PF}/html /etc/viewcvs/doc
-
-	cat <<EOF >apache.conf
-ScriptAlias /viewcvs /var/www/localhost/viewcvs/cgi/viewcvs.cgi
-ScriptAlias /cvsquery /var/www/localhost/viewcvs/cgi/cvsquery.cgi
-
-<Directory /var/www/localhost/viewcvs/cgi>
-	Options ExecCGI
-	<IfModule mod_access.c>
-		Order allow,deny
-		Allow from all
-	</IfModule>
-</Directory>
-EOF
-	dodoc INSTALL TODO CHANGES README apache.conf
-}
-
-pkg_postinst() {
-	ewarn "Before using viewcvs make sure you configure it correctly"
-	einfo "There is a sample apache integration configuration file in the"
-	einfo "documentation directory named: apache.conf"
-}
diff --git a/www-apps/viewcvs/viewcvs-0.9.3.ebuild b/www-apps/viewcvs/viewcvs-0.9.3.ebuild
new file mode 100644
index 000000000000..4c4292aaf3f6
--- /dev/null
+++ b/www-apps/viewcvs/viewcvs-0.9.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.3.ebuild,v 1.1 2005/05/24 02:34:59 ramereth Exp $
+
+inherit webapp
+
+DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
+HOMEPAGE="http://viewcvs.sourceforge.net/"
+SRC_URI="mirror://mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="viewcvs"
+KEYWORDS="~x86 ~ppc"
+IUSE="cvsgraph enscript"
+
+RDEPEND="|| ( ( >=app-text/rcs-5.7
+				>=dev-util/cvs-1.11 )
+				dev-util/subversion )
+			dev-lang/python
+			sys-apps/diffutils
+			cvsgraph? dev-util/cvsgraph
+			enscript? app-text/enscript
+			net-www/apache"
+
+src_install() {
+	webapp_src_preinst
+	dodir ${MY_CGIBINDIR}/${PN} ${MY_HOSTROOTDIR}/${PN}
+
+	exeinto ${MY_CGIBINDIR}/${PN}
+	doexe cgi/viewcvs.cgi cgi/query.cgi standalone.py
+
+	cp -r lib/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -r templates/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -r tools/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -r tests/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	insinto ${MY_HOSTROOTDIR}/${PN}
+	newins cgi/viewcvs.conf.dist viewcvs.conf
+	newins cgi/cvsgraph.conf.dist cvsgraph.conf
+
+	dodoc INSTALL TODO CHANGES README
+	dohtml -r website/*
+	dosym /usr/share/doc/${PF}/html ${MY_HTDOCSDIR}/doc
+
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/viewcvs.conf
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/cvsgraph.conf
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_src_install
+}
diff --git a/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild b/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild
new file mode 100644
index 000000000000..414232600abb
--- /dev/null
+++ b/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild,v 1.1 2005/05/24 02:34:59 ramereth Exp $
+
+inherit webapp
+
+PDATE=${PV/1.0_pre/}
+DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
+HOMEPAGE="http://viewcvs.sourceforge.net/"
+SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
+
+LICENSE="viewcvs"
+KEYWORDS="~x86"
+IUSE="cvsgraph enscript"
+
+RDEPEND="|| ( ( >=app-text/rcs-5.7
+				>=dev-util/cvs-1.11 )
+				dev-util/subversion )
+			dev-lang/python
+			sys-apps/diffutils
+			cvsgraph? dev-util/cvsgraph
+			enscript? app-text/enscript
+			net-www/apache"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+	dodir ${MY_CGIBINDIR}/${PN} ${MY_HOSTROOTDIR}/${PN}
+
+	exeinto ${MY_CGIBINDIR}/${PN}
+	doexe www/cgi/viewcvs.cgi www/cgi/query.cgi standalone.py
+
+	cp -r lib/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -r templates/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -r tools/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	cp -r tests/ ${D}/${MY_HOSTROOTDIR}/${PN}/
+	insinto ${MY_HOSTROOTDIR}/${PN}
+	newins viewcvs.conf.dist viewcvs.conf
+	newins cvsgraph.conf.dist cvsgraph.conf
+
+	dodoc INSTALL TODO CHANGES README
+	dohtml -r website/*
+	dosym /usr/share/doc/${PF}/html ${MY_HTDOCSDIR}/doc
+
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/viewcvs.conf
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/cvsgraph.conf
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_src_install
+}