[gentoo-commits] dev/jmbsvicetto:master commit in: www-apps/drupal/

[Jorge Manuel B. S. Vicetto]

commit:     1ee9ac47a001030187fd9a2e5da671c0b6eceb98
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo 
<DOT> org>
AuthorDate: Thu Nov 20 11:39:58 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Nov 20 11:39:58 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=1ee9ac47

Version bump to address DRUPAL-SA-CORE-2014-006 (6.34).
Revise sqlite dependency (7.34) and improve dep style (6.34).

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> 
gentoo.org>

---
 www-apps/drupal/Manifest                                   |  2 +-
 www-apps/drupal/{drupal-6.33.ebuild => drupal-6.34.ebuild} | 10 ++++++++--
 www-apps/drupal/drupal-7.34.ebuild                         |  7 +------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 0e1501b..17c5e67 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,2 +1,2 @@
-DIST drupal-6.33.tar.gz 1103496 SHA256 
952f9bd6b22058fe8f9c90c0ac96bd695a673306331269a79c7e19e38fd047eb SHA512 
71c272800712493e33f05e58e58da1217c793a6158a84613f7443ee97b2df09cc977621cee353286836513c5f6355187d4eb11f28e8913b58434291f52eae8ee
 WHIRLPOOL 
86fe2eb608c1d43ad83d4b253762d5f82ae9b6f4dd8282bdad34e7fe584bab0d9bdfddbb78dd373c733a85934f00282ec36b3d05d2992dc168f6fce828715d95
+DIST drupal-6.34.tar.gz 1110352 SHA256 
fea34acdc9a1fbe086151df086efc26dd2d5168b8a8ca79d50543d5b83729994 SHA512 
3cc193df9d808cfab2262b65e2cd147483267fbb5d4af723ed132d15ae070498e928707cbe99c986cf64deb0a8b011da675d1c0bd67008b3b6de7e2e97c0cd4d
 WHIRLPOOL 
8e044b112a7aa4ba6d7d4cc9e0d2ce4fa5bc9e9b699a7bb87a37b632bbc96a51281b267b559cf4001209b660b608277149c89735ba5ffd4232065723be268685
 DIST drupal-7.34.tar.gz 3229858 SHA256 
34268d4f2917ad1417725885fe4dad78dd2fecb7b5a27c73627746d2cb1cb3b6 SHA512 
32bca5385ebb0485009c237491337691242064e6c754e271c1ba54e527c3c8577e8b161b69a8a6d02d3b1e908a14ac6d77d23623109731ee0dc167bc432d5882
 WHIRLPOOL 
f3437f7993cfdebe1032c3c562cbb8a58e42b782299896f058a8c95cd26251cbe602c28b546b4dca315f4fe7ca9e8c33c6e5cac5c0d20f37610e28e0bf093453

diff --git a/www-apps/drupal/drupal-6.33.ebuild 
b/www-apps/drupal/drupal-6.34.ebuild
similarity index 93%
rename from www-apps/drupal/drupal-6.33.ebuild
rename to www-apps/drupal/drupal-6.34.ebuild
index 2966ac1..b440e8b 100644
--- a/www-apps/drupal/drupal-6.33.ebuild
+++ b/www-apps/drupal/drupal-6.34.ebuild
@@ -16,9 +16,15 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="+mysql postgres"
 
-RDEPEND="virtual/httpd-php
+RDEPEND="
        dev-lang/php[gd,pdo,postgres?,xml]
-       mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )"
+       virtual/httpd-php
+       mysql? (
+               || (
+                       dev-lang/php[mysql]
+                       dev-lang/php[mysqli]
+               )
+       )"
 
 need_httpd_cgi
 

diff --git a/www-apps/drupal/drupal-7.34.ebuild 
b/www-apps/drupal/drupal-7.34.ebuild
index 45b596e..2127bf6 100644
--- a/www-apps/drupal/drupal-7.34.ebuild
+++ b/www-apps/drupal/drupal-7.34.ebuild
@@ -35,12 +35,7 @@ RDEPEND="
                        dev-lang/php[mysqli]
                )
        )
-       sqlite? (
-               || (
-                       dev-lang/php[sqlite]
-                       dev-lang/php[sqlite3]
-               )
-       )
+       sqlite? ( dev-lang/php[sqlite] )
 "
 
 need_httpd_cgi