Devised new method of getting drupal modules

(Portage version: 2.0.51.21-r1)

7 files changed, 158 insertions, 506 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index b0b89d92fe0b..6609829e5740 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.11 2005/05/02 12:31:41 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.12 2005/05/05 15:46:47 st_lim Exp $
+
+  05 May 2005; Lim Swee Tat <st_lim@gentoo.org> +files/4.6.0/engines,
+  +files/4.6.0/language, +files/4.6.0/modules, +files/4.6.0/themes,
+  drupal-4.6.0.ebuild:
+  Devised new method of getting the modules themes and others
 
   02 May 2005; Lim Swee Tat <st_lim@gentoo.org> drupal-4.6.0.ebuild:
   Updated modules to today's list
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 1c3ccbb56c03..48d626ed620a 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,9 +1,13 @@
 MD5 c2bd53a64982c7a9ad6fa9efa01f3fc7 ChangeLog 402
 MD5 be606d22861d04106bbebfedeb5d33f5 drupal-4.5.2.ebuild 30674
-MD5 8156065aa873fbbc6fefc3f678c3c013 drupal-4.6.0.ebuild 19143
+MD5 23524385d0b8a62aaf4369974bc76073 drupal-4.6.0.ebuild 2787
 MD5 dafdada02bb072949d7839aece868203 drupal-4.6.0_rc1.ebuild 14561
 MD5 88b2c84c1b3552228d711637cb7d9269 metadata.xml 274
 MD5 6e620a6c0cb76bfe99a1d535264081bc files/digest-drupal-4.6.0_rc1 67
 MD5 0f20a567ce1310d62af69bd56921cea3 files/postinstall-en.txt 2595
 MD5 60d816b2bdcf87d62c1f52a2dc8e776c files/digest-drupal-4.6.0 64
 MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
+MD5 57ac487dc3baa53dc38afabe1f689999 files/4.6.0/engines 12
+MD5 87c9963c320ae5d6bf4aceaadbbeb9c3 files/4.6.0/language 38
+MD5 32a619628ce2c242b4339b240d1161fd files/4.6.0/modules 1057
+MD5 78ea84de952135abf94837142ce0f03c files/4.6.0/themes 187
diff --git a/www-apps/drupal/drupal-4.6.0.ebuild b/www-apps/drupal/drupal-4.6.0.ebuild
index b03c5f9da9b0..fad7f1fa454f 100644
--- a/www-apps/drupal/drupal-4.6.0.ebuild
+++ b/www-apps/drupal/drupal-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.6.0.ebuild,v 1.2 2005/05/02 12:31:41 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.6.0.ebuild,v 1.3 2005/05/05 15:46:47 st_lim Exp $
 
 inherit webapp eutils
 
@@ -21,509 +21,18 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	if ! use minimal ; then
-		cd ${S}/modules
-		einfo "Unpacking album"
-		wget -q http://www.drupal.org/files/projects/album-4.6.0.tar.gz
-		tar xfz album-4.6.0.tar.gz
 
