Fixing bugs #100219, #100077, #98485, #98524

(Portage version: 2.0.51.22-r2)

3 files changed, 66 insertions, 31 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index a72ecb03e852..1442e68e1568 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,9 @@
 # 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.17 2005/07/13 23:10:12 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.18 2005/08/04 08:55:29 st_lim Exp $
+
+  04 Aug 2005; Lim Swee Tat <st_lim@gentoo.org> drupal-4.6.2.ebuild:
+  Updated drupal hopefully that fixes bugs #100219, #100077, #98485, #98524
 
   14 Jul 2005; Stuart Herbert <stuart@gentoo.org> drupal-4.6.2.ebuild:
   Removed calls to deprecated webapp_runbycgibin function; fixes bug 98484
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 512827552510..86892be94ede 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,11 +1,11 @@
 MD5 8b98a76cb1d1d587d9cf4cdfa57ed0c5 ChangeLog 1359
 MD5 5d7b1639af0dea7eb477a97e3d5b7cca drupal-4.5.2.ebuild 30648
-MD5 4d57aaeb0128613873707efbcd6b7fd5 drupal-4.6.2.ebuild 2498
+MD5 dee9b6e8d2aba3e183483dd11d9a6776 drupal-4.6.2.ebuild 3746
 MD5 31a7762b97d644514268dab18f853a27 metadata.xml 274
-MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
 MD5 3696ea6a2d2569722c9feebb2c9a7093 files/digest-drupal-4.6.2 64
+MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
 MD5 0f20a567ce1310d62af69bd56921cea3 files/postinstall-en.txt 2595
 MD5 044a234820dd9d17176aeecb72317f97 files/4.6.0/language 81
-MD5 57ac487dc3baa53dc38afabe1f689999 files/4.6.0/engines 12
 MD5 3ddf6c4a30991fd5618b3f0e88e1b6de files/4.6.0/modules 1455
 MD5 1c97d7ff8b82cf1bbfebde2a2e533d90 files/4.6.0/themes 204
+MD5 57ac487dc3baa53dc38afabe1f689999 files/4.6.0/engines 12
diff --git a/www-apps/drupal/drupal-4.6.2.ebuild b/www-apps/drupal/drupal-4.6.2.ebuild
index c2b7b36f0ffd..b88ed3452cc5 100644
--- a/www-apps/drupal/drupal-4.6.2.ebuild
+++ b/www-apps/drupal/drupal-4.6.2.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.2.ebuild,v 1.4 2005/07/13 23:10:12 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.6.2.ebuild,v 1.5 2005/08/04 08:55:29 st_lim Exp $
 
 inherit webapp eutils
 
@@ -8,7 +8,7 @@ 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="minimal"
+IUSE="mysql"
 
 SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
 
@@ -16,30 +16,7 @@ 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
-}
+RDEPEND="mysql? (dev-db/mysql)"
 
 src_compile() {
 	#Default compile hangs!
@@ -54,7 +31,7 @@ src_install() {
 
 	# handle documentation files
 	#
-	D# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
 	# get installed per vhost!
 
 	einfo "Installing docs"
@@ -84,3 +61,58 @@ src_install() {
 
 	webapp_src_install
 }
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	einfo
+	einfo "You might want to run:"
+	einfo "\"ebuild /var/db/pkg/www-apps/${PF}/${PF}.ebuild config\""
+	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
+}