ebuild cleanup wrt #208584

Package-Manager: portage-2.1.4.4

4 files changed, 38 insertions, 32 deletions

diff --git a/www-apps/websvn/ChangeLog b/www-apps/websvn/ChangeLog
index d4cae228949b..5f82e93b93e0 100644
--- a/www-apps/websvn/ChangeLog
+++ b/www-apps/websvn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/websvn
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/ChangeLog,v 1.21 2007/12/26 21:44:02 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/ChangeLog,v 1.22 2008/02/19 16:54:58 hollow Exp $
+
+  19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  websvn-2.0.ebuild:
+  ebuild cleanup wrt #208584
 
   26 Dec 2007; Christian Heim <phreak@gentoo.org> websvn-2.0.ebuild:
   Adjusting RESTRICT=nomirror to be RESTRICT=mirror.
diff --git a/www-apps/websvn/Manifest b/www-apps/websvn/Manifest
index 2c637300cc90..3bcfd50b8457 100644
--- a/www-apps/websvn/Manifest
+++ b/www-apps/websvn/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST websvn-2.0.tar.gz 172005 RMD160 73c3252b362367ef0b11e6f64fc9ecfe9ae4de6a SHA1 f32e69046626ce3da047617dcd066d304cf4e45d SHA256 38104a86d6a90bb3f18a5b0a957b46cf0c1409037bb2a83c09e9f24543cfa2ea
-EBUILD websvn-2.0.ebuild 1379 RMD160 6b8d980189e52eaaa14c79b115ac8980386b9ccc SHA1 194614ad9dc5d2dbbb2ee51775516a13a13d9854 SHA256 d9f86fd53c0336aa904f9fe1b9fdc673e9c5b48b1fd1996d724bd1cdfbaa71f8
-MISC ChangeLog 3499 RMD160 7b88117c6e609036645233f732f7736a97b67469 SHA1 d0f8c77e61a14916f0319491b1b585fc5953c51d SHA256 4d71a32766f62a39ae60ae98bb3476d48778da621776ebd9081f69446b35d399
-MISC metadata.xml 252 RMD160 f984303a02dfcdd1382b527a1098e7bda57747d6 SHA1 6307e1efec75ab7ccfbd2947572cd7619e2a333a SHA256 fc9e1edb7c08dc5642447732d776f1066dd7b626c351ada1321da8758be6b9af
+EBUILD websvn-2.0.ebuild 1178 RMD160 dae4a0ea1c9082d47b6386757fbbad4be49f95dd SHA1 10dcaf7cfeb61f3f08bae801350620bef7d03c9a SHA256 9c977402120dc692aabeef8a4f170c2dcc020430985a5ed5f7d6844225ce608c
+MISC ChangeLog 3614 RMD160 43239040bc2f54c9e5e55c89f8b5134caadb3da9 SHA1 fa0d7d4e1a0ecfeb2082384183a92f35d323e67f SHA256 08bbfae70198260815b79c740447dd754f84293bd8069dbbcd43cf26f1970b85
+MISC metadata.xml 258 RMD160 4643ad38cfe6221f208bc5502d40fdf945ed339c SHA1 1044c6e67f9cedcdbe7a61fdbf126c9b1ae4e1f0 SHA256 bf92dceca1fb1580d7ee567f6caab0865fa76416b431c88e2762556eb2beb520
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke7CeoACgkQmPFBzbX68WHW3QCgglPHFujrME8ZsjCjtl1Aw++M
+iRAAnAliDzNOn6x5zK7iVwPjbnLRSLjh
+=Um5/
+-----END PGP SIGNATURE-----
diff --git a/www-apps/websvn/metadata.xml b/www-apps/websvn/metadata.xml
index 9d5ef92dd8a2..e6d124be11a6 100644
--- a/www-apps/websvn/metadata.xml
+++ b/www-apps/websvn/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-	<longdescription>Web based Subversion repository browser written in PHP</longdescription>
+	<herd>web-apps</herd>
+	<longdescription>
+		Web based Subversion repository browser written in PHP
+	</longdescription>
 </pkgmetadata>
diff --git a/www-apps/websvn/websvn-2.0.ebuild b/www-apps/websvn/websvn-2.0.ebuild
index 8d4f6712cfef..e1d07a471ea3 100644
--- a/www-apps/websvn/websvn-2.0.ebuild
+++ b/www-apps/websvn/websvn-2.0.ebuild
@@ -1,62 +1,52 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-2.0.ebuild,v 1.4 2007/12/26 21:44:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-2.0.ebuild,v 1.5 2008/02/19 16:54:58 hollow 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/39378/websvn-${MY_PV}.tar.gz"
+
 RESTRICT="mirror"
 LICENSE="GPL-2"
 IUSE="enscript"
 KEYWORDS="amd64 ~sparc x86"
 
-RDEPEND="virtual/php
-	dev-util/subversion
-	sys-apps/sed
+RDEPEND="dev-util/subversion
 	enscript? ( app-text/enscript )"
 
+need_php_httpd
+
 S="${WORKDIR}/websvn-${MY_PV}"
 
 pkg_setup() {
 	webapp_pkg_setup
-
-	if ! has_version "=dev-lang/php-5*" ; then
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]] ; then
 		require_php_with_use expat
 	else
 		require_php_with_use xml
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_compile() {
-	mv "${S}"/include/distconfig.php "${S}"/include/config.php
-}
-
 src_install() {
 	webapp_src_preinst
 
-	local doc docs="licence.txt changes.txt doc/*"
+	mv include/{dist,}config.php
 
-	dodoc ${docs}
-	for doc in ${docs}; do
-		rm -f "${doc}"
-	done
+	dodoc changes.txt doc/templates.txt
+	dohtml doc/*
+	rm -rf license.txt changes.txt doc/
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r *
-	webapp_configfile "${MY_HTDOCSDIR}"/include/config.php
+	doins -r .
 
-	# This is the multiview config file
+	webapp_configfile "${MY_HTDOCSDIR}"/include/config.php
 	webapp_configfile "${MY_HTDOCSDIR}"/wsvn.php
 
-	# The cache directory needs to be writeable
 	webapp_serverowned "${MY_HTDOCSDIR}"/cache
 
 	webapp_src_install