-		einfo "Unpacking amazontools"
-		wget -q http://www.drupal.org/files/projects/amazontools-4.6.0.tar.gz
-		tar xfz amazontools-4.6.0.tar.gz
-
-		einfo "Unpacking amazonsearch"
-		wget -q http://www.drupal.org/files/projects/amazonsearch-4.6.0.tar.gz
-		tar xfz amazonsearch-4.6.0.tar.gz
-
-		einfo "Unpacking article"
-		wget -q http://www.drupal.org/files/projects/article-4.6.0.tar.gz
-		tar xfz article-4.6.0.tar.gz
-
-		einfo "Unpacking attachment"
-		wget -q http://www.drupal.org/files/projects/attachment-4.6.0.tar.gz
-		tar xfz attachment-4.6.0.tar.gz
-
-		einfo "Unpacking bookreview"
-		wget -q http://www.drupal.org/files/projects/bookreview-4.6.0.tar.gz
-		tar xfz bookreview-4.6.0.tar.gz
-
-		einfo "Unpacking bookmarks"
-		wget -q http://www.drupal.org/files/projects/bookmarks-4.6.0.tar.gz
-		tar xfz bookmarks-4.6.0.tar.gz
-
-		einfo "Unpacking buddylist"
-		wget -q http://www.drupal.org/files/projects/buddylist-4.6.0.tar.gz
-		tar xfz buddylist-4.6.0.tar.gz
-
-		einfo "Unpacking chatbox"
-		wget -q http://www.drupal.org/files/projects/chatbox-4.6.0.tar.gz
-		tar xfz chatbox-4.6.0.tar.gz
-
-		einfo "Unpacking codefilter"
-		wget -q http://www.drupal.org/files/projects/codefilter-4.6.0.tar.gz
-		tar xfz codefilter-4.6.0.tar.gz
-
-		einfo "Unpacking commentcloser"
-		wget -q http://www.drupal.org/files/projects/commentcloser-4.6.0.tar.gz
-		tar xfz commentcloser-4.6.0.tar.gz
-
-		einfo "Unpacking contact_dir"
-		wget -q http://www.drupal.org/files/projects/contact_dir-4.6.0.tar.gz
-		tar xfz contact_dir-4.6.0.tar.gz
-
-		einfo "Unpacking contextlinks"
-		wget -q http://www.drupal.org/files/projects/contextlinks-4.6.0.tar.gz
-		tar xfz contextlinks-4.6.0.tar.gz
-
-		einfo "Unpacking customerror"
-		wget -q http://www.drupal.org/files/projects/customerror-4.6.0.tar.gz
-		tar xfz customerror-4.6.0.tar.gz
-
-		einfo "Unpacking daily"
-		wget -q http://www.drupal.org/files/projects/daily-4.6.0.tar.gz
-		tar xfz daily-4.6.0.tar.gz
-
-		einfo "Unpacking dba"
-		wget -q http://www.drupal.org/files/projects/dba-4.6.0.tar.gz
-		tar xfz dba-4.6.0.tar.gz
-
-		einfo "Unpacking diff"
-		wget -q http://www.drupal.org/files/projects/diff-4.6.0.tar.gz
-		tar xfz diff-4.6.0.tar.gz
-
-		einfo "Unpacking download_counter"
-		wget -q http://www.drupal.org/files/projects/download_counter-4.6.0.tar.gz
-		tar xfz download_counter-4.6.0.tar.gz
-
-		einfo "Unpacking event"
-		wget -q http://www.drupal.org/files/projects/event-4.6.0.tar.gz
-		tar xfz event-4.6.0.tar.gz
-
-		einfo "Unpacking excerpt"
-		wget -q http://www.drupal.org/files/projects/excerpt-4.6.0.tar.gz
-		tar xfz excerpt-4.6.0.tar.gz
-
-		einfo "Unpacking ezmlm"
-		wget -q http://www.drupal.org/files/projects/ezmlm-4.6.0.tar.gz
-		tar xfz ezmlm-4.6.0.tar.gz
-
-		einfo "Unpacking fckeditor"
-		wget -q http://www.drupal.org/files/projects/fckeditor-4.6.0.tar.gz
-		tar xfz fckeditor-4.6.0.tar.gz
-
-		einfo "Unpacking feedback"
-		wget -q http://www.drupal.org/files/projects/feedback-4.6.0.tar.gz
-		tar xfz feedback-4.6.0.tar.gz
-
-		einfo "Unpacking filemanager"
-		wget -q http://www.drupal.org/files/projects/filemanager-4.6.0.tar.gz
-		tar xfz filemanager-4.6.0.tar.gz
-
-		einfo "Unpacking flexinode"
-		wget -q http://www.drupal.org/files/projects/flexinode-4.6.0.tar.gz
-		tar xfz flexinode-4.6.0.tar.gz
-
-		einfo "Unpacking foaf"
-		wget -q http://www.drupal.org/files/projects/foaf-4.6.0.tar.gz
-		tar xfz foaf-4.6.0.tar.gz
-
-		einfo "Unpacking folksonomy"
-		wget -q http://www.drupal.org/files/projects/folksonomy-4.6.0.tar.gz
-		tar xfz folksonomy-4.6.0.tar.gz
-
-		einfo "Unpacking fontsize"
-		wget -q http://www.drupal.org/files/projects/fontsize-4.6.0.tar.gz
-		tar xfz fontsize-4.6.0.tar.gz
-
-		einfo "Unpacking forms"
-		wget -q http://www.drupal.org/files/projects/forms-4.6.0.tar.gz
-		tar xfz forms-4.6.0.tar.gz
-
-		einfo "Unpacking form_mail"
-		wget -q http://www.drupal.org/files/projects/form_mail-4.6.0.tar.gz
-		tar xfz form_mail-4.6.0.tar.gz
-
-		einfo "Unpacking freelinking"
-		wget -q http://www.drupal.org/files/projects/freelinking-4.6.0.tar.gz
-		tar xfz freelinking-4.6.0.tar.gz
-
-		einfo "Unpacking front"
-		wget -q http://www.drupal.org/files/projects/front-4.6.0.tar.gz
-		tar xfz front-4.6.0.tar.gz
-
-		einfo "Unpacking gallery"
-		wget -q http://www.drupal.org/files/projects/gallery-4.6.0.tar.gz
-		tar xfz gallery-4.6.0.tar.gz
-
-		einfo "Unpacking glossary"
-		wget -q http://www.drupal.org/files/projects/glossary-4.6.0.tar.gz
-		tar xfz glossary-4.6.0.tar.gz
-
-		einfo "Unpacking hof"
-		wget -q http://www.drupal.org/files/projects/hof-4.6.0.tar.gz
-		tar xfz hof-4.6.0.tar.gz
-
-		einfo "Unpacking helpedit"
-		wget -q http://www.drupal.org/files/projects/helpedit-4.6.0.tar.gz
-		tar xfz helpedit-4.6.0.tar.gz
-
-		einfo "Unpacking htmlcorrector"
-		wget -q http://www.drupal.org/files/projects/htmlcorrector-4.6.0.tar.gz
-		tar xfz htmlcorrector-4.6.0.tar.gz
-
-		einfo "Unpacking htmlarea"
-		wget -q http://www.drupal.org/files/projects/htmlarea-4.6.0.tar.gz
-		tar xfz htmlarea-4.6.0.tar.gz
-
-		einfo "Unpacking image"
-		wget -q http://www.drupal.org/files/projects/image-4.6.0.tar.gz
-		tar xfz image-4.6.0.tar.gz
-
-		einfo "Unpacking img_assist"
-		wget -q http://www.drupal.org/files/projects/img_assist-4.6.0.tar.gz
-		tar xfz img_assist-4.6.0.tar.gz
-
-		einfo "Unpacking i18n"
-		wget -q http://www.drupal.org/files/projects/i18n-4.6.0.tar.gz
-		tar xfz i18n-4.6.0.tar.gz
-
-		einfo "Unpacking interwiki"
-		wget -q http://www.drupal.org/files/projects/interwiki-4.6.0.tar.gz
-		tar xfz interwiki-4.6.0.tar.gz
-
-		einfo "Unpacking livediscussions"
-		wget -q http://www.drupal.org/files/projects/livediscussions-4.6.0.tar.gz
-		tar xfz livediscussions-4.6.0.tar.gz
-
-		einfo "Unpacking mailalias"
-		wget -q http://www.drupal.org/files/projects/mailalias-4.6.0.tar.gz
-		tar xfz mailalias-4.6.0.tar.gz
-
-		einfo "Unpacking mailhandler"
-		wget -q http://www.drupal.org/files/projects/mailhandler-4.6.0.tar.gz
-		tar xfz mailhandler-4.6.0.tar.gz
-
-		einfo "Unpacking marksmarty"
-		wget -q http://www.drupal.org/files/projects/marksmarty-4.6.0.tar.gz
-		tar xfz marksmarty-4.6.0.tar.gz
-
-		einfo "Unpacking massmailer"
-		wget -q http://www.drupal.org/files/projects/massmailer-4.6.0.tar.gz
-		tar xfz massmailer-4.6.0.tar.gz
-
-		einfo "Unpacking members"
-		wget -q http://www.drupal.org/files/projects/members-4.6.0.tar.gz
-		tar xfz members-4.6.0.tar.gz
-
-		einfo "Unpacking menu_otf"
-		wget -q http://www.drupal.org/files/projects/menu_otf-4.6.0.tar.gz
-		tar xfz menu_otf-4.6.0.tar.gz
-
-		einfo "Unpacking nodewords"
-		wget -q http://www.drupal.org/files/projects/nodewords-4.6.0.tar.gz
-		tar xfz nodewords-4.6.0.tar.gz
-
-		einfo "Unpacking nodelist"
-		wget -q http://www.drupal.org/files/projects/nodelist-4.6.0.tar.gz
-		tar xfz nodelist-4.6.0.tar.gz
-
-		einfo "Unpacking nmoderation"
-		wget -q http://www.drupal.org/files/projects/nmoderation-4.6.0.tar.gz
-		tar xfz nmoderation-4.6.0.tar.gz
-
-		einfo "Unpacking node_privacy_byrole"
-		wget -q http://www.drupal.org/files/projects/node_privacy_byrole-4.6.0.tar.gz
-		tar xfz node_privacy_byrole-4.6.0.tar.gz
-
-		einfo "Unpacking node_import"
-		wget -q http://www.drupal.org/files/projects/node_import-4.6.0.tar.gz
-		tar xfz node_import-4.6.0.tar.gz
-
-		einfo "Unpacking notify"
-		wget -q http://www.drupal.org/files/projects/notify-4.6.0.tar.gz
-		tar xfz notify-4.6.0.tar.gz
-
-		einfo "Unpacking og"
-		wget -q http://www.drupal.org/files/projects/og-4.6.0.tar.gz
-		tar xfz og-4.6.0.tar.gz
-
-		einfo "Unpacking pathauto"
-		wget -q http://www.drupal.org/files/projects/pathauto-4.6.0.tar.gz
-		tar xfz pathauto-4.6.0.tar.gz
-
-		einfo "Unpacking paypal_framework"
-		wget -q http://www.drupal.org/files/projects/paypal_framework-4.6.0.tar.gz
-		tar xfz paypal_framework-4.6.0.tar.gz
-
-		einfo "Unpacking paypal_subscription"
-		wget -q http://www.drupal.org/files/projects/paypal_subscription-4.6.0.tar.gz
-		tar xfz paypal_subscription-4.6.0.tar.gz
-
-		einfo "Unpacking poormanscron"
-		wget -q http://www.drupal.org/files/projects/poormanscron-4.6.0.tar.gz
-		tar xfz poormanscron-4.6.0.tar.gz
-
-		einfo "Unpacking privatemsg"
-		wget -q http://www.drupal.org/files/projects/privatemsg-4.6.0.tar.gz
-		tar xfz privatemsg-4.6.0.tar.gz
-
-		einfo "Unpacking quote"
-		wget -q http://www.drupal.org/files/projects/quote-4.6.0.tar.gz
-		tar xfz quote-4.6.0.tar.gz
-
-		einfo "Unpacking quotes"
-		wget -q http://www.drupal.org/files/projects/quotes-4.6.0.tar.gz
-		tar xfz quotes-4.6.0.tar.gz
-
-		einfo "Unpacking recipe"
-		wget -q http://www.drupal.org/files/projects/recipe-4.6.0.tar.gz
-		tar xfz recipe-4.6.0.tar.gz
-
-		einfo "Unpacking rsvp"
-		wget -q http://www.drupal.org/files/projects/rsvp-4.6.0.tar.gz
-		tar xfz rsvp-4.6.0.tar.gz
-
-		einfo "Unpacking scheduler"
-		wget -q http://www.drupal.org/files/projects/scheduler-4.6.0.tar.gz
-		tar xfz scheduler-4.6.0.tar.gz
-
-		einfo "Unpacking securesite"
-		wget -q http://www.drupal.org/files/projects/securesite-4.6.0.tar.gz
-		tar xfz securesite-4.6.0.tar.gz
-
-		einfo "Unpacking series"
-		wget -q http://www.drupal.org/files/projects/series-4.6.0.tar.gz
-		tar xfz series-4.6.0.tar.gz
-
-		einfo "Unpacking sidecontent"
-		wget -q http://www.drupal.org/files/projects/sidecontent-4.6.0.tar.gz
-		tar xfz sidecontent-4.6.0.tar.gz
-
-		einfo "Unpacking simpletest"
-		wget -q http://www.drupal.org/files/projects/simpletest-4.6.0.tar.gz
-		tar xfz simpletest-4.6.0.tar.gz
-
-		einfo "Unpacking site_map"
-		wget -q http://www.drupal.org/files/projects/site_map-4.6.0.tar.gz
-		tar xfz site_map-4.6.0.tar.gz
-
-		einfo "Unpacking sitemenu"
-		wget -q http://www.drupal.org/files/projects/sitemenu-4.6.0.tar.gz
-		tar xfz sitemenu-4.6.0.tar.gz
-
-		einfo "Unpacking smartypants"
-		wget -q http://www.drupal.org/files/projects/smartypants-4.6.0.tar.gz
-		tar xfz smartypants-4.6.0.tar.gz
-
-		einfo "Unpacking smileys"
-		wget -q http://www.drupal.org/files/projects/smileys-4.6.0.tar.gz
-		tar xfz smileys-4.6.0.tar.gz
-
-		einfo "Unpacking spam"
-		wget -q http://www.drupal.org/files/projects/spam-4.6.0.tar.gz
-		tar xfz spam-4.6.0.tar.gz
-
-		einfo "Unpacking statistics_filter"
-		wget -q http://www.drupal.org/files/projects/statistics_filter-4.6.0.tar.gz
-		tar xfz statistics_filter-4.6.0.tar.gz
-
-		einfo "Unpacking stock"
-		wget -q http://www.drupal.org/files/projects/stock-4.6.0.tar.gz
-		tar xfz stock-4.6.0.tar.gz
-
-		einfo "Unpacking subscriptions"
-		wget -q http://www.drupal.org/files/projects/subscriptions-4.6.0.tar.gz
-		tar xfz subscriptions-4.6.0.tar.gz
-
-		einfo "Unpacking summary"
-		wget -q http://www.drupal.org/files/projects/summary-4.6.0.tar.gz
-		tar xfz summary-4.6.0.tar.gz
-
-		einfo "Unpacking survey"
-		wget -q http://www.drupal.org/files/projects/survey-4.6.0.tar.gz
-		tar xfz survey-4.6.0.tar.gz
-
-		einfo "Unpacking sxip"
-		wget -q http://www.drupal.org/files/projects/sxip-4.6.0.tar.gz
-		tar xfz sxip-4.6.0.tar.gz
-
-		einfo "Unpacking syndication"
-		wget -q http://www.drupal.org/files/projects/syndication-4.6.0.tar.gz
-		tar xfz syndication-4.6.0.tar.gz
-
-		einfo "Unpacking taxonomy_access"
-		wget -q http://www.drupal.org/files/projects/taxonomy_access-4.6.0.tar.gz
-		tar xfz taxonomy_access-4.6.0.tar.gz
-
-		einfo "Unpacking taxonomy_block"
-		wget -q http://www.drupal.org/files/projects/taxonomy_block-4.6.0.tar.gz
-		tar xfz taxonomy_block-4.6.0.tar.gz
-
-		einfo "Unpacking taxonomy_browser"
-		wget -q http://www.drupal.org/files/projects/taxonomy_browser-4.6.0.tar.gz
-		tar xfz taxonomy_browser-4.6.0.tar.gz
-
-		einfo "Unpacking taxonomy_dhtml"
-		wget -q http://www.drupal.org/files/projects/taxonomy_dhtml-4.6.0.tar.gz
-		tar xfz taxonomy_dhtml-4.6.0.tar.gz
-
-		einfo "Unpacking taxonomy_xml"
-		wget -q http://www.drupal.org/files/projects/taxonomy_xml-4.6.0.tar.gz
-		tar xfz taxonomy_xml-4.6.0.tar.gz
-
-		einfo "Unpacking taxonomy_menu"
-		wget -q http://www.drupal.org/files/projects/taxonomy_menu-4.6.0.tar.gz
-		tar xfz taxonomy_menu-4.6.0.tar.gz
-
-		einfo "Unpacking taxonomy_multi_edit"
-		wget -q http://www.drupal.org/files/projects/taxonomy_multi_edit-4.6.0.tar.gz
-		tar xfz taxonomy_multi_edit-4.6.0.tar.gz
-
-		einfo "Unpacking textile"
-		wget -q http://www.drupal.org/files/projects/textile-4.6.0.tar.gz
-		tar xfz textile-4.6.0.tar.gz
-
-		einfo "Unpacking theme_editor"
-		wget -q http://www.drupal.org/files/projects/theme_editor-4.6.0.tar.gz
-		tar xfz theme_editor-4.6.0.tar.gz
-
-		einfo "Unpacking tinymce"
-		wget -q http://www.drupal.org/files/projects/tinymce-4.6.0.tar.gz
-		tar xfz tinymce-4.6.0.tar.gz
-
-		einfo "Unpacking urlfilter"
-		wget -q http://www.drupal.org/files/projects/urlfilter-4.6.0.tar.gz
-		tar xfz urlfilter-4.6.0.tar.gz
-
-		einfo "Unpacking variable"
-		wget -q http://www.drupal.org/files/projects/variable-4.6.0.tar.gz
-		tar xfz variable-4.6.0.tar.gz
-
-		einfo "Unpacking vimcolor"
-		wget -q http://www.drupal.org/files/projects/vimcolor-4.6.0.tar.gz
-		tar xfz vimcolor-4.6.0.tar.gz
-
-		einfo "Unpacking webform"
-		wget -q http://www.drupal.org/files/projects/webform-4.6.0.tar.gz
-		tar xfz webform-4.6.0.tar.gz
-
-		einfo "Unpacking webserver_auth"
-		wget -q http://www.drupal.org/files/projects/webserver_auth-4.6.0.tar.gz
-		tar xfz webserver_auth-4.6.0.tar.gz
-
-		einfo "Unpacking week"
-		wget -q http://www.drupal.org/files/projects/week-4.6.0.tar.gz
-		tar xfz week-4.6.0.tar.gz
-
-		cd ${S}/themes
-		einfo "Unpacking adc"
-		wget -q http://www.drupal.org/files/projects/adc-4.6.0.tar.gz
-		tar xfz adc-4.6.0.tar.gz
-
-		einfo "Unpacking blix"
-		wget -q http://www.drupal.org/files/projects/blix-4.6.0.tar.gz
-		tar xfz blix-4.6.0.tar.gz
-
-		einfo "Unpacking bluemarine"
-		wget -q http://www.drupal.org/files/projects/bluemarine-4.6.0.tar.gz
-		tar xfz bluemarine-4.6.0.tar.gz
-
-		einfo "Unpacking democratica"
-		wget -q http://www.drupal.org/files/projects/democratica-4.6.0.tar.gz
-		tar xfz democratica-4.6.0.tar.gz
-
-		einfo "Unpacking friendselectric"
-		wget -q http://www.drupal.org/files/projects/friendselectric-4.6.0.tar.gz
-		tar xfz friendselectric-4.6.0.tar.gz
-
-		einfo "Unpacking gespaa"
-		wget -q http://www.drupal.org/files/projects/gespaa-4.6.0.tar.gz
-		tar xfz gespaa-4.6.0.tar.gz
-
-		einfo "Unpacking goofy"
-		wget -q http://www.drupal.org/files/projects/goofy-4.6.0.tar.gz
-		tar xfz goofy-4.6.0.tar.gz
-
-		einfo "Unpacking greenmarinee"
-		wget -q http://www.drupal.org/files/projects/greenmarinee-4.6.0.tar.gz
-		tar xfz greenmarinee-4.6.0.tar.gz
-
-		einfo "Unpacking interlaced"
-		wget -q http://www.drupal.org/files/projects/interlaced-4.6.0.tar.gz
-		tar xfz interlaced-4.6.0.tar.gz
-
-		einfo "Unpacking leaf"
-		wget -q http://www.drupal.org/files/projects/leaf-4.6.0.tar.gz
-		tar xfz leaf-4.6.0.tar.gz
-
-		einfo "Unpacking lincolns_revenge"
-		wget -q http://www.drupal.org/files/projects/lincolns_revenge-4.6.0.tar.gz
-		tar xfz lincolns_revenge-4.6.0.tar.gz
-
-		einfo "Unpacking marvinclassic"
-		wget -q http://www.drupal.org/files/projects/marvinclassic-4.6.0.tar.gz
-		tar xfz marvinclassic-4.6.0.tar.gz
-
-		einfo "Unpacking rdc"
-		wget -q http://www.drupal.org/files/projects/rdc-4.6.0.tar.gz
-		tar xfz rdc-4.6.0.tar.gz
-
-		einfo "Unpacking slash"
-		wget -q http://www.drupal.org/files/projects/slash-4.6.0.tar.gz
-		tar xfz slash-4.6.0.tar.gz
-
-		einfo "Unpacking slurpee"
-		wget -q http://www.drupal.org/files/projects/slurpee-4.6.0.tar.gz
-		tar xfz slurpee-4.6.0.tar.gz
-
-		einfo "Unpacking spreadfirefox"
-		wget -q http://www.drupal.org/files/projects/spreadfirefox-4.6.0.tar.gz
-		tar xfz spreadfirefox-4.6.0.tar.gz
-
-		einfo "Unpacking sunflower"
-		wget -q http://www.drupal.org/files/projects/sunflower-4.6.0.tar.gz
-		tar xfz sunflower-4.6.0.tar.gz
-
-		einfo "Unpacking unconed"
-		wget -q http://www.drupal.org/files/projects/unconed-4.6.0.tar.gz
-		tar xfz unconed-4.6.0.tar.gz
-
-		cd ${S}/includes
-		einfo "Unpacking pt-br"
-		wget -q http://www.drupal.org/files/projects/pt-br-4.6.0.tar.gz
-		tar xfz pt-br-4.6.0.tar.gz
-
-		einfo "Unpacking fr"
-		wget -q http://www.drupal.org/files/projects/fr-4.6.0.tar.gz
-		tar xfz fr-4.6.0.tar.gz
-
-		einfo "Unpacking hu"
-		wget -q http://www.drupal.org/files/projects/hu-4.6.0.tar.gz
-		tar xfz hu-4.6.0.tar.gz
-
-		einfo "Unpacking ja"
-		wget -q http://www.drupal.org/files/projects/ja-4.6.0.tar.gz
-		tar xfz ja-4.6.0.tar.gz
-
-		einfo "Unpacking pl"
-		wget -q http://www.drupal.org/files/projects/pl-4.6.0.tar.gz
-		tar xfz pl-4.6.0.tar.gz
-
-		einfo "Unpacking pt-pt"
-		wget -q http://www.drupal.org/files/projects/pt-pt-4.6.0.tar.gz
-		tar xfz pt-pt-4.6.0.tar.gz
-
-		einfo "Unpacking es"
-		wget -q http://www.drupal.org/files/projects/es-4.6.0.tar.gz
-		tar xfz es-4.6.0.tar.gz
-
-		cd ${S}/themes/engines
-		einfo "Unpacking drupal-pot"
-		wget -q http://www.drupal.org/files/projects/drupal-pot-4.6.0.tar.gz
-		tar xfz drupal-pot-4.6.0.tar.gz
-
-		einfo "Unpacking phptemplate"
-		wget -q http://www.drupal.org/files/projects/phptemplate-4.6.0.tar.gz
-		tar xfz phptemplate-4.6.0.tar.gz
+		for i in modules themes engines language; do 
+			cd ${S}/$i
+			[ "$i" == "engines" ] && cd ${S}/themes/$i
+			[ "$i" == "language" ] && cd ${S}/includes
+			einfo "`pwd`"
+			for item in `cat ${FILESDIR}/${PV}/$i`; do
+				einfo "Unpacking $item"
+				wget -q http://www.drupal.org/files/projects/$item-4.6.0.tar.gz
+				tar xfz $item-4.6.0.tar.gz
+			done
+		done
 
 		find ${S} -name "*.tar.gz" -exec rm -rf {} \;
 		find ${S} -type f -exec chmod 644 {} \;
