Updated and added 4.6.6, 4.7.0 and 4.5.8

8 files changed, 461 insertions, 9 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 7e884439ae31..8eb0fb481304 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.23 2006/01/03 17:34:28 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.24 2006/05/05 05:18:01 st_lim Exp $
+
+*drupal-4.7.0 (05 May 2006)
+*drupal-4.6.6 (05 May 2006)
+*drupal-4.5.8 (05 May 2006)
+
+  05 May 2006; Lim Swee Tat <st_lim@gentoo.org> +drupal-4.5.8.ebuild,
+  +drupal-4.6.6.ebuild, +drupal-4.7.0.ebuild:
+  Updated and added 4.6.6, 4.7.0 and 4.5.8
 
   03 Jan 2006; Lim Swee Tat <st_lim@gentoo.org> drupal-4.6.5.ebuild:
   OOps with Bug #117439
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 4b19e1f8c4f5..7bd1f4a86f6c 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,18 +1,96 @@
-MD5 dad20bc26f4fb88134279a133ad55ae6 ChangeLog 2271
+AUX 4.6.0/engines 28 RMD160 ea86f07194956a76fe6f351adec03268222ebe2a SHA1 0f47f03b85595057f699a8cf4539bf6d745b6bbb SHA256 3f84942a24dcf78c0df807be5b1e96cb2e494518e29eb3a0eb9148190132ba7a size 28
+MD5 7f7293c73bc101820993496a98f5d4fe files/4.6.0/engines 28
+RMD160 ea86f07194956a76fe6f351adec03268222ebe2a files/4.6.0/engines 28
+SHA256 3f84942a24dcf78c0df807be5b1e96cb2e494518e29eb3a0eb9148190132ba7a files/4.6.0/engines 28
+AUX 4.6.0/language 130 RMD160 304c20f299d4f5860b1ae282882901304bde1e67 SHA1 50dfa88850cd2e53ce83a04da9812bfe3b30e13f SHA256 c8f41bee39fea3bb333d1ebcd49fedaa6731f5cbe05edd2e0ee253b7eb83a984 size 130
+MD5 507fcec40f954b5af6ceab22a0676c5d files/4.6.0/language 130
+RMD160 304c20f299d4f5860b1ae282882901304bde1e67 files/4.6.0/language 130
+SHA256 c8f41bee39fea3bb333d1ebcd49fedaa6731f5cbe05edd2e0ee253b7eb83a984 files/4.6.0/language 130
+AUX 4.6.0/modules 2080 RMD160 abdba87d9bc72b920e4b088776acdd419d1c45c7 SHA1 33ae176dc179533b5614547b2dc77e104e158437 SHA256 c4116989867d50f942730a3da0138cf75edf4745cd74a1e41949e3daa8c4cdb5 size 2080
+MD5 16b758714ff6fe1fcc744d02d952c2b5 files/4.6.0/modules 2080
+RMD160 abdba87d9bc72b920e4b088776acdd419d1c45c7 files/4.6.0/modules 2080
+SHA256 c4116989867d50f942730a3da0138cf75edf4745cd74a1e41949e3daa8c4cdb5 files/4.6.0/modules 2080
+AUX 4.6.0/themes 278 RMD160 0c8e3fa42bbf199648229d5ba2954fbcfc35b826 SHA1 85580d8efa520358e181fb608bcef681310a7730 SHA256 4ce43830b5ed27f323cedae0992ca0df063f110f4a5d4218622f10d6e6d789d0 size 278
+MD5 4638c8007177182e9a8acf02f7cdd681 files/4.6.0/themes 278
+RMD160 0c8e3fa42bbf199648229d5ba2954fbcfc35b826 files/4.6.0/themes 278
+SHA256 4ce43830b5ed27f323cedae0992ca0df063f110f4a5d4218622f10d6e6d789d0 files/4.6.0/themes 278
+AUX postinstall-en-4.6.3.txt 2604 RMD160 a93e8aade517632c6eee78594c5f4f41d5ab8fa0 SHA1 caef9f82bd650591d5106bd8a239bb83cf8cdf5e SHA256 ba07c200c77ae0fb01c92d34ad420d03b9575ab29677d220379f1d4182f3fb62 size 2604
+MD5 1be3dc7c7bfe18ac669d422297723067 files/postinstall-en-4.6.3.txt 2604
+RMD160 a93e8aade517632c6eee78594c5f4f41d5ab8fa0 files/postinstall-en-4.6.3.txt 2604
+SHA256 ba07c200c77ae0fb01c92d34ad420d03b9575ab29677d220379f1d4182f3fb62 files/postinstall-en-4.6.3.txt 2604
+AUX postinstall-en.txt 2595 RMD160 db9ff2d7ac53920af3f9dcdebfc75f45374145b8 SHA1 78c906a32234622744d53945e81056f8d6f0dfe3 SHA256 c84a320068d3fb4956b7e7c851f3f5f023163a1241c2383bdcf11772ebdfae87 size 2595
+MD5 0f20a567ce1310d62af69bd56921cea3 files/postinstall-en.txt 2595
+RMD160 db9ff2d7ac53920af3f9dcdebfc75f45374145b8 files/postinstall-en.txt 2595
+SHA256 c84a320068d3fb4956b7e7c851f3f5f023163a1241c2383bdcf11772ebdfae87 files/postinstall-en.txt 2595
+DIST drupal-4.5.2.tar.gz 471370 size 471370
+DIST drupal-4.5.7.tar.gz 467687 size 467687
+DIST drupal-4.5.8.tar.gz 467896 RMD160 581fc4c94ae1d52137c6f5f1797cb96ca8bd0274 SHA256 17812a899a22d5e076add93006d963d21527fe35cc7e2d6185de71325fe0aeb3 size 467896
+DIST drupal-4.6.2.tar.gz 464682 size 464682
+DIST drupal-4.6.3.tar.gz 458095 size 458095
+DIST drupal-4.6.5.tar.gz 455993 size 455993
+DIST drupal-4.6.6.tar.gz 455959 RMD160 d55af1dac65336fda4c830d8c1c56678588e3d91 SHA1 29eb0a60c033d684931f8e8927d2435ff3c5fe83 SHA256 beb73c12af3d1785a0d845170c0785b6c1a83576cb42a17388372c52be3717e0 size 455959
+DIST drupal-4.7.0.tar.gz 483395 RMD160 259a3cc8f50ba297015ea65936b47ec9363b0131 SHA256 6b9953605d40939417401fa86ccc69d3596740887f8257750a8276662abab5fc size 483395
+EBUILD drupal-4.5.2.ebuild 30641 RMD160 fcf2cccebb889a2c274bffcd0acd87f9714bb0d9 SHA1 340be6d76fbd6f6fedbf8d4c5f7e3d8e7902cd62 SHA256 9133024fa72118601324a81c5290fdf1860ac548cfc62e354df040a93bf5e39a size 30641
 MD5 e4f9cbc61147e254fac7a43c679cc943 drupal-4.5.2.ebuild 30641
