Revision bump. HOMEPAGE and DESCRIPTION fixed. Added a patch to fix tempfile creation in gl-setup.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 64 insertions, 13 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/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 3e5b0ad86b85..3a6082a72e73 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX gitolite-require.patch 4663 RMD160 94bf2f4f0e6b7d81905156d4b07473bd2e10c34f SHA1 453386b56338f0afd8a4d48f051433e474a9b755 SHA256 f4eb13cb593f27c8eadf71719a4a4221381b8b3eee414c5977cc813b3c565c64
+AUX gl-setup-tempfile.patch 1735 RMD160 9d618e8ac5f166e33881ee9189f26914310b5a09 SHA1 30a77a86e7bae2d4a1697613836680e7a25e8544 SHA256 f33f237f08ffc657f47fb360a9009c315663f6389466239c12f663cbb0446d91
 DIST gitolite-gentoo-1.5.6.tar.bz2 129140 RMD160 8fecb28ec8642a5a34a79aeea5184ca30dbe571c SHA1 5bcd27f6857173fb99bf7d3d7170775083b437b1 SHA256 4fca6fbf22ed7c5c56f07129d7ae16a1ef100c036d496c54b5f8a4e5db559874
-EBUILD gitolite-gentoo-1.5.6.ebuild 1439 RMD160 0f6219fe2b8cadba0aa380f8180652ba47f392a9 SHA1 bee2ede4ead05debb3447170417c01269f407a4d SHA256 43e3764cdc1c1f4bf4d01a2d647c3eac32f71522da88dc5359efeb97013a92d6
-MISC ChangeLog 439 RMD160 17ae58dd5ca7ef9296ec48cb43fae6d382047d53 SHA1 67f28e5d810ed25e020dac16087fff015f55c474 SHA256 eb42a35228574b7e778cd4945b20041bd2b663e97db3502f6141c7a5ad01f1c2
+EBUILD gitolite-gentoo-1.5.6-r1.ebuild 1541 RMD160 fe494ebb64115688d79b3ce131984a2c81891fc4 SHA1 2c6dadaa522fbcf5d8d3167eb7c44785be5f5cd1 SHA256 838570db83a573b0a92742ac2445b287990f2be3584167d3e109c1b3fc0381b5
+MISC ChangeLog 737 RMD160 161d07c5684ef0d12cfb5e3cf0d25cc35662f586 SHA1 6b5bb7d22c1e1aa145fbb7cbe4f409cb9e223245 SHA256 a02275e87ca6c62cd8288863675b51e408e71ae5cf191e61226fdfd153f34e74
 MISC metadata.xml 334 RMD160 4bbb68c6d92400d8cc600dcddaecc39f30fad7db SHA1 7ead27ae3a05ffcd4e295262d73cce4863b6129e SHA256 b5d11d2edf5782c930b845696571b9417f4f4b247ca4dad494daf470f749fe16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBCAAGBQJM0H6UAAoJEMOx0zmdw4Z12oAH/joiC0FQEkEZ2H/N5PyM9NT3
-/6UzK0lZrVQpldzqLyd0nGr7ZuE5xlMri8R2HGoGzom9nfR08ZUaXNRSw8jtnkyk
-dUrPV9vNLn1Q7WX9Uj8cI5MQ2w0rO2vu77piFURttwdtHBOx4CTQ2i1Jvub1NMg9
-bJzTXPQBs8XPTwpbhl35jqpzxu6oONaDYQJjmwr4jycRrZ72bfOf62M2j5cs3eCc
-3qI8HQWGXfjr+NjDdywxV9IQSyopfAMJeRVvwv01U95qmYmV8uO6w5DX8OI9bPvm
-LLz3RGFM/jHugA+QJfKhKTIWZWp/M5u1obaAS9LK+AzHnA2ZtiJBGUxaQ5P7B6k=
-=q9ct
+iQEcBAEBCAAGBQJM0vhEAAoJEMOx0zmdw4Z1JggH/RrXBC5lPUntNIztK4NP8Ng7
+OHUfN01lSEr5Y5BbvBurpja9HVLU5UEgVC9wI4phywleZdZWLNg1jy2LrGrtxVS4
+8WeGk6iNHeTKrfes5srJmnsI+iBbRvRL/kNrLdXYmXtgpasvTonHP3bM+OEj5FfD
+4oIHynuRAVMXlB3hFnFVNCvBaYZOjCAlC+PtcYhqhqBrr+miaSjIbh/nvYLTSXkG
+2jpky0wmpRRRu1QhXrxPEwtfGaGRGfhrglP26GQdUTsQ8TDzYBwu/bH7uB7W9znu
+SOqWW5xisK1RWCV+xMiXkKM0KUAcjvDMrzT/Yh7EIgyQarspmFx1EseHhM+EIrs=
+=I3pg
 -----END PGP SIGNATURE-----
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}