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

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

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

Version bump to address DRUPAL-SA-CORE-2014-006.
Drop support for old cache ebuilds that were removed from the tree.

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

---
 www-apps/drupal/Manifest                           |  3 +-
 www-apps/drupal/drupal-7.32.ebuild                 | 85 ----------------------
 .../{drupal-7.31.ebuild => drupal-7.34.ebuild}     |  5 --
 3 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index c41371b..0e1501b 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,3 +1,2 @@
 DIST drupal-6.33.tar.gz 1103496 SHA256 952f9bd6b22058fe8f9c90c0ac96bd695a673306331269a79c7e19e38fd047eb SHA512 71c272800712493e33f05e58e58da1217c793a6158a84613f7443ee97b2df09cc977621cee353286836513c5f6355187d4eb11f28e8913b58434291f52eae8ee WHIRLPOOL 86fe2eb608c1d43ad83d4b253762d5f82ae9b6f4dd8282bdad34e7fe584bab0d9bdfddbb78dd373c733a85934f00282ec36b3d05d2992dc168f6fce828715d95
-DIST drupal-7.31.tar.gz 3216766 SHA256 6af4849fd2e1fd0a186a5264de10613e57b84c69dbe7dec0754472d27f37af40 SHA512 51cd83974d376714f278e1263b8835163d4528c3ba96f5a134b1e1db5d2145e8bc043561de667b7348152f123ef9ce9ef9b109dfc561b5256ad1a56f0b99ee0d WHIRLPOOL da110bfbfcc723d62e53604c46f688be7e5257a70f45abde249126da1b6593a0e42a2f303b0d8f097272a278d7183059feff1148c71963e75a50efa08269a08f
-DIST drupal-7.32.tar.gz 3215563 SHA256 f36d5ab0891997bf3c681b76151c6b015b0bb9041610e1c9af7d17e28dc15c39 SHA512 8d2b2f9cf525a3f0c5fb843d7c0cc70fbb8a5c1f60d898dd74d848b4d0f29eb70b2163b81db0fbb1d24e91d2fb6d58e34d2d6bde37175331855312d4e2b2481a WHIRLPOOL c968fdbcdcc1076b91952dc71385cdbd4e831f2f2c080a9c6ea4b22b33157018dd2bdf02909579ffabe0e98b6635d9614b68d772932a616cb708c8516850bde1
+DIST drupal-7.34.tar.gz 3229858 SHA256 34268d4f2917ad1417725885fe4dad78dd2fecb7b5a27c73627746d2cb1cb3b6 SHA512 32bca5385ebb0485009c237491337691242064e6c754e271c1ba54e527c3c8577e8b161b69a8a6d02d3b1e908a14ac6d77d23623109731ee0dc167bc432d5882 WHIRLPOOL f3437f7993cfdebe1032c3c562cbb8a58e42b782299896f058a8c95cd26251cbe602c28b546b4dca315f4fe7ca9e8c33c6e5cac5c0d20f37610e28e0bf093453

diff --git a/www-apps/drupal/drupal-7.32.ebuild b/www-apps/drupal/drupal-7.32.ebuild
deleted file mode 100644
index 6e4e38a..0000000
--- a/www-apps/drupal/drupal-7.32.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.27.ebuild,v 1.1 2014/04/25 07:55:09 radhermit Exp $
-
-EAPI=5
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="http://drupal.org/"
-SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	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
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? (
-		|| (
-			dev-lang/php[sqlite]
-			dev-lang/php[sqlite3]
-		)
-	)
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
-	dodoc ${docs}
-	rm -f ${docs} INSTALL COPYRIGHT.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	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
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-}

diff --git a/www-apps/drupal/drupal-7.31.ebuild b/www-apps/drupal/drupal-7.34.ebuild
similarity index 96%
rename from www-apps/drupal/drupal-7.31.ebuild
rename to www-apps/drupal/drupal-7.34.ebuild
index 6e4e38a..45b596e 100644
--- a/www-apps/drupal/drupal-7.31.ebuild
+++ b/www-apps/drupal/drupal-7.34.ebuild
@@ -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