Fixed an issue with German characters - thanks to Lars Teifland for an almost

working patch, #65351

Fixed the error svn: Cant check path /root/.subversion: Permission denied (websvn issue 32)
(Portage version: 2.0.53_rc5)

6 files changed, 178 insertions, 8 deletions

diff --git a/www-apps/websvn/ChangeLog b/www-apps/websvn/ChangeLog
index b4e016cd55a1..c02faed35066 100644
--- a/www-apps/websvn/ChangeLog
+++ b/www-apps/websvn/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-apps/websvn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/ChangeLog,v 1.7 2005/09/05 10:19:43 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/ChangeLog,v 1.8 2005/10/17 13:00:07 uberlord Exp $
+
+*websvn-1.61-r3 (17 Oct 2005)
+
+  17 Oct 2005; Roy Marples <uberlord@gentoo.org>
+  +files/websvn-1.61-german.patch, +files/websvn-1.61-issue32.patch,
+  +websvn-1.61-r3.ebuild:
+  Fixed an issue with German characters - thanks to Lars Teifland for an almost
+  working patch, #65351
+  
+  Fixed the error "svn: Can't check path '/root/.subversion': Permission denied"
+  (websvn issue 32)
 
 *websvn-1.61-r2 (05 Sep 2005)
 
diff --git a/www-apps/websvn/Manifest b/www-apps/websvn/Manifest
index e6fde8b622e1..bae6bb6d13bf 100644
--- a/www-apps/websvn/Manifest
+++ b/www-apps/websvn/Manifest
@@ -1,10 +1,14 @@
-MD5 2cb25e4130b40585eaf200897460746b websvn-1.61-r2.ebuild 1421
 MD5 8847a98e93017fd1724236f45c0f1eb4 ChangeLog 1429
-MD5 079c9b575ef8818374a7299069ef3200 websvn-1.61-r1.ebuild 1378
-MD5 7999d6b6542ca3e8b7f9fb693fbbd016 metadata.xml 323
-MD5 65009af89b673d7f57d7ce7290d652fa websvn-1.61.ebuild 1308
-MD5 0d0713dd2a344f83db7c81936914b4e6 files/websvn-1.61-r2.patch 442
-MD5 e63dfafda87c3bf459f7d580e0a33b9d files/websvn-1.61-r1.patch 4908
+MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61 61
 MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61-r1 61
 MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61-r2 61
-MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61 61
+MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61-r3 61
+MD5 3013b9d26debc5a20cad7438c0353002 files/websvn-1.61-german.patch 3108
+MD5 24bec7bc11c2c25adeeaa06bf4260cde files/websvn-1.61-issue32.patch 726
+MD5 e63dfafda87c3bf459f7d580e0a33b9d files/websvn-1.61-r1.patch 4908
+MD5 0d0713dd2a344f83db7c81936914b4e6 files/websvn-1.61-r2.patch 442
+MD5 7999d6b6542ca3e8b7f9fb693fbbd016 metadata.xml 323
+MD5 079c9b575ef8818374a7299069ef3200 websvn-1.61-r1.ebuild 1378
+MD5 2cb25e4130b40585eaf200897460746b websvn-1.61-r2.ebuild 1421
+MD5 7ed8028fac60478e28cfa40151cc3d78 websvn-1.61-r3.ebuild 1518
+MD5 65009af89b673d7f57d7ce7290d652fa websvn-1.61.ebuild 1308
diff --git a/www-apps/websvn/files/digest-websvn-1.61-r3 b/www-apps/websvn/files/digest-websvn-1.61-r3
new file mode 100644
index 000000000000..9a1a0b280f50
--- /dev/null
+++ b/www-apps/websvn/files/digest-websvn-1.61-r3
@@ -0,0 +1 @@
+MD5 9f81a3793d08bde2e425d2c98f923875 WebSVN_161.tar.gz 89305
diff --git a/www-apps/websvn/files/websvn-1.61-german.patch b/www-apps/websvn/files/websvn-1.61-german.patch
new file mode 100644
index 000000000000..1bc3981d109c
--- /dev/null
+++ b/www-apps/websvn/files/websvn-1.61-german.patch
@@ -0,0 +1,71 @@
+Index: listing.php

+===================================================================

+--- listing.php	(Revision 1)

++++ listing.php	(Arbeitskopie)

+@@ -232,7 +232,15 @@

+ $vars["action"] = "";

+ $vars["author"] = $log['author'];

+ $vars["date"] = $log['date'];

+-$vars["log"] = nl2br($bugtraq->replaceIDs(create_anchors($log['message'])));

++$log_mess= nl2br($bugtraq->replaceIDs(create_anchors($log['message'])));

++$log_mess=str_replace("?\\195?\\182","&ouml;",$log_mess);

++$log_mess=str_replace("?\\195?\\150","&ouml;",$log_mess);

++$log_mess=str_replace("?\\195?\\156","&Uuml;",$log_mess);

++$log_mess=str_replace("?\\195?\\188","&uuml;",$log_mess);

++$log_mess=str_replace("?\\195?\\164","&auml;",$log_mess);

++$log_mess=str_replace("?\\195?\\132","&Auml;",$log_mess);

++$log_mess=str_replace("?\\195?\\159","&szlig;",$log_mess);

++$vars["log"] = $log_mess;

+ $vars["rev"] = $rev;

+ $vars["lastchangedrev"] = $logrev;

+ $vars["path"] = $ppath;

+Index: log.php

+===================================================================

+--- log.php	(Revision 1)

++++ log.php	(Arbeitskopie)

+@@ -162,6 +162,7 @@

