www-apps/phpbt: Fix dependencies, check for required php features for DB backends, protect config.php, fix quoting, cleanup.

svn path=/experimental/; revision=378

5 files changed, 52 insertions, 25 deletions

diff --git a/www-apps/phpbt/ChangeLog b/www-apps/phpbt/ChangeLog
index b0baacc..08cd2af 100644
--- a/www-apps/phpbt/ChangeLog
+++ b/www-apps/phpbt/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for www-apps/phpbt
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Sep 2007; Jakub Moc <jakub@gentoo.org> files/postinstall-en.txt,
+  phpbt-1.0.1.ebuild:
+  Fix dependencies, check for required php features for DB backends, protect
+  config.php, fix quoting, cleanup.
+
   10 Dec 2005; Renat Lumpau <rl03@gentoo.org> ChangeLog:
   Added missing PEAR-DB dependency
 
diff --git a/www-apps/phpbt/Manifest b/www-apps/phpbt/Manifest
index 480cf1c..1c1c294 100644
--- a/www-apps/phpbt/Manifest
+++ b/www-apps/phpbt/Manifest
@@ -1,4 +1,16 @@
-MD5 023a28e10d1b899a5bbceefce905c651 phpbt-1.0.1.ebuild 998
-MD5 9e8e62ff1a22d169051af52231caecb5 ChangeLog 299
-MD5 308e8d451ace9a6ef9dfe18990f06593 files/postinstall-en.txt 184
-MD5 9a822d72727529ff79199fef965c8138 files/digest-phpbt-1.0.1 63
+AUX postinstall-en.txt 336 RMD160 809781013f2a1b337fb5896da49c7966c0f82e7b SHA1 74455be017397d083e147fc61a902524e0fc9b6f SHA256 c7bafe90d38cd6cf159624ca369606477121f58435a9217768260871a2d7d336
+MD5 6fc179843e87f47da9057e4c726890e5 files/postinstall-en.txt 336
+RMD160 809781013f2a1b337fb5896da49c7966c0f82e7b files/postinstall-en.txt 336
+SHA256 c7bafe90d38cd6cf159624ca369606477121f58435a9217768260871a2d7d336 files/postinstall-en.txt 336
+DIST phpbt-1.0.1.tar.gz 314528 RMD160 b60799c94aab28ea379ab5313ab1fde7c3ca82f6 SHA1 f86c3ac24f8d5902df99327afa8ae31b562dec11 SHA256 dc95a0b199b9a61cc7802226e3c849a2cfa760d90b94c8befeadc3fbd5bd8927
+EBUILD phpbt-1.0.1.ebuild 1202 RMD160 3fd7a4d771183789b2e76b11cfea2f204e726773 SHA1 ebf2d70d75e380ef09d53317582306ce68cb4b10 SHA256 1312dfd276a4569949baef75b9f6cb70778642ad7b562f9374cb112dabb88ab8
+MD5 f7c06c114a31d987b772ceb5d94462a2 phpbt-1.0.1.ebuild 1202
+RMD160 3fd7a4d771183789b2e76b11cfea2f204e726773 phpbt-1.0.1.ebuild 1202
+SHA256 1312dfd276a4569949baef75b9f6cb70778642ad7b562f9374cb112dabb88ab8 phpbt-1.0.1.ebuild 1202
+MISC ChangeLog 505 RMD160 92f1d99da05a83d5d7376e20e03d21ccf0f39ff1 SHA1 2da9b47d21262ba3bdd9e70ab9ab69ab81059503 SHA256 f1eab56eacaa6b95f22f6e0a44a5eabfaee3be026f703f0440f4789977b43b52
+MD5 7349a0cb7b0ee17d15df9ba2773b6ee0 ChangeLog 505
+RMD160 92f1d99da05a83d5d7376e20e03d21ccf0f39ff1 ChangeLog 505
+SHA256 f1eab56eacaa6b95f22f6e0a44a5eabfaee3be026f703f0440f4789977b43b52 ChangeLog 505
+MD5 208a7b057e78cb89489cb60188c59525 files/digest-phpbt-1.0.1 235
+RMD160 c88d819d9ff0d2cf758519078ed8eecdb157f24f files/digest-phpbt-1.0.1 235
+SHA256 4a66d1a50c8c05f6e38357525ad519f912bd9e62a56a9f098bc638779f2cf27d files/digest-phpbt-1.0.1 235
diff --git a/www-apps/phpbt/files/digest-phpbt-1.0.1 b/www-apps/phpbt/files/digest-phpbt-1.0.1
index b36554c..71e06d8 100644
--- a/www-apps/phpbt/files/digest-phpbt-1.0.1
+++ b/www-apps/phpbt/files/digest-phpbt-1.0.1
@@ -1 +1,3 @@
 MD5 15045a5b6f6df8b0c85a5d630814d203 phpbt-1.0.1.tar.gz 314528
