ebuild cleanup wrt #208584

(Portage version: 2.1.4.4)

2 files changed, 15 insertions, 23 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index 6bde73c9cb74..a79473cceb19 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.89 2008/02/15 09:35:52 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.90 2008/02/19 14:26:38 hollow Exp $
+
+  19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> wordpress-2.3.3.ebuild:
+  ebuild cleanup wrt #208584
 
 *wordpress-2.3.3 (15 Feb 2008)
 
diff --git a/www-apps/wordpress/wordpress-2.3.3.ebuild b/www-apps/wordpress/wordpress-2.3.3.ebuild
index 02e33cd5f4b2..dfeca978e917 100644
--- a/www-apps/wordpress/wordpress-2.3.3.ebuild
+++ b/www-apps/wordpress/wordpress-2.3.3.ebuild
@@ -1,56 +1,45 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.3.3.ebuild,v 1.1 2008/02/15 09:35:52 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.3.3.ebuild,v 1.2 2008/02/19 14:26:38 hollow Exp $
 
-inherit webapp eutils depend.php
+inherit webapp depend.php
 
 DESCRIPTION="Wordpress php and mysql based CMS system."
 HOMEPAGE="http://wordpress.org/"
 SRC_URI="http://www.wordpress.org/${P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="virtual/httpd-cgi"
+RDEPEND=""
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}"/${PN}
 
-need_php
+need_php_httpd
 
 pkg_setup() {
 	webapp_pkg_setup
-
 	require_php_with_any_use mysql mysqli
 	require_php_with_use pcre
 }
 
 src_install() {
-	local docs="license.txt readme.html"
-
 	webapp_src_preinst
 
-	cp wp-config-sample.php wp-config.php
-	cp -r * "${D}${MY_HTDOCSDIR}"
+	dohtml readme.html
+	rm -f readme.html license.txt
 
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
+	cp wp-config-sample.php wp-config.php
 
-	dodoc ${docs}
-	for doc in ${docs} INSTALL; do
-		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
-	done
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
-	# Identify files/directory that should be writeable to
-	# the web server
 	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
 	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
 	webapp_serverowned "${MY_HTDOCSDIR}"
 
-	# Identify the configuration files that this app uses
-	# User may want to make changes to these!
 	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt