Version bump to 1.5.8. Remove 1.5.6-r1. Get a rid of dosed.

(Portage version: 2.1.9.25/cvs/Linux i686)

4 files changed, 13 insertions, 183 deletions

diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index a3564dcb6fa0..4168d7146d54 100644
--- a/dev-vcs/gitolite-gentoo/ChangeLog
+++ b/dev-vcs/gitolite-gentoo/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2010/11/14 09:59:01 idl0r Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.5 2011/01/03 05:14:33 idl0r Exp $
+
+*gitolite-gentoo-1.5.8 (03 Jan 2011)
+
+  03 Jan 2011; Christian Ruppert <idl0r@gentoo.org>
+  -gitolite-gentoo-1.5.6-r1.ebuild, +gitolite-gentoo-1.5.8.ebuild,
+  -files/gitolite-require.patch, -files/gl-setup-tempfile.patch:
+  Version bump to 1.5.8. Remove 1.5.6-r1. Get a rid of dosed.
 
 *gitolite-gentoo-1.5.7 (14 Nov 2010)
 
diff --git a/dev-vcs/gitolite-gentoo/files/gitolite-require.patch b/dev-vcs/gitolite-gentoo/files/gitolite-require.patch
deleted file mode 100644
index 37d903f1236f..000000000000
--- a/dev-vcs/gitolite-gentoo/files/gitolite-require.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 66b65e5e1db512e695588f326f7339fb5d5a7478 Mon Sep 17 00:00:00 2001
-From: Sitaram Chamarty <sitaram@atc.tcs.com>
-Date: Sat, 23 Oct 2010 16:43:47 +0530
-Subject: [PATCH 03/14] (doh!) make gitolite.pm easier for packagers
-
-should have done this long ago...
----
- contrib/adc/gl-reflog      |    4 +++-
- contrib/gitweb/gitweb.conf |    3 ++-
- hooks/common/update        |    3 ++-
- src/gl-auth-command        |    3 ++-
- src/gl-compile-conf        |    3 ++-
- src/gl-install             |    3 ++-
- src/gl-setup-authkeys      |    3 ++-
- src/gl-time                |    3 ++-
- 8 files changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/contrib/adc/gl-reflog b/contrib/adc/gl-reflog
-index aa59e15..c6f134b 100755
---- a/contrib/adc/gl-reflog
-+++ b/contrib/adc/gl-reflog
-@@ -33,7 +33,9 @@ use warnings;
- my($cmd, $repo, $ref, $limit) = @ARGV;
- $limit ||= 10;
- 
--require "$ENV{GL_BINDIR}/gitolite.pm" or die "parse gitolite.pm failed\n";
-+unshift @INC, $ENV{GL_BINDIR};
-+require gitolite or die "parse gitolite.pm failed\n";
-+
- my ($perm, $creator, $wild) = &repo_rights($repo);
- die "you don't have read access to $repo\n" unless $perm =~ /R/;
- 
-diff --git a/contrib/gitweb/gitweb.conf b/contrib/gitweb/gitweb.conf
-index edf9af4..283879f 100644
---- a/contrib/gitweb/gitweb.conf
-+++ b/contrib/gitweb/gitweb.conf
-@@ -25,7 +25,8 @@ $ENV{GL_REPO_BASE_ABS} = ( $REPO_BASE =~ m(^/) ? $REPO_BASE : "$gl_home/$REPO_BA
- $projects_list = $projectroot = $ENV{GL_REPO_BASE_ABS};
- 
- # load gitolite helper routines
--require "$GL_ADMINDIR/src/gitolite.pm"
-+unshift @INC, "$GL_ADMINDIR/src";
-+require gitolite
-     or die_error(500, "Failed to parse gitolite.pm: " . ($! or $@));
- 
- $export_auth_hook = sub {
-diff --git a/hooks/common/update b/hooks/common/update
-index 93d3dac..d7296ae 100755
---- a/hooks/common/update
-+++ b/hooks/common/update
-@@ -35,7 +35,8 @@ exit 0 if exists $ENV{GL_BYPASS_UPDATE_HOOK};
- # we should already have the GL_RC env var set when we enter this hook
- die "parse $ENV{GL_RC} failed: "       . ($! or $@) unless do $ENV{GL_RC};
- 
--require "$ENV{GL_BINDIR}/gitolite.pm";
-+unshift @INC, $ENV{GL_BINDIR};
-+require gitolite or die "parse gitolite.pm failed\n";
- 
- my ($perm, $creator, $wild) = &repo_rights($ENV{GL_REPO});
- my $reported_repo = $ENV{GL_REPO} . ( $ENV{GL_REPOPATT} ? " ($ENV{GL_REPOPATT})" : "" );
-diff --git a/src/gl-auth-command b/src/gl-auth-command
-index 0ef6ceb..0db6862 100755
---- a/src/gl-auth-command
-+++ b/src/gl-auth-command
-@@ -43,7 +43,8 @@ our %repo_config;
- my $bindir = $0;
- $bindir =~ s/\/[^\/]+$//;
- $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
--require "$bindir/gitolite.pm";
-+unshift @INC, $bindir;
-+require gitolite or die "parse gitolite.pm failed\n";
- 
- # ask where the rc file is, get it, and "do" it
- &where_is_rc();
-diff --git a/src/gl-compile-conf b/src/gl-compile-conf
-index efc4bc5..82f73f4 100755
---- a/src/gl-compile-conf
-+++ b/src/gl-compile-conf
-@@ -60,7 +60,8 @@ our ($REPONAME_PATT, $REPOPATT_PATT, $USERNAME_PATT, $ABRT, $WARN);
- my $bindir = $0;
- $bindir =~ s/\/[^\/]+$//;
- $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
--require "$bindir/gitolite.pm";
-+unshift @INC, $bindir;
-+require gitolite or die "parse gitolite.pm failed\n";
- 
- # ask where the rc file is, get it, and "do" it
- &where_is_rc();
-diff --git a/src/gl-install b/src/gl-install
-index e941092..844b2c9 100755
---- a/src/gl-install
-+++ b/src/gl-install
-@@ -28,7 +28,8 @@ sub wrap_mkdir
- # the common setup module is in the same directory as this running program is
- my $bindir = $0;
- $bindir =~ s/\/[^\/]+$//;
--require "$bindir/gitolite.pm";
-+unshift @INC, $bindir;
-+require gitolite or die "parse gitolite.pm failed\n";
- 
- # ask where the rc file is, get it, and "do" it
- &where_is_rc();
-diff --git a/src/gl-setup-authkeys b/src/gl-setup-authkeys
-index 758adac..c431cc5 100755
---- a/src/gl-setup-authkeys
-+++ b/src/gl-setup-authkeys
-@@ -30,7 +30,8 @@ our ($GL_PERFLOGT);
- my $bindir = $0;
- $bindir =~ s/\/[^\/]+$//;
- $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
--require "$bindir/gitolite.pm";
-+unshift @INC, $bindir;
-+require gitolite or die "parse gitolite.pm failed\n";
- 
- # prevent newbie from running it accidentally and clobbering his authkeys
- # file!
-diff --git a/src/gl-time b/src/gl-time
-index d68df5e..26102f9 100755
---- a/src/gl-time
-+++ b/src/gl-time
-@@ -22,7 +22,8 @@ do "$ENV{HOME}/.gitolite.rc";
- my $bindir = $0;
- $bindir =~ s/\/[^\/]+$//;
- $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
--require "$bindir/gitolite.pm";
-+unshift @INC, $bindir;
-+require gitolite or die "parse gitolite.pm failed\n";
- 
- # ---------------------------------------------------------------
- 
--- 
-1.7.2.2
-
diff --git a/dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch b/dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch
deleted file mode 100644
index d8ade1288356..000000000000
--- a/dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.8.ebuild
index 7c50739b866e..d496f7433bde 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.6-r1.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.6-r1.ebuild,v 1.2 2010/11/06 23:05:05 idl0r Exp $
+# $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
 
@@ -28,9 +28,6 @@ pkg_setup() {
 }
 
 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
@@ -41,8 +38,8 @@ src_install() {
 
 	./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
+	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}"