Fixed Compare with previous wrt #104712

  DEPEND on virtual/php instead of mod_php

Package-Manager: portage-2.0.51.22-r2

7 files changed, 90 insertions, 19 deletions

diff --git a/www-apps/websvn/ChangeLog b/www-apps/websvn/ChangeLog
index 62350c7613a0..b4e016cd55a1 100644
--- a/www-apps/websvn/ChangeLog
+++ b/www-apps/websvn/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2005/09/01 15:09:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/ChangeLog,v 1.7 2005/09/05 10:19:43 uberlord Exp $
+
+*websvn-1.61-r2 (05 Sep 2005)
+
+  05 Sep 2005; Roy Marples <uberlord@gentoo.org>
+  +files/websvn-1.61-r2.patch, websvn-1.61.ebuild, websvn-1.61-r1.ebuild,
+  +websvn-1.61-r2.ebuild:
+  Fixed Compare with previous wrt #104712
+  DEPEND on virtual/php instead of mod_php
 
   01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> websvn-1.61.ebuild,
   websvn-1.61-r1.ebuild:
diff --git a/www-apps/websvn/Manifest b/www-apps/websvn/Manifest
index 1c0accc9e28c..e6fde8b622e1 100644
--- a/www-apps/websvn/Manifest
+++ b/www-apps/websvn/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b7200af245ba7911cb5eb1fc5bb8bd10 websvn-1.61.ebuild 1320
-MD5 c918af88cc35ab7230b40f2aa423b3f7 websvn-1.61-r1.ebuild 1390
-MD5 5b1777d975b6a72a02e7aa23cef50e64 ChangeLog 1163
+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 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61-r1 61
+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-r1 61
+MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61-r2 61
 MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDFxnFKRy60XGEcJIRAnFxAJ47nTlsXVfvSUfjJtfVYcPYLEVsoACfTCzc
-xIcAbRHdP0GpoTAAEknkzeU=
-=bicF
------END PGP SIGNATURE-----
diff --git a/www-apps/websvn/files/digest-websvn-1.61-r2 b/www-apps/websvn/files/digest-websvn-1.61-r2
new file mode 100644
index 000000000000..9a1a0b280f50
--- /dev/null
+++ b/www-apps/websvn/files/digest-websvn-1.61-r2
@@ -0,0 +1 @@
+MD5 9f81a3793d08bde2e425d2c98f923875 WebSVN_161.tar.gz 89305
diff --git a/www-apps/websvn/files/websvn-1.61-r2.patch b/www-apps/websvn/files/websvn-1.61-r2.patch
new file mode 100644
index 000000000000..00360a552251
--- /dev/null
+++ b/www-apps/websvn/files/websvn-1.61-r2.patch
@@ -0,0 +1,11 @@
+--- 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/websvn-1.61-r1.ebuild b/www-apps/websvn/websvn-1.61-r1.ebuild
index f9ae42e2a56a..ff71b14e8ce3 100644
--- a/www-apps/websvn/websvn-1.61-r1.ebuild
+++ b/www-apps/websvn/websvn-1.61-r1.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/websvn/websvn-1.61-r1.ebuild,v 1.2 2005/09/01 15:09:30 gustavoz Exp $
+# $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
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 IUSE="enscript"
 KEYWORDS="~x86 ~amd64 ~sparc"
 
-RDEPEND=">=dev-php/mod_php-4.1.0
+RDEPEND="virtual/php
 	sys-apps/sed
 	enscript? ( >=app-text/enscript-1.6.0 )"
 DEPEND="sys-apps/findutils"
diff --git a/www-apps/websvn/websvn-1.61-r2.ebuild b/www-apps/websvn/websvn-1.61-r2.ebuild
new file mode 100644
index 000000000000..90005c3fffe4
--- /dev/null
+++ b/www-apps/websvn/websvn-1.61-r2.ebuild
@@ -0,0 +1,58 @@
+# 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.ebuild b/www-apps/websvn/websvn-1.61.ebuild
index 6aca3c6153ff..c032a2a67d67 100644
--- a/www-apps/websvn/websvn-1.61.ebuild
+++ b/www-apps/websvn/websvn-1.61.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/websvn/websvn-1.61.ebuild,v 1.5 2005/09/01 15:09:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-1.61.ebuild,v 1.6 2005/09/05 10:19:43 uberlord Exp $
 
 inherit eutils webapp
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 IUSE="enscript"
 KEYWORDS="x86 ~amd64 ~sparc"
 
-RDEPEND=">=dev-php/mod_php-4.1.0
+RDEPEND="virtual/php
 	sys-apps/sed
 	enscript? ( >=app-text/enscript-1.6.0 )"
 DEPEND="sys-apps/findutils"