--- /usr/portage/www-apps/joomla/joomla-1.0.8.ebuild	2006-02-27 05:23:21.000000000 +1030
+++ /usr/local/portage/www-apps/joomla/joomla-1.0.8.ebuild	2006-04-20 16:28:34.000000000 +0930
@@ -1,11 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.0.8.ebuild,v 1.1 2006/02/26 18:53:21 rl03 Exp $
+inherit eutils webapp depend.php
 
-inherit webapp depend.php
-
-DESCRIPTION="Joomla is one of the most powerful Open Source Content Management
-Systems on the planet."
+DESCRIPTION="Joomla is one of the most powerful Open Source Content Management Systems on the planet."
 HOMEPAGE="http://www.joomla.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
@@ -13,9 +8,9 @@
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 S=${WORKDIR}
 
-IUSE="mysql"
+IUSE=
 
-RDEPEND="mysql? ( dev-db/mysql )
+RDEPEND="dev-db/mysql
 	virtual/php
 	net-www/apache"
 
@@ -82,8 +77,19 @@
 
 	# if $MY_HOST == localhost, don't specify -h argument, so local socket can be used.
 	host=${MY_HOST/localhost}
-	mysqladmin -u ${adminuser} ${host:+-h ${host}} -p create ${MY_DB} || die "Error creating database"
-	mysql -u "${adminuser}" "${host:+-h ${host}}" -p \
-		-e "GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES
-		ON `${MY_DB}`.* TO '${MY_USER}'@'${clientaddr}' IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;"  || die "Error initializing database. Please grant permissions manually."
+
+        einfo " Creating ${MY_DB} database"
+        einfo " Running: mysqladmin -u ${adminuser} ${host:+-h${host}}-p create ${MY_DB}"
+        mysqladmin -u ${adminuser} ${host:+-h${host}} -p create ${MY_DB} || die "Error creating database"
+
+        einfo " Creating tables for ${MY_DB} database"
+        einfo " Running: mysql -u ${adminuser} ${host:+-h${host}}-p ${MY_DB} < /usr/share/webapps/joomla/${PV}/htdocs/installation/sql/joomla.sql"
+        mysql -u"${adminuser}" "${host:+-h${host}}"-p ${MY_DB} < /usr/share/webapps/joomla/${PV}/htdocs/installation/sql/joomla.sql \
+                || die "Error initialising database. Please create tables manually with the above command."
+
+        einfo " Creating privileges for ${MY_DB} database"
+        einfo " Running: mysql -u "${adminuser}" "${host:+-h${host}}" -p -e \"GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES ON ${MY_DB}.* TO '${MY_USER}'@'${clientaddr}' IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;\""
+        mysql -u "${adminuser}" "${host:+-h${host}}" -p \
+                -e "GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES
+                ON ${MY_DB}.* TO '${MY_USER}'@'${clientaddr}' IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;"  || die "Error initialising database. Please grant permissions manually."
 }