add need_httpd_cgi wrt #208584

Package-Manager: portage-2.1.4.4

27 files changed, 106 insertions, 52 deletions

diff --git a/www-apps/ampache/ChangeLog b/www-apps/ampache/ChangeLog
index d8c68af3ef5c..26514bdce060 100644
--- a/www-apps/ampache/ChangeLog
+++ b/www-apps/ampache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/ampache
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.34 2008/02/17 23:00:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.35 2008/02/22 15:40:39 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> ampache-3.3.3.5.ebuild:
+  add need_httpd_cgi wrt #208584
 
   17 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
   ampache-3.3.3.5.ebuild:
diff --git a/www-apps/ampache/ampache-3.3.3.5.ebuild b/www-apps/ampache/ampache-3.3.3.5.ebuild
index a408f1272718..3a8cbc9518eb 100644
--- a/www-apps/ampache/ampache-3.3.3.5.ebuild
+++ b/www-apps/ampache/ampache-3.3.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.3.3.5.ebuild,v 1.6 2008/02/17 23:00:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.3.3.5.ebuild,v 1.7 2008/02/22 15:40:39 hollow Exp $
 
 inherit webapp depend.php
 
@@ -15,6 +15,7 @@ IUSE=""
 RDEPEND=""
 DEPEND=""
 
