version bump; ebuild cleanup wrt #208584

Package-Manager: portage-2.1.4.4

6 files changed, 79 insertions, 66 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/Manifest b/www-apps/phpBB/Manifest
index 849b28646b43..b38a09660058 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 507 RMD160 0d7c3cfdce88fd6ede79b6c8699d30f7abd83195 SHA1 3b0efbe2cde94ce889bbda5dc3e1b3194d84af31 SHA256 75a4c64f7bcfe2594299aac7cb868b2aff740579b9dee076c8b04ff8e2988d0f
-DIST phpBB-2.0.22.tar.bz2 452798 RMD160 4ee622393041580e8dfdfaabc4b603c729adfc58 SHA1 585c013b697fe5645e8a9a1c9671bc23c98c11fe SHA256 0391f4ea50f05f71e6dc0feedc0d8a2a625405f414fce478cfe70006d79e5653
+DIST phpBB-2.0.23.tar.bz2 441152 RMD160 d5f9e4bc33803dea9543dbfd20adaee2f92f606b SHA1 3c8247a9edcd6ab7a058d0be6e8de0da2a40c79c SHA256 b48767ece3baed04b24f58d37de57feecf8c930d754bcf9abda33aafc2e361ce
 DIST phpBB-3.0.0.tar.bz2 1461327 RMD160 dd579d4028790d1d75287d76aa5be160ad04f818 SHA1 7f525c62590cc16c04a52c2ab9a06710e7a3be83 SHA256 99914ef86249798a41aaeacc1f03fcdc170893bde482ca8951e17a9db81a34d7
-EBUILD phpBB-2.0.22.ebuild 1033 RMD160 3bf7c02b59ebcc30474e4a37e3d7b3f24df6c99b SHA1 ecccecf12c46f1caa2a667905188184630be1556 SHA256 d01ea695d3caa6c95f50c29d6477da3ce451ea2d2d09c4733618268a71f9ed33
-EBUILD phpBB-3.0.0.ebuild 1057 RMD160 0855ce4dae5b49da0b0c83babf0335b371f17f47 SHA1 71678e4bf42d57ef511d2524a849d8000959c1cf SHA256 9f35e136e71163c0c9db393e224c7761fadcfc3130c9f0cb7bb5bcf30451a58f
-MISC ChangeLog 6081 RMD160 0c64fe1ff33db5b333724f39254771f5aede02fa SHA1 c87c260e9e88a087618d5943ff67474b38e9a110 SHA256 bf2fdd58dd917f0846137ce98060a6428f0ed4c27fb4b987d50fec5046951c08
-MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
+EBUILD phpBB-2.0.23.ebuild 1091 RMD160 533728287530f3a7a241cc5b2a94bbed91004f70 SHA1 beaa03d7d35e1011f77c14a90f79594972efe63b SHA256 c368cdb852d15ac75746d2a501e8c5be72f7c498980906d4941c91d8f1f62041
+EBUILD phpBB-3.0.0.ebuild 1028 RMD160 b3e0a870c1e97f125aeab77b8bdbc5ab8a4c888a SHA1 30d06a5b32f56f3fa76e4389cad3a8e93cc6ad5c SHA256 fdc6fb84bf2e6b8be1a50ed66a105b206ad6b170e145ea304b619e62016f4dd9
+MISC ChangeLog 6284 RMD160 d9c21634010be246c78ebac6b6bcab3c01a9304d SHA1 d33283d56849398c170fbd6990bbaf37ee917d5d SHA256 b050b8b1735c0451705aeb9c39882e7c2a73c16346ad61b4e05f504d0153ecdb
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfRNjsACgkQmPFBzbX68WEAAwCdHC8YMfKo9zMSgGF8rGWf2Gw9
+ehQAnjPr5ybCX/qDB+IB9AyNN/Gx91TF
+=hwoS
+-----END PGP SIGNATURE-----
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
 }