5 files changed, 29 insertions, 112 deletions
diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
index c6258841f5f7..12387caea78f 100644
--- a/dev-vcs/gitolite/ChangeLog
+++ b/dev-vcs/gitolite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/gitolite
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.13 2011/12/11 09:23:24 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.14 2012/02/15 22:16:17 idl0r Exp $
+
+*gitolite-2.3 (15 Feb 2012)
+
+  15 Feb 2012; Christian Ruppert <idl0r@gentoo.org> -gitolite-1.5.9.1.ebuild,
+  -gitolite-2.0.3-r1.ebuild, +gitolite-2.3.ebuild,
+  -files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch:
+  Version bump, bug 403937.
 
   11 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> gitolite-2.1.0.ebuild:
   x86 stable wrt bug #393151
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index aaa84a877448..b09aaffd7824 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX 0001-fix-a-rather-large-typo-thinko-in-1006eba.patch 945 RMD160 dc07e7ca595e5cf5f7c9751db7f06348c16615ab SHA1 5cc46e29afe547f27559e34788848ce1d8af64ad SHA256 5402e457cd537daab83900479faca293b9f42e13c4d471a0305941081826c393
 AUX gitolite-2.2-gl-system-setup-exit.patch 1418 RMD160 518f67265c0ec7e595036649d05c27e2931daf66 SHA1 0b1ba304d14dcad2bb4b17885f710f672a3ba18f SHA256 44242f30693f7aff22c04870651331af2985233ba57cf90c6019b6ac27c6b54b
-DIST gitolite-1.5.9.1.tar.gz 180299 RMD160 d302b8ad95ec99ad0eec035583fe0327ffef44cb SHA1 100269bae00f56b6cf5266c240d15d910d382ce3 SHA256 5e0b5f0f35433c8e35ad763b13580b4e9c4501160ae74e48a2bc018ab0111077
-DIST gitolite-2.0.3.tar.bz2 180376 RMD160 0f8ccdeaa03297185afcd7e1d2c16f325854caee SHA1 d5849b8d7a745a3d3bb06f55693c7a3e8219b960 SHA256 8be9bca35aed98164cc25842199478cb5e5ec30a0210a6a5ff121300fec2c54d
 DIST gitolite-2.1.0.tar.bz2 189726 RMD160 1911d6c6b700756a0ca1141b8964a69fd91b7e7a SHA1 312532739538e7fe16fbb6de4088037dd8ee77c3 SHA256 c55ca02932893f3f6a76a2e31d53d847c2fd5ccb768831db123c2f80d1b8eaa3
 DIST gitolite-2.2.tar.bz2 186414 RMD160 3403fcde29a5a405d36cb88fdfe380b4bc1f42be SHA1 1c11de5264ecadbc4aed0f38607182dd68ee2cc1 SHA256 b43a735af62dbb2b05ed679029f3eafd8aa0c0e8041399f2c4dad796f87d6ccc
-EBUILD gitolite-1.5.9.1.ebuild 1717 RMD160 9f7e8027b3c1bee45327129b9488fd0258623936 SHA1 c24a2d218fa74790eff0ef6f758cb4d7da52e694 SHA256 b1ad6692306c1ed9e76382736a226cfdb5fa51fa64a5c4ba8820fb1a1d324a64
-EBUILD gitolite-2.0.3-r1.ebuild 1697 RMD160 d9595a9be05b981a26a1c89aa9809306eefd8f2a SHA1 998f3535bac2e5d7c1b3d1b0b439e346c0c51f14 SHA256 57329a75791837c8eb8d5944a1d01550e413bb9e906c62edeff93ce871612568
+DIST gitolite-2.3.tar.bz2 189284 RMD160 e23bd9fc08df815ebc9a82dbde13cd9edf3c0aa0 SHA1 88066185732d67a5bc1417c8aaa9b912ac34696c SHA256 19a01127012930ae59231a898e045bf1eb15df209decc452fb31d71d86a5053d
 EBUILD gitolite-2.1.0.ebuild 1621 RMD160 b16e12470fc9ed765de9fe4c234119de6bac29fb SHA1 7afa543cfeaa5884d05cd95ef10f26e915038db2 SHA256 3a024866afb68132b09ea358b49ae88ceddfce3056a414004b701ae894caefcb
 EBUILD gitolite-2.2.ebuild 1738 RMD160 b64381a23f6cdfe86849ba7868f4509845b3bdaa SHA1 e43c950cd73ea0685f0fb3ce667d60d71af7db08 SHA256 8ca3aca213c3f72bb80590cc04c5976318f2d381c5457c4af416599a7c13ea51
-MISC ChangeLog 2116 RMD160 0942c1ca5aefbb62dca1af049942bfa702905e33 SHA1 5abe2565754bb57100d2b2067fb5a8f433c9b2c3 SHA256 6180a5e7e0e66a7fdf831106794d7d6fac6e2d2040086ac6b80ac361cd22e0ed
+EBUILD gitolite-2.3.ebuild 1681 RMD160 f5f3dd571d7f9cad3460511b9bd59d1dc68b104e SHA1 b63ed27de2baab7eeb80d392c53de9993c91213d SHA256 06d8ee8e90dff234e309789c66adaa5fda1e4c56706afbebc8d2c7662653cfa5
+MISC ChangeLog 2361 RMD160 d1ab2707543a83e9676060f72aac6547fb1fd708 SHA1 4a6895dd7ae03d4099d2601051cd3c4903ff8cd3 SHA256 df7c41186bab56c053d60707ac4f65dcf44ca55e018dda9681c7908dcfc47b3b
 MISC metadata.xml 629 RMD160 73f749e4b49dbd441650edeedeb571a6cc7a63ad SHA1 d2c4e86a937e61031382c39c3ed1ad5629c69e47 SHA256 d91cefaa604035b0a9796fc1c205c8cbb7a5d9fa74c646352dc56d79f24d4f1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7kdpIACgkQuUQtlDBCeQJTfgCdH/7xNIUCuIL+RkPsXVbnl285
