--- CakePHP-1.2.0.7296_rc2.ebuild	2009-01-05 13:05:06.000000000 +0000
+++ CakePHP-1.2.0.7962.ebuild	2009-01-05 23:37:11.000000000 +0000
@@ -4,21 +4,21 @@
 
 inherit eutils webapp depend.php
 
-MY_P="cake_${PV/_/-}"
+# NOTE: This download ID changes every release! Please adjust it accordingly.
+DLID=695
 
-# download id changes every release :-(
-DLID=628
-
-DESCRIPTION="CakePHP is a open source framework for developing Web Applications."
+DESCRIPTION="CakePHP is an open source MVC framework for developing PHP web applications."
 HOMEPAGE="http://www.cakephp.org/"
-SRC_URI="http://cakeforge.org/frs/download.php/${DLID}/${MY_P}.tar.gz/donation=complete/${MY_P}.tar.gz"
+SRC_URI="http://cakeforge.org/frs/download.php/${DLID}/${PV}.tar.gz/donation=complete/${PV}.tar.gz"
 LICENSE="MIT"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
 RDEPEND=""
 
+S=${WORKDIR}/${PV}
+
 need_httpd_cgi
 need_php_httpd
 
@@ -32,13 +32,17 @@
 	unpack ${A}
 	cd "${S}"
 
+	# 'empty' files are only here as some SCMs don't track empty folders.
+	# We can safely delete them.
 	ebegin "Removing unnecessary 'empty' files"
-	find cake -type f -name empty -size 0 -delete &> /dev/null
+	find ./ -type f -name empty -size 0 -delete &> /dev/null
 	eend
 
 	ebegin "Cleaning up some files"
-	rm -f cake/LICENSE.txt
+	mkdir docs
+	mv README docs/
 	mv cake/VERSION.txt docs/
+	rm -f cake/LICENSE.txt
 	rm -f cake/console/cake.bat
 	eend
 }
@@ -46,23 +50,29 @@
 src_install() {
 	webapp_src_preinst
 
-	dodoc ${MY_P}/docs/*
-	rm -rf ${MY_P}/docs/
+	dodoc ${S}/docs/*
+	rm -rf ${S}/docs/
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r ${MY_P}/.htaccess ${MY_P}/*
-
+	doins -r .htaccess *
+	
+	# /app/tmp and all its subdirectories need server write permission
 	webapp_serverowned "${MY_HTDOCSDIR}"/app/tmp/
 	webapp_serverowned "${MY_HTDOCSDIR}"/app/tmp/cache/
+	webapp_serverowned "${MY_HTDOCSDIR}"/app/tmp/logs/
+	webapp_serverowned "${MY_HTDOCSDIR}"/app/tmp/sessions/
+	webapp_serverowned "${MY_HTDOCSDIR}"/app/tmp/tests/
 
 	webapp_src_install
 }
 
 pkg_postinst() {
-	elog "For more info, please take a look at the manual at:"
+	elog "----------------------------------------------------------"
+	elog "For more information, please take a look at the manual at:"
 	elog "http://manual.cakephp.org"
-	elog "------------------------------------------------------"
+	elog "----------------------------------------------------------"
 	elog "Dont't forget to configure an empty vhost with enabled"
 	elog "mod_rewrite and set up CakePHP using"
 	elog "    # webapp-config -I ${PN} ${PV} -h <hostname>"
+	elog "----------------------------------------------------------"
 }