Version bump to address DRUPAL-SA-CORE-2014-006.

Drop affected versions.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

4 files changed, 38 insertions, 34 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 48f8ed17cc1d..7db684398103 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.109 2014/10/17 13:02:55 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.110 2014/11/20 11:45:49 jmbsvicetto Exp $
+
+*drupal-6.34 (20 Nov 2014)
+*drupal-7.34 (20 Nov 2014)
+
+  20 Nov 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +drupal-6.34.ebuild, +drupal-7.34.ebuild, -drupal-6.33.ebuild,
+  -drupal-7.32.ebuild:
+  Version bump to address DRUPAL-SA-CORE-2014-006. Drop affected versions.
 
 *drupal-7.32 (17 Oct 2014)
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 6ee166c39edd..bf6f154901f0 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -2,26 +2,26 @@
 Hash: SHA256
 
 AUX postinstall-en.txt 830 SHA256 ff1b9004e65d7a46a7d94b23e2ea90563d5703f2afb45b9dec6ff7e750e788dc SHA512 1d753f23faead95249d2a691da4187c7882400b308fbd2ab1c9b55ca109deb0f7f3e9414a9e6b59a74341706bc6d698745aecc38283c02e9daea555b9bc04bfc WHIRLPOOL 27c73d7dd50391fc2305ee08c138c316fea6b56458c375c317a455fd8ea43e32542a015c4911c48a93d912e1a875490e8d6523de312349c6d5d33506c68a661a
