Version bump to 6.22

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

3 files changed, 73 insertions, 22 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index deae871c6672..9da98bcb9f94 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.69 2011/01/06 00:45:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.70 2011/05/26 23:44:18 tampakrap Exp $
+
+*drupal-6.22 (26 May 2011)
+
+  26 May 2011; Theo Chatzimichos <tampakrap@gentoo.org> +drupal-6.22.ebuild:
+  Version bump to 6.22
 
 *drupal-7.0 (06 Jan 2011)
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 263abc3dcf83..7ad5266a6177 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.20.tar.gz 1100246 RMD160 04f5f014f783bd508537ea0e838e3b8243e67b01 SHA1 948f26f7c52aade0f1d7ac7dd36f358b1afd4ef7 SHA256 8403a06c1887c0821a78da4af3a5d3cbff43773c22c5cc63542d89b645ba4d8b
+DIST drupal-6.22.tar.gz 1100999 RMD160 42cb64a32ca457779e498ef8edb952e04f8b2c86 SHA1 a67acdb606aabbd9da6ddd2c016d43bb9ec17431 SHA256 d43da1858bfb8211a26ad7f749cce8cc3ae701fd28b13502cf5daef51d31f021
 DIST drupal-7.0.tar.gz 2728271 RMD160 fd27d5f4b826fb818d6b35754b2ea6b548445369 SHA1 124911c7de07b5acd1f801c4a7093440a0e0e3d3 SHA256 62e4146b2a2208d0772cef6578205b369f361b2079bf3fa9408e92f5419902e8
 EBUILD drupal-5.23.ebuild 1453 RMD160 3cc338b3d875dcd549a6e7efb2056fa3f6013937 SHA1 03907649f3f91f714349aa513458774a9f914844 SHA256 a495eae9534407370c382e524d2a8ce3ca073897be29f0aa0d820207a495cbc8
 EBUILD drupal-6.20.ebuild 1766 RMD160 420b12143ce54be39b4cf3aba9be8ab11c3fbb76 SHA1 d54c25e41f3fa98c8ba1e49ec89729800f9090d4 SHA256 eaced2a94fd61ecb179be23fbed15f93ed55a7959cf0b93ea75fcf45f3c13c15
+EBUILD drupal-6.22.ebuild 1769 RMD160 11bc5157266440be47a59ab47326002aed6d9575 SHA1 e24a8664c9c9565f18922a1766337b090aceebcb SHA256 c6ce72ce06c5df5fef0dd79634a57ccb33883a63d96b74ca76c152f5d9af59af
 EBUILD drupal-7.0.ebuild 1813 RMD160 13b5c6f92027171374a8a5d624d548f9521b4235 SHA1 bde0fa4f672a6d8bc0a33fbe5962e9d33927da51 SHA256 8ec254a4e739f300db35533cc1346fb21d2d653ea4644c78c40d139711d2b83f
-MISC ChangeLog 11397 RMD160 84f79992a41f5ea268a2d05352e555784d9608e1 SHA1 0aa57b8fd42198d5337333245a12fef1fa40ea7c SHA256 5857e3b158bf3dbb58369b900e15c50948bf707c35b024b886ec837ed41d4f25
+MISC ChangeLog 11529 RMD160 ae4915f7c48b9d5728a3f3468b46985daeac32d3 SHA1 42a0c52a1f315072f5420565fa4b37bc15b9597b SHA256 94807f893924b2595f987ee6e8891ae1cc7390561ddd66420df25806f5d81414
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNJRDGAAoJEOf+E+/4L5LmdfoP/RrVWVF+EnzAO+nOT9Egf/xT
-S8TKbFCNxzdj5INwh4vsf6lzRnsWjCbyQGSRMEPDDe55yuClBvgqTxr1O86DYQsJ
-nCMYMdRzu6jcEecsWkuIYyg0HUPMBQeKalXIapF68K2KwFWz3t03exZvCi0Hvw8e
-pRK48aJ9X4HC/d7ha/pO7odPSqkk3a9dllsfOBlO5ldlsHfqX4gkVPyxzjAdcVfJ
-Nwkq5N5SqZ+JxFAec0TgwKLdA2/jXPdDdu2KaWtrUgz/5PKcUVc+vvVnW4156CmT
-T9dKFPlSQlmgjyE0Wu3I+1mtLlQBFKdJsR4APjVgBQ3bIiVk2tdQyg6P8kwvrAFZ
-NiJIQzAzrEs87vcI+uoIuQPgY2vfv3y5eF8a5Mwx52G4xRZ8ruXtHCuR8DUAbkil
-oGjJTdlz6zzvB4sb2MhbYj6hlca2bL4z5n6rgHft2rK/FhI448bGlX60oy0uYrjz
-+h7ic4I+pw7IWJJJtZp5nlzXSqasgcNcCkPaP9tfZh4IcPxQNWK0FzwIx0q24oR6
-5Gy5zAPe9kjLGt++wEiha7/Cu0NmNoJ58dSU3qXEneZbRiW9MkSFNf46DDyswduL
-Pqp9iL65Ygpr0qPslSIBsu+7CARiVDjG3LxWahmxgbzVsxXXg8M9z/jQd4BOiuNm
-a0KaZ+CfbWcoAvWnl+yp
-=XFUr
------END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-6.22.ebuild b/www-apps/drupal/drupal-6.22.ebuild
new file mode 100644
index 000000000000..de31e3c347a3
--- /dev/null
+++ b/www-apps/drupal/drupal-6.22.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.22.ebuild,v 1.1 2011/05/26 23:44:18 tampakrap 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
+
+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 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
+}