5 files changed, 42 insertions, 16 deletions
diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index bb21714725c3..eb8a08da12c8 100644
--- a/dev-vcs/gitolite-gentoo/ChangeLog
+++ b/dev-vcs/gitolite-gentoo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/gitolite-gentoo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.9 2011/02/15 17:08:39 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.10 2011/02/16 17:10:37 idl0r Exp $
+
+*gitolite-gentoo-1.5.9.1 (16 Feb 2011)
+
+  16 Feb 2011; Christian Ruppert <idl0r@gentoo.org>
+  -gitolite-gentoo-1.5.9.ebuild, +gitolite-gentoo-1.5.9.1.ebuild:
+  Version bump to 1.5.9.1
 
 *gitolite-gentoo-1.5.9 (15 Feb 2011)
 
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1.ebuild
index 36723a17db4f..6333803f8a85 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.ebuild,v 1.1 2011/02/15 17:08:39 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1.ebuild,v 1.1 2011/02/16 17:10:37 idl0r Exp $
 
 EAPI=3
 
diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
index 520509915b01..d0955569c15d 100644
--- a/dev-vcs/gitolite/ChangeLog
+++ b/dev-vcs/gitolite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/gitolite
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.2 2010/11/26 16:25:14 tampakrap Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.3 2011/02/16 17:15:27 idl0r Exp $
+
+*gitolite-1.5.9.1 (16 Feb 2011)
+
+  16 Feb 2011; Christian Ruppert <idl0r@gentoo.org> -gitolite-1.5.7.ebuild,
+  +gitolite-1.5.9.1.ebuild, metadata.xml:
+  Version bump to 1.5.9.1
 
   26 Nov 2010; <tampakrap@gentoo.org> gitolite-1.5.7.ebuild:
   wget from github is broken, switching to gentoo mirrors
diff --git a/dev-vcs/gitolite/gitolite-1.5.7.ebuild b/dev-vcs/gitolite/gitolite-1.5.9.1.ebuild
index b13995808cec..13be2695143a 100644
--- a/dev-vcs/gitolite/gitolite-1.5.7.ebuild
+++ b/dev-vcs/gitolite/gitolite-1.5.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-1.5.7.ebuild,v 1.2 2010/11/26 16:25:14 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-1.5.9.1.ebuild,v 1.1 2011/02/16 17:15:27 idl0r Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="vim-syntax"
+IUSE="contrib vim-syntax"
 
 DEPEND="dev-lang/perl
 	>=dev-vcs/git-1.6.2"
@@ -26,15 +26,15 @@ pkg_setup() {
 	enewuser git -1 /bin/bash /var/lib/gitolite git
 }
 
-src_prepare() {
-	rm Makefile doc/COPYING
-}
-
 src_unpack() {
 	unpack ${A}
 	mv "${WORKDIR}"/sitaramc-"${PN}"-* "${S}" || die
 }
 
+src_prepare() {
+	rm Makefile doc/COPYING contrib/{autotoc,gitweb,vim}
+}
+
 src_install() {
 	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
 	echo "${PF}" > conf/VERSION
@@ -42,18 +42,29 @@ src_install() {
 	# install using upstream method
 	./src/gl-system-install "${D}"/usr/bin \
 		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
-	dosed "s:${D}::g" usr/bin/gl-setup \
-		usr/share/gitolite/conf/example.gitolite.rc || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
 
 	rm "${D}"/usr/bin/gitolite.pm
 	insinto "${VENDOR_LIB}"
 	doins src/gitolite.pm || die
 
 	dodoc README.mkd doc/*
-	insinto /usr/share/doc/${P}
-	doins -r contrib
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib || die
+	fi
 
 	keepdir /var/lib/gitolite
 	fowners git:git /var/lib/gitolite
 	fperms 750 /var/lib/gitolite
 }
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/metadata.xml b/dev-vcs/gitolite/metadata.xml
index ae44e01bb402..9a928872a7d4 100644
--- a/dev-vcs/gitolite/metadata.xml
+++ b/dev-vcs/gitolite/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd></herd>
+	<herd>no-herd</herd>
 	<maintainer>
 		<email>ramereth@gentoo.org</email>
 		<name>Lance Albertson</name>
@@ -11,5 +11,8 @@
 	control down to the branch level, including specifying who can and cannot
 	rewind a given branch.
 	</longdescription>
+	<use>
+		<flag name="contrib">Install user-contributed files</flag>
+	</use>
 </pkgmetadata>