-es8Anib4hnp15LUl+gO+wmXsY48mivSR
-=DZwH
+iQEcBAEBCAAGBQJPPC63AAoJEMOx0zmdw4Z17RAH/R4RU26gNcQ95Dox2r3aLDVE
+TBJOCzY3WAn+GmDO/DA9rBdQyOEDDOlFEYLsS/ycEG5SLT/cHWsVkgjqlF71r1WU
+3Yfg2zzUfUNSnKhqErXisTm9psbJtOMnme5v0EbI861djUlPD+CVxHZ7tKFGEt/V
+jZqjQeMd57xoMvVdj37mdGpXanqG4YskyElBsgzKRhtTwAYtgYCuzL2LUo3a2gin
+OXIVpOJeSznDcSJoqpK294ddkjHVBjTYevQlV1w2xa0kO4BmCaYUXPbnTcSJHyA7
+0CY3mHzBlcFmXv433NEFquEKD2duqA4Re8smU+bdJNB6V4Fa13yYJzrRITkWc9s=
+=A/Gf
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/gitolite/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch b/dev-vcs/gitolite/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch
deleted file mode 100644
index dd2ebdfad15b..000000000000
--- a/dev-vcs/gitolite/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 63f18a5adfbfa1f62427f02e347a1e0942d4d615 Mon Sep 17 00:00:00 2001
-From: Sitaram Chamarty <sitaram@atc.tcs.com>
-Date: Sat, 10 Sep 2011 18:57:42 +0530
-Subject: [PATCH] fix a rather large typo/thinko in 1006eba
-
-If you look at this change, and the same lines in 1006eba, you can
-easily see what I missed...
-
-diff --git a/src/gl-compile-conf b/src/gl-compile-conf
-index 2c4ac82..6521215 100755
---- a/src/gl-compile-conf
-+++ b/src/gl-compile-conf
-@@ -267,7 +267,7 @@ sub parse_conf_line
-     elsif ($line =~ /^include "(.+)"/)
-     {
-         my $include_glob = $1;
--        for my $file (glob($include_glob =~ m(^/) ? $include_glob : "conf/$include_glob")) {
-+        for my $file (glob($include_glob =~ m(^/) ? $include_glob : "$GL_ADMINDIR/conf/$include_glob")) {
-             die "$ABRT $fragment attempting to include configuration\n" if $fragment ne 'master';
-             die "$ABRT included file not found: '$file'\n" unless -f $file;
- 
diff --git a/dev-vcs/gitolite/gitolite-1.5.9.1.ebuild b/dev-vcs/gitolite/gitolite-1.5.9.1.ebuild
deleted file mode 100644
index e0b6aee28e4e..000000000000
--- a/dev-vcs/gitolite/gitolite-1.5.9.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.9.1.ebuild,v 1.4 2011/05/31 17:24:02 phajdan.jr Exp $
-
-EAPI=3
-
-inherit eutils perl-module
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="contrib vim-syntax"
-
-DEPEND="dev-lang/perl
-	>=dev-vcs/git-1.6.2"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitolite git
-}
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}"/sitaramc-"${PN}"-* "${S}" || die
-}
-
-src_prepare() {
-	rm Makefile doc/COPYING contrib/autotoc
-	rm -rf contrib/{gitweb,vim}
-}
-
-src_install() {
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
-	echo "${PF}" > conf/VERSION
-
-	# install using upstream method
-	./src/gl-system-install "${D}"/usr/bin \
-		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || 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/*
-
-	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/gitolite-2.0.3-r1.ebuild b/dev-vcs/gitolite/gitolite-2.3.ebuild
index 3b8999296bcf..529cbe3649dd 100644
--- a/dev-vcs/gitolite/gitolite-2.0.3-r1.ebuild
+++ b/dev-vcs/gitolite/gitolite-2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.0.3-r1.ebuild,v 1.1 2011/09/10 17:50:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.3.ebuild,v 1.1 2012/02/15 22:16:17 idl0r Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils perl-module
 
@@ -16,30 +16,31 @@ KEYWORDS="~amd64 ~x86"
 IUSE="contrib vim-syntax"
 
 DEPEND="dev-lang/perl
-	>=dev-vcs/git-1.6.2"
+	>=dev-vcs/git-1.6.6"
 RDEPEND="${DEPEND}
 	!dev-vcs/gitolite-gentoo
 	vim-syntax? ( app-vim/gitolite-syntax )"
 
 pkg_setup() {
 	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitolite git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
 }
 
 src_prepare() {
 	rm Makefile doc/COPYING || die
 	rm -rf contrib/{gitweb,vim} || die
 
-	epatch "${FILESDIR}/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch"
-
 	echo "${PF}" > conf/VERSION
 }
 
 src_install() {
+	local gl_bin="${D}/usr/bin"
+
 	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
 
 	# install using upstream method
-	./src/gl-system-install "${D}"/usr/bin \
+	export PATH="${D}"/usr/bin:$PATH
+	./src/gl-system-install ${gl_bin//\/\///} \
 		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
 	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
 		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die