Version bump to 4.6.2

(Portage version: 2.0.51.22-r1)

7 files changed, 135 insertions, 15 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 041a0a8c3c8a..c5193aad6280 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.15 2005/06/16 17:28:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.16 2005/07/05 15:10:40 st_lim Exp $
+
+*drupal-4.6.2 (05 Jul 2005)
+
+  05 Jul 2005; Lim Swee Tat <st_lim@gentoo.org> files/4.6.0/modules,
+  files/4.6.0/themes, +drupal-4.6.2.ebuild:
+  Bumped version
 
   16 Jun 2005; Luca Barbato <lu_zero@gentoo.org> drupal-4.6.1.ebuild:
   Marked ~ppc
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 0cb3ed9d141d..10482ad3a1ad 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,15 +1,17 @@
-MD5 88b2c84c1b3552228d711637cb7d9269 metadata.xml 274
-MD5 ca5eec946769a8850e36ef8adb0239d6 drupal-4.6.1.ebuild 2787
-MD5 dafdada02bb072949d7839aece868203 drupal-4.6.0_rc1.ebuild 14561
-MD5 2f019fd3ee2a9e0302160813f1b78617 drupal-4.6.0.ebuild 2777
-MD5 5c0f29917ad1fc4c93c30b7291e608d2 ChangeLog 1053
+MD5 16417bc813a1df53d330e2cf30856be5 ChangeLog 1213
 MD5 be606d22861d04106bbebfedeb5d33f5 drupal-4.5.2.ebuild 30674
+MD5 2f019fd3ee2a9e0302160813f1b78617 drupal-4.6.0.ebuild 2777
+MD5 dafdada02bb072949d7839aece868203 drupal-4.6.0_rc1.ebuild 14561
+MD5 ca5eec946769a8850e36ef8adb0239d6 drupal-4.6.1.ebuild 2787
+MD5 89a077e8911a5d85cfe8ec8718248a26 drupal-4.6.2.ebuild 2809
+MD5 88b2c84c1b3552228d711637cb7d9269 metadata.xml 274
 MD5 6e620a6c0cb76bfe99a1d535264081bc files/digest-drupal-4.6.0_rc1 67
-MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
-MD5 60d816b2bdcf87d62c1f52a2dc8e776c files/digest-drupal-4.6.0 64
 MD5 0f20a567ce1310d62af69bd56921cea3 files/postinstall-en.txt 2595
+MD5 60d816b2bdcf87d62c1f52a2dc8e776c files/digest-drupal-4.6.0 64
 MD5 3f7f433f0ef0a86155733ac5f2db2a42 files/digest-drupal-4.6.1 64
-MD5 044a234820dd9d17176aeecb72317f97 files/4.6.0/language 81
+MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
+MD5 3696ea6a2d2569722c9feebb2c9a7093 files/digest-drupal-4.6.2 64
 MD5 57ac487dc3baa53dc38afabe1f689999 files/4.6.0/engines 12
-MD5 705314245b13f56440e69ea8cc6ce268 files/4.6.0/modules 1335
-MD5 dfcacf3d4b69dc02a6ce352db7edf69e files/4.6.0/themes 193
+MD5 044a234820dd9d17176aeecb72317f97 files/4.6.0/language 81
+MD5 3ddf6c4a30991fd5618b3f0e88e1b6de files/4.6.0/modules 1455
+MD5 1c97d7ff8b82cf1bbfebde2a2e533d90 files/4.6.0/themes 204
diff --git a/www-apps/drupal/drupal-4.6.1.ebuild b/www-apps/drupal/drupal-4.6.1.ebuild
index d2b58fb4ae4b..dc1cb9aa1923 100644
--- a/www-apps/drupal/drupal-4.6.1.ebuild
+++ b/www-apps/drupal/drupal-4.6.1.ebuild
@@ -1,9 +1,11 @@
 # 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.3 2005/06/16 17:28:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.6.1.ebuild,v 1.4 2005/07/05 15:10:40 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="$IUSE minimal"
@@ -27,10 +29,10 @@ src_unpack() {
 			[ "$i" == "engines" ] && cd ${S}/themes/$i
 			[ "$i" == "language" ] && cd ${S}/includes
 			einfo "`pwd`"
-			for item in `cat ${FILESDIR}/${PV}/$i`; do
+			for item in `cat ${FILESDIR}/${MY_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
+				wget -q http://www.drupal.org/files/projects/$item-${MY_PV}.tar.gz
+				tar xfz $item-${MY_PV}.tar.gz
 			done
 		done
 
diff --git a/www-apps/drupal/drupal-4.6.2.ebuild b/www-apps/drupal/drupal-4.6.2.ebuild
new file mode 100644
index 000000000000..49921198d57f
--- /dev/null
+++ b/www-apps/drupal/drupal-4.6.2.ebuild
@@ -0,0 +1,97 @@
+# 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.2.ebuild,v 1.1 2005/07/05 15:10:40 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="$IUSE minimal"
+S="${WORKDIR}/${P}"
+
+SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~ppc ~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}/${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 ${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/modules b/www-apps/drupal/files/4.6.0/modules
index d31a6ccf878f..9200fc3a1eed 100644
--- a/www-apps/drupal/files/4.6.0/modules
+++ b/www-apps/drupal/files/4.6.0/modules
@@ -1,8 +1,10 @@
 adminblock
 adsense
 amazontools
+amazon_items
 amazonsearch
 article
+atom
 attachment
 banner
 bbcode_wysiwyg
@@ -22,9 +24,11 @@ daily
 dba
 diff
 distantparent
+donations
 download_counter
 ecommerce
 event
+eventfinder
 excerpt
 ezmlm
 fckeditor
@@ -45,6 +49,7 @@ glossary
 guestbook
 hof
 helpedit
+highlight
 htmlcorrector
 html2txt
 htmlarea
@@ -72,6 +77,7 @@ nodewords
 nodelist
 nmoderation
 node_privacy_byrole
+nodevote
 node_import
 notify
 og
@@ -87,10 +93,12 @@ quotes
 recipe
 rsvp
 scheduler
+scripturefilter
 securesite
 series
 shoutbox
 sidecontent
+similar
 simpletest
 site_map
 profile_pages
@@ -100,6 +108,7 @@ smileys
 spam
 trip_search
 statistics_filter
+statistics_trends
 stock
 subscriptions
 summary
@@ -122,12 +131,14 @@ trackback
 troll
 urlfilter
 variable
+video
 vimcolor
 volunteer
 webform
 weblink
 webserver_auth
 week
+whatsrelated
 wiki
 wordfilter
 workspace
diff --git a/www-apps/drupal/files/4.6.0/themes b/www-apps/drupal/files/4.6.0/themes
index 2c17888d4d56..e28fb31b7555 100644
--- a/www-apps/drupal/files/4.6.0/themes
+++ b/www-apps/drupal/files/4.6.0/themes
@@ -2,6 +2,7 @@ adc
 blix
 bluemarine
 box_grey
+civicspace
 democratica
 friendselectric
 gespaa
diff --git a/www-apps/drupal/files/digest-drupal-4.6.2 b/www-apps/drupal/files/digest-drupal-4.6.2
new file mode 100644
index 000000000000..651eae4dd3ef
--- /dev/null
+++ b/www-apps/drupal/files/digest-drupal-4.6.2
@@ -0,0 +1 @@
+MD5 7bbee605d6b57052e27adb1a61685ec1 drupal-4.6.2.tar.gz 464682