4 files changed, 67 insertions, 15 deletions
diff --git a/www-apps/phpwebsite/ChangeLog b/www-apps/phpwebsite/ChangeLog
index b071297f52b2..1ebea8f8f086 100644
--- a/www-apps/phpwebsite/ChangeLog
+++ b/www-apps/phpwebsite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/phpwebsite
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/ChangeLog,v 1.18 2005/02/27 11:28:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/ChangeLog,v 1.19 2005/02/28 16:06:08 rizzo Exp $
+
+*phpwebsite-0.10.0-r2 (28 Feb 2005)
+
+  28 Feb 2005; Don Seiler <rizzo@gentoo.org> +phpwebsite-0.10.0-r2.ebuild:
+  Revision bump for another patch for bug #83297
 
   27 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
   phpwebsite-0.10.0-r1.ebuild:
diff --git a/www-apps/phpwebsite/Manifest b/www-apps/phpwebsite/Manifest
index e33c9ae50637..a3c61e71c094 100644
--- a/www-apps/phpwebsite/Manifest
+++ b/www-apps/phpwebsite/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 327bb207c31e945e61c642c16a8e5df8 ChangeLog 5324
 MD5 ecbb5a02001856289bc050635b8d8394 metadata.xml 522
 MD5 4f03dd69be734fbd9aa2969d30ebb2c2 phpwebsite-0.10.0.ebuild 1433
 MD5 41dbaed8aafa97c8930480adc9d77c58 phpwebsite-0.9.3_p4-r1.ebuild 1636
-MD5 2605b5e8abb079f71b12202c38a8f86d phpwebsite-0.10.0-r1.ebuild 1616
-MD5 327bb207c31e945e61c642c16a8e5df8 ChangeLog 5324
 MD5 c9b0b64992415f435bb5cf0b8f603435 phpwebsite-0.9.3_p4-r2.ebuild 1853
+MD5 2605b5e8abb079f71b12202c38a8f86d phpwebsite-0.10.0-r1.ebuild 1616
+MD5 9fa6b26efa50c10bd9faa56410df04f8 phpwebsite-0.10.0-r2.ebuild 1738
+MD5 6ddbbfb4f4e1e5c4d8bf717835d3c2d8 files/digest-phpwebsite-0.9.3_p4-r2 239
+MD5 dab689c75fd084b695c69c427aa758b8 files/digest-phpwebsite-0.10.0 75
 MD5 9db128d972b5f4cbbda4723ba50699d7 files/postinstall-en.txt 466
 MD5 e328ec89d9602d614fbf60f87988f218 files/digest-phpwebsite-0.10.0-r1 147
-MD5 dab689c75fd084b695c69c427aa758b8 files/digest-phpwebsite-0.10.0 75
 MD5 823ff723bde0deb5142a1753183467fd files/digest-phpwebsite-0.9.3_p4-r1 157
-MD5 6ddbbfb4f4e1e5c4d8bf717835d3c2d8 files/digest-phpwebsite-0.9.3_p4-r2 239
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCIa+VugEuf3OQ0akRAqHwAKCQnSLREoqxFUdRi0UGOjHZ2rsv0wCggabe
-i6exuFdVlL3SmWql1cN3x+0=
-=y8Pf
------END PGP SIGNATURE-----
+MD5 c50eef019c793463d0818d3fe35b46f4 files/digest-phpwebsite-0.10.0-r2 221
diff --git a/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r2 b/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r2
new file mode 100644
index 000000000000..cbf337d6b657
--- /dev/null
+++ b/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r2
@@ -0,0 +1,3 @@
+MD5 6d433111d1a40b6e94c0a33bd7f01a8f phpwebsite-0.10.0-full.tar.gz 4615559
+MD5 e3539ca482a24582bb65b9c23c701cde phpws_image_secure_patch.tgz 14846
+MD5 3a953b36b925288d7b1b4d185003248c phpws_files_security_patch3.tgz 4781
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.0-r2.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..97b94c69ab7f
--- /dev/null
+++ b/www-apps/phpwebsite/phpwebsite-0.10.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/phpwebsite-0.10.0-r2.ebuild,v 1.1 2005/02/28 16:06:08 rizzo Exp $
+
+inherit webapp
+
+MY_PV="${PV/_p/-}"
+DESCRIPTION="phpWebSite Content Management System"
+HOMEPAGE="http://phpwebsite.appstate.edu"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-full.tar.gz
+http://phpwebsite.appstate.edu/downloads/security/phpws_image_secure_patch.tgz
+http://phpwebsite.appstate.edu/downloads/security/phpws_files_security_patch3.tgz"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE=""
+RDEPEND="virtual/httpd-php
+	>=dev-db/mysql-3.23.23"
+
+DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
+
+S="${WORKDIR}/${PN}-${MY_PV}-full"
+
+src_unpack() {
+	unpack ${PN}-${MY_PV}-full.tar.gz
+	cd ${S}
+	unpack phpws_files_security_patch3.tgz
+	unpack phpws_image_secure_patch.tgz
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="docs/CREDITS.txt docs/REQUIREMENTS.txt docs/UNINSTALL.txt docs/THEMES.txt docs/LICENSE.txt docs/README.txt docs/PEARERRORS.txt docs/sample.config.php docs/INSTALL.txt docs/CONVERSION.txt docs/UPGRADE.txt docs/KNOWNISSUES.txt"
+	dodoc ${docs}
+
+	einfo "Installing main files"
+	cp -r * ${D}${MY_HTDOCSDIR}
+
+	#webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
+
+	# Files that need to be owned by webserver
+	webapp_serverowned ${MY_HTDOCSDIR}/conf
+	webapp_serverowned ${MY_HTDOCSDIR}/files
+	webapp_serverowned ${MY_HTDOCSDIR}/images
+	webapp_serverowned ${MY_HTDOCSDIR}/images/mod
+	webapp_serverowned ${MY_HTDOCSDIR}/images/mod/controlpanel
+	webapp_serverowned ${MY_HTDOCSDIR}/mod
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}