Bump drupal to release 7.23.

Make dependency on accelerator and uploadprogress optional.
Fixes bugs: 416897, 443736 and 475584.

(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key BB0E6E98)

3 files changed, 97 insertions, 2 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index b9693d6d3e23..26aaf92caa46 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.97 2013/04/06 10:03:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.98 2013/09/13 12:13:30 jmbsvicetto Exp $
+
+*drupal-7.23 (13 Sep 2013)
+
+  13 Sep 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +drupal-7.23.ebuild, metadata.xml:
+  Bump drupal to release 7.23. Make dependency on accelerator and uploadprogress
+  optional. Fixes bugs: 416897, 443736 and 475584.
 
   06 Apr 2013; Tim Harder <radhermit@gentoo.org> -drupal-7.20.ebuild,
   -drupal-7.21.ebuild:
diff --git a/www-apps/drupal/drupal-7.23.ebuild b/www-apps/drupal/drupal-7.23.ebuild
new file mode 100644
index 000000000000..00ec7fef1a3a
--- /dev/null
+++ b/www-apps/drupal/drupal-7.23.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.23.ebuild,v 1.1 2013/09/13 12:13:30 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,pdo,postgres?,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
+}
diff --git a/www-apps/drupal/metadata.xml b/www-apps/drupal/metadata.xml
index 794e56895482..318cc2f778a1 100644
--- a/www-apps/drupal/metadata.xml
+++ b/www-apps/drupal/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>web-apps</herd>
+<use>
+	<flag name='accelerator'>Add dependency on a php accelerator</flag>
+	<flag name='uploadprogress'>Install <pkg>dev-php/pecl-uploadprogress</pkg> package</flag>
+</use>
 </pkgmetadata>