+RMD160 b60799c94aab28ea379ab5313ab1fde7c3ca82f6 phpbt-1.0.1.tar.gz 314528
+SHA256 dc95a0b199b9a61cc7802226e3c849a2cfa760d90b94c8befeadc3fbd5bd8927 phpbt-1.0.1.tar.gz 314528
diff --git a/www-apps/phpbt/files/postinstall-en.txt b/www-apps/phpbt/files/postinstall-en.txt
index 47e6ebd..7189804 100644
--- a/www-apps/phpbt/files/postinstall-en.txt
+++ b/www-apps/phpbt/files/postinstall-en.txt
@@ -5,3 +5,7 @@ You are almost done!
 
   1. Login on
   http://${VHOST_HOSTNAME}/${VHOST_APPDIR} and follow the directions.
+
+
+Note: You must have magic_quotes_gpc set to On either in php.ini or in 
+.htaccess (see http://www.php.net/manual/en/configuration.php for more info).
diff --git a/www-apps/phpbt/phpbt-1.0.1.ebuild b/www-apps/phpbt/phpbt-1.0.1.ebuild
index c01b1b5..5d2f5bc 100644
--- a/www-apps/phpbt/phpbt-1.0.1.ebuild
+++ b/www-apps/phpbt/phpbt-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@
 # Submitted-By: F. Steinel
 # Reviewed-By: rl03 2005-12-10
 
-inherit webapp
+inherit webapp depend.apache depend.php
 
 DESCRIPTION="phpBugTracker, A PHP replacement for bugzilla"
 HOMEPAGE="http://phpbt.sourceforge.net/"
@@ -14,34 +14,38 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86"
-IUSE="jpgraph"
+IUSE="jpgraph mysql mysqli oci8 postgres"
 
-RDEPEND="|| ( dev-db/mysql dev-db/postgresql )
-	virtual/php
-	net-www/apache
-	dev-php/PEAR-DB
-	jpgraph? ( dev-php/jpgraph )"
+RDEPEND="dev-php/PEAR-DB
+	jpgraph? ( || ( dev-php5/jpgraph dev-php4/jpgraph ) )"
+
+need_php_httpd
+want_apache
 
 pkg_setup() {
+	local flags
+	for i in mysql mysqli oci8 postgres ; do
+		use ${i} && flags="${flags} ${i}"
+	done
+	require_php_with_use ${flags}
 	webapp_pkg_setup
-	einfo "Please make sure your PHP is compiled with PEAR-DB support"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# make sure we don't clobber existing config.php
-	rm config.php
 }
 
 src_install () {
+	# make sure we don't clobber existing config.php with empty one
+	rm -f config.php
+	cp config-dist.php config.php
+
 	webapp_src_preinst
 
-	dodoc CHANGELOG INSTALL README TODO UPGRADING
-	dohtml docs/html/*
+	local DOCS="CHANGELOG INSTALL README TODO UPGRADING"
+	dodoc ${DOCS}
+	dohtml -r docs/html/*
+	rm -rf ${DOCS} docs/
 
-	cp -R . ${D}/${MY_HTDOCSDIR}
+	cp -R . "${D}"/${MY_HTDOCSDIR}
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_configfile ${MY_HTDOCSDIR}/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
 }