Added drupal-5.4 to the tree. Fixes security bug #201478. Removed Roy

Marples as maintainer since he retired. Added a postinstall instructions
file.
(Portage version: 2.1.4_rc7)

8 files changed, 35 insertions, 53 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 9c28609156c4..15506b085049 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.37 2007/10/18 06:30:12 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.38 2007/12/06 14:40:54 wrobel Exp $
+
+*drupal-5.4 (06 Dec 2007)
+
+  06 Dec 2007; Gunnar Wrobel <wrobel@gentoo.org> +files/postinstall-en.txt,
+  metadata.xml, -drupal-5.2.ebuild, -drupal-5.3.ebuild, +drupal-5.4.ebuild:
+  Added drupal-5.4 to the tree. Fixes security bug #201478. Removed Roy
+  Marples as maintainer since he retired. Added a postinstall instructions
+  file.
 
 *drupal-5.3 (18 Oct 2007)
 
diff --git a/www-apps/drupal/drupal-5.3.ebuild b/www-apps/drupal/drupal-5.3.ebuild
deleted file mode 100644
index d1579c8b5a46..000000000000
--- a/www-apps/drupal/drupal-5.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.3.ebuild,v 1.1 2007/10/18 06:30:12 uberlord Exp $
-
-inherit webapp eutils
-
-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=""
-
-RDEPEND="virtual/httpd-php"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt"
-	dodoc ${docs}
-	rm -f ${docs} INSTALL
-
-	einfo "Copying main files"
-	cp -r . "${D}/${MY_HTDOCSDIR}"
-
-	# we install the .htaccess file to enable support for clean URLs
-	cp .htaccess "${D}/${MY_HTDOCSDIR}"
-
-	# create the files upload directory
-	mkdir "${D}/${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-	webapp_src_install
-}
diff --git a/www-apps/drupal/drupal-5.2.ebuild b/www-apps/drupal/drupal-5.4.ebuild
index d0f667c3ce31..3c5a641a07da 100644
--- a/www-apps/drupal/drupal-5.2.ebuild
+++ b/www-apps/drupal/drupal-5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.2.ebuild,v 1.1 2007/07/28 12:26:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.4.ebuild,v 1.1 2007/12/06 14:40:54 wrobel Exp $
 
 inherit webapp eutils
 
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="virtual/httpd-php"
+RDEPEND="virtual/httpd-php
+	 virtual/httpd-cgi"
 
 src_install() {
 	webapp_src_preinst
@@ -32,8 +33,12 @@ src_install() {
 	# create the files upload directory
 	mkdir "${D}/${MY_HTDOCSDIR}"/files
 	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	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/files/digest-drupal-5.2 b/www-apps/drupal/files/digest-drupal-5.2
deleted file mode 100644
index c0b9b0a0b233..000000000000
--- a/www-apps/drupal/files/digest-drupal-5.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7971b5d3d8eed28c52cea519948dfb8 drupal-5.2.tar.gz 751205
-RMD160 6a42700b90f046dabbb12dbf8381e3641c595847 drupal-5.2.tar.gz 751205
-SHA256 f26c74af4dd31f1ca0b8315a5e0b2842a23abd35546ab2cd758c3d0fb6ae49e7 drupal-5.2.tar.gz 751205
diff --git a/www-apps/drupal/files/digest-drupal-5.3 b/www-apps/drupal/files/digest-drupal-5.3
deleted file mode 100644
index 875bdffab71c..000000000000
--- a/www-apps/drupal/files/digest-drupal-5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 21979a64f1ea2ffffac688811d342771 drupal-5.3.tar.gz 753427
-RMD160 d6eaa0a3ebe860857a9f212302206db967e2478a drupal-5.3.tar.gz 753427
-SHA256 27ec97477fbf533dbd875604816a560cf38328f3f0df4e3bbb0d61f5f1ac3a40 drupal-5.3.tar.gz 753427
diff --git a/www-apps/drupal/files/digest-drupal-5.4 b/www-apps/drupal/files/digest-drupal-5.4
new file mode 100644
index 000000000000..417862edccc1
--- /dev/null
+++ b/www-apps/drupal/files/digest-drupal-5.4
@@ -0,0 +1,3 @@
+MD5 363c29a5e8c1e9fbec83044ae04c9b2a drupal-5.4.tar.gz 753584
+RMD160 ed20245d804cbd2ff7670a164e61b5be6202600e drupal-5.4.tar.gz 753584
+SHA256 ccaf57a48b76175993f2ac446bd0777ad4a72914664018b9bd62fa88a804441f drupal-5.4.tar.gz 753584
diff --git a/www-apps/drupal/files/postinstall-en.txt b/www-apps/drupal/files/postinstall-en.txt
new file mode 100644
index 000000000000..54ff3320f14b
--- /dev/null
+++ b/www-apps/drupal/files/postinstall-en.txt
@@ -0,0 +1,16 @@
+You will need to provide a database for your drupal installation.  
+
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
+
+http://www.gentoo.org/doc/en/mysql-howto.xml 
+
+Once you have a database ready all you need to do is to go to this 
+location
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+
+and provide the credential required for the database access.
+
+After that you can start to use drupal.
diff --git a/www-apps/drupal/metadata.xml b/www-apps/drupal/metadata.xml
index 16d89feeeebe..794e56895482 100644
--- a/www-apps/drupal/metadata.xml
+++ b/www-apps/drupal/metadata.xml
@@ -3,9 +3,4 @@
 
 <pkgmetadata>
 <herd>web-apps</herd>
-<maintainer>
-  <email>uberlord@gentoo.org</email>
-  <name>Roy Marples</name>
-  <description>Primary maintainer</description>
-</maintainer>
 </pkgmetadata>