Bump drupal to the 7.24 release - fixes bug 491858.

Adjust php deps - bug 479830.

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 95 insertions, 3 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 26aaf92caa46..a539c40b5136 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.98 2013/09/13 12:13:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.99 2013/11/29 18:42:01 jmbsvicetto Exp $
+
+*drupal-7.24 (29 Nov 2013)
+
+  29 Nov 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +drupal-7.24.ebuild, drupal-7.23.ebuild:
+  Bump drupal to the 7.24 release - fixes bug 491858. Adjust php deps - bug
+  479830.
 
 *drupal-7.23 (13 Sep 2013)
 
diff --git a/www-apps/drupal/drupal-7.23.ebuild b/www-apps/drupal/drupal-7.23.ebuild
index 00ec7fef1a3a..7d4a3376ecdd 100644
--- a/www-apps/drupal/drupal-7.23.ebuild
+++ b/www-apps/drupal/drupal-7.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.23.ebuild,v 1.1 2013/09/13 12:13:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.23.ebuild,v 1.2 2013/11/29 18:42:01 jmbsvicetto Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
 
 RDEPEND="
-	dev-lang/php[gd,pdo,postgres?,xml]
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
 	virtual/httpd-php
 	accelerator? ( ||
 		(
diff --git a/www-apps/drupal/drupal-7.24.ebuild b/www-apps/drupal/drupal-7.24.ebuild
new file mode 100644
index 000000000000..5befcb965ba8
--- /dev/null
+++ b/www-apps/drupal/drupal-7.24.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.24.ebuild,v 1.1 2013/11/29 18:42:01 jmbsvicetto 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
+
+	cp sites/default/{default.settings.php,settings.php}
+	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() {
+	ewarn
+	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}"
+	ewarn
+}