Update php use flag dependencies.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 21 insertions, 18 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index d42715d88855..9bed012f6227 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.79 2012/03/03 10:15:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.80 2012/03/03 10:20:04 radhermit Exp $
+
+  03 Mar 2012; Tim Harder <radhermit@gentoo.org> drupal-6.24.ebuild,
+  drupal-7.12.ebuild:
+  Update php use flag dependencies.
 
   03 Mar 2012; Tim Harder <radhermit@gentoo.org> -drupal-5.23.ebuild,
   -drupal-6.22.ebuild, -drupal-7.10.ebuild:
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 6649db2b1818..a72a82b0a0cb 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -4,18 +4,18 @@ Hash: SHA512
 AUX postinstall-en.txt 830 RMD160 4997cbee7b19d60dd0c36f2b5060f0526221fe1a SHA1 1474f5012ddcbf49a6e624de50562d6988d8dd43 SHA256 ff1b9004e65d7a46a7d94b23e2ea90563d5703f2afb45b9dec6ff7e750e788dc
 DIST drupal-6.24.tar.gz 1104440 RMD160 9fbb8f061c51c4b1532c64ba70a56ce5e456a109 SHA1 aadbac0691fe56ea4e0c7dc7dc85ac17c622d52d SHA256 cc9c08a7625565a059a2f7f37676636d84d968221d4a6d24368163ee50a5115d
 DIST drupal-7.12.tar.gz 3088472 RMD160 12afe461a68d4ec59921395cdbea0c5cceb79767 SHA1 aa0c85f2c384c9e6e7e1289d171afdf360bbf376 SHA256 e08702b7dd963e951796da3371124ca7f8b1b13af1026f014d10d74f522bf9dd
-EBUILD drupal-6.24.ebuild 1625 RMD160 5d8d0b984c440c779a83b18f929fa213e776fa3e SHA1 064d7ea66966acbda854f0ea98126a047d33e6df SHA256 648f8fbe5f47b7547e6e52581f0c420072e19ae3453c124d406ef11329d05ebf
-EBUILD drupal-7.12.ebuild 1666 RMD160 71c765df4ef7c3ac0ede6e57878a3043cd15b3d1 SHA1 011cb2ba2b0503ce61e3dc12de093dc532ab8356 SHA256 ec2ef3cfd15cb1dd4e99ae57873796d6c436e8f6caf88a7efba126369cb9cbee
-MISC ChangeLog 12836 RMD160 64bf7277033646130ba1ad259a2ab1f15288d257 SHA1 e2e24f4a55235a92f42dbd6299b93d9b36fe14af SHA256 6a1d123db7adb356a984bca1ea8ebc7b56c09c33c75d3d4c12644ac6d6712c52
+EBUILD drupal-6.24.ebuild 1577 RMD160 0ce30d6c919c1eeaa3b27ae7dba2ee1faad2e94d SHA1 224a6bcd37ea933ffea80926d61b9664ab7100b5 SHA256 d345037c7e0133f82ab31f7ef6f3679e8f32fc2eec2bcb3dbcb2b64e81ef1f73
+EBUILD drupal-7.12.ebuild 1645 RMD160 c13607e8fab95004cf638891f5bef4f1504d9182 SHA1 e26ebe8224d04b3d5209e3d44a82eb37f043de21 SHA256 b496f18675b733f6621923be4406c443ae34013ba84dea42fbb17f72ff22e744
+MISC ChangeLog 12964 RMD160 c3cd515f9858d61dc2d971377573c18a04cb4003 SHA1 0835fc9629cff5daeedf1e277fc4df28579aac22 SHA256 1083cdd3857fa30471ec23680f557942ccaa24518a10fe7ce3a07380b9578c17
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPUe9TAAoJEEqz6FtPBkyj5hQIALDJSmazSlimgzjGhV0rbDCE
-VcgUEilndORhwUtE83tqI8D8Uh6KTdi0+sVwX/DQI0Q9XXEr24u19u7YL3JPF1o0
-nn4A7su3RDme2piMlihyo64YvEA+yAt1ze/D/xl2v+raNq9m8SfDWvC78qaGlgfl
-eKhnbR054z/Wa7Mc6oKV0ugksD8IfEaIYAJuBjwZU4GPwidDEOVJjjhNAJ7JhpUd
-NFrH1opFqUJpRMfgvct5DwUvD2vBF3+IzwzODKtYkMdqYoSsWFsLMuItrpErrb6J
-LRnYS39Y87iKm5VM0YATerhW8bUQ7xF6JHKA5RbOgbE3rxiaoE5rVorcowokdhY=
-=AUQE
+iQEcBAEBCgAGBQJPUfBaAAoJEEqz6FtPBkyjfmQH/A/hzZIsfYgp3hef8mT6Gh0a
+7zRD7ZejpZW+ofzb84e6OT0Kc1vOvzgV46EhKD2NjpWWJaG3Ahqkhe56IASkRCME
+Lr2fb+QCIBPOcMpH8HunRsNsYytgxsj4JXWRnDlkTIwFD6UIAeAhpbzVXFscjr3b
+q/y5b80QVFamuXv4vvewNTVUVbD9PGMP51UM+ki6Kg+VlPpqYuKyArlEnvLkH6On
+UcKXTrZwduX+jNJs/bF0TwZ0XABbgecHpdzJ7yHlxw6TkBWesEyIHHjxBWsk10Mu
+Kbj4pThI3Vwu/5We8E7DTqppPl2zRNBatPS2jSrLNxY6q28qY/QXe3PwFlolwRA=
+=Vo0E
 -----END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-6.24.ebuild b/www-apps/drupal/drupal-6.24.ebuild
index d3e9593b3fbd..7a9b1d7ac4e9 100644
--- a/www-apps/drupal/drupal-6.24.ebuild
+++ b/www-apps/drupal/drupal-6.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.24.ebuild,v 1.1 2012/02/05 05:53:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.24.ebuild,v 1.2 2012/03/03 10:20:04 radhermit Exp $
 
 EAPI=4
 
@@ -17,9 +17,8 @@ KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="+mysql postgres"
 
 RDEPEND="virtual/httpd-php
-	dev-lang/php[pdo,postgres?,xml]
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	|| ( dev-lang/php[gd] dev-lang/php[gd-external] )"
+	dev-lang/php[gd,pdo,postgres?,xml]
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )"
 
 need_httpd_cgi
 
diff --git a/www-apps/drupal/drupal-7.12.ebuild b/www-apps/drupal/drupal-7.12.ebuild
index 276a348ff903..db61bd7e0725 100644
--- a/www-apps/drupal/drupal-7.12.ebuild
+++ b/www-apps/drupal/drupal-7.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.12.ebuild,v 1.1 2012/02/05 05:53:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.12.ebuild,v 1.2 2012/03/03 10:20:04 radhermit Exp $
 
 EAPI=4
 
@@ -17,9 +17,9 @@ KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="+mysql postgres sqlite"
 
 RDEPEND="virtual/httpd-php
-	dev-lang/php[pdo,postgres?,sqlite?,xml]
+	dev-lang/php[gd,pdo,postgres?,xml]
 	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	|| ( dev-lang/php[gd] dev-lang/php[gd-external] )"
+	sqlite? ( dev-lang/php[sqlite3] )"
 
 need_httpd_cgi