+       {

+          // Turn all the HTML entities into real characters.  

+          

++	 $log_mess=$log["message"];

+          if (version_compare(phpversion(), "4.1.0", "<"))

+             $msg = html_entity_decode($log["message"]);

+          else

+@@ -215,7 +216,15 @@

+       

+       $listing[$index]["revauthor"] = $log["author"];

+       $listing[$index]["revage"] = $log["age"];

+-      $listing[$index]["revlog"] = nl2br($bugtraq->replaceIDs(create_anchors($log["message"])));

++      $log_mess = nl2br($bugtraq->replaceIDs(create_anchors($log["message"])));

++	  $log_mess=str_replace("?\\195?\\182","&ouml;",$log_mess);

++	  $log_mess=str_replace("?\\195?\\150","&ouml;",$log_mess);

++	  $log_mess=str_replace("?\\195?\\156","&Uuml;",$log_mess);

++	  $log_mess=str_replace("?\\195?\\188","&uuml;",$log_mess);

++	  $log_mess=str_replace("?\\195?\\164","&auml;",$log_mess);

++	  $log_mess=str_replace("?\\195?\\132","&Auml;",$log_mess);

++	  $log_mess=str_replace("?\\195?\\159","&szlig;",$log_mess);

++      $listing[$index]["revlog"] = $log_mess;

+       $listing[$index]["rowparity"] = "$row";

+       

+       $row = 1 - $row;

+Index: rss.php

+===================================================================

+--- rss.php	(Revision 1)

++++ rss.php	(Arbeitskopie)

+@@ -98,7 +98,15 @@

+  

+    $url = $config->getURL($rep, $parent, "dir");

+    

+-   $desc = $log["message"];

++   $log_mess = $log["message"];

++   $log_mess=str_replace("?\\195?\\182","&ouml;",$log_mess);

++   $log_mess=str_replace("?\\195?\\150","&ouml;",$log_mess);

++   $log_mess=str_replace("?\\195?\\156","&Uuml;",$log_mess);

++   $log_mess=str_replace("?\\195?\\188","&uuml;",$log_mess);

++   $log_mess=str_replace("?\\195?\\164","&auml;",$log_mess);

++   $log_mess=str_replace("?\\195?\\132","&Auml;",$log_mess);

++   $log_mess=str_replace("?\\195?\\159","&szlig;",$log_mess);

++   $desc=$log_mess;

+    $item = new FeedItem();

+    

+    // For the title, we show the first 10 words of the description

diff --git a/www-apps/websvn/files/websvn-1.61-issue32.patch b/www-apps/websvn/files/websvn-1.61-issue32.patch
new file mode 100644
index 000000000000..7b85f005b706
--- /dev/null
+++ b/www-apps/websvn/files/websvn-1.61-issue32.patch
@@ -0,0 +1,22 @@
+Index: include/configclass.inc
+===================================================================
+--- include/configclass.inc	(revision 328)
++++ include/configclass.inc	(working copy)
+@@ -190,7 +190,7 @@
+    // Tool path locations

+ 

+    var $svnlook = "svnlook";

+-   var $svn = "svn --non-interactive";

++   var $svn = "svn --non-interactive --config-dir /tmp";

+    var $diff = "diff";

+    var $enscript ="enscript";

+    var $sed = "sed";

+@@ -436,7 +436,7 @@
+    

+    function setSVNCommandPath($path)

+    {

+-      $this->setPath($this->svn, $path, "svn");

++      $this->setPath($this->svn, $path, "svn --non-interactive --config-dir /tmp");

+       $this->setPath($this->svnlook, $path, "svnlook");

+    }

+    

diff --git a/www-apps/websvn/websvn-1.61-r3.ebuild b/www-apps/websvn/websvn-1.61-r3.ebuild
new file mode 100644
index 000000000000..f2725f80dbd9
--- /dev/null
+++ b/www-apps/websvn/websvn-1.61-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-1.61-r3.ebuild,v 1.1 2005/10/17 13:00:07 uberlord Exp $
+
+inherit eutils webapp
+
+MY_PV="161"
+DESCRIPTION="Web-based browsing tool for Subversion (SVN) repositories in PHP"
+HOMEPAGE="http://websvn.tigris.org/"
+SRC_URI="http://websvn.tigris.org/files/documents/1380/14334/WebSVN_${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+IUSE="enscript"
+KEYWORDS="~x86 ~amd64 ~sparc"
+
+RDEPEND="virtual/php
+	sys-apps/sed
+	enscript? ( >=app-text/enscript-1.6.0 )"
+DEPEND="sys-apps/findutils"
+
+S="${WORKDIR}/WebSVN"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-${PV}-r1.patch"
+	epatch "${FILESDIR}/${PN}-${PV}-r2.patch"
+
+	epatch "${FILESDIR}/${PN}-${PV}-issue32.patch"
+	epatch "${FILESDIR}/${PN}-${PV}-german.patch"
+}
+
+src_compile() {
+	mv "${S}/include/distconfig.inc" "${S}/include/config.inc"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local doc docs="changes.txt install.txt templates.txt"
+
+	dodoc ${docs}
+	for doc in ${docs}; do
+		rm -f "${doc}"
+	done
+
+	# Remove .cvs* files and CVS directories
+	find -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r *
+	webapp_configfile "${MY_HTDOCSDIR}/include/config.inc"
+
+	# This is the multiview config file
+	webapp_configfile "${MY_HTDOCSDIR}/wsvn.php"
+
+	# The cache directory needs to be writeable
+	webapp_serverowned "${MY_HTDOCSDIR}/cache"
+
+	webapp_src_install
+}