--- joomla-1.5.22.ebuild	2010-11-05 13:05:05.000000000 +0100
+++ joomla-1.6.1.ebuild	2011-03-09 13:33:51.832000007 +0100
@@ -8,10 +8,10 @@
 
 DESCRIPTION="Joomla is a powerful Open Source Content Management System."
 HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://joomlacode.org/gf/download/frsrelease/13105/57240/Joomla_${PV}-Stable-Full_Package.zip"
+SRC_URI="http://joomlacode.org/gf/download/frsrelease/14236/62394/Joomla_${PV}-Stable-Full_Package.zip"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 need_httpd_cgi
@@ -21,23 +21,25 @@
 
 DEPEND="${DEPEND}
 	app-arch/unzip"
-RDEPEND="dev-lang/php[mysql,zlib,xml]"
+RDEPEND="dev-lang/php[json,mysql,zlib,xml]"
 
 src_install () {
 	webapp_src_preinst
 
-	dodoc CHANGELOG.php INSTALL.php
+	dodoc installation/CHANGELOG installation/INSTALL README.txt
 
 	touch configuration.php
 	insinto "${MY_HTDOCSDIR}"
 	doins -r .
 
-	local files="administrator/backups administrator/cache
-	administrator/components administrator/language administrator/language/en-GB
+	local files=" administrator/cache administrator/components
+	administrator/language administrator/language/en-GB
+	administrator/manifests/packages
 	administrator/modules administrator/templates cache components images
-	images/banners images/stories language language/en-GB language/pdf_fonts
-	media modules plugins plugins/content plugins/editors plugins/editors-xtd
-	plugins/search plugins/system plugins/user plugins/xmlrpc tmp templates"
+	images/banners installation/models/configuration.php language
+	language/en-GB media modules plugins plugins/authentication plugins/content
+	plugins/editors plugins/editors-xtd plugins/search plugins/system
+	plugins/user plugins tmp templates"
 
 	for file in ${files}; do
 		webapp_serverowned "${MY_HTDOCSDIR}"/${file}