A new snapshot and remove some old ebuilds

7 files changed, 41 insertions, 136 deletions

diff --git a/www-apps/viewcvs/ChangeLog b/www-apps/viewcvs/ChangeLog
index 1cf1e51b2117..7779964022cf 100644
--- a/www-apps/viewcvs/ChangeLog
+++ b/www-apps/viewcvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/viewcvs
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.4 2004/08/30 19:45:27 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.5 2004/09/01 10:56:15 pauldv Exp $
+
+*viewcvs-0.9.2_p20040831 (01 Sep 2004)
+
+  01 Sep 2004; <pauldv@gentoo.org> -viewcvs-0.9.2-r1.ebuild,
+  -viewcvs-0.9.2-r2.ebuild, +viewcvs-0.9.2_p20040831.ebuild:
+  Remove some stale versions and get a new version from the viewcvs cvs. 
+  The old snapshot is more than a year old now.
 
   30 Aug 2004; Renat Lumpau <rl03@gentoo.org>
   viewcvs-0.9.2_p20030430-r2.ebuild:
diff --git a/www-apps/viewcvs/Manifest b/www-apps/viewcvs/Manifest
index 0cd55e5a8e23..7aae732897fd 100644
--- a/www-apps/viewcvs/Manifest
+++ b/www-apps/viewcvs/Manifest
@@ -1,16 +1,14 @@
-MD5 0b24dbbf17a48fa287b61c6629b69b8a viewcvs-0.9.2_p20030430-r2.ebuild 1257
-MD5 a97c27e8add0308571d86a889271f1bd viewcvs-0.9.2-r1.ebuild 2344
-MD5 d4be9b9587fb3ba56b11c3eea3437028 viewcvs-0.9.2-r3.ebuild 2776
-MD5 1fe983f72e8be00b8b906b6df5bd8d3e viewcvs-0.9.2_p20030430.ebuild 2325
-MD5 7e5c309216b00abdd5d51cae387732d9 viewcvs-0.9.2_p20030430-r1.ebuild 2412
-MD5 664067b803c823c47f6301acba9aa1a5 viewcvs-0.9.2-r2.ebuild 2743
 MD5 739ac583585c1e4574c909377e4a3402 ChangeLog 3403
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 fbac846bcd488f255dc57fdd27ba99df files/digest-viewcvs-0.9.2_p20030430 69
-MD5 07a07f1a89e77c9f093ade7e395ffe3b files/digest-viewcvs-0.9.2-r1 65
-MD5 07a07f1a89e77c9f093ade7e395ffe3b files/digest-viewcvs-0.9.2-r2 65
-MD5 07a07f1a89e77c9f093ade7e395ffe3b files/digest-viewcvs-0.9.2-r3 65
-MD5 39d356a0537a0b8cdee280b47feb6413 files/postinstall-en.txt 416
-MD5 fbac846bcd488f255dc57fdd27ba99df files/digest-viewcvs-0.9.2_p20030430-r1 69
+MD5 d4be9b9587fb3ba56b11c3eea3437028 viewcvs-0.9.2-r3.ebuild 2776
+MD5 7e5c309216b00abdd5d51cae387732d9 viewcvs-0.9.2_p20030430-r1.ebuild 2412
+MD5 1fe983f72e8be00b8b906b6df5bd8d3e viewcvs-0.9.2_p20030430.ebuild 2325
+MD5 f1060d32ebcda2f6b57181c770c4230c viewcvs-0.9.2_p20040831.ebuild 2406
+MD5 0b24dbbf17a48fa287b61c6629b69b8a viewcvs-0.9.2_p20030430-r2.ebuild 1257
 MD5 fbac846bcd488f255dc57fdd27ba99df files/digest-viewcvs-0.9.2_p20030430-r2 69
 MD5 0088c763c379d737d15788ef2f387cd9 files/reconfig 336
