Version bump

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

3 files changed, 108 insertions, 9 deletions

diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index c2d67e620fc2..a03846432a0a 100644
--- a/dev-vcs/gitolite-gentoo/ChangeLog
+++ b/dev-vcs/gitolite-gentoo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/gitolite-gentoo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.36 2014/08/23 22:37:18 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.37 2014/08/24 21:31:07 idl0r Exp $
+
+*gitolite-gentoo-3.6.1 (24 Aug 2014)
+
+  24 Aug 2014; Christian Ruppert <idl0r@gentoo.org>
+  +gitolite-gentoo-3.6.1.ebuild:
+  Version bump
 
 *gitolite-gentoo-2.3.3 (23 Aug 2014)
 
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index cd133130ebf2..3e069e48ebdb 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -4,19 +4,21 @@ Hash: SHA256
 DIST gitolite-gentoo-2.3.1.tar.bz2 198849 SHA256 65c4646b5609f987b3004dbc44ebf9a76d3f1791414fbe13eacea25460b966ae SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e WHIRLPOOL 9d4effd46f5953bb330f799962a79fb999ada0c6ba8cf0b536275f3c56f1178f76730b6ab659e8adf3378c2fbe8ba6ff602eec15e32822192cd0d07f8637aa8d
 DIST gitolite-gentoo-2.3.3.tar.bz2 199370 SHA256 41680cd9ff0999a945498749022360101dd33d4195161912418e8002bbabc9a8 SHA512 f9720effa816400544bf5526d896b9db734828c46356d0188e2ddb8fa8f175efb0f60b30c9e9c80a0624f6cb6dc5c5a301d8dfa35f13ad08fcd0538a0b8f77c3 WHIRLPOOL 1e3edc9bc7a66d51c205b1bca516620248cb31e78ab1cd5bf455a07096948a208825858ce11eb21b82ed825bfff043d59215a1257641557fd6ffe869924b4896
 DIST gitolite-gentoo-3.5.3.1.tar.bz2 127391 SHA256 0a7025e597f9e50b15bf181c34e7851b68e449400ebfbcc96be7d307760cb726 SHA512 f36a270f651b2b8d4ae02fd7b3841a599b7c66d36a6f92df8974897fdec863b4c09064c384ede9309150a4a487186ba3c3079cd0037d5fd39852b452115933bb WHIRLPOOL 0cb2b06a13f6a57e335556c68861bb1cf7ea907901cf3cb9479757775b1e8636856b889f12cecb5dff10200afbd66ad810e450a81739f6ce7b399e6fe6685afe
+DIST gitolite-gentoo-3.6.1.tar.bz2 140554 SHA256 db138b8f616322f0b9c5fb466c579f64e30eb5c1a5029750b64c3846eb2a8db4 SHA512 563f2753f4d04d8a2c5d323fbf3d15f9f12975d4aa3ae3781011b521be7ca2b2ac755f9c4247f86ee303aa7f8c9795f3fdff4504a347b9b9cd08525666bb0187 WHIRLPOOL e8d30287a7420b42b3aa5b96a69bc79cb6b0dd2c9cf61ac3764ac9abcb54a10d19a91dc3509f32d14ed7efc6ede9aa7b9f3c8b01606d549bd38b8393712aae2b
 EBUILD gitolite-gentoo-2.3.1.ebuild 2002 SHA256 69be6585a20e1792b94f23cbc73e0acc1c575d20d4fad0942193e5c41fea2e7c SHA512 3dfbe22cfc57706601430fd9895866b9cca27b35ade6db710085fade3d575ed8d31cac1e63e53c03173fbdfb87345f82ca28a26bba0623063753536138023793 WHIRLPOOL c71ae74627d64a23c40011c1bc431661023847ebfc4bfc4b0eb00cdb79652bdfc63783c3d495266dde126aa23d96b4e436b6cd245fc4d8aaeffbf90fdafbf419
 EBUILD gitolite-gentoo-2.3.3.ebuild 2006 SHA256 1ec8d861e7aef3cb8504e4391c20889e2407e087225060dc3d9e73888c519430 SHA512 a52ddf13aaad0f71da457e3cb3711ac993237050a442e15eb5acc00aa1332ddb5b68cdcd6d1d312a764a96d747c8d87265c05d915c3ffa6262aea20d48f697a6 WHIRLPOOL 22d2d19f9f189e6bdd0bb459d3bab0765d01bccd3fd1bb81d504f1d51545b88b5b49fffa224f52ccef6d6aabb3eb9a993ea2202e9b7181a272a54ca271c34b86
 EBUILD gitolite-gentoo-3.5.3.1.ebuild 2447 SHA256 db2ebd016d336c5da28cdc286224467ec7f727613caf12ee5f3d8c034b7fc981 SHA512 753b774f6465d341624d2bbc50f6ea16bc75b5271c612714d0986e73057771eaf823586a03284be83311767f7b7d7bb6badc1f663963c9f4c9b544f1d07f69a1 WHIRLPOOL aa68ad768e78ea7c74d39820a8323daa2d010f96579cb28c8f11ac03c55ded897f43c7932914bd179e14d19b177fc25d954fa95f231a4a72cdbf6b5e253cc611
