Marked 0.9.3 stable on x86, New CVS snapshot with numerous fixes (see changelog)

(Portage version: 2.0.51.22-r2)

7 files changed, 174 insertions, 25 deletions

diff --git a/www-apps/viewcvs/ChangeLog b/www-apps/viewcvs/ChangeLog
index 8d9d4af2cd22..e30b268f2b1c 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.19 2005/08/22 23:26:34 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.20 2005/10/03 05:06:28 ramereth Exp $
+
+*viewcvs-1.0_pre20050929 (03 Oct 2005)
+
+  03 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/postinstall-new-en.txt, files/reconfig, viewcvs-0.9.3.ebuild,
+  +viewcvs-1.0_pre20050929.ebuild:
+  * New CVS snapshot with several fixes:
+    * Resolved #77226 giving the option of using either
+      apache1/apache2/lighttpd for cgi capable webservers
+    * Resolved #106506 adding a mysql flag, and mysql-python deps for folks
+      wanting to use the mysql query engine.
+    * Added checks for several apps to ensure they have proper use flags
+      enabled.
+    * Added sql files for creating query engine tables
+    * Fixed reconfig script to fix the mod_python scripts
+    * Updated postinstall to include new information
+  * Marked 0.9.3 stable on x86
 
 *viewcvs-0.9.4 (22 Aug 2005)
 
diff --git a/www-apps/viewcvs/Manifest b/www-apps/viewcvs/Manifest
index bf58d222ef5d..49c8727551d7 100644
--- a/www-apps/viewcvs/Manifest
+++ b/www-apps/viewcvs/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 00fe87907d76cc673b54c6cc709c8cea ChangeLog 6351
-MD5 48783b2b9bd95be9a4eb1525a0bf708a files/digest-viewcvs-0.9.2_p20041207-r1 69
-MD5 1ebd12b88a2c6a6964c0d02b5c82911a files/digest-viewcvs-0.9.3 65
-MD5 26ecfea58fa51e62bc28985ff0f73048 files/digest-viewcvs-0.9.4 65
-MD5 63be22bf657c7d52e524b1a74c92cf2c files/digest-viewcvs-1.0_pre20050523 69
-MD5 9777bfdf8cffc9f8a930dca991d05c11 files/postinstall-en.txt 354
-MD5 7137b2f76746164b7e369e849a972214 files/reconfig 472
-MD5 550579a3a648e62d01ec4c3c3ee47327 files/viewcvs-CAN-2004-1062.patch 341
 MD5 fa8daabae86da3beefbc3ea1e5ccd42c metadata.xml 779
 MD5 de35d046cef5f9b95a5ddce9f2bf990d viewcvs-0.9.2_p20041207-r1.ebuild 2536
