Browse files

version bump

(Portage version: 2.1.8.3/git/Linux x86_64)
 (Signed Manifest commit)
  • Loading branch information...
1 parent e445a09 commit 85da7e0aa669ad6a35d7271e8bc5b3aa497d30b5 @ramereth committed Nov 6, 2010
View
6 dev-vcs/gitolite/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*gitolite-1.5.6 (07 Nov 2010)
+
+ 07 Nov 2010; Lance Albertson <ramereth@gentoo.org> +gitolite-1.5.6.ebuild,
+ +files/gitolite-package-mgr-fixes.patch:
+ version bump
+
*gitolite-1.5.5 (27 Aug 2010)
27 Aug 2010; Lance Albertson <ramereth@gentoo.org> +gitolite-1.5.5.ebuild,
View
11 dev-vcs/gitolite/Manifest
@@ -1,14 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX gitolite-package-mgr-fixes.patch 4252 RMD160 932ef8360c2cca4caba6f80af367149722d8fa45 SHA1 988fd98ae241b8e96f7176e8a06778258e79b68a SHA256 9735d4e64fa86a50e6146ba16fa1d8d10be9c663b7e1ffef0d5202acf6dcdc37
DIST gitolite-git-1.5.5.tgz 136991 RMD160 6de7f040aba25488633e02b68d5dc7d796f2ebd6 SHA1 9f45d497caa2c15baea28dfd4cdf63152ec0d181 SHA256 1d4a3c7aed1a25bd8a72ac053226f0176e7693e99b6e80902c4e0eefae0bddc0
+DIST gitolite-git-1.5.6.tgz 156465 RMD160 4cf8fc6fc32031cae0f56cedf8384028577be4fa SHA1 8560260c88c3535968aa648f524a297d5185740a SHA256 774e6c73b5d57b706a6910e3aceea24e69dd7eabfc3c06bcbdf3a4fdcba49a60
EBUILD gitolite-1.5.5.ebuild 1203 RMD160 22fbffc32b57deaa1dfa8f9cb8cd6bce2df436ed SHA1 4c5be17cd009ec07e19e7f6036f14456faaf9eaf SHA256 8f72c42af7ccd3a40940d47c29f3cf6ce4fa350aba2abb6b027c6ca396990720
-MISC ChangeLog 260 RMD160 b07d8d9edc336340bbd8b1a9ab07f850ff3464f4 SHA1 843725f501d8ad1b01a972c7eed611a6f9e62488 SHA256 460779adc41c10a933b381dbe546aeda769800485b90ac51ac83ee1f1d753d2c
+EBUILD gitolite-1.5.6.ebuild 1410 RMD160 141995c9e90c36c3b8dd9a2736779be813c412fb SHA1 1e319e0e96f679fc9bcb3d3dbafeff4b019094a7 SHA256 21966b91e5eee6b2d8b884863b47b40ca4af0af81846287d4deae5137b8a6ce4
+MISC ChangeLog 427 RMD160 ba85d108ce00e73b91beac99980a047eea15b630 SHA1 3e06b667382ece1fb7302e405480149a4b9bba7a SHA256 fc994f6ac79b136a1f96305afaa8497d9f88b05bdf303968117bc204f061dea1
MISC metadata.xml 472 RMD160 b83381e17eaa172670a01dd2640ac1275152e65d SHA1 5b30cd1881b41550d1ed78b397733c9a24ff230f SHA256 f73f9da430150c63839a5aced481de7bbf00463e6ff149f4ad2d7f3b118cb1e2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iD8DBQFMd1qnQW+hXSf0t0IRAsbKAKCNIehZf9cHu23WZBljKwm/SLICJgCfeX3B
-6cFVJ6sAjNkvd2AVC5xWJJU=
-=2anq
+iD8DBQFM1fImQW+hXSf0t0IRAhx4AKD1ser/kVn4K99TBNqNqSX0mf1/NwCg4eau
+7yw8/QBY9mBaHTFTZJ9hjPs=
+=yKOK
-----END PGP SIGNATURE-----
View
121 dev-vcs/gitolite/files/gitolite-package-mgr-fixes.patch
@@ -0,0 +1,121 @@
+commit 66b65e5e1db512e695588f326f7339fb5d5a7478
+Author: Sitaram Chamarty <sitaram@atc.tcs.com>
+Date: Sat Oct 23 16:43:47 2010 +0530
+
+ (doh!) make gitolite.pm easier for packagers
+
+ should have done this long ago...
+
+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";
+
+ # ---------------------------------------------------------------
+
View
60 dev-vcs/gitolite/gitolite-1.5.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils perl-module
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="http://github.com/sitaramc/gitolite"
+SRC_URI="http://github.com/sitaramc/${PN}/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vim-syntax"
+
+DEPEND="dev-lang/perl
+ >=dev-vcs/git-1.6.2"
+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() {
+ epatch "${FILESDIR}"/"${PN}"-package-mgr-fixes.patch
+ rm Makefile doc/COPYING
+}
+
+src_unpack() {
+ unpack ${A}
+ mv "${WORKDIR}"/sitaramc-"${PN}"-* "${S}" || die
+}
+
+src_install() {
+ dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+ echo "${PF}" > conf/VERSION
+
+ # install using upstream method
+ ./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/*
+ insinto /usr/share/doc/${P}
+ doins -r contrib
+
+ keepdir /var/lib/gitolite
+ fowners git:git /var/lib/gitolite
+ fperms 750 /var/lib/gitolite
+}

0 comments on commit 85da7e0

Please sign in to comment.