-DIST drupal-6.33.tar.gz 1103496 SHA256 952f9bd6b22058fe8f9c90c0ac96bd695a673306331269a79c7e19e38fd047eb SHA512 71c272800712493e33f05e58e58da1217c793a6158a84613f7443ee97b2df09cc977621cee353286836513c5f6355187d4eb11f28e8913b58434291f52eae8ee WHIRLPOOL 86fe2eb608c1d43ad83d4b253762d5f82ae9b6f4dd8282bdad34e7fe584bab0d9bdfddbb78dd373c733a85934f00282ec36b3d05d2992dc168f6fce828715d95
-DIST drupal-7.32.tar.gz 3215563 SHA256 f36d5ab0891997bf3c681b76151c6b015b0bb9041610e1c9af7d17e28dc15c39 SHA512 8d2b2f9cf525a3f0c5fb843d7c0cc70fbb8a5c1f60d898dd74d848b4d0f29eb70b2163b81db0fbb1d24e91d2fb6d58e34d2d6bde37175331855312d4e2b2481a WHIRLPOOL c968fdbcdcc1076b91952dc71385cdbd4e831f2f2c080a9c6ea4b22b33157018dd2bdf02909579ffabe0e98b6635d9614b68d772932a616cb708c8516850bde1
-EBUILD drupal-6.33.ebuild 1591 SHA256 abc73a0eba7862df24f5af12e298d4aa64a671670c7393877eea0ad1a83baaf1 SHA512 70babcd7980838d3e8d8322fb2a07101772e2e1343f9e0fa0cc115082a3f148032884920831eedae9e663ff539045087ae3b9f6313a36ff55bf4301ae41cab4e WHIRLPOOL e00767d2f2411b57919658dd0d9f9af243c24b9cbc486ff1cbd69449827c75afb13151c8d40008ff848ab625ae0e61df1603349d381e929629567283772b3e85
-EBUILD drupal-7.32.ebuild 1994 SHA256 29b70f03ff51535d7832020ac62ea19f8effeff4db127ef14083da5475db7cda SHA512 952b2d2441803d4e58362e80c26e35fd64d3d01de5b1d01066de5eb1d3f4b810866aa50af2230dc40ad67e2dcf009793068efd4bb622e5f90ff248deb33351d0 WHIRLPOOL d1b5e2855cc8f82e48434e534e9494cd8674b268fdce794630f9da206e07717da34d3a51e6d7d36802be9d47e390fed7d2c312b5f23d7f7137bf9c85d28739a0
-MISC ChangeLog 17664 SHA256 d753e7537a98b1a7c240bd3f83079bbec2d83a3f0a40c480a9ea07dfc24cf7fa SHA512 d73f312d2c8216e3cf796e7abffb6dab701c957e1fb6ab01e8a726ee61799dfbae9ff5c1314e40072943389b30e8778fe774f4fb8dc326ed7dd9a04d90a82531 WHIRLPOOL 89c65d57155c5e88d348c99036f876853aa10ce14a7ac4b66d1aa625e358bf3f41c31e794a42aa1000251d246042d33973fb991533606123b7d7921d43d89864
+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
+EBUILD drupal-6.34.ebuild 1604 SHA256 f9dbfae5a1f80c3b02cae0570d0f9f9bd63d78945e7de239b04d8ce54d397fda SHA512 3f20c85dbe4ce2d3f0cdeba902a9d7044dbf2525b34e909d19a097df061e9b266baaf643b7776360640362bc2502ef978c659a693a0636c6bcfc7244a0b7fdd3 WHIRLPOOL ce2401c66569dc94a6a6e145910e8e5ff643e55fbb9d81d3a220b18e47c574410dd97a28e499f91771ee53ad7b5cd3670692c59881ad914f8d41c5e0701df85e
+EBUILD drupal-7.34.ebuild 1877 SHA256 70380ee8d1676d4970a3c01acd2f5a525cb2f4739520523c1e72ded82799128f SHA512 5e545ecbea85f898485ddb547dc51eed5f208a8844ca1a59199c6e5609647f7a0841308b6f1a742900d04b7cdc042f7e4e2c50e98c95bbb38e3daac99ce2e5ec WHIRLPOOL d3de5ed4a5a62593ffe65879d40c5f290adec760f7ead3b08f0652b4f224690c7746a71895070824e0f76df4aa9fcf311c4f510767dfa925df015f10a7719b37
+MISC ChangeLog 17950 SHA256 c9206ff1b096ce4ae1e8a2bf8bbda31f164036268234db0b46cc342d2cf5acf2 SHA512 40ee174e579ca4fe0cd0d4474a0030d49e89b6ffa82db7e8c15e5827b4704d3cfe9c6e0783373b52858002cab9cdbdf3bed8549c53918de83e04b3f98392a711 WHIRLPOOL f0221e5bc782cb6a9e9d2d2f30ed7ca61216137637c5a4d8d520c417189d98a2b42d407a76508e3b959c99c55d3644ab5db434558ec38994b9b8f95c4cab6bd3
 MISC metadata.xml 334 SHA256 b1d825183ede1df66432e5d9cbc1f0f227d4c238ae1262c3cf492810d3ba5ce2 SHA512 1579decab2343f47cc16d738f45e6152b4f8567f6e0f53e05c587c126d1c05c94ecbbb1bc9aaaf6885bdb53b3bccedc0f63d125e3c245465c24a12a216bd4730 WHIRLPOOL a6446b0fcf9824990c48b511889a402e39f3edd5d9d7d8c58d574abd5435db1b5b4006407340589073e79f50a85d55c90ce1059a2944566cfe9901607adfecae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUQRJWAAoJEC8ZTXQF1qEPUbAP/0DFoilTugy/VFgWJfIy9LhY