-MD5 05e3390fc1193128d6ed098a82284e23 viewcvs-0.9.3.ebuild 1478
-MD5 add81eb48bf3db049469feb65a64c0dd viewcvs-0.9.4.ebuild 1513
+MD5 92f226ac71acb7ee308efff9ebeab9a8 viewcvs-0.9.3.ebuild 1477
 MD5 1efa77758ff6f9f8fa039c77a4e4d032 viewcvs-1.0_pre20050523.ebuild 1523
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDCnFKI1lqEGTUzyQRAuYiAKCu58gHFJGo/1vwynpYJB9A9LsuvACgyC8t
-SpszoIoc8M6jMuNwxRtspPQ=
-=x/Tz
------END PGP SIGNATURE-----
+MD5 add81eb48bf3db049469feb65a64c0dd viewcvs-0.9.4.ebuild 1513
+MD5 bbf67d94d5d12f248450c120e981a26f viewcvs-1.0_pre20050929.ebuild 3305
+MD5 63be22bf657c7d52e524b1a74c92cf2c files/digest-viewcvs-1.0_pre20050523 69
+MD5 1ebd12b88a2c6a6964c0d02b5c82911a files/digest-viewcvs-0.9.3 65
+MD5 9777bfdf8cffc9f8a930dca991d05c11 files/postinstall-en.txt 354
+MD5 ea0cf5dbba37ce6502717d717fce1601 files/reconfig 471
+MD5 48783b2b9bd95be9a4eb1525a0bf708a files/digest-viewcvs-0.9.2_p20041207-r1 69
+MD5 550579a3a648e62d01ec4c3c3ee47327 files/viewcvs-CAN-2004-1062.patch 341
+MD5 26ecfea58fa51e62bc28985ff0f73048 files/digest-viewcvs-0.9.4 65
+MD5 8dd7c985d9b13ffa051e8f293e88ddb1 files/postinstall-new-en.txt 933
+MD5 6ad94993c3421b9b0413f3268e5f09b6 files/digest-viewcvs-1.0_pre20050929 69
diff --git a/www-apps/viewcvs/files/digest-viewcvs-1.0_pre20050929 b/www-apps/viewcvs/files/digest-viewcvs-1.0_pre20050929
new file mode 100644
index 000000000000..aae5e7a0b793
--- /dev/null
+++ b/www-apps/viewcvs/files/digest-viewcvs-1.0_pre20050929
@@ -0,0 +1 @@
+MD5 dbb92ef006328839e3035a8358246c81 viewcvs-20050929.tar.bz2 341558
diff --git a/www-apps/viewcvs/files/postinstall-new-en.txt b/www-apps/viewcvs/files/postinstall-new-en.txt
new file mode 100644
index 000000000000..92b1e4a9ef6c
--- /dev/null
+++ b/www-apps/viewcvs/files/postinstall-new-en.txt
@@ -0,0 +1,22 @@
+If you are using Apache, consider adding something like this to your
+apache.conf:
+
+ScriptAlias /viewcvs ${VHOST_CGIBINDIR}/${PN}/viewcvs.cgi
+ScriptAlias /cvsquery ${VHOST_CGIBINDIR}/${PN}/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.
+
+If you're using mod_python, remember to add '-D PYTHON' in
+/etc/conf.d/apache. The needed settings for viewcvs have been included in
+${VHOST_ROOT}/htdocs/.htaccess.
+
+If you're wanting to use the query engine, you'll need to first create a
+database. Next, run the following command to populate the database with tables
+you'll need.
+
+# mysql -u root -p <database name> < /usr/share/webapps/viewcvs/${PV}/sqlscripts/mysql/${PV}_create.sql
+
+After this, please read the upstream documentation on how to setup the query
+engine. This can be located at /usr/share/docs/${P}/INSTALL.gz.
diff --git a/www-apps/viewcvs/files/reconfig b/www-apps/viewcvs/files/reconfig
index a1d44f14386a..54d68da2717b 100644
--- a/www-apps/viewcvs/files/reconfig
+++ b/www-apps/viewcvs/files/reconfig
@@ -1,11 +1,12 @@
 #!/bin/bash
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/files/reconfig,v 1.4 2005/08/22 23:26:34 rl03 Exp $
+# $Id: reconfig,v 1.5 2005/10/03 05:06:28 ramereth Exp $
 
 if [ $1 = "install" ]; then
-	find ${VHOST_CGIBINDIR}/viewcvs ${VHOST_ROOT}/viewcvs -type f \
+	find ${VHOST_CGIBINDIR}/viewcvs ${VHOST_ROOT}/viewcvs ${VHOST_ROOT}/htdocs/. -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
+	s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${VHOST_ROOT}/viewcvs,g 
+	s,\(<VIEWCVS_APACHE_LIBRARY_DIRECTORY>\),${VHOST_ROOT}/viewcvs/lib,g" -i
 	
 elif [ $1 = "clean" ]; then
 	echo $1
diff --git a/www-apps/viewcvs/viewcvs-0.9.3.ebuild b/www-apps/viewcvs/viewcvs-0.9.3.ebuild
index 4f204b30b312..be4722383367 100644
--- a/www-apps/viewcvs/viewcvs-0.9.3.ebuild
+++ b/www-apps/viewcvs/viewcvs-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2005/07/15 18:50:20 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.3.ebuild,v 1.6 2005/10/03 05:06:28 ramereth Exp $
 
 inherit webapp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://viewcvs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="viewcvs"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~ppc ~sparc x86"
 IUSE="cvsgraph enscript"
 
 RDEPEND="|| (
