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)

3 files changed, 54 insertions, 4 deletions

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.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6-r1.ebuild
index 775c172bc09d..bac1e64061ff 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6-r1.ebuild
@@ -1,13 +1,13 @@
 # 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 $
+# $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"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
+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"
@@ -27,6 +27,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/gl-setup-tempfile.patch"
 	epatch "${FILESDIR}/gitolite-require.patch"
 
 	rm -rf Makefile doc/COPYING contrib/{autotoc,gitweb,vim}