version bump

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.22-vs2.3.0.34-gentoo x86_64

4 files changed, 121 insertions, 3 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index c36fad059922..08de8d5efc5b 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/drupal
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.55 2008/12/25 18:45:23 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.56 2009/01/16 09:47:51 hollow Exp $
+
+*drupal-6.9 (16 Jan 2009)
+*drupal-5.15 (16 Jan 2009)
+
+  16 Jan 2009; Benedikt Böhm <hollow@gentoo.org> +drupal-5.15.ebuild,
+  +drupal-6.9.ebuild:
+  version bump
 
 *drupal-6.8 (25 Dec 2008)
 *drupal-5.14 (25 Dec 2008)
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index e1b96d11ef58..e2edf3a14c9f 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,11 +1,15 @@
 AUX postinstall-en.txt 501 RMD160 c5e116848f3c1dc5b51d2f3b81911f5569119f2e SHA1 2dc808031b46939f115769f8f36f28eefb1e3d75 SHA256 83e41dae36c0d98540d0d4599eed0fc2ad6f1aa2815ca2454e5cb6307a9d3fcd
 DIST drupal-5.13.tar.gz 764729 RMD160 cf3c32849395dcf6c72d670791b8c3b9a03f4c7b SHA1 06fc9907f15ef9eec933bdf7974ea52c71ddd982 SHA256 c0695e37a17eedd29288aa8daf7812b7a04d148e31feb0f491f1b677ca3e8302
 DIST drupal-5.14.tar.gz 764727 RMD160 4888d3a56cbc592822b568789f888d571e373e63 SHA1 bc1089626ac01165f2b3df0ac3cc521e740b328a SHA256 7adb6e5f4881f0396e3f5a24cf6ad690dcc3aaebe58d73ea0914b6f57dfec4e0
+DIST drupal-5.15.tar.gz 766007 RMD160 404c59d34f9d4ebe09186dc66eb6203990c7488c SHA1 ecf67f38e85a6f01102f4dae18f1b2d221f1acba SHA256 bae9ffdd68259657c593c4ae59675b987c28de1727ab3965f1892b84a6f657df
 DIST drupal-6.7.tar.gz 1074300 RMD160 eea570e8894b1f5ada99a37919d0125e89c41d78 SHA1 1a1f9955878b794bbf201e2f8544f00c74121c3c SHA256 7af067d6ebf6c7374e2894ae5f8d7e07a64597bc33802e28a367625b65f0111f
 DIST drupal-6.8.tar.gz 1074294 RMD160 b487e82383ed5b7e83614d0b68036533485952ff SHA1 d736ef18f1c2fd06217e31f6af3ea3745299f7fd SHA256 08b55fc80c46a46e464b6c6f34d92f2a23e918cffbd0c8720804eebc78228507
+DIST drupal-6.9.tar.gz 1075558 RMD160 9e8e181fb406f2ae5d6ce1f62c6ef37ff714598f SHA1 d9eb531bcb2a4d500dc9e989b0afe702653d7e84 SHA256 350feb1350ef272f7d70ee1b77cdbc05afba2fb6c4326e0e0c9a18c2c313d5d8
 EBUILD drupal-5.13.ebuild 1237 RMD160 a9da30591dba5341219224838191e1210191cf09 SHA1 2ea517d8970e8eb0cf4f89662b79e1a5e6978b8a SHA256 bf202a7f8f8f7dca3554c48df4da181c3718cbdb2b6fb6c57e5a9cee0f07940b
 EBUILD drupal-5.14.ebuild 1237 RMD160 f93ba5f95f3ca0523b7102137d8c29a6aed6d264 SHA1 7817020929f8104a0679e451250d53263b44eeef SHA256 6756f6b65cfef7952198fca475af2d6215385d59d00314afdf4ead8e14bb2a90
+EBUILD drupal-5.15.ebuild 1240 RMD160 d0ef408c6e896bf59b172a79c1cd1e7dccadf3c1 SHA1 b66e14d2d3223865ba825fe2566917e0f45f3b21 SHA256 bca67251afdd34c168490e730b20c0a8023661020b762d76cc0bb8ce7548fbf5
 EBUILD drupal-6.7.ebuild 1549 RMD160 5c2f3ff6473b81805c7847ab3dfca99dd3c8180d SHA1 6cd8e102a8b6f489d0ddeeacf5d95df5bbaf3807 SHA256 d366a0493044b1966b42823715f47016793eb108e029f10446bdc9d1752e0fd0
 EBUILD drupal-6.8.ebuild 1549 RMD160 7529b5b53cb3f73628dfbc5e0adb61da1619ca48 SHA1 38c689ad2449c6cc21debc369d0d3917f1fca2db SHA256 9f05f2ce2b78d112510e3e1178e5adc7a232f7c2def932673c47d1c03a37b71d
-MISC ChangeLog 8193 RMD160 05e807dc23bc6a833570cd63a5414cb7af3b93a1 SHA1 b112bf04022732357bb1144fca034dc821bd2672 SHA256 8bfc3be104fe8d37aa139a70edaa657e90fc71e39e8cdb8100149b3ce9a0ef87
+EBUILD drupal-6.9.ebuild 1552 RMD160 9073bc2ef95b6b496aa6184b5b97daf93e4cc641 SHA1 bafd3031450a72f5ac9b79cde91b875e5025e49f SHA256 9b68f4fa4dd0fd5fa5d546e0ebd7fbf9476ce2a608dc7d17f0be68f82460810c
+MISC ChangeLog 8359 RMD160 8e673fe3fd095613b494958b905de975603db752 SHA1 b15f07fdde85ee340b32012119e4da0a77136eb6 SHA256 405d6f751d810b54890cb5707528ae2d0820ffe331db091d12b2ce0462db4acd
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
diff --git a/www-apps/drupal/drupal-5.15.ebuild b/www-apps/drupal/drupal-5.15.ebuild
new file mode 100644
index 000000000000..e4d92b1b0b3e
--- /dev/null
+++ b/www-apps/drupal/drupal-5.15.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.15.ebuild,v 1.1 2009/01/16 09:47:51 hollow 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
+		require_php_with_use expat
+	else
+		require_php_with_use xml
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt"
+	dodoc ${docs}
+	rm -f ${docs} INSTALL
+
+	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
+}
diff --git a/www-apps/drupal/drupal-6.9.ebuild b/www-apps/drupal/drupal-6.9.ebuild
new file mode 100644
index 000000000000..a3294a8ea18d
--- /dev/null
+++ b/www-apps/drupal/drupal-6.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.9.ebuild,v 1.1 2009/01/16 09:47:51 hollow 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
+}