-MISC ChangeLog 6522 SHA256 b83a803bb8cda59db4bb0d92af0c7c136df557e2c7bb93e89e2b8d3b4599b163 SHA512 8a94d7f5f5e396004324ed7fb46e9913cbc576d6dccb485710191e5790f467d065cb1bc0922a4e61cfde18ea25a92e91143a5351d510be8427042e794cae0700 WHIRLPOOL 3fc29e4376f34824deb48f70f4edc7ef16a952ff35a7bdaab352155b61e2f734a00608623a4dbf14e7a7e16290d74bf2b74f9daaf3ae2f9d04254cd341fc6d13
+EBUILD gitolite-gentoo-3.6.1.ebuild 2445 SHA256 64c80ff34d7deca543ad84f7f619fe3446fed8166e7fd4d3ff8f538fa68c4c77 SHA512 f5a3ee302152c8197cfa80cb7f9944d2d2201ee88a52ed99a7759860efa02373a0d25f47ea3fa41d600c0bd1042cf70bec9db58951e31e53d8dc3f497f60d471 WHIRLPOOL 5a55e0cf40dc831fafb06fa5de3be5152f2060f26315d89de9d9a20b299ad45846f474e2b992ffa21f607599acf6887a96871d6d847e0ac33a2f0a022d55d401
+MISC ChangeLog 6661 SHA256 554a00e17f302ac4b86ec97394868757d355591aa3ed67fa616d2e4fe5c17ef0 SHA512 cdf5ddbfcc6a34a17a7cef1f78fe04718a93f822d7a7a37e3b6a5fbb9b59491156e042979d0ef0df315d354a70bf231d8f3c340fe9e128eafff5f02234102b46 WHIRLPOOL ef99e1776c119832cb5144130b732310a7d29f005dc27cfbd10f1175e3b174fa2c0de5742ed6111b58739a8e1f25ed8b59383b8f1f3e6c0d9bebea7d32fa541f
 MISC metadata.xml 462 SHA256 4f254ca85d9f1691c416f549328464a3156b5a5524d893b7444891be779d6de8 SHA512 8e35ba2c2682cc77565deb411dfff100423e21774ce4c7f4d5e93b6a0c355c2407413e73409824169160a0d76292758bdf120a289d3f500553932a70101181db WHIRLPOOL 0a78421d60535d27362e62dcc3f4c8b28b6dc8db6d6b8616ec8576bfa964b313dad656ed8849234dd61cff2cffd00d7eb798bb56fdf002dcc1033c02886abf81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT+RenAAoJEMOx0zmdw4Z1Y5UH/2gbB8n8BxfKXGQQ0Lt71hO+
-TtqJZs5rfpBROyeA42zfGfXcCnXnkNLGjKRM0dG/aBe5wA1wuGS7xJ8eCAD1tiAS
-r/D+aDhlj8Yomh9GR90TAEK+tZZu7xq8C3a0FSi5FQgeIFSmZfhzjBSGxjt7RjB+
-FlUF2C/82ugUeDDID/xyiT8xJHxu4xQigcxQ2tfm7Sot6C1X+I6OgpLJSCJqkrTe
-prpXSSONWAHUEGLU6W0NJrqXC1+OTdq4eXaFe7F9umQxv/Ij7kowJY+W6qnnlr35
-8+PXKtN5/KJyfUOeXTmQkAEn9tTcQVp1Yle24xKCk+GqneQJ9KtkYCwHFOz9MoE=
-=usKY
+iQEcBAEBCAAGBQJT+lmgAAoJEMOx0zmdw4Z1LiQH/R6LH0wnL0P8A92WTclhCBMZ
+f9gfxRo3Re10SgjwtTWmLKKFPogEnjen9a/1h5nVrPQbnnAqY2BtNkeOnHvcDYeG
+AaZLTFMPvCm9tK6MhUjREfQtGPJ0HLSyaLyVlA5GQRiP5nUBOzd+k1Hrkk40K981
+YLFhUSUAzhXpzh+bptILUk/cl8nag8Fp93zN5q8dqBgKjtz0p+O5iK+z3LVTNIXC
+gl1Up32Qq+XCjs6PADCq4DY1M99OOnMO6iLNNtMJdHSmvcCG6eKvtTI365/+B/Nq
+qKuTBWgdP5eAjf2ro7bqSICAm8UUhNhkQ0/bn5d0Wlgo3IMHJs9bPBMcGkPlCMU=
+=ieAo
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild
new file mode 100644
index 000000000000..d6bca2601a53
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild,v 1.1 2014/08/24 21:31:07 idl0r Exp $
+
+EAPI=5
+
+inherit perl-module user versionator
+
+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="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=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/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.txt CHANGELOG
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		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
+	fi
+}