merge from webapps overlay wrt #208584

(Portage version: 2.1.4)

2 files changed, 36 insertions, 17 deletions

diff --git a/www-apps/phpwiki/ChangeLog b/www-apps/phpwiki/ChangeLog
index c04ad97f3f73..cfdd610a414c 100644
--- a/www-apps/phpwiki/ChangeLog
+++ b/www-apps/phpwiki/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/phpwiki
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.23 2007/08/30 14:25:50 wrobel Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.24 2008/02/04 08:30:59 hollow Exp $
+
+  04 Feb 2008; Benedikt Böhm <hollow@gentoo.org> phpwiki-1.3.14.ebuild:
+  merge from webapps overlay wrt #208584
+
+  02 Feb 2008; Jakub Moc <jakub@gentoo.org> phpwiki-1.3.14.ebuild:
+  Remove apache dependency wrt Bug 208584. Move php checks to pkg_setup where
+  they belong, and fix them up. Add use flags for databases. Fix quoting,
+  clean up the ebuild.
 
   30 Aug 2007; <wrobel@gentoo.org> -files/phpwiki-1.3.10-xmlrpc.patch,
   metadata.xml, -phpwiki-1.3.10-r3.ebuild, -phpwiki-1.3.13_rc1.ebuild:
diff --git a/www-apps/phpwiki/phpwiki-1.3.14.ebuild b/www-apps/phpwiki/phpwiki-1.3.14.ebuild
index 55710cffcc66..1aaa893148e4 100644
--- a/www-apps/phpwiki/phpwiki-1.3.14.ebuild
+++ b/www-apps/phpwiki/phpwiki-1.3.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.14.ebuild,v 1.2 2007/08/14 18:13:04 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.14.ebuild,v 1.3 2008/02/04 08:30:59 hollow Exp $
 
 inherit webapp depend.php
 
@@ -10,33 +10,44 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/php
-	www-servers/apache"
+IUSE="msql mysql postgres"
+
+RDEPEND="virtual/httpd-cgi"
+need_php
+
+pkg_setup() {
+	local flags="pcre"
+	for f in msql mysql postgres ; do
+		use ${f} && flags="${flags} ${f}"
+	done
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
+		! PHPCHECKNODIE="yes" require_php_with_any_use apache2 cgi ; then
+			die "Re-install ${PHP_PKG} with ${flags} and at least one of apache2 or cgi."
+	fi
+	webapp_pkg_setup
+}
 
 src_unpack() {
-	require_php_with_use pcre
-
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	rm -f Makefile LICENSE
 }
 
 src_install() {
 	webapp_src_preinst
 
-	cp -pPR * ${D}/${MY_HTDOCSDIR}
-	rm -rf ${D}/${MY_HTDOCSDIR}/{doc,schemas,README,INSTALL,TODO,UPGRADING}
+	cp -pPR * "${D}/${MY_HTDOCSDIR}"
+	rm -rf "${D}/${MY_HTDOCSDIR}"/{doc,schemas,README,INSTALL,TODO,UPGRADING}
 
 	dodoc README INSTALL TODO UPGRADING doc/* schemas/*
 
 	# Create config file from distribution default, and fix up invalid defaults
-	cd ${D}/${MY_HTDOCSDIR}/config
-	sed "s:;DEBUG = 1:DEBUG = 0:" config-dist.ini > config.ini
+	dosed "s:;DEBUG = 1:DEBUG = 0:" "${MY_HTDOCSDIR}"/config/config-dist.ini
+	cd "${D}"/${MY_HTDOCSDIR}/config
+	cp config-dist.ini config.ini
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-1.3-en.txt
-	webapp_configfile ${MY_HTDOCSDIR}/config/config.ini
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-1.3-en.txt
+	webapp_configfile "${MY_HTDOCSDIR}"/config/config.ini
 
 	webapp_src_install
 }