Cleanup

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

5 files changed, 6 insertions, 260 deletions

diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
index ea351d5d9a2b..d882c86cd747 100644
--- a/dev-vcs/gitolite/ChangeLog
+++ b/dev-vcs/gitolite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/gitolite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.25 2012/10/10 18:51:22 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.26 2012/10/30 20:11:41 idl0r Exp $
+
+  30 Oct 2012; Christian Ruppert <idl0r@gentoo.org> -gitolite-2.1.0.ebuild,
+  -gitolite-2.2.ebuild, -gitolite-2.3.ebuild,
+  -files/gitolite-2.2-gl-system-setup-exit.patch:
+  Cleanup
 
 *gitolite-3.1 (10 Oct 2012)
 
diff --git a/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch b/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch
deleted file mode 100644
index 1d3e12aca05e..000000000000
--- a/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ab9d0d2f57ed84c01513053b88587dac82d9ed66 Mon Sep 17 00:00:00 2001
-From: Sitaram Chamarty <sitaram@atc.tcs.com>
-Date: Thu, 17 Nov 2011 18:49:24 +0530
-Subject: [PATCH] a couple of very minor oopsies
-
-(1) c5f342a forgot authkeys can have blank lines also
-
-(2) f0cedeb ended gl-system-install on a non-0 ret code
-
-both caught by matthewtdawson at gmail
----
- src/gl-system-install |    4 +++-
- src/sshkeys-lint      |    2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/gl-system-install b/src/gl-system-install
-index 0eec005..d7df7e4 100755
---- a/src/gl-system-install
-+++ b/src/gl-system-install
-@@ -108,8 +108,10 @@ gl-setup is not in your \$PATH.
- $path_advice"
- 
- which=`dirname $which`
--[ "$which" != "$gl_bin_dir" ] && die "                ***** WARNING *****
-+[ "$which" = "$gl_bin_dir" ] || die "                ***** WARNING *****
- $which precedes $gl_bin_dir in your \$PATH,
- and it *also* contains gl-setup.  This is almost certainly going to confuse
- you or me later.
- $path_advice"
-+
-+exit 0
-diff --git a/src/sshkeys-lint b/src/sshkeys-lint
-index bcb8f7b..96c027f 100755
---- a/src/sshkeys-lint
-+++ b/src/sshkeys-lint
-@@ -119,7 +119,7 @@ sub ak_comment {
-     $in_gl_section = 1 if /^# gitolite start/;
-     $in_gl_section = 0 if /^# gitolite end/;
-     die "gitosis?  what's that?\n" if /^#.*gitosis/;
--    return /^\s*#/;
-+    return /^\s*(#|$)/;
- }
- 
- sub fprint {
--- 
-1.7.5.4
-
diff --git a/dev-vcs/gitolite/gitolite-2.1.0.ebuild b/dev-vcs/gitolite/gitolite-2.1.0.ebuild
deleted file mode 100644
index a2fd4b6c7f09..000000000000
--- a/dev-vcs/gitolite/gitolite-2.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.1.0.ebuild,v 1.4 2012/06/07 21:53:43 zmedico Exp $
-
-EAPI=4
-
-inherit eutils perl-module user
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-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.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
-}
-
-src_prepare() {
-	rm Makefile doc/COPYING || die
-	rm -rf contrib/{gitweb,vim} || die
-
-	echo "${PF}" > conf/VERSION
-}
-
-src_install() {
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
-
-	# 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/*.pm
-	insinto "${VENDOR_LIB}"
-	doins src/*.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.2.ebuild b/dev-vcs/gitolite/gitolite-2.2.ebuild
deleted file mode 100644
index c1829c31f9b5..000000000000
--- a/dev-vcs/gitolite/gitolite-2.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.2.ebuild,v 1.2 2012/06/07 21:53:43 zmedico Exp $
-
-EAPI=4
-
-inherit eutils perl-module user
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-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.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
-}
-
-src_prepare() {
-	rm Makefile doc/COPYING || die
-	rm -rf contrib/{gitweb,vim} || die
-
-	echo "${PF}" > conf/VERSION
-
-	epatch "${FILESDIR}/${P}-gl-system-setup-exit.patch"
-}
-
-src_install() {
-	local gl_bin="${D}/usr/bin"
-
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
-
-	# install using upstream method
-	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
-
-	rm "${D}"/usr/bin/*.pm
-	insinto "${VENDOR_LIB}"
-	doins src/*.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.3.ebuild b/dev-vcs/gitolite/gitolite-2.3.ebuild
deleted file mode 100644
index 6409251e6ed9..000000000000
--- a/dev-vcs/gitolite/gitolite-2.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.3.ebuild,v 1.5 2012/06/07 21:53:43 zmedico Exp $
-
-EAPI=4
-
-inherit eutils perl-module user
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="contrib vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=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/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	rm Makefile doc/COPYING || die
-	rm -rf contrib/{gitweb,vim} || die
-
-	echo "${PF}" > conf/VERSION
-}
-
-src_install() {
-	local gl_bin="${D}/usr/bin"
-	gl_bin=${gl_bin/\/\//\/}
-
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
-
-	# install using upstream method
-	export PATH="${gl_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
-
-	rm "${D}"/usr/bin/*.pm
-	insinto "${VENDOR_LIB}"
-	doins src/*.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
-}