--- cgit-0.8.3.1-r1.ebuild	2010-06-21 11:12:58.000000000 +0400
+++ cgit-0.8.3.2.ebuild	2010-06-25 18:21:18.000000000 +0400
@@ -1,12 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.8.3.1-r1.ebuild,v 1.3 2010/06/16 16:32:52 ramereth Exp $
+# $Header: $
 
 EAPI="2"
 
-inherit webapp
+inherit webapp eutils
 
-GIT_V="1.6.4.3"
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+# Webserver group, here for Apache by default
+HTTPD_GROUP="${HTTPD_GROUP:-apache}"
+
+GIT_V="1.7.0"
 
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="http://hjemli.net/git/cgit/about/"
@@ -15,23 +19,35 @@
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cgi doc"
+IUSE="doc"
 
-RDEPEND="dev-vcs/git
+RDEPEND="
+	dev-vcs/git
 	sys-libs/zlib
 	dev-libs/openssl
-	cgi? ( virtual/httpd-cgi )"
+	virtual/httpd-cgi
+"
 DEPEND="${RDEPEND}
 	doc? ( app-text/docbook-xsl-stylesheets
-		>=app-text/asciidoc-8.5.1 )"
+		>=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+	enewuser "${PN}"
+}
 
 src_prepare() {
 	rmdir git
 	mv "${WORKDIR}"/git-"${GIT_V}" git
+
+	sed -i \
+		-e "/^CACHE_ROOT =/s:/var/cache/cgit:${CGIT_CACHEDIR}:" \
+		Makefile || die "sed failed"
 }
 
 src_compile() {
-	emake || die "emake died"
+	emake || die "emake failed"
 	if use doc ; then
 		emake man-doc || die "emake man-doc died"
 	fi
@@ -40,19 +56,21 @@
 src_install() {
 	webapp_src_preinst
 
-	mv cgit cgit.cgi
-	if use cgi -o use fastcgi ; then
-		cp cgit.cgi "${D}"/${MY_CGIBINDIR}
-	fi
-	insinto ${MY_HTDOCSDIR}
-	doins cgit.css cgit.png
+	emake \
+		CGIT_SCRIPT_PATH="${MY_CGIBINDIR}" \
+		CGIT_DATA_PATH="${MY_HTDOCSDIR}" \
+		DESTDIR="${D}" install || die "emake install failed"
+
 	insinto /etc
 	doins "${FILESDIR}"/cgitrc
-	dodir /var/cache/cgit
-	keepdir /var/cache/cgit
+
 	dodoc README
 	use doc && doman cgitrc.5
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
+
+	keepdir "${CGIT_CACHEDIR}"
+	fowners ${PN}:${HTTPD_GROUP} "${CGIT_CACHEDIR}"
+	fperms 750 "${CGIT_CACHEDIR}"
 }