19 files changed, 12 insertions, 553 deletions
diff --git a/www-apps/websvn/files/digest-websvn-1.61-r1 b/www-apps/websvn/files/digest-websvn-1.61-r1
deleted file mode 100644
index 2d6ccaba2c85..000000000000
--- a/www-apps/websvn/files/digest-websvn-1.61-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9f81a3793d08bde2e425d2c98f923875 WebSVN_161.tar.gz 89305
-RMD160 aedd187926ff286b5582f2359cbe3fb56d7a0bc9 WebSVN_161.tar.gz 89305
-SHA256 f419aaca535bcfb06dc96b5575e84cefc6d8e1487c52c564c8eebfd633537e08 WebSVN_161.tar.gz 89305
diff --git a/www-apps/websvn/files/digest-websvn-1.61-r2 b/www-apps/websvn/files/digest-websvn-1.61-r2
deleted file mode 100644
index 2d6ccaba2c85..000000000000
--- a/www-apps/websvn/files/digest-websvn-1.61-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9f81a3793d08bde2e425d2c98f923875 WebSVN_161.tar.gz 89305
-RMD160 aedd187926ff286b5582f2359cbe3fb56d7a0bc9 WebSVN_161.tar.gz 89305
-SHA256 f419aaca535bcfb06dc96b5575e84cefc6d8e1487c52c564c8eebfd633537e08 WebSVN_161.tar.gz 89305
diff --git a/www-apps/websvn/files/digest-websvn-1.61-r3 b/www-apps/websvn/files/digest-websvn-1.61-r3
deleted file mode 100644
index 2d6ccaba2c85..000000000000
--- a/www-apps/websvn/files/digest-websvn-1.61-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9f81a3793d08bde2e425d2c98f923875 WebSVN_161.tar.gz 89305
-RMD160 aedd187926ff286b5582f2359cbe3fb56d7a0bc9 WebSVN_161.tar.gz 89305
-SHA256 f419aaca535bcfb06dc96b5575e84cefc6d8e1487c52c564c8eebfd633537e08 WebSVN_161.tar.gz 89305
diff --git a/www-apps/websvn/files/digest-websvn-1.70_beta1 b/www-apps/websvn/files/digest-websvn-1.70_beta1
deleted file mode 100644
index d9825209606e..000000000000
--- a/www-apps/websvn/files/digest-websvn-1.70_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ca5dc1321413afbee4f1e1b0c43e111c WebSVN_170beta1.tar.gz 225497
-RMD160 2b41e0bb9fa75d6129d51311c10aac285929d25b WebSVN_170beta1.tar.gz 225497
-SHA256 807257fd8897f00e0d957f2a899224070bc601544a233ce7963b22b0aa739d2f WebSVN_170beta1.tar.gz 225497
diff --git a/www-apps/websvn/files/digest-websvn-2.0 b/www-apps/websvn/files/digest-websvn-2.0
new file mode 100644
index 000000000000..245687e7ff83
--- /dev/null
+++ b/www-apps/websvn/files/digest-websvn-2.0
@@ -0,0 +1,3 @@
+MD5 7a60acd7f922cf46af2c847eb0acd33f websvn-2.0.tar.gz 172966
+RMD160 19883e866711e75691f081474ba28a6cd873e6e7 websvn-2.0.tar.gz 172966
+SHA256 a58743fd05045e4bc1c904655f1f3b59a3ae5ac322b6a074760d8cba77d83c3e websvn-2.0.tar.gz 172966
diff --git a/www-apps/websvn/files/digest-websvn-2.0_rc1 b/www-apps/websvn/files/digest-websvn-2.0_rc1
deleted file mode 100644
index 7c16a47c009a..000000000000
--- a/www-apps/websvn/files/digest-websvn-2.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7007e333c83bafc38dc18fc9748547b WebSVN_2.0rc1.tar.gz 115073
-RMD160 740439dddeb4d9b00a82f1fafce217d08b6ef051 WebSVN_2.0rc1.tar.gz 115073
-SHA256 9cc30925274203b9a254c96a5996cb9a461515ddeaefa9df37fc9c32dbff7918 WebSVN_2.0rc1.tar.gz 115073
diff --git a/www-apps/websvn/files/digest-websvn-2.0_rc4 b/www-apps/websvn/files/digest-websvn-2.0_rc4
deleted file mode 100644
index 75694a526adb..000000000000
--- a/www-apps/websvn/files/digest-websvn-2.0_rc4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8a5938bad14021c61f0bbf06f7faf618 websvn-2.0rc4.tar.bz2 98840
-RMD160 3699883a3fbd8569fb9d7cb73034e1593b195c76 websvn-2.0rc4.tar.bz2 98840
-SHA256 4a5a1d2fed05eff091ff52ced3f94265c09fe30b5bb73038d3c92be3e2cff333 websvn-2.0rc4.tar.bz2 98840
diff --git a/www-apps/websvn/files/websvn-1.61-german.patch b/www-apps/websvn/files/websvn-1.61-german.patch
deleted file mode 100644
index 3d0e48044220..000000000000
--- a/www-apps/websvn/files/websvn-1.61-german.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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
deleted file mode 100644
index 7b85f005b706..000000000000
--- a/www-apps/websvn/files/websvn-1.61-issue32.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/files/websvn-1.61-r1.patch b/www-apps/websvn/files/websvn-1.61-r1.patch
deleted file mode 100644
index 327b12c96ac7..000000000000
--- a/www-apps/websvn/files/websvn-1.61-r1.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-This patchset applies the patches at the below urls
-
-http://websvn.tigris.org/issues/show_bug.cgi?id=29
-http://websvn.tigris.org/issues/show_bug.cgi?id=31
-http://websvn.tigris.org/issues/show_bug.cgi?id=33
-http://websvn.tigris.org/issues/show_bug.cgi?id=37
-
---- include/feedcreator.class.php.orig	2004-06-24 03:14:52.000000000 -0400
-+++ include/feedcreator.class.php	2005-05-06 09:57:15.000000000 -0400
-@@ -122,11 +122,6 @@
- *          A little setup                                                 *
- **************************************************************************/
- 
--// your local timezone, set to "" to disable or for GMT
--define("TIME_ZONE","+01:00");
--
--
--
- 
- /**
- * Version string.
-@@ -588,10 +583,7 @@
-      * @return a date in RFC 822 format
-      */
-     function rfc822() {
--        //return gmdate("r",$this->unix);
--        $date = gmdate("D, d M Y H:i:s", $this->unix);
--        if (TIME_ZONE!="") $date .= " ".str_replace(":","",TIME_ZONE);
--        return $date;
-+        return gmdate("r",$this->unix);
-     }
-     
-     /**
-@@ -602,7 +594,6 @@
-     function iso8601() {
-         $date = gmdate("Y-m-d\TH:i:sO",$this->unix);
-         $date = substr($date,0,22) . ':' . substr($date,-2);
--        if (TIME_ZONE!="") $date = str_replace("+00:00",TIME_ZONE,$date);
-         return $date;
-     }
-     
---- include/svnlook.inc.orig	2005-01-07 11:26:06.000000000 -0500
-+++ include/svnlook.inc		2005-05-09 19:42:52.000000000 -0400
-@@ -188,20 +188,10 @@
-       // Remove the offset to get the time in GMT
-       $h -= $offset / 100;
-       
--      // Get the commit time as seconds.  Note that the mktime function assumes that the time being
--      // passed to it is a local time - it will therefore subtract/add the required number of hours
--      // to make it GMT.  Since we already have the time in GMT we first add the localtime offset to
--      // get the commit time in local time.  The offset calculated above already handles the summer
--      // time case, so we tell mktime not to take this into account.
--      
--      $lt = gettimeofday();
--      $minwest = $lt["minuteswest"];
--      $committime = mktime($h ,$m - $minwest, $s, $mo, $d, $y, 0);
-+      $committime = gmmktime($h ,$m, $s, $mo, $d, $y, -1);
-       $log["committime"] = $committime;
-       
--      // Get the current time (as GMT)
--      $t = localtime(time(), 1);
--      $curtime = mktime($t["tm_hour"],  $t["tm_min"], $t["tm_sec"], $t["tm_mon"] + 1, $t["tm_mday"], $t["tm_year"] + 1900, $t["tm_isdst"]);
-+      $curtime = time();
-       
-       // Get the number of seconds since the commit
-       $agesecs = $curtime - $committime;
---- include/configclass.inc.orig	2005-05-26 21:25:25.000000000 -0400
-+++ include/configclass.inc	2005-05-26 21:24:53.000000000 -0400
-@@ -402,7 +402,7 @@
-          if ($rep == -1)
-             return $fname."?path=".urlencode($path)."&amp;";
-          else
--            return $fname."?repname=".$rep->name."&amp;path=".urlencode($path)."&amp;";
-+            return $fname."?repname=".urlencode($rep->name)."&amp;path=".urlencode($path)."&amp;";
-       }
-    }
- 
---- include/configclass.inc.orig	2005-08-16 10:00:42.000000000 +0100
-+++ include/configclass.inc	2005-08-16 10:02:01.000000000 +0100
-@@ -339,8 +339,11 @@
-       
-       if ($this->multiViews)
-       {
--         // Remove the .php
--         $base = substr($base, 0, -4);
-+         if ( eregi(".php$", $base) )
-+         {
-+            // Remove the .php
-+            $base = substr($base, 0, -4);
-+         }
-          
-          if ($path && $path{0} != "/") $path = "/".$path;
-                
-Index: log.php
-===================================================================
---- log.php	(revision 328)
-+++ log.php	(working copy)
-@@ -199,16 +199,17 @@
-       $parent = substr($rpath, 0, $pos + 1);
-    
-       $url = $config->getURL($rep, $parent, "dir");
--      $listing[$index]["compare_box"] = "<input type=\"checkbox\" name=\"compare[]\" value=\"$parent@${r["rev"]}\" onClick=\"checkCB(this)\">";
-       $listing[$index]["revlink"] = "<a href=\"${url}rev=${r["rev"]}&amp;sc=1\">${r["rev"]}</a>";
-    
-       if ($isDir)
--      {
-+      {
-+         $listing[$index]["compare_box"] = "<input type=\"checkbox\" name=\"compare[]\" value=\"$parent@${r["rev"]}\" onClick=\"checkCB(this)\">";
-          $url = $config->getURL($rep, $rpath, "dir"); 
-          $listing[$index]["revpathlink"] = "<a href=\"${url}rev=${r["rev"]}&amp;sc=$showchanged\">$rpath</a>";
-       }
-       else
--      {
-+      {
-+         $listing[$index]["compare_box"] = "<input type=\"checkbox\" name=\"compare[]\" value=\"$rpath@${r["rev"]}\" onClick=\"checkCB(this)\">";
-          $url = $config->getURL($rep, $rpath, "file"); 
-          $listing[$index]["revpathlink"] = "<a href=\"${url}rev=${r["rev"]}&amp;sc=$showchanged\">$rpath</a>";
-       }
diff --git a/www-apps/websvn/files/websvn-1.61-r2.patch b/www-apps/websvn/files/websvn-1.61-r2.patch
deleted file mode 100644
index 00360a552251..000000000000
--- a/www-apps/websvn/files/websvn-1.61-r2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comp.php.orig	2005-09-05 10:52:28.000000000 +0100
-+++ comp.php	2005-09-05 10:53:02.000000000 +0100
-@@ -113,7 +113,7 @@
- 
- if (!$noinput)
- {
--   $rawcmd = $config->svn." diff -r$rev1:$rev2 ".quote("file:///".$path1)." ".quote("file:///".$path2);
-+   $rawcmd = $config->svn." diff ".quote("file:///".$path1."@".$rev1)." ".quote("file:///".$path2."@".$rev2);
-    $cmd = quoteCommand($rawcmd, true);
-    if ($debug) echo "$cmd\n";
- }
diff --git a/www-apps/websvn/files/websvn-2.0_rc1-pathinfo.patch b/www-apps/websvn/files/websvn-2.0_rc1-pathinfo.patch
deleted file mode 100644
index 9275ea79c10a..000000000000
--- a/www-apps/websvn/files/websvn-2.0_rc1-pathinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- websvn/wsvn.php	2006-05-08 10:28:13.000000000 +0100
-+++ websvn/wsvn.php	2006-05-08 12:12:45.000000000 +0100
-@@ -59,7 +59,7 @@
-       exit;
-    }
- 
--   $path = @$_SERVER["PATH_INFO"];
-+   $path = trim(empty($_SERVER['PATH_INFO']) ? $_SERVER['ORIG_PATH_INFO'] : $_SERVER['PATH_INFO']);
- 
-    // Remove initial slash
-    $path = substr($path, 1);
diff --git a/www-apps/websvn/metadata.xml b/www-apps/websvn/metadata.xml
index d96b85b88c23..4405d7eac6f3 100644
--- a/www-apps/websvn/metadata.xml
+++ b/www-apps/websvn/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>web-apps</herd>
 	<maintainer>
 		<email>uberlord@gentoo.org</email>
 		<name>Roy Marples</name>
diff --git a/www-apps/websvn/websvn-1.61-r1.ebuild b/www-apps/websvn/websvn-1.61-r1.ebuild
deleted file mode 100644
index ff71b14e8ce3..000000000000
--- a/www-apps/websvn/websvn-1.61-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-r1.ebuild,v 1.3 2005/09/05 10:19:43 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}/websvn-1.61-r1.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
-}
diff --git a/www-apps/websvn/websvn-1.61-r2.ebuild b/www-apps/websvn/websvn-1.61-r2.ebuild
deleted file mode 100644
index 90005c3fffe4..000000000000
--- a/www-apps/websvn/websvn-1.61-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-r2.ebuild,v 1.1 2005/09/05 10:19:43 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"
-}
-
-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
-}
diff --git a/www-apps/websvn/websvn-1.61-r3.ebuild b/www-apps/websvn/websvn-1.61-r3.ebuild
deleted file mode 100644
index f2725f80dbd9..000000000000
--- a/www-apps/websvn/websvn-1.61-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
-}
diff --git a/www-apps/websvn/websvn-1.70_beta1.ebuild b/www-apps/websvn/websvn-1.70_beta1.ebuild
deleted file mode 100644
index 69c6063b66cc..000000000000
--- a/www-apps/websvn/websvn-1.70_beta1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.70_beta1.ebuild,v 1.1 2005/10/20 19:38:39 uberlord Exp $
-
-inherit eutils webapp
-
-MY_PV="170beta1"
-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
-	dev-util/subversion
-	sys-apps/sed
-	enscript? ( >=app-text/enscript-1.6.0 )"
-
-S="${WORKDIR}/WebSVN"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-}
-
-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
-
-	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
-}
diff --git a/www-apps/websvn/websvn-2.0_rc4.ebuild b/www-apps/websvn/websvn-2.0.ebuild
index b6eeef141992..cabac1f8c2e2 100644
--- a/www-apps/websvn/websvn-2.0_rc4.ebuild
+++ b/www-apps/websvn/websvn-2.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-2.0_rc4.ebuild,v 1.1 2006/10/23 10:29:38 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-2.0.ebuild,v 1.1 2007/08/14 06:33:11 wrobel Exp $
 
 inherit depend.php eutils webapp
 
 MY_PV="${PV//_/}"
 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/34307/websvn-${MY_PV}.tar.bz2"
+SRC_URI="http://websvn.tigris.org/files/documents/1380/39378/websvn-${MY_PV}.tar.gz"
+RESTRICT="nomirror"
 LICENSE="GPL-2"
 IUSE="enscript"
 KEYWORDS="~amd64 ~sparc ~x86"
@@ -32,27 +33,25 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-2.0_rc1"-pathinfo.patch
 }
 
 src_compile() {
-	mv "${S}"/include/distconfig.inc "${S}"/include/config.inc
+	mv "${S}"/include/distconfig.php "${S}"/include/config.php
 }
 
 src_install() {
 	webapp_src_preinst
 
-	local doc docs="changes.txt templates.txt"
+	local doc docs="licence.txt changes.txt doc/*"
 
 	dodoc ${docs}
-	for doc in ${docs} install.txt ; do
+	for doc in ${docs}; do
 		rm -f "${doc}"
 	done
 
 	insinto "${MY_HTDOCSDIR}"
 	doins -r *
-	webapp_configfile "${MY_HTDOCSDIR}"/include/config.inc
+	webapp_configfile "${MY_HTDOCSDIR}"/include/config.php
 
 	# This is the multiview config file
 	webapp_configfile "${MY_HTDOCSDIR}"/wsvn.php
diff --git a/www-apps/websvn/websvn-2.0_rc1.ebuild b/www-apps/websvn/websvn-2.0_rc1.ebuild
deleted file mode 100644
index 19643ed2119e..000000000000
--- a/www-apps/websvn/websvn-2.0_rc1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-2.0_rc1.ebuild,v 1.4 2006/07/09 13:43:54 uberlord Exp $
-
-inherit depend.php eutils webapp
-
-MY_PV="${PV//_/}"
-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/31740/WebSVN_${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-IUSE="enscript"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-RDEPEND="virtual/php
-	dev-util/subversion
-	sys-apps/sed
-	enscript? ( app-text/enscript )"
-
-S="${WORKDIR}/WebSVN-${MY_PV}"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if ! has_version "=dev-lang/php-5*" ; then
-		require_php_with_use expat
-	else
-		require_php_with_use xml
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}"-pathinfo.patch
-}
-
-src_compile() {
-	mv "${S}"/include/distconfig.inc "${S}"/include/config.inc
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local doc docs="changes.txt templates.txt"
-
-	dodoc ${docs}
-	for doc in ${docs} install.txt ; do
-		rm -f "${doc}"
-	done
-
-	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
-}