7 files changed, 155 insertions, 11 deletions
diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 6609829e5740..f94505fd700f 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2005/05/05 15:46:47 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.13 2005/06/16 09:26:22 st_lim Exp $
+
+*drupal-4.6.1 (16 Jun 2005)
+
+  16 Jun 2005; Lim Swee Tat <st_lim@gentoo.org> files/4.6.0/language,
+  files/4.6.0/modules, files/4.6.0/themes, +drupal-4.6.1.ebuild:
+  Version bump.  There was a security flaw.
 
   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,
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 308a9fd54fbe..3e4102ac8954 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,13 +1,15 @@
+MD5 c8ea06557730f010001dd8ae21bdb958 ChangeLog 835
+MD5 be606d22861d04106bbebfedeb5d33f5 drupal-4.5.2.ebuild 30674
 MD5 2f019fd3ee2a9e0302160813f1b78617 drupal-4.6.0.ebuild 2777
-MD5 88b2c84c1b3552228d711637cb7d9269 metadata.xml 274
 MD5 dafdada02bb072949d7839aece868203 drupal-4.6.0_rc1.ebuild 14561
-MD5 be606d22861d04106bbebfedeb5d33f5 drupal-4.5.2.ebuild 30674
-MD5 fe32a11fe8254f3d3b6beb077baeb9c8 ChangeLog 626
+MD5 a51dffc764699c152ee97f03dfa59f5f drupal-4.6.1.ebuild 2774
+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 6e620a6c0cb76bfe99a1d535264081bc files/digest-drupal-4.6.0_rc1 67
+MD5 3f7f433f0ef0a86155733ac5f2db2a42 files/digest-drupal-4.6.1 64
 MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
-MD5 87c9963c320ae5d6bf4aceaadbbeb9c3 files/4.6.0/language 38
 MD5 57ac487dc3baa53dc38afabe1f689999 files/4.6.0/engines 12
-MD5 32a619628ce2c242b4339b240d1161fd files/4.6.0/modules 1057
-MD5 78ea84de952135abf94837142ce0f03c files/4.6.0/themes 187
+MD5 044a234820dd9d17176aeecb72317f97 files/4.6.0/language 81
+MD5 705314245b13f56440e69ea8cc6ce268 files/4.6.0/modules 1335
+MD5 dfcacf3d4b69dc02a6ce352db7edf69e files/4.6.0/themes 193
diff --git a/www-apps/drupal/drupal-4.6.1.ebuild b/www-apps/drupal/drupal-4.6.1.ebuild
new file mode 100644
index 000000000000..a5677548787c
--- /dev/null
+++ b/www-apps/drupal/drupal-4.6.1.ebuild
@@ -0,0 +1,95 @@
+# 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.1.ebuild,v 1.1 2005/06/16 09:26:22 st_lim Exp $
+
+inherit webapp eutils
+
+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="$IUSE minimal"
+S="${WORKDIR}/${P}"
+
+SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND="virtual/php"
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack ${P}.tar.gz
+
+	if ! use minimal ; then
+
+		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 {} \;
+		find ${S} -type d -exec chmod 755 {} \;
+	fi
+}
+
+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
+	#
+	D# 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
+
+	# Identify any script files that need #! headers adding to run under
+	# a CGI script (such as PHP/CGI)
+	#
+	# for drupal, we *assume* that all .php files need to have CGI/BIN
+	# support added
+
+	for x in `find . -name '*.php' -print ` ; do
+		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
+	done
+
+	#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.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/drupal/files/4.6.0/language b/www-apps/drupal/files/4.6.0/language
index cba463dc4ae0..ea02f2e1fd45 100644
--- a/www-apps/drupal/files/4.6.0/language
+++ b/www-apps/drupal/files/4.6.0/language
@@ -1,8 +1,19 @@
+drupal-pot
+af
 pt-br
+ca
+zh-hans
+zh-hant
+cs
+da
+nl
 fr
+de
 hu
+it
 ja
 pl
 pt-pt
+ru
 es
-drupal-pot
+sk
diff --git a/www-apps/drupal/files/4.6.0/modules b/www-apps/drupal/files/4.6.0/modules
index aab4fb4de737..d31a6ccf878f 100644
--- a/www-apps/drupal/files/4.6.0/modules
+++ b/www-apps/drupal/files/4.6.0/modules
@@ -1,20 +1,27 @@
-album
+adminblock
+adsense
 amazontools
 amazonsearch
 article
 attachment
+banner
+bbcode_wysiwyg
+blogtheme
 bookreview
 bookmarks
 buddylist
+captcha
 chatbox
 codefilter
 commentcloser
 contact_dir
 contextlinks
+currency
 customerror
 daily
 dba
 diff
+distantparent
 download_counter
 ecommerce
 event
@@ -23,6 +30,7 @@ ezmlm
 fckeditor
 feedback
 filemanager
+filestore2
 flexinode
 foaf
 folksonomy
@@ -31,19 +39,28 @@ forms
 form_mail
 freelinking
 front
+fscache
 gallery
 glossary
+guestbook
 hof
 helpedit
 htmlcorrector
+html2txt
 htmlarea
 image
+image_filter
 img_assist
+indexpage
+inline
 i18n
 interwiki
 jsdomenu
+ldap_integration
 legal
+linkattach
 livediscussions
+location
 mail
 mailalias
 mailhandler
@@ -61,8 +78,10 @@ og
 pathauto
 paypal_framework
 paypal_subscription
+album
 poormanscron
 privatemsg
+project
 quote
 quotes
 recipe
@@ -70,9 +89,11 @@ rsvp
 scheduler
 securesite
 series
+shoutbox
 sidecontent
 simpletest
 site_map
+profile_pages
 sitemenu
 smartypants
 smileys
@@ -83,6 +104,7 @@ stock
 subscriptions
 summary
 survey
+swish
 sxip
 syndication
 taxonomy_access
@@ -96,10 +118,16 @@ taxonomy_multi_edit
 textile
 theme_editor
 tinymce
+trackback
 troll
 urlfilter
 variable
 vimcolor
+volunteer
 webform
+weblink
 webserver_auth
 week
+wiki
+wordfilter
+workspace
diff --git a/www-apps/drupal/files/4.6.0/themes b/www-apps/drupal/files/4.6.0/themes
index a07c2ae24dec..2c17888d4d56 100644
--- a/www-apps/drupal/files/4.6.0/themes
+++ b/www-apps/drupal/files/4.6.0/themes
@@ -9,12 +9,13 @@ goofy
 greenmarinee
 gworks
 interlaced
+kubrick
 leaf
 lincolns_revenge
+manji
 marvinclassic
 rdc
 slash
 slurpee
 spreadfirefox
 sunflower
-unconed
diff --git a/www-apps/drupal/files/digest-drupal-4.6.1 b/www-apps/drupal/files/digest-drupal-4.6.1
new file mode 100644
index 000000000000..1cc952752890
--- /dev/null
+++ b/www-apps/drupal/files/digest-drupal-4.6.1
@@ -0,0 +1 @@
+MD5 0269a3739c21694079504c3b336da8d7 drupal-4.6.1.tar.gz 464269