fix #213061

Package-Manager: portage-2.1.4.4

5 files changed, 57 insertions, 32 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/Manifest b/www-apps/drupal/Manifest
index 8285bc23ce62..b1380ba75e40 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -5,15 +5,15 @@ AUX postinstall-en.txt 501 RMD160 c5e116848f3c1dc5b51d2f3b81911f5569119f2e SHA1
 DIST drupal-5.6.tar.gz 754408 RMD160 edce977bcd679d61495f2869c0e1b9f07afed838 SHA1 84d6d3ffa41696fb7c0733a519d8e1539fa342a0 SHA256 bea975adf1b46bb684c359ca9c0f343fbc28d21e8f9ac872334e0f1377e54b6c
 DIST drupal-6.0.tar.gz 1057166 RMD160 b85788625e5651fcfb2265ccc6968d3f53aa2782 SHA1 3fbb61295fc397a30592be72e369ea7367aae0ca SHA256 aff01e8e36e0260e46bd59c55ed70152f0a081c04027420f5ec28bdbf0268dc1
 DIST drupal-6.1.tar.gz 1057213 RMD160 cbc8a6f022c713b899d804abb55bbd37daee3c48 SHA1 81faeb3beecaa8cc4ee1f441d40a283268e150eb SHA256 9b4ac194ef961ee8b0efd6819fcb4880d66808687a1335f59323c4b1ec580ce8
-EBUILD drupal-5.6.ebuild 1213 RMD160 9cb635f08389311500774027858b63da479f283a SHA1 6f59a24d67c375880ec436e5848bee29cfb50d14 SHA256 bb348aff389468b7e2e3c6f1f423d363ab3626c0b490ea2b326f3e2a03be3417
-EBUILD drupal-6.0.ebuild 1281 RMD160 bcdbfadb0b581d6d61adb5619255dba99538ba40 SHA1 54e32d85ef0fdaa8522c9221b2025deb1bbe912e SHA256 8c4b1cb1e6c8b06c1f1c6444be16086ed47a2e77ced3204484107cc7785277ae
-EBUILD drupal-6.1.ebuild 1106 RMD160 d233109d809b47d16ad6cd588c32944aa04be412 SHA1 b3d404b6c275b633a3c49db735531b315dc4a18b SHA256 59388754e5c8d7c579c9dcfa0896a20ce83468565c801e69c969271cd19e0ccc
-MISC ChangeLog 5851 RMD160 39378adbe43e3e1cbe70aaf491ff14bf2f81ef6d SHA1 575efad0a9bf6dc6d7673afac587216ab853cb5e SHA256 de8b4bc66dcdd752bdb4eb8282ec3887be32590f19125aaa9104cbc455e1c66f
+EBUILD drupal-5.6.ebuild 1239 RMD160 7be03807cc73dc49b14afa812a2d2ce1d8ce3a39 SHA1 2d8bffffe90ab3e1b94310aef79b4c5ff1915a25 SHA256 a3ad8cf5ff76033e2277a00fbbe7ecf8739c44f68c19692323f870f575b1d94c
+EBUILD drupal-6.0.ebuild 1255 RMD160 de23b4c845b2ae62ed1840606046371bae1c68ac SHA1 4cc6f8eb8bbbac872e98aa23ee4c7300164b0eb7 SHA256 38661f89fd9a8977701ad43e5b3cc46ce6fd96d4844e3abff75d9c781ad699cf
+EBUILD drupal-6.1.ebuild 1255 RMD160 b1726bb6a8466a36be0173032a91d214d2c88214 SHA1 a1c3d14ee25317aff109711832b5f7d78d4fb44d SHA256 fc6da01ebac55c14d3176e3137bda6142e0745eda8bcc7d0591e6b2b366fa721
+MISC ChangeLog 5975 RMD160 d46aad77ea33b6a086987e471a42d0ad55cb6198 SHA1 d05cee14a73ce90d950e850c39de9ba2bfa8a2a4 SHA256 23da7edadaf630dd31dd5dd83168d381af3572f20cdbd63116d7b04b54f28196
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfJjNkACgkQmPFBzbX68WHIxgCfWyCM/TXFjaQ8ypgO0lqcglUB
-55oAni7+9D7vwGsPp60EQ/VCbwcvbvB2
-=8AXO
+iD8DBQFH9K6OmPFBzbX68WERAmQCAJ9r5yvvpfr905eRuXceL364cem5VgCdGBzI
+TPfYbT60e9JwaslYhW38mro=
+=GTUZ
 -----END PGP SIGNATURE-----
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