diff options
Diffstat (limited to 'dev-vcs/gitolite-gentoo')
| -rw-r--r-- | dev-vcs/gitolite-gentoo/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-vcs/gitolite-gentoo/Manifest | 26 | ||||
| -rw-r--r-- | dev-vcs/gitolite-gentoo/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch | 21 | ||||
| -rw-r--r-- | dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.9.1-umask.patch | 42 | ||||
| -rw-r--r-- | dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1-r1.ebuild | 73 | ||||
| -rw-r--r-- | dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1.ebuild (renamed from dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3-r1.ebuild) | 18 |
6 files changed, 31 insertions, 159 deletions
diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog index adffb61b177e..c311c37f1877 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.27 2012/05/19 15:15:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.28 2012/05/20 20:11:14 idl0r Exp $ + +*gitolite-gentoo-2.3.1 (20 May 2012) + + 20 May 2012; Christian Ruppert <idl0r@gentoo.org> + -gitolite-gentoo-1.5.9.1-r1.ebuild, -gitolite-gentoo-2.0.3-r1.ebuild, + +gitolite-gentoo-2.3.1.ebuild, -files/gitolite-gentoo-1.5.9.1-umask.patch, + -files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch: + Version bump to 2.3.1. Remove some old versions. 19 May 2012; Agostino Sarubbo <ago@gentoo.org> gitolite-gentoo-2.3.ebuild: Stable for amd64, wrt bug #416569 diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest index dcedeed32b9c..34541515c0eb 100644 --- a/dev-vcs/gitolite-gentoo/Manifest +++ b/dev-vcs/gitolite-gentoo/Manifest @@ -1,29 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX 0001-fix-a-rather-large-typo-thinko-in-1006eba.patch 945 RMD160 dc07e7ca595e5cf5f7c9751db7f06348c16615ab SHA1 5cc46e29afe547f27559e34788848ce1d8af64ad SHA256 5402e457cd537daab83900479faca293b9f42e13c4d471a0305941081826c393 -AUX gitolite-gentoo-1.5.9.1-umask.patch 1492 RMD160 0c8331771c698e86d04dac92b0d6050d4830dfe2 SHA1 a187aba851b3c6784eecf9f9cd65d2fc6fb02297 SHA256 1f115fccb6cc029b8c8d0262ae04c0c4539fd4fd55598ece94442aa2c8625208 AUX gitolite-gentoo-2.2-gl-system-setup-exit.patch 1418 RMD160 518f67265c0ec7e595036649d05c27e2931daf66 SHA1 0b1ba304d14dcad2bb4b17885f710f672a3ba18f SHA256 44242f30693f7aff22c04870651331af2985233ba57cf90c6019b6ac27c6b54b -DIST gitolite-gentoo-1.5.9.1.tar.bz2 147081 RMD160 9f260abcb0e24726088e95709485e312b9aa5be3 SHA1 32557db816f1e17da8df0b2c8028c0ecd3ad91bf SHA256 10a260e2e3d2c035c4a717cd30bbe319b7760c39180cbc8d8a7c227911c1dac8 -DIST gitolite-gentoo-2.0.3.tar.bz2 182066 RMD160 260178a5292e5eb088c2d080d8f42e315e45ad88 SHA1 5ca84545e9798e55209a5c091aed62a02d882418 SHA256 c9e685023bb04a19bdaec0374b37fa18d4105cb1a50cf8d7aaddbfd0de7cd191 DIST gitolite-gentoo-2.1.0.tar.bz2 191407 RMD160 62328cd94b0a180d718abb84c467d161cd581984 SHA1 fee8c9be8d6d79911d8772af72389c9237f86410 SHA256 431521c18d5f3b1ae12f4bed6c3ce422ac8b43242ab6a1c944801795a24ad6e8 DIST gitolite-gentoo-2.2.tar.bz2 187769 RMD160 0f87d87b50ed30469573aa244590d236ab019151 SHA1 573fb57b91e320c13bfa676e1df2e8ba2011bfb0 SHA256 2ed4be0be6454444cbabdcd650e47697c8b838ec4e688bca7554c6a7eed17538 +DIST gitolite-gentoo-2.3.1.tar.bz2 198849 RMD160 69e434f4bb8401dea64ab788844144d2c4c4a5bd SHA1 4973892155951aa54ff8e104f2348df438dd0a2a SHA256 65c4646b5609f987b3004dbc44ebf9a76d3f1791414fbe13eacea25460b966ae DIST gitolite-gentoo-2.3.tar.bz2 190668 RMD160 594b58c5bf1dff5e6363576b828040d39f46f56a SHA1 8450a91ab65f9673ce4a69f37ca6e6a859393b24 SHA256 ec97063a65c01d59f9e8c72fdff2ad3436fb7503c691f0d4f1f27c5c61ebc6d9 -EBUILD gitolite-gentoo-1.5.9.1-r1.ebuild 1945 RMD160 40377fe0b045e6c89998dee573c04a6fca74b0c5 SHA1 9b2ca2e6cd2549d910887916c62822aeaebbad33 SHA256 9d85c604baf9710f9f4eb634ea46fa5dd67c78de20a1b116fbc0eb6acabbec02 -EBUILD gitolite-gentoo-2.0.3-r1.ebuild 1948 RMD160 3abcdacd06ed2283598b69313c228348ae89a7cf SHA1 765e70aaebd8bfc8c8e8721f5c4ff935910db566 SHA256 b1c06e991122e1b8026d6d0c92b2ac012beb164bf4ef5432967e9ba68d4ac25d EBUILD gitolite-gentoo-2.1.0.ebuild 1872 RMD160 c32ce682182dd1ba282ef57062a438560048a942 SHA1 d4988628f345ebf4948a423bf49313bf10a7db4e SHA256 c43efd2481bba271cd908273b311d03a2f2accf6388f428e219e29964fd5428e EBUILD gitolite-gentoo-2.2.ebuild 1988 RMD160 9548fb81dd635757f52e05ab5fc50e4f194d4136 SHA1 a949088c9ab201ada68d8110efc4999aa96bcba0 SHA256 dcfcfeb78aa8876d3c42de7ae8c6afba040238847607412fa1bd5e836b2533cc +EBUILD gitolite-gentoo-2.3.1.ebuild 2001 RMD160 858bfacecf7858727601fd1e96e2a020c416fff0 SHA1 5c9b7836fab0c8e75cdec5f7f834751a9314c57c SHA256 72a020470d389f66ebfac219b7963b9369a62b324a5000ecc2ced967201044fa EBUILD gitolite-gentoo-2.3.ebuild 1996 RMD160 2c89be5bed2d7498d10304b5ccba30f0ecde7429 SHA1 f479284d179846a2b24264eedda070f162b52ac2 SHA256 42591ffa8c6694ddac7c0784324dfde209e96f0c4cbe01a68c0d1a132898232d -MISC ChangeLog 4965 RMD160 a5f1561c53d6378925502705f1446401c0d5beef SHA1 390eca38b67c4842fcd2dbd9a215484d26892bbc SHA256 e8003ec9447fc7fc6024ff740ed49a3ba9cd934221acdfcd686cf0b263268c5b +MISC ChangeLog 5321 RMD160 cf8ac1156248003b39d69c6a2e0474795a1d49d2 SHA1 cb8ec06898220488c39e2be370567e912c0d8c64 SHA256 9953cb416db2d5e213919c4f8a8257ea3f2b207b6e59d109102feebf5a1b1622 MISC metadata.xml 312 RMD160 11e08691ee3b8d1760e01a850c191051cea33266 SHA1 b2450cd68efba23d3e8c88eafc3c29cd41dcd3c9 SHA256 2bd97e3481039d2126c07f5f19a80d44b81b67df628a32028718b75053d9b52d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBCgAGBQJPt7j8AAoJEOTDgjZ80txdsA4IAIqZ5EF30c1yjSV1zXV6iRdK -spBELr9k2dTAlYozVkrcflUTXiPlhkJraz0iSzNWKeqF69rHaD61h83QGmmhEZyI -cJvDPm4D7PTcS2gANxazsPdm5r5mDnX1hnILNmMJWSIhJO4fxkKJCnx0qlnbalAE -oZGoToZUak34oHOYiAA5MAyowhP4bzrLTqBie2C/j+KRWt4dOXWzLd9bdVzNkUHo -JQBIyC/g6q+Qz84PWOOabHG7S12sARgzcc/pdmqHdaRo7q1MKPGMi1CIZQ00ToCf -06GYaS1u0W/wfJZQpCtLPDwGTGzgO3rOMZpnuDKSC9KfobNfX9SeyKm4TCc+eXY= -=MsUN +iQEcBAEBCAAGBQJPuU/rAAoJEMOx0zmdw4Z1MqkH/0dGOLYL5QfSCO7jyGYe/7W9 +QOHV4kDVnrcaBTIys2uANyzMOo5DgsLfVlyvikDY1+dbH9eZSjuu6wlXYAU7UpnR +RF5vnFyuz2oWfvb1GA/x4B6sJyXjBD+ZhghYDnwaEBUJqMg/tbFXUtF6elLi+BWP +yQNkzuZCBsOjCV44me3fS2e+lDFBpfVSvLXqGAcvkoSLmWsnzZiU+KTHRWO46UtX +6eC+/omEXgmCJacqYDjerOWvIguPoi1rM+qX4i9vJ5Qyl4mH3SXQ6OfLyUoPQESE +ydJ45hevX83XguBXFrGXVl4+CAx+A+sZttjQJ6wsulCNJhCh7m+8NHX5hkbCjbU= +=ESaI -----END PGP SIGNATURE----- diff --git a/dev-vcs/gitolite-gentoo/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch b/dev-vcs/gitolite-gentoo/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch deleted file mode 100644 index dd2ebdfad15b..000000000000 --- a/dev-vcs/gitolite-gentoo/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 63f18a5adfbfa1f62427f02e347a1e0942d4d615 Mon Sep 17 00:00:00 2001 -From: Sitaram Chamarty <sitaram@atc.tcs.com> -Date: Sat, 10 Sep 2011 18:57:42 +0530 -Subject: [PATCH] fix a rather large typo/thinko in 1006eba - -If you look at this change, and the same lines in 1006eba, you can -easily see what I missed... - -diff --git a/src/gl-compile-conf b/src/gl-compile-conf -index 2c4ac82..6521215 100755 ---- a/src/gl-compile-conf -+++ b/src/gl-compile-conf -@@ -267,7 +267,7 @@ sub parse_conf_line - elsif ($line =~ /^include "(.+)"/) - { - my $include_glob = $1; -- for my $file (glob($include_glob =~ m(^/) ? $include_glob : "conf/$include_glob")) { -+ for my $file (glob($include_glob =~ m(^/) ? $include_glob : "$GL_ADMINDIR/conf/$include_glob")) { - die "$ABRT $fragment attempting to include configuration\n" if $fragment ne 'master'; - die "$ABRT included file not found: '$file'\n" unless -f $file; - diff --git a/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.9.1-umask.patch b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.9.1-umask.patch deleted file mode 100644 index d215f1138886..000000000000 --- a/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.9.1-umask.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cab19e5760b43385347a8960e48a05c547cf54e6 Mon Sep 17 00:00:00 2001 -From: Christian Ruppert <idl0r@gentoo.org> -Date: Tue, 1 Mar 2011 23:37:03 +0100 -Subject: [PATCH] Set umask properly before initialising a new repo - ---- - src/gitolite.pm | 4 ++-- - src/gl-compile-conf | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/gitolite.pm b/src/gitolite.pm -index 73038ca..d58df32 100644 ---- a/src/gitolite.pm -+++ b/src/gitolite.pm -@@ -274,9 +274,9 @@ sub where_is_rc - # NOTE: this sub will change your cwd; caller beware! - sub new_repo - { -- my ($repo, $hooks_dir, $creator) = @_; -+ my ($repo, $hooks_dir, $creator, $umask) = @_; - -- umask(get_repo_umask($repo)); -+ umask($umask ? $umask : get_repo_umask($repo)); - die "wildrepos disabled, can't set creator $creator on new repo $repo\n" - if $creator and not $GL_WILDREPOS; - -diff --git a/src/gl-compile-conf b/src/gl-compile-conf -index f8d35bb..e0a5331 100755 ---- a/src/gl-compile-conf -+++ b/src/gl-compile-conf -@@ -497,7 +497,7 @@ sub do_normal_repos - unless ($GL_NO_CREATE_REPOS) { - unless (-d "$repo.git") { - print STDERR "creating $repo...\n"; -- new_repo($repo, "$GL_ADMINDIR/hooks/common"); -+ new_repo($repo, "$GL_ADMINDIR/hooks/common", undef, $repos{$repo}{"umask"}); - # new_repo would have chdir'd us away; come back - wrap_chdir("$ENV{GL_REPO_BASE_ABS}"); - } --- -1.7.3.4 - diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1-r1.ebuild deleted file mode 100644 index 3ef47fdf5c06..000000000000 --- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# 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.9.1-r1.ebuild,v 1.4 2011/05/31 17:23:16 phajdan.jr 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 - dev-perl/Net-SSH-AuthorizedKeysFile - vim-syntax? ( app-vim/gitolite-syntax )" - -pkg_setup() { - enewgroup git - enewuser git -1 /bin/bash /var/lib/gitolite git -} - -src_prepare() { - epatch "${FILESDIR}/${P}-umask.patch" - - rm Makefile doc/COPYING contrib/autotoc || die - rm -rf contrib/{gitweb,vim} || die - - 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 - 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}" - 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 -} - -pkg_postinst() { - # bug 352291 - ewarn - elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)." - elog "Especially if you're migrating from gitosis." - ewarn - ewarn - elog "If you use the umask feature and upgrade from gitolite-gentoo-1.5.9.1" - elog "then please check the permissions of all repositories using the umask feature" - ewarn -} diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1.ebuild index 33ea91680549..ce184d1d7db6 100644 --- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3-r1.ebuild +++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3-r1.ebuild,v 1.1 2011/09/10 17:52:10 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1.ebuild,v 1.1 2012/05/20 20:11:14 idl0r Exp $ -EAPI=3 +EAPI=4 inherit eutils perl-module @@ -16,7 +16,9 @@ KEYWORDS="~amd64 ~x86" IUSE="contrib vim-syntax" DEPEND="dev-lang/perl - >=dev-vcs/git-1.6.2" + virtual/perl-File-Path + virtual/perl-File-Temp + >=dev-vcs/git-1.6.6" RDEPEND="${DEPEND} !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile @@ -31,15 +33,17 @@ src_prepare() { rm Makefile doc/COPYING || die rm -rf contrib/{gitweb,vim} || die - epatch "${FILESDIR}/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch" - echo "${PF}-gentoo" > conf/VERSION } src_install() { + local gl_bin="${D}/usr/bin" + gl_bin=${gl_bin/\/\//\/} + dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die - ./src/gl-system-install "${D}"/usr/bin \ + export PATH="${gl_bin}:${PATH}" + ./src/gl-system-install ${gl_bin} \ "${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \ "${D}/usr/share/gitolite/conf/example.gitolite.rc" || die |