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

Package-Manager: portage-2.2.0_alpha9_p4/cvs/Linux x86_64

4 files changed, 93 insertions, 18 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/Manifest b/www-apps/drupal/Manifest
index 404d371fbaf2..605784710f90 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 AUX postinstall-en.txt 830 RMD160 4997cbee7b19d60dd0c36f2b5060f0526221fe1a SHA1 1474f5012ddcbf49a6e624de50562d6988d8dd43 SHA256 ff1b9004e65d7a46a7d94b23e2ea90563d5703f2afb45b9dec6ff7e750e788dc
 DIST drupal-5.23.tar.gz 768263 RMD160 3ef5e809d522efc7c91c2cfae564c3e6af3525b4 SHA1 9b70b5822a34d6ec9b97214675b1443c265ef481 SHA256 c7590400ebb2fff6e6cbee512a514cf0d9cb875940ce916e2cffeab606e06762
-DIST drupal-6.19.tar.gz 1095592 RMD160 f06780d45196a6aa2de04c5356adacafe27107c3 SHA1 60862b5c57e09feef850bdd427ff3a8bcdf8e002 SHA256 b2067b18408321af8595715e2c1fb0e9f20c188b4276bb616c066ff6ab26ee88
+DIST drupal-6.20.tar.gz 1100246 RMD160 04f5f014f783bd508537ea0e838e3b8243e67b01 SHA1 948f26f7c52aade0f1d7ac7dd36f358b1afd4ef7 SHA256 8403a06c1887c0821a78da4af3a5d3cbff43773c22c5cc63542d89b645ba4d8b
+DIST drupal-7.0-rc2.tar.gz 2705734 RMD160 9f7113e61a9bb4cd442c99d30b963ce60fef8612 SHA1 01f40b67756939d6ddf4efc65e657bb6c2f75f44 SHA256 2e01cf5bc7e9d8293d2a2d4815c99507174376b29bafc034616a1065ea5cf477
 EBUILD drupal-5.23.ebuild 1453 RMD160 3cc338b3d875dcd549a6e7efb2056fa3f6013937 SHA1 03907649f3f91f714349aa513458774a9f914844 SHA256 a495eae9534407370c382e524d2a8ce3ca073897be29f0aa0d820207a495cbc8
-EBUILD drupal-6.19.ebuild 1766 RMD160 aa1f5dec5bb830fe352280a94c775bdbec05dd33 SHA1 e6e51f955d20cccbf983004260538d24532405b7 SHA256 90e925c9673afa05b826b902e97524eef8401c041e9b4f0aa7f23630897674e2
-MISC ChangeLog 10859 RMD160 ffa2840481961f89caba502ea3f2be5b165bfec9 SHA1 1f3a59ef8f87ca23ce922822e72cba17c9c40896 SHA256 01f2374f0e0fe8daacb9d7ee760cdb0f71f86f013b5ede7fc8e6267993496607
+EBUILD drupal-6.20.ebuild 1766 RMD160 420b12143ce54be39b4cf3aba9be8ab11c3fbb76 SHA1 d54c25e41f3fa98c8ba1e49ec89729800f9090d4 SHA256 eaced2a94fd61ecb179be23fbed15f93ed55a7959cf0b93ea75fcf45f3c13c15
+EBUILD drupal-7.0_rc2.ebuild 1817 RMD160 e5bae0987c308bf8912e4e29e620eec2dc35a65d SHA1 0b5ec7f6cbb2a9e19fe134c5d88a010ff1f64124 SHA256 df0e653c4f28bc7de3f402ac2af0eba792769a4cdcce1e55649d1e36b6bbbd48
+MISC ChangeLog 11076 RMD160 2017957fe56f413938ef8a9f75e5eae78b1a674e SHA1 bda36da36665d0a388bfeccdded1f5d8863db480 SHA256 896003f2d0940e3f4f40c2e6715bef01e380c212cd05bdce23f5ddfc1b97509d
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMaX3PAAoJEOf+E+/4L5LmUMoP/i1l3xmm/sOXQPCTM+7NIRKF
-IkPHn6CRSiKDwjPpLle16Ppq7C6kHvZzhhNkKrJ2rsYpKUut9u6KOPOh6X+ij3PI
-oSbzrch65N10SXhJANDbrgywmzWg3/I4EoWkyrTJ7bngWBCC7AgNWC335Y21LM96
-qGoXFeUiz+tcC27VFRXge90kCrfRVCqCmLgT32tWLJrW8sRLfWewVBEjGMcCpRFY
-ely7onb7nC8Nv5D8ZpDIobZYRk9vmwmkx4X+kxf+YR2BlmG7N0H8rxvXblItWwR/
-q6x3+VsZPKjDZrceBw/PA/mCzTj6V1mRLmRKhom6i1wJhZ/fKQ6vVwffF8iXLqZ0
-1nMzpw43xQZFsH82cS8SGEJBH8d8iTT/+nHMeqZWtFdTgezNbt4eDZbew0U9eToq
-4pIANk6pf4erSnZ80YGN8LVc2TYeNoh+q+FgU1ostCS2Ez8+wO9yaClJd75py6eR
-VJdEG1D3ZxAPdvf+wYLE8QRQYrTzzXXL+2Amw1OoH6hTmhqiu8APrAoeLibdkzM4
-T9xw+bpONc+FPujlqyYWcBNC9s+aBHir8Yg6zhBRDKbMrwU+y1O5ftZmANtilK0a
-AT89FnlNLsoK6IVgHmoisIJNQPmv5FNC867Y5pU28A8ZRIKoHahKkk5zWFWydAjG
-bW9i1agCDvryXeEhpu0+
-=A+PY
+iQIcBAEBCAAGBQJNDoJ9AAoJEOf+E+/4L5Lmxw8P/3I5iMj8K2B7iR54XFJKlToZ
+tsbJ1xnb6nIwQ4KG5cC0IiDT+yv6TItZZEKpDNLlBZM+4wA1DBDpCD3rX/Nz8xpo
+XGOZYSU5k/Z4aMpZqvOHWubGUd3S6qEkBcdNgTVnUwvXPuUotJ4n0DNYu7IBzQSz
+k9N6KUSWq8lC3Y+EPRO0hKpZ26cd4rJCuwbGbsjMSBQyVYqCrVxUdL4wlU/ZkMpd
+qzcTtVpTFa5IGFEAzZA9Z7AJ6IFjGBFcEy7sn5YWry4i+hVSgxkbCd0FjLpp4vb5
+rUaLKcZr1pWdvHc5HmoLZGqJVdOKRxjrG/M3nT10TyRyorfttJmgPdfBIsjxOvkJ
+NeRyLLhfbuR63raYmoRTfF8CSsmTl1/z78GpYyLVErhFp/o30knPUH1GGv2nxLAl
+eu8cv2fa541HrVcvDAahTirfqU1/qkQpc4cXmzud4eTddwhD3x2DGGP3OasnFRpY
++afn6Mx7+TDHsJcD0R2vMio/zdqFQUHJx6jWJ/IjF32FHioVPUYkXW5YVkwqKPHF
+rLm7lbck0N6xfI0C7vaVbbl9nnSJKaIGR+nZNmRN5kLAzURDqEd8fn3+eCZm8BGO
+W5y9XUquy0Nwy/COMuGG8PJgmv3LkhBg/GO/TUEFfbCLSazzDkA+gpGu9ZpBLAji
+3yYNLA4K4e2IqMwcqhwX
+=1uG3
 -----END PGP SIGNATURE-----
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
+}