new patch for commitid problems, changed around the names for config files to be example only

(Portage version: 2.0.51.22-r2)

4 files changed, 47 insertions, 24 deletions

diff --git a/www-apps/viewcvs/ChangeLog b/www-apps/viewcvs/ChangeLog
index 00c56ea5e7d4..6b5e30d0591f 100644
--- a/www-apps/viewcvs/ChangeLog
+++ b/www-apps/viewcvs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2005/10/05 02:32:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.24 2005/10/09 22:17:08 ramereth Exp $
+
+  09 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/viewcvs-commitid-fix.patch, viewcvs-1.0_pre20050929.ebuild:
+  * New patch to fix commitid problems
+  * Changed config files to be just example config files until webapp-config is
+  fixed
 
   05 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
   viewcvs-1.0_pre20050929.ebuild:
diff --git a/www-apps/viewcvs/Manifest b/www-apps/viewcvs/Manifest
index 70cf25d355c5..ddecf6f393f6 100644
--- a/www-apps/viewcvs/Manifest
+++ b/www-apps/viewcvs/Manifest
@@ -1,28 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f988cf1eb860f34079022c267408f207 ChangeLog 7551
 MD5 fa8daabae86da3beefbc3ea1e5ccd42c metadata.xml 779
+MD5 de35d046cef5f9b95a5ddce9f2bf990d viewcvs-0.9.2_p20041207-r1.ebuild 2536
 MD5 60259d2075951e829e25d800b66e6e5b viewcvs-0.9.3.ebuild 1479
 MD5 1efa77758ff6f9f8fa039c77a4e4d032 viewcvs-1.0_pre20050523.ebuild 1523
 MD5 add81eb48bf3db049469feb65a64c0dd viewcvs-0.9.4.ebuild 1513
-MD5 df580f4da3b565a5eb77cbeed0ff4eae viewcvs-1.0_pre20050929.ebuild 3311
-MD5 de35d046cef5f9b95a5ddce9f2bf990d viewcvs-0.9.2_p20041207-r1.ebuild 2536
-MD5 1ebd12b88a2c6a6964c0d02b5c82911a files/digest-viewcvs-0.9.3 65
+MD5 64ddab5013f8f36a0342b283bd65b5b5 viewcvs-1.0_pre20050929.ebuild 3428
 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 12fb198ba0e0736a29ee719e25ab44fb files/reconfig 962
+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 6ad94993c3421b9b0413f3268e5f09b6 files/digest-viewcvs-1.0_pre20050929 69
 MD5 8dd7c985d9b13ffa051e8f293e88ddb1 files/postinstall-new-en.txt 933
+MD5 6ad94993c3421b9b0413f3268e5f09b6 files/digest-viewcvs-1.0_pre20050929 69
 MD5 9b65df9cd8e1bae9bca4fcf9623396e7 files/viewcvs-mysql-4.0.sql 2495
 MD5 6260728f582a42a165dcf791a36b4825 files/viewcvs-mysql-4.1.sql 2422
-MD5 48783b2b9bd95be9a4eb1525a0bf708a files/digest-viewcvs-0.9.2_p20041207-r1 69
-MD5 9777bfdf8cffc9f8a930dca991d05c11 files/postinstall-en.txt 354
-MD5 12fb198ba0e0736a29ee719e25ab44fb files/reconfig 962
-MD5 550579a3a648e62d01ec4c3c3ee47327 files/viewcvs-CAN-2004-1062.patch 341
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDQztFOpjtAl+gMRURAueuAJ9q83ZXYHpGK0UBKXNZW5nzggjJowCgmZH3
-HpOIXxcZky4C2kYH6psfHW0=
-=HZ0Z
------END PGP SIGNATURE-----
+MD5 fee1dd762ebcd6fe9707794740684836 files/viewcvs-commitid-fix.patch 844
diff --git a/www-apps/viewcvs/files/viewcvs-commitid-fix.patch b/www-apps/viewcvs/files/viewcvs-commitid-fix.patch
new file mode 100644
index 000000000000..f04aa7ae9bdc
--- /dev/null
+++ b/www-apps/viewcvs/files/viewcvs-commitid-fix.patch
@@ -0,0 +1,20 @@
+diff -u -r1.61 -r1.62
+--- viewcvs/viewcvs/lib/vclib/bincvs/__init__.py	2005/10/03 20:57:12	1.61
++++ viewcvs/viewcvs/lib/vclib/bincvs/__init__.py	2005/10/05 12:51:50	1.62
+@@ -290,10 +290,16 @@
+                '^retrieving revision (.*)$',
+                '^diff .*$',
+                ]
++    _re_diff_warning = re.compile(
++      r'^.*rcsdiff: .*,v: warning: Unknown phrases like .*\n$')
+     for i in range(len(headers)):
+       line = fp.readline()
+       if not line:
+         raise vclib.Error("Error reading diff headers")
++      # Eat up any warning lines
++      while re.match(_re_diff_warning, line):
++        line = fp.readline()
++      # Make sure we get five good lines of output that match what we expect
+       if not re.match(headers[i], string.lstrip(line)):
+         raise vclib.Error("Error parsing diff headers")
+     return fp
diff --git a/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild b/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild
index b6d84941c31b..6e68001e7270 100644
--- a/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild
+++ b/www-apps/viewcvs/viewcvs-1.0_pre20050929.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-1.0_pre20050929.ebuild,v 1.2 2005/10/05 02:32:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild,v 1.3 2005/10/09 22:17:08 ramereth Exp $
 
 inherit webapp depend.apache eutils
 
@@ -48,6 +48,12 @@ pkg_setup() {
 	webapp_pkg_setup
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-commitid-fix.patch
+}
+
 src_compile() {
 	sed -i -e "s:1.0-dev:${PV}:" lib/viewcvs.py
 }
@@ -80,8 +86,8 @@ src_install() {
 	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
+	newins viewcvs.conf.dist viewcvs.conf.example
+	newins cvsgraph.conf.dist cvsgraph.conf.example
 
 	dosym /usr/share/doc/${PF}/html ${MY_HTDOCSDIR}/doc
 	dodoc INSTALL TODO CHANGES README
@@ -92,8 +98,8 @@ src_install() {
 		newexe standalone.py viewcvs-standalone
 	fi
 
-	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/viewcvs.conf
-	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/cvsgraph.conf
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/viewcvs.conf.example
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/cvsgraph.conf.example
 	webapp_postinst_txt en ${FILESDIR}/postinstall-new-en.txt
 	webapp_hook_script ${FILESDIR}/reconfig