version bump; ebuild cleanup wrt #208584

(Portage version: 2.1.4.4)

5 files changed, 64 insertions, 61 deletions

diff --git a/www-apps/phpBB/ChangeLog b/www-apps/phpBB/ChangeLog
index c4370c411ee1..8a5abd3562f6 100644
--- a/www-apps/phpBB/ChangeLog
+++ b/www-apps/phpBB/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/phpBB
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/ChangeLog,v 1.27 2008/01/25 08:06:29 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/ChangeLog,v 1.28 2008/03/07 12:33:54 hollow Exp $
+
+*phpBB-2.0.23 (07 Mar 2008)
+
+  07 Mar 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  -phpBB-2.0.22.ebuild, +phpBB-2.0.23.ebuild, phpBB-3.0.0.ebuild:
+  version bump; ebuild cleanup wrt #208584
 
 *phpBB-3.0.0 (25 Jan 2008)
 
diff --git a/www-apps/phpBB/metadata.xml b/www-apps/phpBB/metadata.xml
index 13bc126c7d91..6632069b5aff 100644
--- a/www-apps/phpBB/metadata.xml
+++ b/www-apps/phpBB/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
-</maintainer>
+	<herd>web-apps</herd>
 </pkgmetadata>
diff --git a/www-apps/phpBB/phpBB-2.0.22.ebuild b/www-apps/phpBB/phpBB-2.0.22.ebuild
deleted file mode 100644
index 324a0a991cd1..000000000000
--- a/www-apps/phpBB/phpBB-2.0.22.ebuild
+++ /dev/null
@@ -1,37 +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/phpBB/phpBB-2.0.22.ebuild,v 1.1 2006/12/24 12:42:13 rl03 Exp $
-
-inherit webapp
-
-DESCRIPTION="phpBB is an open-source bulletin board package."
-HOMEPAGE="http://www.phpbb.com/"
-SRC_URI="http://www.phpbb.com/files/releases/${P}.tar.bz2
-		mirror://sourceforge/phpbb/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-
-RDEPEND="virtual/httpd-php"
-
-S=${WORKDIR}/${PN}2
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc ${S}/docs/*
-
-	cp -pPR * "${D}/${MY_HTDOCSDIR}"
-	rm -rf ${D}/${MY_HTDOCSDIR}/docs
-
-	webapp_serverowned ${MY_HTDOCSDIR}/config.php
-	webapp_serverowned ${MY_HTDOCSDIR}/images
-	webapp_serverowned ${MY_HTDOCSDIR}/images/avatars
-	webapp_serverowned ${MY_HTDOCSDIR}/images/avatars/gallery
-	webapp_serverowned ${MY_HTDOCSDIR}/language
-	webapp_serverowned ${MY_HTDOCSDIR}/templates
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/phpBB/phpBB-2.0.23.ebuild b/www-apps/phpBB/phpBB-2.0.23.ebuild
new file mode 100644
index 000000000000..8ea46176228a
--- /dev/null
+++ b/www-apps/phpBB/phpBB-2.0.23.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/phpBB-2.0.23.ebuild,v 1.1 2008/03/07 12:33:54 hollow Exp $
+
+inherit webapp depend.php
+
+DESCRIPTION="phpBB is an open-source bulletin board package."
+HOMEPAGE="http://www.phpbb.com/"
+SRC_URI="http://www.phpbb.com/files/releases/${P}.tar.bz2
+		mirror://sourceforge/phpbb/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${PN}2
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc docs/*
+	rm -rf docs
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/images
+	webapp_serverowned "${MY_HTDOCSDIR}"/images/avatars
+	webapp_serverowned "${MY_HTDOCSDIR}"/images/avatars/gallery
+	webapp_serverowned "${MY_HTDOCSDIR}"/language
+	webapp_serverowned "${MY_HTDOCSDIR}"/templates
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/phpBB/phpBB-3.0.0.ebuild b/www-apps/phpBB/phpBB-3.0.0.ebuild
index bac46ff29033..8b50e21e2f48 100644
--- a/www-apps/phpBB/phpBB-3.0.0.ebuild
+++ b/www-apps/phpBB/phpBB-3.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/phpBB-3.0.0.ebuild,v 1.1 2008/01/25 08:06:29 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/phpBB-3.0.0.ebuild,v 1.2 2008/03/07 12:33:54 hollow Exp $
 
-inherit webapp
+inherit webapp depend.php
 
 DESCRIPTION="phpBB is an open-source bulletin board package."
 HOMEPAGE="http://www.phpbb.com/"
@@ -10,30 +10,29 @@ SRC_URI="http://www.phpbb.com/files/releases/${P}.tar.bz2
 		mirror://sourceforge/phpbb/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
-RDEPEND="virtual/httpd-php
-	virtual/httpd-cgi"
+need_httpd_cgi
+need_php_httpd
 
-S=${WORKDIR}/${PN}3
+S="${WORKDIR}"/${PN}3
 
 src_install() {
 	webapp_src_preinst
 
-	dodoc ${S}/docs/*
+	dodoc docs/*
+	rm -rf docs
 
-	cp -pPR * "${D}/${MY_HTDOCSDIR}"
-	rm -rf "${D}/${MY_HTDOCSDIR}/docs"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
-	webapp_serverowned "${MY_HTDOCSDIR}/config.php"
-	webapp_serverowned "${MY_HTDOCSDIR}/cache"
-	webapp_serverowned "${MY_HTDOCSDIR}/files"
-	webapp_serverowned "${MY_HTDOCSDIR}/images/avatars/upload"
-	webapp_serverowned "${MY_HTDOCSDIR}/store"
-
-	webapp_configfile  "${MY_HTDOCSDIR}/config.php"
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_serverowned "${MY_HTDOCSDIR}"/cache
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/images/avatars/upload
+	webapp_serverowned "${MY_HTDOCSDIR}"/store
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
 
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
 }