5 files changed, 12 insertions, 145 deletions
diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index 4380e5d5ea9f..bb21714725c3 100644
--- a/dev-vcs/gitolite-gentoo/ChangeLog
+++ b/dev-vcs/gitolite-gentoo/ChangeLog
@@ -1,6 +1,15 @@
 # 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.8 2011/01/23 00:03:56 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.9 2011/02/15 17:08:39 idl0r Exp $
+
+*gitolite-gentoo-1.5.9 (15 Feb 2011)
+
+  15 Feb 2011; Christian Ruppert <idl0r@gentoo.org>
+  -gitolite-gentoo-1.5.7.ebuild, -gitolite-gentoo-1.5.8.ebuild,
+  -gitolite-gentoo-1.5.8.1-r1.ebuild,
+  -files/gitolite-gentoo-1.5.8.1-missing-bracket.patch,
+  +gitolite-gentoo-1.5.9.ebuild:
+  Version bump to 1.5.9. Remove old ebuilds.
 
   23 Jan 2011; Christian Ruppert <idl0r@gentoo.org>
   gitolite-gentoo-1.5.8.1-r1.ebuild:
diff --git a/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.8.1-missing-bracket.patch b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.8.1-missing-bracket.patch
deleted file mode 100644
index 9d67463bfb60..000000000000
--- a/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.8.1-missing-bracket.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4a04df5f1d06d78f04a52b04291548d3e70de870 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Mon, 17 Jan 2011 11:31:25 +0100
-Subject: [PATCH] Add missing curly bracket
-
----
- src/gitolite.pm |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/gitolite.pm b/src/gitolite.pm
-index 336c292..550cf1c 100644
---- a/src/gitolite.pm
-+++ b/src/gitolite.pm
-@@ -1253,6 +1253,7 @@ sub export_key_metadata {
-         }
-     }
-     close(PUBKEY);
-+}
- 
- sub get_repo_umask {
- 	my $repo = shift;
--- 
-1.7.3.4
-
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.7.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.7.ebuild
deleted file mode 100644
index 52fd13478b22..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 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.7.ebuild,v 1.1 2010/11/14 09:59:01 idl0r Exp $
-
-EAPI=3
-
-inherit eutils perl-module
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-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
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitolite git
-}
-
-src_prepare() {
-	rm -rf Makefile doc/COPYING contrib/{autotoc,gitweb,vim}
-
-	echo "${PF}-gentoo" > conf/VERSION
-}
-
-src_install() {
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
-
-	./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
-
-	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
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.8.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.8.ebuild
deleted file mode 100644
index d496f7433bde..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.8.ebuild
+++ /dev/null
@@ -1,58 +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-gentoo/gitolite-gentoo-1.5.8.ebuild,v 1.1 2011/01/03 05:14:33 idl0r Exp $
-
-EAPI=3
-
-inherit eutils perl-module
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-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
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitolite git
-}
-
-src_prepare() {
-	rm -rf Makefile doc/COPYING contrib/{autotoc,gitweb,vim}
-
-	echo "${PF}-gentoo" > conf/VERSION
-}
-
-src_install() {
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
-
-	./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
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.8.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.ebuild
index be26ef0945c4..36723a17db4f 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.8.1-r1.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.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.8.1-r1.ebuild,v 1.2 2011/01/23 00:03:56 idl0r Exp $
+# $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 $
 
 EAPI=3
 
@@ -28,9 +28,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-missing-bracket.patch"
-
-	rm -rf Makefile doc/COPYING contrib/{autotoc,gitweb,vim}
+	rm -rf Makefile doc/COPYING contrib/{autotoc,gitweb,vim} || die
 
 	echo "${PF}-gentoo" > conf/VERSION
 }