+RMD160 fcf2cccebb889a2c274bffcd0acd87f9714bb0d9 drupal-4.5.2.ebuild 30641
+SHA256 9133024fa72118601324a81c5290fdf1860ac548cfc62e354df040a93bf5e39a drupal-4.5.2.ebuild 30641
+EBUILD drupal-4.5.7.ebuild 3754 RMD160 69a2ec80999550fb38d72297c468cd676341c4b7 SHA1 cbfe1a82dbd2df848603f77bf1983aa3f75bb6d9 SHA256 f94b4046779e8e8f26a3ef123561a9610cc257e4cc40cc69a33a754dc6460c39 size 3754
 MD5 2614a689d49c82e7a71abc94e93ee885 drupal-4.5.7.ebuild 3754
+RMD160 69a2ec80999550fb38d72297c468cd676341c4b7 drupal-4.5.7.ebuild 3754
+SHA256 f94b4046779e8e8f26a3ef123561a9610cc257e4cc40cc69a33a754dc6460c39 drupal-4.5.7.ebuild 3754
+EBUILD drupal-4.5.8.ebuild 3754 RMD160 69a2ec80999550fb38d72297c468cd676341c4b7 SHA1 cbfe1a82dbd2df848603f77bf1983aa3f75bb6d9 SHA256 f94b4046779e8e8f26a3ef123561a9610cc257e4cc40cc69a33a754dc6460c39 size 3754
+MD5 2614a689d49c82e7a71abc94e93ee885 drupal-4.5.8.ebuild 3754
+RMD160 69a2ec80999550fb38d72297c468cd676341c4b7 drupal-4.5.8.ebuild 3754
+SHA256 f94b4046779e8e8f26a3ef123561a9610cc257e4cc40cc69a33a754dc6460c39 drupal-4.5.8.ebuild 3754
+EBUILD drupal-4.6.2.ebuild 3757 RMD160 c921e45f8b8cfc8bb9d57a7f9683280317e0400b SHA1 5518358bc12da2cf14a9263c39b8bb894376159f SHA256 0b70f7118d24aa5efa9df25b8a45c46aae73a53588864ce3fefe7fac99221856 size 3757
 MD5 e82b6e40e3e223403bb373c04d346d72 drupal-4.6.2.ebuild 3757
