From: Renat Lumpau <rl03@gentoo.org>
Date: Sun, 18 Jun 2006 00:52:07 +0000 (+0000)
Subject: Don't overwrite config file (bug #136770).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f8815816cccefc868700fd020a7f1642eba2719b;p=gentoo.git

Don't overwrite config file (bug #136770).
Package-Manager: portage-2.1
---

diff --git a/www-apps/phpBB/ChangeLog b/www-apps/phpBB/ChangeLog
index 0e86c15cb54d..a1f9afc2ecfd 100644
--- a/www-apps/phpBB/ChangeLog
+++ b/www-apps/phpBB/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/phpBB
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/ChangeLog,v 1.24 2006/06/18 00:13:09 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/ChangeLog,v 1.25 2006/06/18 00:52:07 rl03 Exp $
+
+  18 Jun 2006; Renat Lumpau <rl03@gentoo.org> phpBB-2.0.21.ebuild:
+  Don't overwrite config file (bug #136770).
 
   18 Jun 2006; Renat Lumpau <rl03@gentoo.org> ChangeLog:
   Updating digest for new upstream tarball
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index b6c1167c414c..8d2fe0861c1a 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 200 RMD160 d2ff2708d1613b71ebaf22ee6b1f8d175389b104 SHA1 14e21c42c2b1f2b0629db50bf58abac27aa957c2 SHA256 7d1329dc18136ee027013170b923f42b6ce2d349e042972f2fe24ae096d0b991
 MD5 33f8ee5f512a327dd3eb4e5ee7be5ae7 files/postinstall-en.txt 200
 RMD160 d2ff2708d1613b71ebaf22ee6b1f8d175389b104 files/postinstall-en.txt 200
 SHA256 7d1329dc18136ee027013170b923f42b6ce2d349e042972f2fe24ae096d0b991 files/postinstall-en.txt 200
 DIST phpBB-2.0.21.tar.bz2 452873 RMD160 148d65c0551cf0686417360efeab96f8d4fbc1b3 SHA1 a160d0e1efd083003963af30582f9ddeafac0422 SHA256 4b2bbfea47e709fdbad0c17c0ca0f3d3c36a83de08befa55bebab130cb24ddde
-EBUILD phpBB-2.0.21.ebuild 1187 RMD160 45fde9e7ce8ffad92e4812640746c9de7b1c0306 SHA1 acf52ca573cae24322deee92968851bcb9ac96c7 SHA256 3537b09ca764ac8cd14b5b5495008d7cb379e1565f810b1f1d389e58b2333d03
-MD5 9693a2fc499538fcb8cb56dede88513e phpBB-2.0.21.ebuild 1187
-RMD160 45fde9e7ce8ffad92e4812640746c9de7b1c0306 phpBB-2.0.21.ebuild 1187
-SHA256 3537b09ca764ac8cd14b5b5495008d7cb379e1565f810b1f1d389e58b2333d03 phpBB-2.0.21.ebuild 1187
-MISC ChangeLog 5671 RMD160 e9bdbecb91fc2b9fb6c5042f4197f0706690d038 SHA1 2edec50b124d042a6c5e887fbe18c7d9687e4342 SHA256 6215efa7949a001559811ed55a780e7c2b27f16a7cb5e70f5956129e891e5633
-MD5 5feea07e22df2ec783d5082ba953a79c ChangeLog 5671
-RMD160 e9bdbecb91fc2b9fb6c5042f4197f0706690d038 ChangeLog 5671
-SHA256 6215efa7949a001559811ed55a780e7c2b27f16a7cb5e70f5956129e891e5633 ChangeLog 5671
+EBUILD phpBB-2.0.21.ebuild 1033 RMD160 90f8df9dbda7eda8b542a9bebb45dd935526c604 SHA1 31a530601192829759e090251efc40fea5e321a5 SHA256 666a89f325a5b98fab79deaa025ec7d8fe0256bc4c49b4520817bba7b3b029a4
+MD5 3702b2b6a9ff5b252fcea21003da15f1 phpBB-2.0.21.ebuild 1033
+RMD160 90f8df9dbda7eda8b542a9bebb45dd935526c604 phpBB-2.0.21.ebuild 1033
+SHA256 666a89f325a5b98fab79deaa025ec7d8fe0256bc4c49b4520817bba7b3b029a4 phpBB-2.0.21.ebuild 1033
+MISC ChangeLog 5784 RMD160 e229193086832ad718a244c9228b7bfcf2b8c924 SHA1 db26d0b1a3cdc3f30aa57e4e077fd76cab776b4a SHA256 adfdb30719177fe23057c602b06cf67fc95fa6881357db6a805d2a76e425748a
+MD5 d0e126bdb6f8ebb2badddde442d2e0e1 ChangeLog 5784
+RMD160 e229193086832ad718a244c9228b7bfcf2b8c924 ChangeLog 5784
+SHA256 adfdb30719177fe23057c602b06cf67fc95fa6881357db6a805d2a76e425748a ChangeLog 5784
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
@@ -18,3 +21,10 @@ SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a metadata
 MD5 7d25dc87d07435887bddc7622b171ce3 files/digest-phpBB-2.0.21 241
 RMD160 f2fd4c9805b6abc54f92c0f2d0c59641b0d50715 files/digest-phpBB-2.0.21 241
 SHA256 4929ed2983edc9d8d538d84e883909770fe88c5de85d488fbd925b3547571030 files/digest-phpBB-2.0.21 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFElKL5EzitwsaoONoRAny4AJ9JNXiMorDxiG0LR9vdDwCYFezOagCeKqV0
+skqsWB3zNJ1+7RQZev1iswg=
+=lVoy
+-----END PGP SIGNATURE-----
diff --git a/www-apps/phpBB/phpBB-2.0.21.ebuild b/www-apps/phpBB/phpBB-2.0.21.ebuild
index ae59c05936a0..9e1020e901a0 100644
--- a/www-apps/phpBB/phpBB-2.0.21.ebuild
+++ b/www-apps/phpBB/phpBB-2.0.21.ebuild
@@ -1,6 +1,6 @@
 # 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.21.ebuild,v 1.1 2006/06/09 22:19:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/phpBB-2.0.21.ebuild,v 1.2 2006/06/18 00:52:07 rl03 Exp $
 
 inherit webapp
 
@@ -24,8 +24,7 @@ src_install() {
 	cp -pPR * "${D}/${MY_HTDOCSDIR}"
 	rm -rf ${D}/${MY_HTDOCSDIR}/docs
 
-	echo "<?php trigger_error('Please use install/install.php to configure phpBB for your system!', E_USER_ERROR); ?>" > "${D}/${MY_HTDOCSDIR}/config.php"
-	webapp_serverowned "${MY_HTDOCSDIR}/config.php"
+	webapp_serverowned ${MY_HTDOCSDIR}/config.php
 	webapp_serverowned ${MY_HTDOCSDIR}/images
 	webapp_serverowned ${MY_HTDOCSDIR}/images/avatars
 	webapp_serverowned ${MY_HTDOCSDIR}/images/avatars/gallery