-E9ek7cm+bfm8GwJ9k0QRlAtmVISDZJj684LA9pkcLTiY7eX5jcbLGzMHWLHd4CbI
-5x7wHgWs5PYbed8UtSqYBKy7DSie8pMlAvGUILcBcM/MyjxZJz9Vku0KoRUYmpch
-2m+5uVFwn3bqjaJFrxMlFsFd6RWGDjih+STTr8627T8onR1TnYbAthoVeXu5X2pU
-bIv2hJnvFPrOXOz3yqomx0yj9gwoZHwiZ72t4DlMVRW80AbVIYcNgowrK85FjRso
-+RmOOUKrz6tfHdrFZH/yfh51xshll12aiMW1+ZILQvpDj9C63QG8Se8jEiNlAnY5
-nFLnUic0JxhR0OU8SIejNUJ/PAA6eUS5SQj6nnHeKuK2IersBFmWRD7mFs2qnqLA
-XhmcsAU65OtIMiycbLMTDiK8cIpc+OZ3QOedf8O/TH2V5EfVu8BrOpPMPbYDCy2H
-1nsaiQpEF7tWV6Tvn/73ZteQG0MFV9q7qSgzH2n4YP0mb5KFop3+kpy60LUy8OF2
-YnV8eH/auolry+SP7x6CQIEppXP39/BxbOfJjdPnRSShXF6vMuWb07p2iUR4CdW4
-iCfzoa0PRDWgI4onKFXLZw4HPjjOURwMOw6VD9OulZUGcotO6G4UGpapW4h5G7rA
-0kBny5IiLQkibBqnYozG
-=SU5y
+iQIcBAEBCAAGBQJUbdMeAAoJEC8ZTXQF1qEPhpEQALYAWXbM+v1Un8oRx1alLkM2
+P6Mo1IJ6mplNqsHe4elMTyUPwcR5vO9D3wm6LCnJuBkMWqHtB6Q50UHJ7fKKTQIo
+g89MtfdVtl7FwY68bRlbOcuv38D750BGRXwEGqXIgW//DvoOO8jJWjncrmGfpeRY
+xoF9YaO2DwCwyRlfsbv58VUKgRbWlTgcKH9xzImRiyJj1HEwHH/r0VXNu3OjSn9G
+9R0Z7tkp8pDreiqCXOvxp7ezpZz2qkX4Kpup5ZyKkFeSCc0LjKstOZzFx2ttDU0L
+gbDGa/joGiQtbpmsv1Zjic7Bfl4vqInu8MgcAVitKH0IpmQTEw1kOm8iAirEbDOz
+jF+72Bmf0ht7sbDQC9qCKlXRGc3IXjHKQT7tkF4ES0d4enkIECN4gPm2RxMuPBga
+CN/UFHqJ3zIDwux9crTJp2tJWs8RwcGX6uX/HofGI3ZkVXxWc3lSwCl9SCDZQh3N
+mLkB1Ai5Fc1M60gJu+zknJBG2hVVj1S+pN7ZyMPk4d+alsv2zIXrbTH4/anyA/uQ
+LRQrZFqgHXqn9Rmv177RXXUuSxVkdpn2TWgEtL/IVXPs5F6wXPG5VX9HBGF+u9Mr
+vq+aaRLDp/pplyhYzU6jM2Ljpc8L59YPG4xqU+W0RsdfsSw1HY1f0daz5tarTKV4
+9IhFQV2gGTcvFhMTfceC
+=9ZDN
 -----END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-6.33.ebuild b/www-apps/drupal/drupal-6.34.ebuild
index dd8529f5826e..14ef0658631d 100644
--- a/www-apps/drupal/drupal-6.33.ebuild
+++ b/www-apps/drupal/drupal-6.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.33.ebuild,v 1.1 2014/08/14 12:59:01 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.34.ebuild,v 1.1 2014/11/20 11:45:49 jmbsvicetto Exp $
 
 EAPI=5
 
@@ -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.32.ebuild b/www-apps/drupal/drupal-7.34.ebuild
index 7d6d74258bd7..5965a6e62db1 100644
--- a/www-apps/drupal/drupal-7.32.ebuild
+++ b/www-apps/drupal/drupal-7.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.32.ebuild,v 1.1 2014/10/17 13:02:55 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.34.ebuild,v 1.1 2014/11/20 11:45:49 jmbsvicetto Exp $
 
 EAPI=5
 
@@ -21,12 +21,7 @@ RDEPEND="
 	virtual/httpd-php
 	accelerator? ( ||
 		(
-			(
-				<dev-lang/php-5.5
-				dev-php/pecl-apc
-			)
 			dev-php/xcache
-			dev-php/eaccelerator
 			(
 				>=dev-lang/php-5.5[opcache]
 				dev-php/pecl-apcu
@@ -40,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