+RMD160 c921e45f8b8cfc8bb9d57a7f9683280317e0400b drupal-4.6.2.ebuild 3757
+SHA256 0b70f7118d24aa5efa9df25b8a45c46aae73a53588864ce3fefe7fac99221856 drupal-4.6.2.ebuild 3757
+EBUILD drupal-4.6.3.ebuild 3763 RMD160 48cc4f5e4a8477cb3e0318ad798749f1ce55dbe2 SHA1 29df8506fa271bf39348a96066871a753b1a8fa1 SHA256 c2591955c502369015440c926c86571998c6f1c33f4ea3228ef6e38363f74c50 size 3763
 MD5 c33f1bf60abf50566e003ed060542ae4 drupal-4.6.3.ebuild 3763
+RMD160 48cc4f5e4a8477cb3e0318ad798749f1ce55dbe2 drupal-4.6.3.ebuild 3763
+SHA256 c2591955c502369015440c926c86571998c6f1c33f4ea3228ef6e38363f74c50 drupal-4.6.3.ebuild 3763
+EBUILD drupal-4.6.5.ebuild 3763 RMD160 3479aa8c4c92c85dfc8c34bd32608ddbd342bf8a SHA1 893d9df6d962c4036487dc3adcadff275d475cc1 SHA256 fbaf2c792d2328c81aa8188afe5c8365a0f334c30f7cec7e6e86625f3085a3ce size 3763
 MD5 397f0b852abb99d472d249b1a64652a6 drupal-4.6.5.ebuild 3763
