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

Marples as maintainer since he retired. Added a postinstall instructions
file.
Package-Manager: portage-2.1.4_rc7

9 files changed, 65 insertions, 77 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/Manifest b/www-apps/drupal/Manifest
index b03c15cea804..b21db1b50048 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,24 +1,30 @@
-DIST drupal-5.2.tar.gz 751205 RMD160 6a42700b90f046dabbb12dbf8381e3641c595847 SHA1 d6460630b5c946c0fff152da5a83ff638fb8b097 SHA256 f26c74af4dd31f1ca0b8315a5e0b2842a23abd35546ab2cd758c3d0fb6ae49e7
-DIST drupal-5.3.tar.gz 753427 RMD160 d6eaa0a3ebe860857a9f212302206db967e2478a SHA1 71aaf830b65ec3c1029855b6ae95b6493ca17ae5 SHA256 27ec97477fbf533dbd875604816a560cf38328f3f0df4e3bbb0d61f5f1ac3a40
-EBUILD drupal-5.2.ebuild 1070 RMD160 bfd46d6e45c6cec205a77faf5d7f5da108a17905 SHA1 03e98ae67fc2503a846f1e711c6f38178c24af44 SHA256 f7056312ea0bd4939d7e3c9ae7032739d13bfe0d31a3e40495fb9174aab06736
-MD5 df86001f4b933955f6cfa8eaf19ec5ff drupal-5.2.ebuild 1070
-RMD160 bfd46d6e45c6cec205a77faf5d7f5da108a17905 drupal-5.2.ebuild 1070
-SHA256 f7056312ea0bd4939d7e3c9ae7032739d13bfe0d31a3e40495fb9174aab06736 drupal-5.2.ebuild 1070
-EBUILD drupal-5.3.ebuild 1070 RMD160 c02801ddf1133581ab779c0eecd9400c99a8fe71 SHA1 14095c4d9d3e87400cd25b71e77417b0b157723d SHA256 891ddd802ab78536a9cc27ac1d1cf1230d519a8faf5ff53e1bedc3e15d77dc5b
-MD5 d06f6e6ae8cbdbbe4cdca1abfa3e3b5c drupal-5.3.ebuild 1070
-RMD160 c02801ddf1133581ab779c0eecd9400c99a8fe71 drupal-5.3.ebuild 1070
-SHA256 891ddd802ab78536a9cc27ac1d1cf1230d519a8faf5ff53e1bedc3e15d77dc5b drupal-5.3.ebuild 1070
-MISC ChangeLog 4726 RMD160 2c82fd00c9ddebe45cd69a636fe6376b01abd47d SHA1 7fc68b68d06c1af0a0c8d5959478fc47b6827fc9 SHA256 254b813f37840ab0fd5aac422bc0fd80c22b943f926d3c580ded336aacd12cf3
-MD5 3ed54b32f539cf17568a87698f4086ce ChangeLog 4726
-RMD160 2c82fd00c9ddebe45cd69a636fe6376b01abd47d ChangeLog 4726
-SHA256 254b813f37840ab0fd5aac422bc0fd80c22b943f926d3c580ded336aacd12cf3 ChangeLog 4726
-MISC metadata.xml 301 RMD160 3a0e7c6617e58e448b323664a3b01eabc0204b22 SHA1 990b2b161a17cdbb20df24c25022290cd7a3c348 SHA256 c296c5de4f8947e60c83a63d90332052f82ba8c9c0128bd1b3c5ee2632419557
-MD5 6a9ed65e0b09600737b14f007c9616fb metadata.xml 301
-RMD160 3a0e7c6617e58e448b323664a3b01eabc0204b22 metadata.xml 301
-SHA256 c296c5de4f8947e60c83a63d90332052f82ba8c9c0128bd1b3c5ee2632419557 metadata.xml 301
-MD5 2981d59c963f6cd8e97b9bbca3cd4c7b files/digest-drupal-5.2 232
-RMD160 9ddfb98ab34192b6855be47f959906c47882b23c files/digest-drupal-5.2 232
-SHA256 7df15fb09e6cc61f61a658b28ec1fc53b42a55ae16941c76791bc6770f6e47f3 files/digest-drupal-5.2 232
-MD5 66679f2277022fdca95fee2ab23ec339 files/digest-drupal-5.3 232
-RMD160 9e8ca6329527338352e33038a170ea57631f7187 files/digest-drupal-5.3 232
-SHA256 de4419a8dc859f622288a9cebd8cb0d0f9b9ea847e7a44e7d7015626271668c8 files/digest-drupal-5.3 232
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX postinstall-en.txt 501 RMD160 c5e116848f3c1dc5b51d2f3b81911f5569119f2e SHA1 2dc808031b46939f115769f8f36f28eefb1e3d75 SHA256 83e41dae36c0d98540d0d4599eed0fc2ad6f1aa2815ca2454e5cb6307a9d3fcd
+MD5 e55d67444beb7b064ec0783f11e37de1 files/postinstall-en.txt 501
+RMD160 c5e116848f3c1dc5b51d2f3b81911f5569119f2e files/postinstall-en.txt 501
+SHA256 83e41dae36c0d98540d0d4599eed0fc2ad6f1aa2815ca2454e5cb6307a9d3fcd files/postinstall-en.txt 501
+DIST drupal-5.4.tar.gz 753584 RMD160 ed20245d804cbd2ff7670a164e61b5be6202600e SHA1 76e08a766d36d24c4628f61aea47d8961064f29b SHA256 ccaf57a48b76175993f2ac446bd0777ad4a72914664018b9bd62fa88a804441f
+EBUILD drupal-5.4.ebuild 1212 RMD160 c7a915be9dd924835fadd3a30835adc01f6c88c8 SHA1 f4e8e1ab6b322c2e166f1a7e8b45e9c825afb3da SHA256 f5e2ff4dcc8dac2802f38d26b7cce40ff663abdbc134426fed740005aeb8d674
+MD5 caad1f0a8a8364fd112b8c099ad1985a drupal-5.4.ebuild 1212
+RMD160 c7a915be9dd924835fadd3a30835adc01f6c88c8 drupal-5.4.ebuild 1212
+SHA256 f5e2ff4dcc8dac2802f38d26b7cce40ff663abdbc134426fed740005aeb8d674 drupal-5.4.ebuild 1212
+MISC ChangeLog 5059 RMD160 0d4b0a16a2576434193dfc5c01d704c4a0203fa2 SHA1 92ff2dd307a40ecc978bee9dd466b38d76489e29 SHA256 0f346b9a3dae47c4aaa724fa9fec19d6584a9bfac2754efbc601a0569126268d
+MD5 e3f54524188cd8904689a12cb5c5ab7c ChangeLog 5059
+RMD160 0d4b0a16a2576434193dfc5c01d704c4a0203fa2 ChangeLog 5059
+SHA256 0f346b9a3dae47c4aaa724fa9fec19d6584a9bfac2754efbc601a0569126268d ChangeLog 5059
+MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
+MD5 2b8c75730a151ac8e996c1fe32af5227 metadata.xml 162
+RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 metadata.xml 162
+SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40 metadata.xml 162
+MD5 18f8ad6dcca74e40d2f3481a0d0f0ebc files/digest-drupal-5.4 232
+RMD160 c1c7b72cdb37d1be97ba2237eab566b2bbe0ec8b files/digest-drupal-5.4 232
+SHA256 26169568b4e4920add24646d4e9df3f1713f2936df112c6c1fe92dd0e3df4f9a files/digest-drupal-5.4 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD4DBQFHWAn8EEcxCpcDQ74RAgQXAJ9Z7rbM1FTlz8REwNVqxb/1NB4xsACY/3Il
+5t1UOw9JIkk92bF1H/azfw==
+=9IL2
+-----END PGP SIGNATURE-----
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>