+need_httpd_cgi
 need_php_httpd
 
 pkg_setup() {
@@ -28,7 +29,8 @@ src_install() {
 	dodoc docs/*
 	rm -rf docs/
 
-	cp -R . "${D}"${MY_HTDOCSDIR}
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
 	webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
 	webapp_src_install
diff --git a/www-apps/b2evolution/ChangeLog b/www-apps/b2evolution/ChangeLog
index 957da29d9dcb..f92eee2892e9 100644
--- a/www-apps/b2evolution/ChangeLog
+++ b/www-apps/b2evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/b2evolution
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.28 2008/02/17 23:28:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.29 2008/02/22 15:43:08 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> b2evolution-1.10.2.ebuild,
+  b2evolution-1.10.3.ebuild, b2evolution-2.4.0_rc2.ebuild:
+  add need_httpd_cgi wrt #208584
 
   17 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
   b2evolution-1.10.2.ebuild, b2evolution-1.10.3.ebuild,
diff --git a/www-apps/b2evolution/b2evolution-1.10.2.ebuild b/www-apps/b2evolution/b2evolution-1.10.2.ebuild
index 094a64e52608..5fec7ef00e03 100644
--- a/www-apps/b2evolution/b2evolution-1.10.2.ebuild
+++ b/www-apps/b2evolution/b2evolution-1.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.2.ebuild,v 1.6 2008/02/17 23:28:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.2.ebuild,v 1.7 2008/02/22 15:43:08 hollow Exp $
 
 inherit webapp eutils depend.php
 
@@ -19,6 +19,7 @@ RDEPEND=""
 DEPEND="${DEPEND} ${RDEPEND}
 	app-arch/unzip"
 
+need_httpd_cgi
 need_php_httpd
 
 S="${WORKDIR}/${PN}"
@@ -36,15 +37,15 @@ pkg_setup() {
 src_install() {
 	webapp_src_preinst
 
-	insinto ${MY_HTDOCSDIR}
+	insinto "${MY_HTDOCSDIR}"
 	doins -r blogs/*
 
 	rm doc/*.*-*.html doc/*.src.html
 	dohtml doc/*.html
 
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php
-	webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned "${MY_HTDOCSDIR}"/conf/_basic_config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 
diff --git a/www-apps/b2evolution/b2evolution-1.10.3.ebuild b/www-apps/b2evolution/b2evolution-1.10.3.ebuild
index 957ab3d4ce8e..e05ff5003b44 100644
--- a/www-apps/b2evolution/b2evolution-1.10.3.ebuild
+++ b/www-apps/b2evolution/b2evolution-1.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.3.ebuild,v 1.2 2008/02/17 23:28:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.3.ebuild,v 1.3 2008/02/22 15:43:08 hollow Exp $
 
 inherit webapp eutils depend.php
 
@@ -19,6 +19,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
+need_httpd_cgi
 need_php_httpd
 
 S="${WORKDIR}/${PN}"
@@ -36,15 +37,15 @@ pkg_setup() {
 src_install() {
 	webapp_src_preinst
 
-	insinto ${MY_HTDOCSDIR}
+	insinto "${MY_HTDOCSDIR}"
 	doins -r blogs/*
 
 	rm doc/*.*-*.html doc/*.src.html
 	dohtml doc/*.html
 
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php
-	webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned "${MY_HTDOCSDIR}"/conf/_basic_config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 
diff --git a/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild b/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild
index bb9a99bd3334..bf7790e3c101 100644
--- a/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild
+++ b/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild,v 1.2 2008/02/17 23:28:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild,v 1.3 2008/02/22 15:43:09 hollow Exp $
 
 inherit webapp eutils depend.php
 
@@ -19,6 +19,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
+need_httpd_cgi
 need_php_httpd
 
 S="${WORKDIR}/${PN}"
@@ -36,15 +37,15 @@ pkg_setup() {
 src_install() {
 	webapp_src_preinst
 
-	insinto ${MY_HTDOCSDIR}
+	insinto "${MY_HTDOCSDIR}"
 	doins -r blogs/*
 
 	rm doc/*.*-*.html doc/*.src.html
 	dohtml doc/*.html
 
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php
-	webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned "${MY_HTDOCSDIR}"/conf/_basic_config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
diff --git a/www-apps/bugport/ChangeLog b/www-apps/bugport/ChangeLog
index 27c6edcd6e66..644aa127b01c 100644
--- a/www-apps/bugport/ChangeLog
+++ b/www-apps/bugport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/bugport
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/ChangeLog,v 1.10 2008/02/18 11:27:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/ChangeLog,v 1.11 2008/02/22 15:46:04 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> bugport-1.146.ebuild,
+  bugport-1.147.ebuild:
+  add need_httpd_cgi wrt #208584
 
   18 Feb 2008; Benedikt Böhm <hollow@gentoo.org> bugport-1.146.ebuild,
   bugport-1.147.ebuild:
diff --git a/www-apps/bugport/bugport-1.146.ebuild b/www-apps/bugport/bugport-1.146.ebuild
index 0cea242e6381..7a38b6b5bfcf 100644
--- a/www-apps/bugport/bugport-1.146.ebuild
+++ b/www-apps/bugport/bugport-1.146.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/bugport-1.146.ebuild,v 1.5 2008/02/18 11:27:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/bugport-1.146.ebuild,v 1.6 2008/02/22 15:46:04 hollow Exp $
 
 inherit webapp depend.php
 
@@ -14,9 +14,10 @@ IUSE=""
 
 DEPEND="dev-php/adodb"
 
+need_httpd_cgi
 need_php_httpd
 
-S=${WORKDIR}/${PN}_${PV}
+S="${WORKDIR}"/${PN}_${PV}
 
 pkg_setup() {
 	webapp_pkg_setup
@@ -45,11 +46,11 @@ src_install() {
 	sed -i -e 's|^\(# \+\)\?\$adoDir.\+$|$adoDir = "/usr/lib/php/adodb/"; # DO NOT CHANGE!|' \
 		conf/config.php || die "failed to fix adodb location in config.php."
 
-	insinto ${MY_HTDOCSDIR}
+	insinto "${MY_HTDOCSDIR}"
 	doins -r .
 
-	webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
-	webapp_configfile ${MY_HTDOCSDIR}/conf/configuration.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/configuration.php
 
 	webapp_src_install
 }
diff --git a/www-apps/bugport/bugport-1.147.ebuild b/www-apps/bugport/bugport-1.147.ebuild
index 1c64f34d7976..dc52a41eb553 100644
--- a/www-apps/bugport/bugport-1.147.ebuild
+++ b/www-apps/bugport/bugport-1.147.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/bugport-1.147.ebuild,v 1.3 2008/02/18 11:27:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugport/bugport-1.147.ebuild,v 1.4 2008/02/22 15:46:04 hollow Exp $
 
 inherit webapp depend.php
 
@@ -14,9 +14,10 @@ IUSE="mysql"
 
 DEPEND="dev-php/adodb"
 
+need_httpd_cgi
 need_php_httpd
 
-S=${WORKDIR}/${PN}_${PV}
+S="${WORKDIR}"/${PN}_${PV}
 
 pkg_setup() {
 	webapp_pkg_setup
@@ -54,11 +55,11 @@ src_install() {
 	sed -i -e 's|^\(# \+\)\?\$adoDir.\+$|$adoDir = "/usr/lib/php/adodb/"; # DO NOT CHANGE!|' \
 		conf/config.php || die "failed to fix adodb location in config.php."
 
-	insinto ${MY_HTDOCSDIR}
+	insinto "${MY_HTDOCSDIR}"
 	doins -r .
 
-	webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
-	webapp_configfile ${MY_HTDOCSDIR}/conf/configuration.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/configuration.php
 
 	webapp_src_install
 }
diff --git a/www-apps/coppermine/ChangeLog b/www-apps/coppermine/ChangeLog
index 8a6d685068e8..24628f5f8b62 100644
--- a/www-apps/coppermine/ChangeLog
+++ b/www-apps/coppermine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/coppermine
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/ChangeLog,v 1.23 2008/02/19 11:45:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/ChangeLog,v 1.24 2008/02/22 15:47:01 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> coppermine-1.4.16.ebuild:
+  add need_httpd_cgi wrt #208584
 
   19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> coppermine-1.4.16.ebuild:
   ebuild cleanup wrt #208584
diff --git a/www-apps/coppermine/coppermine-1.4.16.ebuild b/www-apps/coppermine/coppermine-1.4.16.ebuild
index df64fde03a57..01cbdd363a66 100644
--- a/www-apps/coppermine/coppermine-1.4.16.ebuild
+++ b/www-apps/coppermine/coppermine-1.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/coppermine-1.4.16.ebuild,v 1.2 2008/02/19 11:45:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/coppermine-1.4.16.ebuild,v 1.3 2008/02/22 15:47:01 hollow Exp $
 
 inherit webapp versionator depend.php
 
@@ -17,6 +17,7 @@ RDEPEND="imagemagick? ( media-gfx/imagemagick )"
 
 S="${WORKDIR}"/cpg$(delete_all_version_separators)
 
+need_httpd_cgi
 need_php_httpd
 
 pkg_setup() {
diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 9b9f52f29bb8..aa715fc83c67 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.29 2008/02/19 12:37:37 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.30 2008/02/22 15:48:20 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> dokuwiki-20070626b.ebuild:
+  add need_httpd_cgi wrt #208584
 
   19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> dokuwiki-20070626b.ebuild:
   ebuild cleanup wrt #208584
diff --git a/www-apps/dokuwiki/dokuwiki-20070626b.ebuild b/www-apps/dokuwiki/dokuwiki-20070626b.ebuild
index bce406eb95ec..0696d649b985 100644
--- a/www-apps/dokuwiki/dokuwiki-20070626b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20070626b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20070626b.ebuild,v 1.4 2008/02/19 12:37:37 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20070626b.ebuild,v 1.5 2008/02/22 15:48:20 hollow Exp $
 
 inherit webapp depend.php
 
@@ -18,6 +18,7 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
+need_httpd_cgi
 need_php_httpd
 
 pkg_setup() {
diff --git a/www-apps/dragonflycms/ChangeLog b/www-apps/dragonflycms/ChangeLog
index 70c64a64d6ea..03283072bad6 100644
--- a/www-apps/dragonflycms/ChangeLog
+++ b/www-apps/dragonflycms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/dragonflycms
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/ChangeLog,v 1.17 2008/02/19 13:13:56 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/ChangeLog,v 1.18 2008/02/22 15:49:28 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  dragonflycms-9.1.2.1.ebuild:
+  add need_httpd_cgi wrt #208584
 
   19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
   dragonflycms-9.1.2.1.ebuild:
diff --git a/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild b/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild
index f667d3bf6148..5f82ee9ccef8 100644
--- a/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild
+++ b/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild,v 1.2 2008/02/19 13:13:56 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild,v 1.3 2008/02/22 15:49:28 hollow Exp $
 
 inherit webapp depend.php
 
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE=""
 
+need_httpd_cgi
 need_php_httpd
 
 S="${WORKDIR}"
diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 6351b9e11dff..85835d694098 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/gallery
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.135 2008/02/20 18:07:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.136 2008/02/22 15:50:50 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> gallery-1.5.3.ebuild,
+  gallery-1.5.7.ebuild, gallery-2.2.4.ebuild:
+  add need_httpd_cgi wrt #208584
 
   20 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
   gallery-1.5.3.ebuild, -gallery-1.5.5.ebuild, gallery-1.5.7.ebuild,
diff --git a/www-apps/gallery/gallery-1.5.3.ebuild b/www-apps/gallery/gallery-1.5.3.ebuild
index b011279121d9..c3a45a9bb615 100644
--- a/www-apps/gallery/gallery-1.5.3.ebuild
+++ b/www-apps/gallery/gallery-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.3.ebuild,v 1.11 2008/02/20 18:07:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.3.ebuild,v 1.12 2008/02/22 15:50:50 hollow Exp $
 
 inherit webapp depend.php confutils
 
@@ -18,6 +18,7 @@ RDEPEND="media-libs/jpeg
 	unzip? ( app-arch/unzip )
 	zip? ( app-arch/zip )"
 
+need_httpd_cgi
 need_php_httpd
 
 S="${WORKDIR}"/${PN}
diff --git a/www-apps/gallery/gallery-1.5.7.ebuild b/www-apps/gallery/gallery-1.5.7.ebuild
index e7f7b2d7cb07..7bd5a1775478 100644
--- a/www-apps/gallery/gallery-1.5.7.ebuild
+++ b/www-apps/gallery/gallery-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.7.ebuild,v 1.3 2008/02/20 18:07:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.7.ebuild,v 1.4 2008/02/22 15:50:50 hollow Exp $
 
 inherit webapp depend.php confutils
 
@@ -18,6 +18,7 @@ RDEPEND="media-libs/jpeg
 	unzip? ( app-arch/unzip )
 	zip? ( app-arch/zip )"
 
+need_httpd_cgi
 need_php_httpd
 
 S="${WORKDIR}"/${PN}
diff --git a/www-apps/gallery/gallery-2.2.4.ebuild b/www-apps/gallery/gallery-2.2.4.ebuild
index e6a69a0f3fb8..a26b4d08f282 100644
--- a/www-apps/gallery/gallery-2.2.4.ebuild
+++ b/www-apps/gallery/gallery-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.2.4.ebuild,v 1.9 2008/02/20 18:07:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.2.4.ebuild,v 1.10 2008/02/22 15:50:50 hollow Exp $
 
 inherit webapp eutils depend.php confutils
 
@@ -22,6 +22,7 @@ RDEPEND="media-libs/jpeg
 
 S="${WORKDIR}"/${PN}2
 
+need_httpd_cgi
 need_php_httpd
 
 pkg_setup() {
diff --git a/www-apps/phpsysinfo/ChangeLog b/www-apps/phpsysinfo/ChangeLog
index 3d5057c9ba1d..a3ea55070e71 100644
--- a/www-apps/phpsysinfo/ChangeLog
+++ b/www-apps/phpsysinfo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/phpsysinfo
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpsysinfo/ChangeLog,v 1.41 2008/02/22 12:21:43 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpsysinfo/ChangeLog,v 1.42 2008/02/22 15:54:24 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> phpsysinfo-2.5.4.ebuild:
+  add need_httpd_cgi wrt #208584
 
   22 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org> phpsysinfo-2.5.4.ebuild:
   The ebuild needs to check php for xml support. Syntax cleanup.
diff --git a/www-apps/phpsysinfo/phpsysinfo-2.5.4.ebuild b/www-apps/phpsysinfo/phpsysinfo-2.5.4.ebuild
index e0f57ba7154d..88cf82c1f85c 100644
--- a/www-apps/phpsysinfo/phpsysinfo-2.5.4.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpsysinfo/phpsysinfo-2.5.4.ebuild,v 1.7 2008/02/22 12:21:43 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpsysinfo/phpsysinfo-2.5.4.ebuild,v 1.8 2008/02/22 15:54:24 hollow Exp $
 
 inherit eutils webapp depend.php
 
@@ -12,8 +12,9 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}"/${PN}
 
+need_httpd_cgi
 need_php_httpd
 
 pkg_setup() {
@@ -28,9 +29,8 @@ src_install() {
 
 	insinto "${MY_HTDOCSDIR}"
 	doins -r [:dit:]*
-	cp config.php.new config.php
-	doins config.php
+	newins config.php{.new,}
 
-	webapp_configfile ${MY_HTDOCSDIR}/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
 	webapp_src_install
 }
diff --git a/www-apps/postfixadmin/ChangeLog b/www-apps/postfixadmin/ChangeLog
index d74befcceba9..23a6c4cb4f4c 100644
--- a/www-apps/postfixadmin/ChangeLog
+++ b/www-apps/postfixadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/postfixadmin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.10 2008/02/20 16:12:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.11 2008/02/22 15:56:28 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  postfixadmin-2.1.0-r1.ebuild:
+  add need_httpd_cgi wrt #208584
 
 *postfixadmin-2.1.0-r1 (20 Feb 2008)
 
diff --git a/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild b/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild
index 69a222f6dfa9..20f021c75304 100644
--- a/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild,v 1.1 2008/02/20 16:12:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild,v 1.2 2008/02/22 15:56:28 hollow Exp $
 
 inherit eutils webapp depend.php confutils
 
@@ -19,6 +19,7 @@ DEPEND=">=mail-mta/postfix-2.0.0
 	postgres? ( dev-perl/DBD-Pg )"
 RDEPEND="${DEPEND}"
 
+need_httpd_cgi
 need_php_httpd
 
 pkg_setup() {
diff --git a/www-apps/xrms/ChangeLog b/www-apps/xrms/ChangeLog
index ab5fb72f5737..ae63aa2b4065 100644
--- a/www-apps/xrms/ChangeLog
+++ b/www-apps/xrms/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/xrms
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xrms/ChangeLog,v 1.4 2008/02/20 12:41:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xrms/ChangeLog,v 1.5 2008/02/22 15:58:41 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> xrms-1.99.2.ebuild:
+  add need_httpd_cgi wrt #208584
 
   20 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
   update metadata
diff --git a/www-apps/xrms/xrms-1.99.2.ebuild b/www-apps/xrms/xrms-1.99.2.ebuild
index a9f2f053a0ca..491a775483c3 100644
--- a/www-apps/xrms/xrms-1.99.2.ebuild
+++ b/www-apps/xrms/xrms-1.99.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xrms/xrms-1.99.2.ebuild,v 1.3 2008/02/20 12:40:40 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xrms/xrms-1.99.2.ebuild,v 1.4 2008/02/22 15:58:41 hollow Exp $
 
 inherit webapp depend.php eutils
 
@@ -17,6 +17,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="dev-php/PEAR-PEAR"
 
+need_httpd_cgi
 need_php_httpd
 
 S="${WORKDIR}"/${PN}
diff --git a/www-apps/zina/ChangeLog b/www-apps/zina/ChangeLog
index 142f8e43ff8c..6b5b59453c0e 100644
--- a/www-apps/zina/ChangeLog
+++ b/www-apps/zina/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/zina
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/zina/ChangeLog,v 1.9 2008/02/19 13:46:04 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/zina/ChangeLog,v 1.10 2008/02/22 15:57:35 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> zina-1.0_rc3.ebuild:
+  add need_httpd_cgi wrt #208584
 
   19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> -zina-1.0_rc2.ebuild,
   zina-1.0_rc3.ebuild:
diff --git a/www-apps/zina/zina-1.0_rc3.ebuild b/www-apps/zina/zina-1.0_rc3.ebuild
index 22688e6331d3..97bd7d107af7 100644
--- a/www-apps/zina/zina-1.0_rc3.ebuild
+++ b/www-apps/zina/zina-1.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/zina/zina-1.0_rc3.ebuild,v 1.4 2008/02/19 13:46:04 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/zina/zina-1.0_rc3.ebuild,v 1.5 2008/02/22 15:57:35 hollow Exp $
 
 inherit webapp depend.php
 
@@ -17,6 +17,7 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
+need_httpd_cgi
 need_php_httpd
 
 S="${WORKDIR}"/${MY_P}