-MD5 7f7293c73bc101820993496a98f5d4fe files/4.6.0/engines 28
-MD5 507fcec40f954b5af6ceab22a0676c5d files/4.6.0/language 130
-MD5 16b758714ff6fe1fcc744d02d952c2b5 files/4.6.0/modules 2080
-MD5 4638c8007177182e9a8acf02f7cdd681 files/4.6.0/themes 278
+RMD160 3479aa8c4c92c85dfc8c34bd32608ddbd342bf8a drupal-4.6.5.ebuild 3763
+SHA256 fbaf2c792d2328c81aa8188afe5c8365a0f334c30f7cec7e6e86625f3085a3ce drupal-4.6.5.ebuild 3763
+EBUILD drupal-4.6.6.ebuild 3763 RMD160 3479aa8c4c92c85dfc8c34bd32608ddbd342bf8a SHA1 893d9df6d962c4036487dc3adcadff275d475cc1 SHA256 fbaf2c792d2328c81aa8188afe5c8365a0f334c30f7cec7e6e86625f3085a3ce size 3763
+MD5 397f0b852abb99d472d249b1a64652a6 drupal-4.6.6.ebuild 3763
+RMD160 3479aa8c4c92c85dfc8c34bd32608ddbd342bf8a drupal-4.6.6.ebuild 3763
+SHA256 fbaf2c792d2328c81aa8188afe5c8365a0f334c30f7cec7e6e86625f3085a3ce drupal-4.6.6.ebuild 3763
+EBUILD drupal-4.7.0.ebuild 3763 RMD160 3479aa8c4c92c85dfc8c34bd32608ddbd342bf8a SHA1 893d9df6d962c4036487dc3adcadff275d475cc1 SHA256 fbaf2c792d2328c81aa8188afe5c8365a0f334c30f7cec7e6e86625f3085a3ce size 3763
+MD5 397f0b852abb99d472d249b1a64652a6 drupal-4.7.0.ebuild 3763
+RMD160 3479aa8c4c92c85dfc8c34bd32608ddbd342bf8a drupal-4.7.0.ebuild 3763
+SHA256 fbaf2c792d2328c81aa8188afe5c8365a0f334c30f7cec7e6e86625f3085a3ce drupal-4.7.0.ebuild 3763
+MISC ChangeLog 2271 RMD160 b7294bc2cd651e21f27450bcc602881cdff5bb82 SHA1 9e772262464bd363051ed9641ec503a05e4f4a83 SHA256 7ff5a9078f690d88e9a23ec4ad40187a4a56104e1ed9c1bf64f282be5c28c9ac size 2271
+MD5 dad20bc26f4fb88134279a133ad55ae6 ChangeLog 2271
+RMD160 b7294bc2cd651e21f27450bcc602881cdff5bb82 ChangeLog 2271
+SHA256 7ff5a9078f690d88e9a23ec4ad40187a4a56104e1ed9c1bf64f282be5c28c9ac ChangeLog 2271
+MISC metadata.xml 274 RMD160 fc9bb49dd533125399dcd6b9f40ac2ad6d80fdd1 SHA1 217ad831771f30b9ac1553cf3b709c8d1c367fe8 SHA256 a3440380801ba64f4e812124c06028f6271158de3b9c346c619570b80c4bc9ea size 274
+MD5 31a7762b97d644514268dab18f853a27 metadata.xml 274
+RMD160 fc9bb49dd533125399dcd6b9f40ac2ad6d80fdd1 metadata.xml 274
+SHA256 a3440380801ba64f4e812124c06028f6271158de3b9c346c619570b80c4bc9ea metadata.xml 274
 MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
+RMD160 25e9f06f3a126f8ac9051a6088bdaef41fc6820d files/digest-drupal-4.5.2 64
+SHA256 43b7282ad3ef2ef2d2f7f2c734210ca525d60539ccf96d398e18b40401799d21 files/digest-drupal-4.5.2 64
 MD5 9c083d23e1b5638814092afb5d0bbc42 files/digest-drupal-4.5.7 64
+RMD160 1639e8b1b8aadacd497dc8c63b245c21991322ca files/digest-drupal-4.5.7 64
+SHA256 826825d0c872acfc849182356e738745fef46a8b6a440c0e7676bb27c80291bf files/digest-drupal-4.5.7 64
+MD5 5bda2c5cb04ea2d8ed11fd10af689f67 files/digest-drupal-4.5.8 238
+RMD160 e0700090c33b9d442b755713fa53e7b63e2da29a files/digest-drupal-4.5.8 238
+SHA256 3a651c83ae9d4fa18fc5ca38536d0ddedb2665abb1509e01ddd403e80de56ebd files/digest-drupal-4.5.8 238
 MD5 3696ea6a2d2569722c9feebb2c9a7093 files/digest-drupal-4.6.2 64
+RMD160 45392b62cf2eab9e96f2ff5504e80fcfa7fe74c1 files/digest-drupal-4.6.2 64
+SHA256 ec9e773ec2663aa3dcf5c9f7477b57ad3a3aa9b6b448df74697019f98285efce files/digest-drupal-4.6.2 64
 MD5 35efbdccb8fc0c5155a69dff4283ce9b files/digest-drupal-4.6.3 64
