[www-apps/drupal] Version bump per bug #349000 #348476

(Portage version: 2.2.0_alpha9_p4/cvs/Linux x86_64)

3 files changed, 75 insertions, 2 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index e1acd5f857ba..c737164a9098 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.66 2010/08/16 18:04:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.67 2010/12/19 22:09:02 alexxy Exp $
+
+*drupal-7.0_rc2 (19 Dec 2010)
+*drupal-6.20 (19 Dec 2010)
+
+  19 Dec 2010; Alexey Shvetsov <alexxy@gentoo.org> -drupal-6.19.ebuild,
+  +drupal-6.20.ebuild, +drupal-7.0_rc2.ebuild:
+  Version bump per bug #349000 #348476
 
 *drupal-6.19 (16 Aug 2010)
 *drupal-5.23 (16 Aug 2010)
diff --git a/www-apps/drupal/drupal-6.19.ebuild b/www-apps/drupal/drupal-6.20.ebuild
index 770d2df99567..31b223652241 100644
--- a/www-apps/drupal/drupal-6.19.ebuild
+++ b/www-apps/drupal/drupal-6.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.19.ebuild,v 1.1 2010/08/16 18:04:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.20.ebuild,v 1.1 2010/12/19 22:09:02 alexxy Exp $
 
 inherit webapp eutils depend.php
 
diff --git a/www-apps/drupal/drupal-7.0_rc2.ebuild b/www-apps/drupal/drupal-7.0_rc2.ebuild
new file mode 100644
index 000000000000..2fe9b4a29f92
--- /dev/null
+++ b/www-apps/drupal/drupal-7.0_rc2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.0_rc2.ebuild,v 1.1 2010/12/19 22:09:02 alexxy Exp $
+
+inherit webapp eutils depend.php
+
+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=""
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}/${P/_/-}"
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]] ; then
+		local flags="expat"
+	else
+		local flags="xml"
+	fi
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} \
+		|| ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
+			die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external"
+	fi
+}
+
+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
+}