@@ -544,7 +53,7 @@ src_install() {
 
 	# handle documentation files
 	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	D# NOTE that doc files go into /usr/share/doc as normal; they do NOT
 	# get installed per vhost!
 
 	einfo "Installing docs"
diff --git a/www-apps/drupal/files/4.6.0/engines b/www-apps/drupal/files/4.6.0/engines
new file mode 100644
index 000000000000..d7180787161f
--- /dev/null
+++ b/www-apps/drupal/files/4.6.0/engines
@@ -0,0 +1 @@
+phptemplate
diff --git a/www-apps/drupal/files/4.6.0/language b/www-apps/drupal/files/4.6.0/language
new file mode 100644
index 000000000000..cba463dc4ae0
--- /dev/null
+++ b/www-apps/drupal/files/4.6.0/language
@@ -0,0 +1,8 @@
+pt-br
+fr
+hu
+ja
+pl
+pt-pt
+es
+drupal-pot
diff --git a/www-apps/drupal/files/4.6.0/modules b/www-apps/drupal/files/4.6.0/modules
new file mode 100644
index 000000000000..aab4fb4de737
--- /dev/null
+++ b/www-apps/drupal/files/4.6.0/modules
@@ -0,0 +1,105 @@
+album
+amazontools
+amazonsearch
+article
+attachment
+bookreview
+bookmarks
+buddylist
+chatbox
+codefilter
+commentcloser
+contact_dir
+contextlinks
+customerror
+daily
+dba
+diff
+download_counter
+ecommerce
+event
+excerpt
+ezmlm
+fckeditor
+feedback
+filemanager
+flexinode
+foaf
+folksonomy
+fontsize
+forms
+form_mail
+freelinking
+front
+gallery
+glossary
+hof
+helpedit
+htmlcorrector
+htmlarea
+image
+img_assist
+i18n
+interwiki
+jsdomenu
+legal
+livediscussions
+mail
+mailalias
+mailhandler
+marksmarty
+massmailer
+members
+menu_otf
+nodewords
+nodelist
+nmoderation
+node_privacy_byrole
+node_import
+notify
+og
+pathauto
+paypal_framework
+paypal_subscription
+poormanscron
+privatemsg
+quote
+quotes
+recipe
+rsvp
+scheduler
+securesite
+series
+sidecontent
+simpletest
+site_map
+sitemenu
+smartypants
+smileys
+spam
+trip_search
+statistics_filter
+stock
+subscriptions
+summary
+survey
+sxip
+syndication
+taxonomy_access
+taxonomy_block
+taxonomy_browser
+taxonomy_context
+taxonomy_dhtml
+taxonomy_xml
+taxonomy_menu
+taxonomy_multi_edit
+textile
+theme_editor
+tinymce
+troll
+urlfilter
+variable
+vimcolor
+webform
+webserver_auth
+week
diff --git a/www-apps/drupal/files/4.6.0/themes b/www-apps/drupal/files/4.6.0/themes
new file mode 100644
index 000000000000..a07c2ae24dec
--- /dev/null
+++ b/www-apps/drupal/files/4.6.0/themes
@@ -0,0 +1,20 @@
+adc
+blix
+bluemarine
+box_grey
+democratica
+friendselectric
+gespaa
+goofy
+greenmarinee
+gworks
+interlaced
+leaf
+lincolns_revenge
+marvinclassic
+rdc
+slash
+slurpee
+spreadfirefox
+sunflower
+unconed