+RMD160 946bb8bc758286b06e65ecee53155397304c4021 files/digest-drupal-4.6.3 64
+SHA256 bf91136c9fad603d8c683e651b0e03fd7baca313ba74b45fff6f4067e7c2653b files/digest-drupal-4.6.3 64
 MD5 683c1808d111f7adae88126f6367f75e files/digest-drupal-4.6.5 64
-MD5 1be3dc7c7bfe18ac669d422297723067 files/postinstall-en-4.6.3.txt 2604
-MD5 0f20a567ce1310d62af69bd56921cea3 files/postinstall-en.txt 2595
-MD5 31a7762b97d644514268dab18f853a27 metadata.xml 274
+RMD160 631696af6795b0306e1773afaa486e091747f9ed files/digest-drupal-4.6.5 64
+SHA256 c105e288f5a5efd7686b8ee7ab66d300a3aa1f2afb51d7b551397728b44db13f files/digest-drupal-4.6.5 64
+MD5 3797baa895b9cf97008398c6d7289e9a files/digest-drupal-4.6.6 238
+RMD160 7b0ba24166021307abce142dfc154678dadf4dbb files/digest-drupal-4.6.6 238
+SHA256 a286f02e121d23734317a73e7edbab1b815440d041618beeeefbbf0fed8bc5c9 files/digest-drupal-4.6.6 238
+MD5 8ffb6b7e92fe84dad216d3918ddaa0a4 files/digest-drupal-4.7.0 238
+RMD160 13f13cca3c9fcfb9b7d684a4e293e8a3e84a9821 files/digest-drupal-4.7.0 238
+SHA256 3fa3f6d767b0bbe332beb59cb8422b7d5ca03a47c9616f4a4a7e822900350fa9 files/digest-drupal-4.7.0 238
diff --git a/www-apps/drupal/drupal-4.5.8.ebuild b/www-apps/drupal/drupal-4.5.8.ebuild
new file mode 100644
index 000000000000..3a772626c40b
--- /dev/null
+++ b/www-apps/drupal/drupal-4.5.8.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.5.8.ebuild,v 1.1 2006/05/05 05:18:01 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="Drupal is a PHP-based open-source platform and content management system for building dynamic web sites offering a broad range of features and services; including user administration, publishing workflow, discussion capabilities, news aggregation, metadata functionalities using controlled vocabularies and XML publishing for content sharing purposes. Equipped with a powerful blend of features and configurability, Drupal can support a diverse range of web projects ranging from personal weblogs to large community-driven sites."
+HOMEPAGE="http://drupal.org"
+IUSE=""
+
+SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~ppc ~x86 ~amd64"
+
+DEPEND="virtual/php"
+RDEPEND="|| ( dev-db/mysql dev-db/postgresql )
+		>=net-www/apache-1.3"
+
+src_compile() {
+	#Default compile hangs!
+	echo "Nothing to compile"
+}
+
+src_install() {
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt"
+
+	webapp_src_preinst
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	einfo "Installing docs"
+	dodoc ${docs}
+	for doc in ${docs} INSTALL; do
+		rm -f ${doc}
+	done
+
+	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
+
+	#All files must be owned by server
+	for x in `find . -type f -print` ; do
+		webapp_serverowned ${MY_HTDOCSDIR}/$x
+	done
+
+	webapp_configfile ${MY_HTDOCSDIR}/includes/conf.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-${PV}.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	einfo
+	einfo "You might want to run:"
+	einfo "\"emerge --config =${PF} \""
+	einfo "if this is a new install."
+	einfo
+}
+
+pkg_config() {
+	# This is the default directory, but we have this portion for the user to
+	# change the default directory if it does not exist.
+	MY_HTDOCSDIR=/usr/share/webapps/${PN}/${PV}/htdocs
+	if [ ! -d ${MY_HTDOCSDIR} ] && \
+		[ ! -d ${MY_HTDOCSDIR}/modules ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ ! -d ${MY_HTDOCSDIR}/language ] ; then
+		einfo "Please specify the directory your drupal installation "
+		einfo "is installed in."
+		echo
+		while true
+		do
+			read -p " Please type in the name of the directory: " MY_HTDOCSDIR
+			[ -d ${MY_HTDOCSDIR} ] && \
+				[ -d ${MY_HTDOCSDIR}/modules ] && \
+				[ -d ${MY_HTDOCSDIR}/themes ] && \
+				[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+				[ -d ${MY_HTDOCSDIR}/language ] && \
+				break || \
+				ewarn "The directory ${MY_HTDOCSDIR} does not exist"
+		done
+	fi
+	if [ -d ${MY_HTDOCSDIR} ] && \
+		[ -d ${MY_HTDOCSDIR}/modules ] && \
+		[ -d ${MY_HTDOCSDIR}/themes ] && \
+		[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ -d ${MY_HTDOCSDIR}/language ] ; then
+		for i in modules themes engines language; do
+			cd ${MY_HTDOCSDIR}/$i
+			[ "$i" == "engines" ] && cd ${S}/themes/$i
+			[ "$i" == "language" ] && cd ${S}/includes
+			for item in `cat ${PORTDIR}/www-apps/${PN}/files/${MY_PV}/$i`; do
+				einfo "Unpacking $item"
+				wget -q http://www.drupal.org/files/projects/$item-${MY_PV}.tar.gz
+				tar xfz $item-${MY_PV}.tar.gz
+			done
+		done
+
+		find ${MY_HTDOCSDIR} -name "*.tar.gz" -exec rm -rf {} \;
+		find ${MY_HTDOCSDIR} -type f -exec chmod 644 {} \;
+		find ${MY_HTDOCSDIR} -type d -exec chmod 755 {} \;
+	fi
+}
diff --git a/www-apps/drupal/drupal-4.6.6.ebuild b/www-apps/drupal/drupal-4.6.6.ebuild
new file mode 100644
index 000000000000..461d74b72516
--- /dev/null
+++ b/www-apps/drupal/drupal-4.6.6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.6.6.ebuild,v 1.1 2006/05/05 05:18:01 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="Drupal is a PHP-based open-source platform and content management system for building dynamic web sites offering a broad range of features and services; including user administration, publishing workflow, discussion capabilities, news aggregation, metadata functionalities using controlled vocabularies and XML publishing for content sharing purposes. Equipped with a powerful blend of features and configurability, Drupal can support a diverse range of web projects ranging from personal weblogs to large community-driven sites."
+HOMEPAGE="http://drupal.org"
+IUSE=""
+
+SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~ppc ~x86 ~amd64"
+
+DEPEND="virtual/php"
+RDEPEND="|| ( dev-db/mysql dev-db/postgresql )
+		>=net-www/apache-1.3"
+
+src_compile() {
+	#Default compile hangs!
+	echo "Nothing to compile"
+}
+
+src_install() {
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt"
+
+	webapp_src_preinst
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	einfo "Installing docs"
+	dodoc ${docs}
+	for doc in ${docs} INSTALL; do
+		rm -f ${doc}
+	done
+
+	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
+
+	#All files must be owned by server
+	for x in `find . -type f -print` ; do
+		webapp_serverowned ${MY_HTDOCSDIR}/$x
+	done
+
+	webapp_configfile ${MY_HTDOCSDIR}/sites/default/settings.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-4.6.3.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	einfo
+	einfo "You might want to run:"
+	einfo "\"emerge --config =${PF} \""
+	einfo "if this is a new install."
+	einfo
+}
+
+pkg_config() {
+	# This is the default directory, but we have this portion for the user to
+	# change the default directory if it does not exist.
+	MY_HTDOCSDIR=/usr/share/webapps/${PN}/${PV}/htdocs
+	if [ ! -d ${MY_HTDOCSDIR} ] && \
+		[ ! -d ${MY_HTDOCSDIR}/modules ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ ! -d ${MY_HTDOCSDIR}/language ] ; then
+		einfo "Please specify the directory your drupal installation "
+		einfo "is installed in."
+		echo
+		while true
+		do
+			read -p " Please type in the name of the directory: " MY_HTDOCSDIR
+			[ -d ${MY_HTDOCSDIR} ] && \
+				[ -d ${MY_HTDOCSDIR}/modules ] && \
+				[ -d ${MY_HTDOCSDIR}/themes ] && \
+				[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+				[ -d ${MY_HTDOCSDIR}/language ] && \
+				break || \
+				ewarn "The directory ${MY_HTDOCSDIR} does not exist"
+		done
+	fi
+	if [ -d ${MY_HTDOCSDIR} ] && \
+		[ -d ${MY_HTDOCSDIR}/modules ] && \
+		[ -d ${MY_HTDOCSDIR}/themes ] && \
+		[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ -d ${MY_HTDOCSDIR}/language ] ; then
+		for i in modules themes engines language; do
+			cd ${MY_HTDOCSDIR}/$i
+			[ "$i" == "engines" ] && cd ${S}/themes/$i
+			[ "$i" == "language" ] && cd ${S}/includes
+			for item in `cat ${PORTDIR}/www-apps/${PN}/files/${MY_PV}/$i`; do
+				einfo "Unpacking $item"
+				wget -q http://www.drupal.org/files/projects/$item-${MY_PV}.tar.gz
+				tar xfz $item-${MY_PV}.tar.gz
+			done
+		done
+
+		find ${MY_HTDOCSDIR} -name "*.tar.gz" -exec rm -rf {} \;
+		find ${MY_HTDOCSDIR} -type f -exec chmod 644 {} \;
+		find ${MY_HTDOCSDIR} -type d -exec chmod 755 {} \;
+	fi
+}
diff --git a/www-apps/drupal/drupal-4.7.0.ebuild b/www-apps/drupal/drupal-4.7.0.ebuild
new file mode 100644
index 000000000000..bd9319742fb0
--- /dev/null
+++ b/www-apps/drupal/drupal-4.7.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.7.0.ebuild,v 1.1 2006/05/05 05:18:01 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="Drupal is a PHP-based open-source platform and content management system for building dynamic web sites offering a broad range of features and services; including user administration, publishing workflow, discussion capabilities, news aggregation, metadata functionalities using controlled vocabularies and XML publishing for content sharing purposes. Equipped with a powerful blend of features and configurability, Drupal can support a diverse range of web projects ranging from personal weblogs to large community-driven sites."
+HOMEPAGE="http://drupal.org"
+IUSE=""
+
+SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~ppc ~x86 ~amd64"
+
+DEPEND="virtual/php"
+RDEPEND="|| ( dev-db/mysql dev-db/postgresql )
+		>=net-www/apache-1.3"
+
+src_compile() {
+	#Default compile hangs!
+	echo "Nothing to compile"
+}
+
+src_install() {
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt"
+
+	webapp_src_preinst
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	einfo "Installing docs"
+	dodoc ${docs}
+	for doc in ${docs} INSTALL; do
+		rm -f ${doc}
+	done
+
+	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
+
+	#All files must be owned by server
+	for x in `find . -type f -print` ; do
+		webapp_serverowned ${MY_HTDOCSDIR}/$x
+	done
+
+	webapp_configfile ${MY_HTDOCSDIR}/sites/default/settings.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-4.6.3.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	einfo
+	einfo "You might want to run:"
+	einfo "\"emerge --config =${PF} \""
+	einfo "if this is a new install."
+	einfo
+}
+
+pkg_config() {
+	# This is the default directory, but we have this portion for the user to
+	# change the default directory if it does not exist.
+	MY_HTDOCSDIR=/usr/share/webapps/${PN}/${PV}/htdocs
+	if [ ! -d ${MY_HTDOCSDIR} ] && \
+		[ ! -d ${MY_HTDOCSDIR}/modules ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ ! -d ${MY_HTDOCSDIR}/language ] ; then
+		einfo "Please specify the directory your drupal installation "
+		einfo "is installed in."
+		echo
+		while true
+		do
+			read -p " Please type in the name of the directory: " MY_HTDOCSDIR
+			[ -d ${MY_HTDOCSDIR} ] && \
+				[ -d ${MY_HTDOCSDIR}/modules ] && \
+				[ -d ${MY_HTDOCSDIR}/themes ] && \
+				[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+				[ -d ${MY_HTDOCSDIR}/language ] && \
+				break || \
+				ewarn "The directory ${MY_HTDOCSDIR} does not exist"
+		done
+	fi
+	if [ -d ${MY_HTDOCSDIR} ] && \
+		[ -d ${MY_HTDOCSDIR}/modules ] && \
+		[ -d ${MY_HTDOCSDIR}/themes ] && \
+		[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ -d ${MY_HTDOCSDIR}/language ] ; then
+		for i in modules themes engines language; do
+			cd ${MY_HTDOCSDIR}/$i
+			[ "$i" == "engines" ] && cd ${S}/themes/$i
+			[ "$i" == "language" ] && cd ${S}/includes
+			for item in `cat ${PORTDIR}/www-apps/${PN}/files/${MY_PV}/$i`; do
+				einfo "Unpacking $item"
+				wget -q http://www.drupal.org/files/projects/$item-${MY_PV}.tar.gz
+				tar xfz $item-${MY_PV}.tar.gz
+			done
+		done
+
+		find ${MY_HTDOCSDIR} -name "*.tar.gz" -exec rm -rf {} \;
+		find ${MY_HTDOCSDIR} -type f -exec chmod 644 {} \;
+		find ${MY_HTDOCSDIR} -type d -exec chmod 755 {} \;
+	fi
+}
diff --git a/www-apps/drupal/files/digest-drupal-4.5.8 b/www-apps/drupal/files/digest-drupal-4.5.8
new file mode 100644
index 000000000000..392f3af19ede
--- /dev/null
+++ b/www-apps/drupal/files/digest-drupal-4.5.8
@@ -0,0 +1,3 @@
+MD5 44bb6d4b5901d5de8289708c010a4a29 drupal-4.5.8.tar.gz 467896
+RMD160 581fc4c94ae1d52137c6f5f1797cb96ca8bd0274 drupal-4.5.8.tar.gz 467896
+SHA256 17812a899a22d5e076add93006d963d21527fe35cc7e2d6185de71325fe0aeb3 drupal-4.5.8.tar.gz 467896
diff --git a/www-apps/drupal/files/digest-drupal-4.6.6 b/www-apps/drupal/files/digest-drupal-4.6.6
new file mode 100644
index 000000000000..0dd9a4ed5a77
--- /dev/null
+++ b/www-apps/drupal/files/digest-drupal-4.6.6
@@ -0,0 +1,3 @@
+MD5 4d2f5745c0c9eef56ef7ca88654eacf5 drupal-4.6.6.tar.gz 455959
+RMD160 d55af1dac65336fda4c830d8c1c56678588e3d91 drupal-4.6.6.tar.gz 455959
+SHA256 beb73c12af3d1785a0d845170c0785b6c1a83576cb42a17388372c52be3717e0 drupal-4.6.6.tar.gz 455959
diff --git a/www-apps/drupal/files/digest-drupal-4.7.0 b/www-apps/drupal/files/digest-drupal-4.7.0
new file mode 100644
index 000000000000..72ccf8a284fa
--- /dev/null
+++ b/www-apps/drupal/files/digest-drupal-4.7.0
@@ -0,0 +1,3 @@
+MD5 1df238bb0dbb11addbd5387014018015 drupal-4.7.0.tar.gz 483395
+RMD160 259a3cc8f50ba297015ea65936b47ec9363b0131 drupal-4.7.0.tar.gz 483395
+SHA256 6b9953605d40939417401fa86ccc69d3596740887f8257750a8276662abab5fc drupal-4.7.0.tar.gz 483395