+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 39d356a0537a0b8cdee280b47feb6413 files/postinstall-en.txt 416
+MD5 db9223dd117bcf0933c71e4d5598ceba files/digest-viewcvs-0.9.2_p20040831 69
diff --git a/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r1 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r1
deleted file mode 100644
index 7ee3ce69fbbc..000000000000
--- a/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r1
+++ /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-r2 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r2
deleted file mode 100644
index 7ee3ce69fbbc..000000000000
--- a/www-apps/viewcvs/files/digest-viewcvs-0.9.2-r2
+++ /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_p20040831 b/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20040831
new file mode 100644
index 000000000000..8d4954399ef4
--- /dev/null
+++ b/www-apps/viewcvs/files/digest-viewcvs-0.9.2_p20040831
@@ -0,0 +1 @@
+MD5 692a22591bc229daae695adb2474d71e viewcvs-20040831.tar.bz2 205993
diff --git a/www-apps/viewcvs/viewcvs-0.9.2-r2.ebuild b/www-apps/viewcvs/viewcvs-0.9.2-r2.ebuild
deleted file mode 100644
index 80b978071ef4..000000000000
--- a/www-apps/viewcvs/viewcvs-0.9.2-r2.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-r2.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="/home/httpd/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 /home/httpd/viewcvs and creates an alias to /viewcvs
-# Configuration of ViewCVS could be done in /etc/viewcvs/
-
-ScriptAlias /viewcvs /home/httpd/viewcvs/cgi/viewcvs.cgi
-ScriptAlias /cvsquery /home/httpd/viewcvs/cgi/cvsquery.cgi
-
-<Directory /home/httpd/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-r1.ebuild b/www-apps/viewcvs/viewcvs-0.9.2_p20040831.ebuild
index ceda3035a1eb..b8ddec46e1f2 100644
--- a/www-apps/viewcvs/viewcvs-0.9.2-r1.ebuild
+++ b/www-apps/viewcvs/viewcvs-0.9.2_p20040831.ebuild
@@ -1,24 +1,26 @@
 # 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-r1.ebuild,v 1.2 2004/08/26 08:00:05 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.2_p20040831.ebuild,v 1.1 2004/09/01 10:56:15 pauldv 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"
+SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
 
 LICENSE="viewcvs"
 SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
+KEYWORDS="~x86"
 
 DEPEND=""
-RDEPEND=">=app-text/rcs-5.7
-	>=dev-util/cvs-1.11
+RDEPEND="|| ( ( >=app-text/rcs-5.7
+	>=dev-util/cvs-1.11 )
+	dev-util/subversion )
 	sys-apps/diffutils
 	net-www/apache"
+S=${WORKDIR}/${PN}
 
-WWW="/home/httpd/viewcvs"
+WWW="/var/www/localhost/viewcvs"
+CONFFILE="/etc/viewcvs/viewcvs.conf"
 
 doinstall() {
 	# start_location=$1
@@ -34,7 +36,7 @@ doinstall() {
 		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
+		s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${CONFFILE}\",}" ${1} >${1}.cpy
 
 		install -o root -m $3 ${1}.cpy ${D}/$2
 		rm ${1}.cpy
@@ -45,30 +47,27 @@ 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 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
 
-	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
+	doinstall templates `dirname ${CONFFILE}`/templates 644
 
-	dosym ${WWW}/viewcvs.conf /etc/viewcvs/viewcvs.conf
-	dosym ${WWW}/cvsgraph.conf /etc/viewcvs/cvsgraph.conf
+	dohtml -r website/*
+	dosym /usr/share/doc/${PF}/html /etc/viewcvs/doc
 
 	cat <<EOF >apache.conf
-ScriptAlias /viewcvs /home/httpd/viewcvs/cgi/viewcvs.cgi
-ScriptAlias /cvsquery /home/httpd/viewcvs/cgi/cvsquery.cgi
+ScriptAlias /viewcvs /var/www/localhost/viewcvs/cgi/viewcvs.cgi
+ScriptAlias /cvsquery /var/www/localhost/viewcvs/cgi/cvsquery.cgi
 
-<Directory /home/httpd/viewcvs/cgi>
+<Directory /var/www/localhost/viewcvs/cgi>
 	Options ExecCGI
 	<IfModule mod_access.c>
 		Order allow,deny
@@ -80,7 +79,7 @@ EOF
 }
 
 pkg_postinst() {
-	ewarn "Before using viewcvs make sure you configure it correctly."
+	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"
 }