ebuild cleanup wrt #208584

(Portage version: 2.1.4.1)

5 files changed, 37 insertions, 41 deletions

diff --git a/www-apps/b2evolution/ChangeLog b/www-apps/b2evolution/ChangeLog
index cce86d84b2a9..957da29d9dcb 100644
--- a/www-apps/b2evolution/ChangeLog
+++ b/www-apps/b2evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/b2evolution
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.27 2008/02/15 11:38:29 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.28 2008/02/17 23:28:43 hollow Exp $
+
+  17 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  b2evolution-1.10.2.ebuild, b2evolution-1.10.3.ebuild,
+  b2evolution-2.4.0_rc2.ebuild:
+  ebuild cleanup wrt #208584
 
 *b2evolution-2.4.0_rc2 (15 Feb 2008)
 *b2evolution-1.10.3 (15 Feb 2008)
diff --git a/www-apps/b2evolution/b2evolution-1.10.2.ebuild b/www-apps/b2evolution/b2evolution-1.10.2.ebuild
index 17e9bccf67d7..094a64e52608 100644
--- a/www-apps/b2evolution/b2evolution-1.10.2.ebuild
+++ b/www-apps/b2evolution/b2evolution-1.10.2.ebuild
@@ -1,58 +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/b2evolution/b2evolution-1.10.2.ebuild,v 1.5 2007/08/14 18:15:31 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.2.ebuild,v 1.6 2008/02/17 23:28:43 hollow Exp $
 
 inherit webapp eutils depend.php
 
-MY_EXT="-2007-06-08"
+MY_EXT="2007-06-08"
+MY_PV=${PV/_/-}
 
 DESCRIPTION="Multilingual multiuser multi-blog engine"
 HOMEPAGE="http://www.b2evolution.net"
-SRC_URI="mirror://sourceforge/evocms/${P}${MY_EXT}.zip"
+SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip"
+
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
-RDEPEND="virtual/httpd-php"
 
+RDEPEND=""
 DEPEND="${DEPEND} ${RDEPEND}
 	app-arch/unzip"
 
+need_php_httpd
+
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	webapp_pkg_setup
 	has_php
 	if [[ ${PHP_VERSION} == "4" ]]; then
-		require_php_with_use expat
+		require_php_with_use expat tokenizer mysql
 	else
-		require_php_with_use xml
+		require_php_with_use xml tokenizer mysql
 	fi
 }
 
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use tokenizer mysql
-}
-
 src_install() {
 	webapp_src_preinst
 
-	einfo "Installing main files"
-	cp -r blogs/* ${D}${MY_HTDOCSDIR}
-	einfo "Done"
+	insinto ${MY_HTDOCSDIR}
+	doins -r blogs/*
 
-	dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \
-		doc/upgradefrom_mt.html
+	rm doc/*.*-*.html doc/*.src.html
+	dohtml doc/*.html
 
-	# Identify the configuration files that this app uses
-	# User can want to make changes to these!
 	webapp_serverowned ${MY_HTDOCSDIR}
 	webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php
 	webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
 
-	# post-install instructions
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 
-	# now strut stuff
 	webapp_src_install
 }
diff --git a/www-apps/b2evolution/b2evolution-1.10.3.ebuild b/www-apps/b2evolution/b2evolution-1.10.3.ebuild
index 50efb9328288..957ab3d4ce8e 100644
--- a/www-apps/b2evolution/b2evolution-1.10.3.ebuild
+++ b/www-apps/b2evolution/b2evolution-1.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.3.ebuild,v 1.1 2008/02/15 11:38:29 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.3.ebuild,v 1.2 2008/02/17 23:28:43 hollow Exp $
 
 inherit webapp eutils depend.php
 
@@ -10,6 +10,7 @@ MY_PV=${PV/_/-}
 DESCRIPTION="Multilingual multiuser multi-blog engine"
 HOMEPAGE="http://www.b2evolution.net"
 SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip"
+
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
@@ -18,7 +19,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-need_php
+need_php_httpd
 
 S="${WORKDIR}/${PN}"
 
@@ -35,14 +36,12 @@ pkg_setup() {
 src_install() {
 	webapp_src_preinst
 
-	einfo "Installing main files"
-	cp -r blogs/* "${D}"${MY_HTDOCSDIR}
-	einfo "Done"
+	insinto ${MY_HTDOCSDIR}
+	doins -r blogs/*
 
-	dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \
-		doc/upgradefrom_mt.html
+	rm doc/*.*-*.html doc/*.src.html
+	dohtml doc/*.html
 
-	# Identify the configuration files that this app uses
 	webapp_serverowned ${MY_HTDOCSDIR}
 	webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php
 	webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
diff --git a/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild b/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild
index fdbb7af5e326..bb9a99bd3334 100644
--- a/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild
+++ b/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild,v 1.1 2008/02/15 11:38:29 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild,v 1.2 2008/02/17 23:28:43 hollow Exp $
 
 inherit webapp eutils depend.php
 
@@ -10,6 +10,7 @@ MY_PV=${PV/_/-}
 DESCRIPTION="Multilingual multiuser multi-blog engine"
 HOMEPAGE="http://www.b2evolution.net"
 SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip"
+
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
@@ -18,7 +19,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-need_php
+need_php_httpd
 
 S="${WORKDIR}/${PN}"
 
@@ -35,14 +36,12 @@ pkg_setup() {
 src_install() {
 	webapp_src_preinst
 
-	einfo "Installing main files"
-	cp -r blogs/* "${D}"${MY_HTDOCSDIR}
-	einfo "Done"
+	insinto ${MY_HTDOCSDIR}
+	doins -r blogs/*
 
-	dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \
-		doc/upgradefrom_mt.html
+	rm doc/*.*-*.html doc/*.src.html
+	dohtml doc/*.html
 
-	# Identify the configuration files that this app uses
 	webapp_serverowned ${MY_HTDOCSDIR}
 	webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php
 	webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
diff --git a/www-apps/b2evolution/metadata.xml b/www-apps/b2evolution/metadata.xml
index e125fba8f543..6632069b5aff 100644
--- a/www-apps/b2evolution/metadata.xml
+++ b/www-apps/b2evolution/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+	<herd>web-apps</herd>
 </pkgmetadata>
-