Version bump to 2.2.

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

5 files changed, 158 insertions, 25 deletions

diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index 1d567e639584..e3013ed665a0 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.19 2011/10/17 21:12:52 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.20 2011/12/04 16:37:33 idl0r Exp $
+
+*gitolite-gentoo-2.2 (04 Dec 2011)
+
+  04 Dec 2011; Christian Ruppert <idl0r@gentoo.org>
+  +gitolite-gentoo-2.2.ebuild,
+  +files/gitolite-gentoo-2.2-gl-system-setup-exit.patch:
+  Version bump to 2.2.
 
 *gitolite-gentoo-2.1.0 (17 Oct 2011)
 
diff --git a/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-2.2-gl-system-setup-exit.patch b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-2.2-gl-system-setup-exit.patch
new file mode 100644
index 000000000000..1d3e12aca05e
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-2.2-gl-system-setup-exit.patch
@@ -0,0 +1,47 @@
+From ab9d0d2f57ed84c01513053b88587dac82d9ed66 Mon Sep 17 00:00:00 2001
+From: Sitaram Chamarty <sitaram@atc.tcs.com>
+Date: Thu, 17 Nov 2011 18:49:24 +0530
+Subject: [PATCH] a couple of very minor oopsies
+
+(1) c5f342a forgot authkeys can have blank lines also
+
+(2) f0cedeb ended gl-system-install on a non-0 ret code
+
+both caught by matthewtdawson at gmail
+---
+ src/gl-system-install |    4 +++-
+ src/sshkeys-lint      |    2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gl-system-install b/src/gl-system-install
+index 0eec005..d7df7e4 100755
+--- a/src/gl-system-install
++++ b/src/gl-system-install
+@@ -108,8 +108,10 @@ gl-setup is not in your \$PATH.
+ $path_advice"
+ 
+ which=`dirname $which`
+-[ "$which" != "$gl_bin_dir" ] && die "                ***** WARNING *****
++[ "$which" = "$gl_bin_dir" ] || die "                ***** WARNING *****
+ $which precedes $gl_bin_dir in your \$PATH,
+ and it *also* contains gl-setup.  This is almost certainly going to confuse
+ you or me later.
+ $path_advice"
++
++exit 0
+diff --git a/src/sshkeys-lint b/src/sshkeys-lint
+index bcb8f7b..96c027f 100755
+--- a/src/sshkeys-lint
++++ b/src/sshkeys-lint
+@@ -119,7 +119,7 @@ sub ak_comment {
+     $in_gl_section = 1 if /^# gitolite start/;
+     $in_gl_section = 0 if /^# gitolite end/;
+     die "gitosis?  what's that?\n" if /^#.*gitosis/;
+-    return /^\s*#/;
++    return /^\s*(#|$)/;
+ }
+ 
+ sub fprint {
+-- 
+1.7.5.4
+
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild
new file mode 100644
index 000000000000..9009fe907dd9
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild
@@ -0,0 +1,76 @@
+# 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-2.2.ebuild,v 1.1 2011/12/04 16:37:33 idl0r 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.6"
+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() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}-gentoo" > conf/VERSION
+
+	epatch "${FILESDIR}/${P}-gl-system-setup-exit.patch"
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	export PATH="${D}"/usr/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
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.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/Manifest b/dev-vcs/gitolite/Manifest
index 3694e379c04a..fd57a38c6ef9 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -2,22 +2,25 @@
 Hash: SHA256
 
 AUX 0001-fix-a-rather-large-typo-thinko-in-1006eba.patch 945 RMD160 dc07e7ca595e5cf5f7c9751db7f06348c16615ab SHA1 5cc46e29afe547f27559e34788848ce1d8af64ad SHA256 5402e457cd537daab83900479faca293b9f42e13c4d471a0305941081826c393
+AUX gitolite-2.2-gl-system-setup-exit.patch 1418 RMD160 518f67265c0ec7e595036649d05c27e2931daf66 SHA1 0b1ba304d14dcad2bb4b17885f710f672a3ba18f SHA256 44242f30693f7aff22c04870651331af2985233ba57cf90c6019b6ac27c6b54b
 DIST gitolite-1.5.9.1.tar.gz 180299 RMD160 d302b8ad95ec99ad0eec035583fe0327ffef44cb SHA1 100269bae00f56b6cf5266c240d15d910d382ce3 SHA256 5e0b5f0f35433c8e35ad763b13580b4e9c4501160ae74e48a2bc018ab0111077
 DIST gitolite-2.0.3.tar.bz2 180376 RMD160 0f8ccdeaa03297185afcd7e1d2c16f325854caee SHA1 d5849b8d7a745a3d3bb06f55693c7a3e8219b960 SHA256 8be9bca35aed98164cc25842199478cb5e5ec30a0210a6a5ff121300fec2c54d
 DIST gitolite-2.1.0.tar.bz2 189726 RMD160 1911d6c6b700756a0ca1141b8964a69fd91b7e7a SHA1 312532739538e7fe16fbb6de4088037dd8ee77c3 SHA256 c55ca02932893f3f6a76a2e31d53d847c2fd5ccb768831db123c2f80d1b8eaa3
+DIST gitolite-2.2.tar.bz2 186414 RMD160 3403fcde29a5a405d36cb88fdfe380b4bc1f42be SHA1 1c11de5264ecadbc4aed0f38607182dd68ee2cc1 SHA256 b43a735af62dbb2b05ed679029f3eafd8aa0c0e8041399f2c4dad796f87d6ccc
 EBUILD gitolite-1.5.9.1.ebuild 1717 RMD160 9f7e8027b3c1bee45327129b9488fd0258623936 SHA1 c24a2d218fa74790eff0ef6f758cb4d7da52e694 SHA256 b1ad6692306c1ed9e76382736a226cfdb5fa51fa64a5c4ba8820fb1a1d324a64
 EBUILD gitolite-2.0.3-r1.ebuild 1697 RMD160 d9595a9be05b981a26a1c89aa9809306eefd8f2a SHA1 998f3535bac2e5d7c1b3d1b0b439e346c0c51f14 SHA256 57329a75791837c8eb8d5944a1d01550e413bb9e906c62edeff93ce871612568
 EBUILD gitolite-2.1.0.ebuild 1618 RMD160 a7ee321afc4653a8fb9473a1f05169c63252a110 SHA1 e75b48a6ef8e1fda02d6170232db813426ced64d SHA256 c1d51e7af6a853d5fd578ccf464ba7be7529a4e83e6e61f4ed6e5c082956be48
-MISC ChangeLog 1703 RMD160 cd4c127f1d9a80bf4f9d9df51ea411c2ede8b7b2 SHA1 a475552a2d87343d29e54a59ae6989dcff88b13b SHA256 6eaf543459c077f1862ee70836218ec3e48b08fc3c416e03c49a0d27e7b7009c
+EBUILD gitolite-2.2.ebuild 1738 RMD160 b64381a23f6cdfe86849ba7868f4509845b3bdaa SHA1 e43c950cd73ea0685f0fb3ce667d60d71af7db08 SHA256 8ca3aca213c3f72bb80590cc04c5976318f2d381c5457c4af416599a7c13ea51
+MISC ChangeLog 1892 RMD160 4665a4c2ab0dcb8a13e297896278b3e3eccd05b5 SHA1 253531176a3b5eff68ba52e7d11bab9e51592c7b SHA256 6f83149a436b13ae299b273e2f48f6c3683b73cb5443e92e08719faa54edaed4
 MISC metadata.xml 629 RMD160 73f749e4b49dbd441650edeedeb571a6cc7a63ad SHA1 d2c4e86a937e61031382c39c3ed1ad5629c69e47 SHA256 d91cefaa604035b0a9796fc1c205c8cbb7a5d9fa74c646352dc56d79f24d4f1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJOnIZGAAoJEMOx0zmdw4Z1HPMIAMD9cel8vaM4VND+TFjjbLUe
-DYbGxqgRFu3o/RLfPdmBnV1ustJqygTb05pKV1Nebai+2C5mEVaUUllzaMTimPsR
-TnAJnFi1Qq+A0EEaRaCY6Xj60t94OQnw3CPqOKyKvJ4VpyJNWH03QUSOPkmTdbJL
-H3gZD4NS7YGHytwwvNSl9fPc7T0agYCVR8pYYr5jNb1/FPTC5ehNvlEwR4zKf2mr
-0WcYomShc91kWUvBdzvYyv146jbWUrx5nJ1y8Oe0CtGPdPAmF81ztdHJCXkg2Inr
-S8HKZ5l5odRSIvLUgQql9y0OwECVQINIcRmncXhw8sYxCPt4wyL7SGJqbDZVQtY=
-=hD+b
+iQEcBAEBCAAGBQJO26JvAAoJEMOx0zmdw4Z1VLUH/2BZTTTFKjcmes4XLfzfMWFQ
+C/l39+Gv51ocUcVL8jNXOBvD7DfVE9toZOmLrnAOvfIlEH5Ey73N2DXW+nK8JWHU
+NunXJWqeMmm82/FRkzDU3UE+g/3EKZ14J+RiCznHGa2cJdcnXTE1PDFOdqZf7v0p
+5KI3xvD9UDT9KbCE273Nkyv/CRH/LHtl++JGUOGtdXZkLlAf7Cplzqgtyn/RVCyt
+1PomVBcuJsjPu6NjWb+MKsNuvWiEV9N5r34hGU+Rrt/9dnaALxmOf3nP3W6njnnC
+kIa/2Vzx/y0lIyePqCeWAkf3k1c0KU839nOj0XHKIZVjjRfzfghqsgOe7J8VPtI=
+=iC7v
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/rapidsvn/Manifest b/dev-vcs/rapidsvn/Manifest
index c3fbd482ca3c..1c583a562141 100644
--- a/dev-vcs/rapidsvn/Manifest
+++ b/dev-vcs/rapidsvn/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX rapidsvn-0.9.8-sar.patch 955 RMD160 872c2307abee59bc2b2d63866b8d72ec81600e08 SHA1 0682da8f3dcd41019c780f749b1087ba22793311 SHA256 485eca96c9d393baffec28443eb7f32fe577d9a12533c0797ca61f67380c4b0e
 AUX rapidsvn-sar.patch 931 RMD160 ba28d6ccfd86553b4963d611593812db6005ae4c SHA1 175d1609f2e9cfb7f0f6e832ee168869760b442e SHA256 0690d1c3c516e32138225ca60c74a157632eab7358f5d8cbdd374f7b5d1c5782
@@ -9,25 +9,25 @@ DIST rapidsvn-0.12.0-1.tar.gz 1246675 RMD160 2c6e28f5b3a6450cfb8a749fc27490877cc
 DIST rapidsvn-0.9.6.tar.gz 1205771 RMD160 060a66d3f268f9a4018f01a9541df2a3394ed7b8 SHA1 266f846437e3bbce1707799ec0d95c2d1be43b4a SHA256 4e026b0e7a56b2a0ba4cd12b1ee224c8d0645e98eb5b682078220f912513b36d
 DIST rapidsvn-0.9.8.tar.gz 1212108 RMD160 a1614daff3631536c3eb0a14c279f0581b257fbf SHA1 22d145d2d686841da100d45789a663c70e325a3c SHA256 9af7462559d8a600a1b54ac19a79c111691818969e193a06080c9d9306b32b13
 EBUILD rapidsvn-0.10.0.ebuild 2829 RMD160 bdbfdfde3c4644193a02c27464cf280639599586 SHA1 0cb02faab6465368f630ca535de57c3cf3f63fa4 SHA256 ca87a34a3f8e28417fd2650e0000ed22b0953ef4d5740339354f9aabbcc4ff30
-EBUILD rapidsvn-0.12.0.ebuild 2749 RMD160 1cc1417271563c70e56db3610f9f531e8c406f7b SHA1 ffed063d4691e00e65d936cc43bbcdb0ad4aec9f SHA256 a6c5101b143ff5b2fcfc01898f7f5a8b1c1c9c801b4fa62faaeaae03aa2aed90
+EBUILD rapidsvn-0.12.0.ebuild 2746 RMD160 d616183a85e5147c8e84dd00bf12e3cece5f3f4c SHA1 c25179b2ea4424e7de659444790bf728eaece3ac SHA256 0638b18d98849646512c2b4938757eeea55a11b7368d5ae70a43a0d59054e062
 EBUILD rapidsvn-0.9.6-r1.ebuild 3166 RMD160 de794e3d9f315ee286f04ab4a67d191f1d11cea8 SHA1 e5421c8773ac629eaa6db1f00182e4fd9f0df846 SHA256 e334413abb3449220da4a79796fc7a299ce99851043b740f0bfeb6901dd68f51
 EBUILD rapidsvn-0.9.8.ebuild 2997 RMD160 43ded0e159c08c0e8fd37c177b42b770c5ab1742 SHA1 4c097bcfae69b565354e7344f3a3e145be54d3f5 SHA256 cf316c04c03a0380f182d3988dc4efcd5433d596cbed99ceb3f340ab0753610d
-MISC ChangeLog 12727 RMD160 b33405d988569a5d8223c1fb9e9d13afba6a764d SHA1 b8795d710c8f3c319816155fd2a7dd2a0c417d51 SHA256 6c86a29aea08b34b19f00a9fc7225c2a65a108f330762fd8428efeda1d776747
+MISC ChangeLog 12837 RMD160 676bfd1797ee7ad3a2c4e91c299917ef3ce64b65 SHA1 b35c8d008b561e83ea54cb3a37930cdf11472639 SHA256 1e3f3ed42b90699c6fb7aabddeda5cf4dc23163b791f728ecbf3829fa45ab93a
 MISC metadata.xml 518 RMD160 b9c97307a72d2c0ae05deb166229ffc603d8855b SHA1 6b9c6a8c99c7dd184cf048b4e306f0a0e5f81788 SHA256 b7e173df02d2585da2771a95e6acd8ae824e61887087747d227b9ea07bf0b435
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOyN33AAoJEF0huFKJUZL5tT8P/2GKGOkxgL3wZPhtJsB9iXwA
-MJJf/uRivsjvCpOushDhdaO+h7qwxmNdJk4tsCWkPF3pnP6GRf5o0NSlQ4NHdtTy
-dq0e6lgo8u5KfY+KQ39oSzMhU/VHc2TkVU3qRFGItvXGBd6I7AM7UOLIE6MZOoM1
-CJ3MJed+s4Ky1ulume+NtpOSjmuz420AiFhQdbT2Sw9WYQxrvQsNt8BPZCGQFtUB
-7Dgpt0iyZSbD25E2qRPP/y8VYjc0Z/wuzIcyBoQ0I9NYvxmms1PjG8F0v/bSkjjA
-dCOGm2284xaqQ1EXx6E/GR/pKxD2uJ2WNglOQjn32sFxpcZ7M3vXMQMDMQc+0vim
-zlDNIgzjIMy16NRLAD5tk0JR7YF3bPUkSwisUeCBUoVgcEqUrt+kdvHYYGvgICEY
-7XhwPJ48c+IyLjMJbDaBzVLn84Uz4AMogNyRUC4BW62+ATv7iYS6SHulEAz161t4
-6k22mEzbatY+gSb+I64ov2DMcciClU4eE8FXpIhqn4LBlKO33N2G7FJIjSRTdr3D
-0Z6E2MtvgF8qWX6krGlqtcnT4hoKcZrxOTZ3xZW/xEBI+ET1zY8I0TMfa8tBmhMS
-G0lpD9+5EydW9O6j8c77+dGCORZrJRFI7U+LlrZZnZbz1wkys66UvDTGMgnKzCge
-TfJL0Q1Ju/cY0C6N4/Vz
-=xPgg
+iQIcBAEBCgAGBQJO26LSAAoJEPqDWhW0r/LCCNUP/jY0pL1EimlvN8f7a4L66Mu8
+q+9ZYv0e+h7ApG16GQSzadvzsG9wlwqUkQvDVNxR5GxyMTQm//cGULD+NIi6RMo9
+TG2TG+E/mOXXYmpwv5xoUxxlrTpquokfZbHG42oNubW2EGlZDS1cYwmxuzw7LTg0
+TOg8i5VgAfnW54wM3AdeGZBXQavYFHHGxIcEuFrxbev3FuZfjjL/K12Dwc1S66+s
+UBsN1kpCurr/jd8q8CtR1D6hy61loFQRPHbNQ1RBMeoDQOlwOytJ7qiJbfIEaBvA
+/PJIeYRsi0xBwQk011B3mYEOIp00RifSLSNVKfuVJ/a3O5nNHH4ic6N6t6sjAO1b
+9AW2bmXoiI32t0UZxSw2SBXhEgi9mK0fRlkCn3TmoZZa+6dqqJ3K0jIn20w2Mj73
+lCaP78/MgaZWvAd3WdPvD/p49btvgzejaXqJTvOaOtgH/kYrXNPUAsenRhKgJhan
+mEcJGFEp41vq9jV2508w6pgqzzXoYNNseRuAr7q4Gw+pPqFAQugvng/mBdUM0o93
+tOn/kQDfFpKb9ER41dPucI7X21fzbeJvfjoAsnF/B6WdJonRO+cLtk0/oLXWNFg1
+HnqQKocsPf6fDlFBeGonA2kmDTBeZA5zEyXoLX8bIFhh5tIOrIY/jaiiJiAXfMgG
+JAahCh0ShqyGp+jkLx2o
+=Y2TJ
 -----END PGP SIGNATURE-----