Version bump, bug 403937.

(Portage version: 2.1.10.44/cvs/Linux i686)

4 files changed, 18 insertions, 102 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/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