From f3546f6857ede4b7a462703c4b5cbb7b7c89dfb3 Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@gentoo.org>
Date: Thu, 4 Nov 2010 18:15:27 +0000
Subject: Revision bump. HOMEPAGE and DESCRIPTION fixed. Added a patch to fix
 tempfile creation in gl-setup.

(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
---
 dev-vcs/gitolite-gentoo/ChangeLog                  | 10 +++-
 .../gitolite-gentoo/files/gl-setup-tempfile.patch  | 41 +++++++++++++++
 .../gitolite-gentoo-1.5.6-r1.ebuild                | 60 ++++++++++++++++++++++
 .../gitolite-gentoo/gitolite-gentoo-1.5.6.ebuild   | 59 ---------------------
 4 files changed, 110 insertions(+), 60 deletions(-)
 create mode 100644 dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch
 create mode 100644 dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6-r1.ebuild
 delete mode 100644 dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6.ebuild

(limited to 'dev-vcs/gitolite-gentoo')

diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index c5906909c8e9..e0d2818057e6 100644
--- a/dev-vcs/gitolite-gentoo/ChangeLog
+++ b/dev-vcs/gitolite-gentoo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/gitolite-gentoo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.1 2010/11/02 21:08:07 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.2 2010/11/04 18:15:26 idl0r Exp $
+
+*gitolite-gentoo-1.5.6-r1 (04 Nov 2010)
+
+  04 Nov 2010; Christian Ruppert <idl0r@gentoo.org>
+  -gitolite-gentoo-1.5.6.ebuild, +gitolite-gentoo-1.5.6-r1.ebuild,
+  +files/gl-setup-tempfile.patch:
+  Revision bump. HOMEPAGE and DESCRIPTION fixed. Added a patch to fix tempfile
+  creation in gl-setup.
 
 *gitolite-gentoo-1.5.6 (02 Nov 2010)
 
diff --git a/dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch b/dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch
new file mode 100644
index 000000000000..d8ade1288356
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch
@@ -0,0 +1,41 @@
+diff --git a/src/gl-setup b/src/gl-setup
+index e72ebc6..f9f50a2 100755
+--- a/src/gl-setup
++++ b/src/gl-setup
+@@ -21,6 +21,9 @@ GL_PACKAGE_CONF=/tmp/share/gitolite/conf
+ 
+ die() { echo "$@"; exit 1; }
+ 
++TEMPDIR=$(mktemp -d)
++export TEMPDIR
++trap "/bin/rm -rf $TEMPDIR" 0
+ 
+ if [ -n "$GITOLITE_HTTP_HOME" ]
+ then
+@@ -40,10 +43,10 @@ fi
+ 
+ if [ -f $HOME/.gitolite.rc ]
+ then
+-    perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $GL_PACKAGE_CONF/example.gitolite.rc | sort > .newvars
+-    perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $HOME/.gitolite.rc                   | sort > .oldvars
+-    comm -23 .newvars .oldvars > .diffvars
+-    if [ -s .diffvars ]
++    perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $GL_PACKAGE_CONF/example.gitolite.rc | sort > $TEMPDIR/.newvars
++    perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $HOME/.gitolite.rc                   | sort > $TEMPDIR/.oldvars
++    comm -23 $TEMPDIR/.newvars $TEMPDIR/.oldvars > $TEMPDIR/.diffvars
++    if [ -s $TEMPDIR/.diffvars ]
+     then
+         cp $GL_PACKAGE_CONF/example.gitolite.rc $HOME/.gitolite.rc.new
+         echo new version of the rc file saved in $HOME/.gitolite.rc.new
+@@ -51,10 +54,9 @@ then
+         echo please update $HOME/.gitolite.rc manually if you need features
+         echo controlled by any of the following variables:
+         echo ----
+-        sed -e 's/^/    /' < .diffvars
++        sed -e 's/^/    /' < $TEMPDIR/.diffvars
+         echo ----
+     fi
+-    rm -f .newvars .oldvars .diffvars
+ else
+     [ -n "$GITOLITE_HTTP_HOME" ] || [ -n "$pubkey_file" ] || die "looks like first run -- I need a pubkey file"
+     [ -z "$GITOLITE_HTTP_HOME" ] || [ -n "$admin_name"  ] || die "looks like first run -- I need an admin name"
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6-r1.ebuild
new file mode 100644
index 000000000000..bac1e64061ff
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6-r1.ebuild
@@ -0,0 +1,60 @@
+# 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.6-r1.ebuild,v 1.1 2010/11/04 18:15:26 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
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/gl-setup-tempfile.patch"
+	epatch "${FILESDIR}/gitolite-require.patch"
+
+	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.6.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6.ebuild
deleted file mode 100644
index 775c172bc09d..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6.ebuild
+++ /dev/null
@@ -1,59 +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.6.ebuild,v 1.2 2010/11/02 21:11:43 idl0r 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.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
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitolite git
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/gitolite-require.patch"
-
-	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
-}
-- 
cgit v1.2.3-65-gdbad