diff --git a/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild b/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild
new file mode 100644
index 000000000000..d3c74e7f43c2
--- /dev/null
+++ b/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild
@@ -0,0 +1,115 @@
+# 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_pre20050929.ebuild,v 1.1 2005/10/03 05:06:28 ramereth Exp $
+
+inherit webapp depend.apache eutils
+
+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="~sparc ~x86"
+IUSE="cvsgraph enscript mod_python mysql standalone"
+
+want_apache
+
+RDEPEND="|| ( >=dev-util/cvs-1.11
+			  dev-util/subversion )
+		dev-lang/python
+		>=app-text/rcs-5.7
+		sys-apps/diffutils
+		cvsgraph? ( dev-util/cvsgraph )
+		enscript? ( app-text/enscript )
+		apache2? ( mod_python? ( dev-python/mod_python ) )
+		mysql? ( dev-db/mysql
+				 dev-python/mysql-python )
+		!apache? ( !apache2? ( www-servers/lighttpd ) )"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	if has_version dev-util/subversion && ! built_with_use dev-util/subversion python ; then
+		eerror "Your subversion has been built without python bindings"
+		eerror "If you want subversion to work with viewcvs, please"
+		eerror "enable the 'python' useflag"
+		die "pkg_setup failed"
+	fi
+	if use mod_python && ! use apache2 ; then
+		eerror "mod_python requires at least apache2"
+		die "pkg_setup failed"
+	fi
+	if use standalone && ! built_with_use dev-lang/python tcltk ; then
+		eerror "Standalone client requires tkinter, please enable the"
+		eerror "tcltk useflag for python and recompile"
+		die "pkg_setup failed"
+	fi
+	webapp_pkg_setup
+}
+
+src_compile() {
+	sed -i -e "s:1.0-dev:${PV}:" lib/viewcvs.py
+}
+
+src_install() {
+	webapp_src_preinst
+	dodir ${MY_CGIBINDIR}/${PN} ${MY_HOSTROOTDIR}/${PN}
+
+	exeinto ${MY_CGIBINDIR}/${PN}
+	doexe www/cgi/viewcvs.cgi
+
+	if use mysql ; then
+		exeinto ${MY_CGIBINDIR}/${PN}
+		doexe www/cgi/query.cgi
+	fi
+
+	if use mod_python && use apache2 ; then
+		exeinto ${MY_HTDOCSDIR}
+		doexe www/mod_python/viewcvs.py www/mod_python/query.py
+		if use mysql ; then
+			exeinto ${MY_HTDOCSDIR}
+			doexe www/mod_python/query.py
+		fi
+		insinto ${MY_HTDOCSDIR}
+		doins www/mod_python/.htaccess
+	fi
+
+	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
+
+	dosym /usr/share/doc/${PF}/html ${MY_HTDOCSDIR}/doc
+	dodoc INSTALL TODO CHANGES README
+	dohtml -r website/*
+
+	if use standalone ; then
+		exeinto /usr/sbin
+		newexe standalone.py viewcvs-standalone
+	fi
+
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/viewcvs.conf
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/cvsgraph.conf
+	webapp_postinst_txt en ${FILESDIR}/postinstall-new-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig
+
+	if use mysql && has_version "=dev-db/mysql-4.0*" ; then
+		webapp_sqlscript mysql ${FILESDIR}/viewcvs-mysql-4.0.sql
+	elif use mysql && has_version "=dev-db/mysql-4.1*" ; then
+		webapp_sqlscript mysql ${FILESDIR}/viewcvs-mysql-4.1.sql
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	if use standalone ; then
+		einfo "The standalone script is called viewcvs-standalone"
+		einfo "instead of standalone.py for clarity sake"
+	fi
+}