From 7002990f56ea0866de170aa418b9d3ef2629f14d Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <wrobel@gentoo.org>
Date: Fri, 15 Feb 2008 09:22:34 +0000
Subject: [PATCH] Correct the dependency on php. Package-Manager:
 portage-2.1.4_rc7

---
 www-apps/drupal/ChangeLog         |  6 +++++-
 www-apps/drupal/Manifest          | 12 ++++++------
 www-apps/drupal/drupal-5.6.ebuild |  9 +++++----
 www-apps/drupal/drupal-6.0.ebuild |  9 +++++----
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index acbb6f1357e4..07dcaffc8f49 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.41 2008/02/15 09:05:41 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.42 2008/02/15 09:22:34 wrobel Exp $
+
+  15 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org> drupal-5.6.ebuild,
+  drupal-6.0.ebuild:
+  Correct the dependency on php.
 
 *drupal-6.0 (15 Feb 2008)
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 7f7f56cc35b2..5bb054c37673 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX postinstall-en.txt 501 RMD160 c5e116848f3c1dc5b51d2f3b81911f5569119f2e SHA1 2dc808031b46939f115769f8f36f28eefb1e3d75 SHA256 83e41dae36c0d98540d0d4599eed0fc2ad6f1aa2815ca2454e5cb6307a9d3fcd
 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
-EBUILD drupal-5.6.ebuild 1212 RMD160 984b895594dd0c9532e951cb673234b64835a1d3 SHA1 e786f3aecd973b28ee47abadd6fed7c30bfa5d4e SHA256 34710269e8b64a83580f271a3533d2ec7e6c4286e619558fe8a4ca0bb48029d2
-EBUILD drupal-6.0.ebuild 1280 RMD160 09a39348c14888d2277bac7710cbf183b5913fcf SHA1 309289f047dddcefb0e79e6595f1137f4130206c SHA256 379a9da2fa20b4a74092bd48c0c378033d9d423bf043014176d4c2e079026c8b
-MISC ChangeLog 5594 RMD160 3608ab4cb5b3a8d7fd5b0094e15f843e3237de01 SHA1 01ddbfc9ee735923cec72294152ab37e8fc1cc07 SHA256 28cbef7b932749c6b5af84df0371db141fce76e7e768e0c050c70b3acce2a9ff
+EBUILD drupal-5.6.ebuild 1213 RMD160 9cb635f08389311500774027858b63da479f283a SHA1 6f59a24d67c375880ec436e5848bee29cfb50d14 SHA256 bb348aff389468b7e2e3c6f1f423d363ab3626c0b490ea2b326f3e2a03be3417
+EBUILD drupal-6.0.ebuild 1281 RMD160 bcdbfadb0b581d6d61adb5619255dba99538ba40 SHA1 54e32d85ef0fdaa8522c9221b2025deb1bbe912e SHA256 8c4b1cb1e6c8b06c1f1c6444be16086ed47a2e77ced3204484107cc7785277ae
+MISC ChangeLog 5717 RMD160 0547316ee73b366f6ab24a1b2ad0c5936d6ed8db SHA1 24d0d3a6be6da48e43b3efce9a930f9c7a791174 SHA256 ae8afa08b768178ee21294ccaeb49809f76fae6146f1649b2ed38622281924e7
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHtVXrEEcxCpcDQ74RAmoeAJ9lFjHn3qPsR8E6EJFU/fDsdJnUaACeMvO0
-7Q7D7kDFymyA2XlEc7XjuDg=
-=qQOq
+iD8DBQFHtVngEEcxCpcDQ74RAkpdAJkBp4Yo2QG46Os7MVvc+gLKNI+x8gCfedTj
+QItB4vRKORV/gRTe2YnQKNs=
+=flGj
 -----END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-5.6.ebuild b/www-apps/drupal/drupal-5.6.ebuild
index c2a57bd7371e..08ff63d26082 100644
--- a/www-apps/drupal/drupal-5.6.ebuild
+++ b/www-apps/drupal/drupal-5.6.ebuild
@@ -1,8 +1,8 @@
 # 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.1 2008/01/17 09:21:10 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.6.ebuild,v 1.2 2008/02/15 09:22:34 wrobel Exp $
 
-inherit webapp eutils
+inherit webapp eutils depend.php
 
 MY_PV=${PV:0:3}.0
 
@@ -14,8 +14,9 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="virtual/httpd-php
-	 virtual/httpd-cgi"
+RDEPEND="virtual/httpd-cgi"
+
+need_php
 
 src_install() {
 	webapp_src_preinst
diff --git a/www-apps/drupal/drupal-6.0.ebuild b/www-apps/drupal/drupal-6.0.ebuild
index c5b67ec7b2bf..d40c2ab1333d 100644
--- a/www-apps/drupal/drupal-6.0.ebuild
+++ b/www-apps/drupal/drupal-6.0.ebuild
@@ -1,8 +1,8 @@
 # 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.1 2008/02/15 09:05:41 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.0.ebuild,v 1.2 2008/02/15 09:22:34 wrobel Exp $
 
-inherit webapp eutils
+inherit webapp eutils depend.php
 
 MY_PV=${PV:0:3}.0
 
@@ -14,8 +14,9 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="virtual/httpd-php
-	 virtual/httpd-cgi"
+RDEPEND="virtual/httpd-cgi"
+
+need_php
 
 src_install() {
 	webapp_src_preinst
-- 
2.26.2