fix #213061

(Portage version: 2.1.4.4)

4 files changed, 49 insertions, 24 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 071b250e6ef9..57501850f793 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.43 2008/03/01 17:05:19 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.44 2008/04/03 10:16:36 hollow Exp $
+
+  03 Apr 2008; Benedikt Böhm <hollow@gentoo.org> drupal-5.6.ebuild,
+  drupal-6.0.ebuild, drupal-6.1.ebuild:
+  fix #213061
 
 *drupal-6.1 (01 Mar 2008)
 
diff --git a/www-apps/drupal/drupal-5.6.ebuild b/www-apps/drupal/drupal-5.6.ebuild
index 08ff63d26082..e13153f64777 100644
--- a/www-apps/drupal/drupal-5.6.ebuild
+++ b/www-apps/drupal/drupal-5.6.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/drupal/drupal-5.6.ebuild,v 1.2 2008/02/15 09:22:34 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.6.ebuild,v 1.3 2008/04/03 10:16:36 hollow Exp $
 
 inherit webapp eutils depend.php
 
@@ -14,9 +14,18 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="virtual/httpd-cgi"
-
-need_php
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]] ; then
+		require_php_with_use expat
+	else
+		require_php_with_use xml
+	fi
+}
 
 src_install() {
 	webapp_src_preinst
@@ -25,15 +34,12 @@ src_install() {
 	dodoc ${docs}
 	rm -f ${docs} INSTALL
 
-	einfo "Copying main files"
-	cp -r . "${D}/${MY_HTDOCSDIR}"
-
-	# we install the .htaccess file to enable support for clean URLs
-	cp .htaccess "${D}/${MY_HTDOCSDIR}"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
-	# create the files upload directory
-	mkdir "${D}/${MY_HTDOCSDIR}"/files
+	dodir "${MY_HTDOCSDIR}"/files
 	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
 	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
 
 	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
diff --git a/www-apps/drupal/drupal-6.0.ebuild b/www-apps/drupal/drupal-6.0.ebuild
index d40c2ab1333d..86abd777b852 100644
--- a/www-apps/drupal/drupal-6.0.ebuild
+++ b/www-apps/drupal/drupal-6.0.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/drupal/drupal-6.0.ebuild,v 1.2 2008/02/15 09:22:34 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.0.ebuild,v 1.3 2008/04/03 10:16:36 hollow Exp $
 
 inherit webapp eutils depend.php
 
@@ -14,9 +14,18 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="virtual/httpd-cgi"
-
-need_php
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]] ; then
+		require_php_with_use expat
+	else
+		require_php_with_use xml
+	fi
+}
 
 src_install() {
 	webapp_src_preinst
@@ -25,14 +34,10 @@ src_install() {
 	dodoc ${docs}
 	rm -f ${docs} INSTALL
 
-	einfo "Copying main files"
-	cp -r . "${D}/${MY_HTDOCSDIR}"
-
-	# we install the .htaccess file to enable support for clean URLs
-	cp .htaccess "${D}/${MY_HTDOCSDIR}"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
-	# create the files upload directory
-	mkdir "${D}/${MY_HTDOCSDIR}"/files
+	dodir "${MY_HTDOCSDIR}"/files
 	webapp_serverowned "${MY_HTDOCSDIR}"/files
 	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
 	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/default.settings.php
diff --git a/www-apps/drupal/drupal-6.1.ebuild b/www-apps/drupal/drupal-6.1.ebuild
index c26ab576effa..f8a29d34f3dd 100644
--- a/www-apps/drupal/drupal-6.1.ebuild
+++ b/www-apps/drupal/drupal-6.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/drupal/drupal-6.1.ebuild,v 1.1 2008/03/01 17:05:19 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.1.ebuild,v 1.2 2008/04/03 10:16:36 hollow Exp $
 
 inherit webapp eutils depend.php
 
@@ -17,6 +17,16 @@ IUSE=""
 need_httpd_cgi
 need_php_httpd
 
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]] ; then
+		require_php_with_use expat
+	else
+		require_php_with_use xml
+	fi
+}
+
 src_install() {
 	webapp_src_preinst