Bump for revised Gentoo changes, including multi-line keys in setup.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

3 files changed, 115 insertions, 2 deletions

diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index d16133ce4ee3..03e04d99c686 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.47 2015/05/10 00:00:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.48 2015/05/26 22:29:57 robbat2 Exp $
+
+*gitolite-gentoo-3.6.3.1 (26 May 2015)
+
+  26 May 2015; Robin H. Johnson <robbat2@gentoo.org>
+  +gitolite-gentoo-3.6.3.1.ebuild:
+  Bump for revised Gentoo changes, including multi-line keys in setup.
 
 *gitolite-gentoo-3.6.3 (10 May 2015)
 
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 2726aded62f0..8cfad122a6bf 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -6,6 +6,7 @@ DIST gitolite-gentoo-3.6.2.1.tar.bz2 143357 SHA256 5304b50e5b2b89990503c59bf1b1e
 DIST gitolite-gentoo-3.6.2.2.tar.bz2 143601 SHA256 bc5841306567a43c63b542cceab7661cfd9b46f4f8b3651fbf14e13ad8a1f0f1 SHA512 431df7002d146d321199ff5ae324177f5b14b1a0ae8e87288ff15a8670eec9e55637d8a6d28d4eac2ff2a54f3f38e3aa700257c5321c73133fcb09037fb384f8 WHIRLPOOL 35abdcfe6b493e808e77f3b7e4c8ab7dc932365db6db73a90788cf9fce6cc130f9c90a4d9d5cbeb79d6f9a35f69141695ac8303dd83da8688852c33e2df7db1d
 DIST gitolite-gentoo-3.6.2.3.tar.bz2 143658 SHA256 cfc0329d930513d99dc6c52bb4ecb1b0486e73ae7f02a81bfd5d57b79ff19966 SHA512 9b8ddaad043d9c7cdbcb027fcbfd36cd09ce2cfaf0b102deee037977461d54942fd7ac019373876f9f4ab04250f78c8565c73494b7b9fc0e42e140d878cc303f WHIRLPOOL 25bc3ab404b00dc1f804777be3609a4db6ac47ad6b27a0fdbb33cca8e35d8ccfc52b44e29d5a0670f9fad3006264bf8056de16d0f67a1586c16abc7eb0fc457b
 DIST gitolite-gentoo-3.6.2.4.tar.bz2 143564 SHA256 37153036346a7efded1eacfbc11740319dc8b398c27479a2c2cef3a8327a81f7 SHA512 ec5e62822687b1293348107df003e3c3c4a3aad9b4f461e09410aef993bb464a176daee81223ae952159572db7158267fd90b90cbc877c4be2a9fdc2ecc87fb7 WHIRLPOOL 6f7be9a57dfe30c452abe3f084adef61123e409a48ba110fb726ae91cb02a1cadb8e36f23d0d84be6c8d3392baba3af81215d8e9436ed0e130e618d85d52938d
+DIST gitolite-gentoo-3.6.3.1.tar.bz2 148822 SHA256 201ecfc556581a07a1a10e77997a5d7b5ec4dc52092ed576734d9bb18560e0f6 SHA512 0230bc71cce9da3c9648c80b413248a6bee0ad382c745fd108875cd8953fa99e8ea66fa1be697229691e7109d100761853c885b3aae97710e23a97c0d06c7308 WHIRLPOOL 97d964778796399d1b5f5e2490affd8959201870cfdf0d81d5b86f536b4662e96dd48bffce5c2f56ca90bea267a43d84473e80c070d045c7cc188322cf70057d
 DIST gitolite-gentoo-3.6.3.tar.bz2 147531 SHA256 6689cfedb258f61206777eaa83d388eacb670d66384f9294474440d4669f08eb SHA512 4c4f40cf608ea78f76c39701880e53e2f6486fc37478818f5b4f0946fcd9ffe30ef122463b7b6b48a0a9931271fe7ef7aecf6bf23bbce45f36cd1e217e5ec45a WHIRLPOOL 7d7d1a060c9f8d7124df59cdcca9f1cf0a1bc37c2ca3a32c278f122b0b3c9f17c8d7ea2fb58151bc19c2f44f3745d4a82a3ff19ba2ff8e44675b0ba2b39187c8
 EBUILD gitolite-gentoo-2.3.1-r1.ebuild 1981 SHA256 9442dc1ee584d825638c17b2d20592e3b15a2705df05094978c28d05d8f95f3c SHA512 8a7739bd5a3d95a5aa0114168a4c3b0d87e60c211a1ecc48dc14d297017e94e2647fb367239f4359b214fb9e9fb57efe073f11171c6d58452eba2eb1d1b3533f WHIRLPOOL ced417ca807826c9a942dbc6f684e298eab1ea92bc0b4f93ecc81385da651f3831db10a20274fbed7604f27a848eaa79e040a8e627a62d08e64ea30588255a52
 EBUILD gitolite-gentoo-2.3.3-r1.ebuild 1983 SHA256 42b7bd8dfcf51159cf9f2232879dd4520855630f55edf02a42bd98e870b9debb SHA512 2578aae64e97260eab65836308bdef48fb91884bed8b011e5dca27cb8cc45fc63035d819221d27ad36a43bca31043b4210d5919fb916356b06f9b8907c132e77 WHIRLPOOL 598054d1df88fad9ca811aba20402dc35f8db253ee8417594888d9bf2dbf22c77efa07596d02d9aecfb4abc017f3a6443cd613f503791e814c9dd79ce19e6b0d
@@ -16,7 +17,8 @@ EBUILD gitolite-gentoo-3.6.2.1.ebuild 2870 SHA256 5b89d7043399fee1b5a0614eaed39b
 EBUILD gitolite-gentoo-3.6.2.2.ebuild 2870 SHA256 37cf7774cf6bc2d83158fccaa4dbaa79c968e604692fcbc55a67d6ad1d7bab3e SHA512 8c9737c727b4f20b0cd88fa76a973c7415e81676ebfe758150944e6c46784c8f3d21cd3be754e6f68e9df80151cd7852fc0c72fe2c82b136630cc95d40ac3ca4 WHIRLPOOL 35936a1029f02a5fc113c7b0ff2ae2ec3202f2ab00e74f28e59bc8a588eda3cdc252ef9bd2c6b28456068a82d0d88eb17939b1e0719de1aec3255137ea516416
 EBUILD gitolite-gentoo-3.6.2.3.ebuild 2877 SHA256 553c4ac327e3bf216da8e003a9c4369d9be3ee5286e5b51ef7ef598eb3e1d1c6 SHA512 b82b3bbbead1b7d4d9c12e8b4f03aa832a628346805cd5f53009e70c98be043aed5c831d2c8f09631982e9071d432d3cb0a6544e2bc5f0d6e6a41d4ed0d5da65 WHIRLPOOL d84b327408b55dfae6e999ce23c17cad5fa54da09e58030ef09b6e6a52dafd7b2b5b02eae6ed3861a069ffaeca8084e8728fce1553e527c1abed5f46193ce32b
 EBUILD gitolite-gentoo-3.6.2.4.ebuild 2877 SHA256 37d4769e170ed4bc54ab77804960f7076abf890864854f75cda0cab4071fea58 SHA512 e8ad4a523544d6a63095563fcfc2e4afb27c138a198cc4bb0437041549a0adcd69a01aa1ac29ccdafe84c4d023c9bfb47e2a133c6c867a8208b9088941021341 WHIRLPOOL 5b04211273d19e42e006602084f1784c2ba622b37d3673ff365b02b7f692556169606614800ac9b82e7afb624900a5eeaf322f43159dbd01728ba1aa5e020a84
+EBUILD gitolite-gentoo-3.6.3.1.ebuild 2877 SHA256 2e189fa743f33890e41b055ba8e38cee62f8a8a53d1933173003bdaccf75083a SHA512 7c6b687bee7b53d620807c5636e33a123a2663e1984ce09f3f46716277dfed6fa54cbd70aed0823909a9ab1681513f5a2dce8469f39389482f798270fdda36a2 WHIRLPOOL cbdea85d57139a0636d2edbaecdd73e11d9d66f3f4d6001ce743d952dda980aa24de0c1ebafb27fb3c1cffc039b85011304ebc5198d0efccd9dbbfe4bff1f8a4
 EBUILD gitolite-gentoo-3.6.3.ebuild 2875 SHA256 02acdf31138619ae69f59e396a02ce345fc57710e8e12bb27c5a3de188e99178 SHA512 8ab5bde55de99c763b4e1151622191b64fa16c8f7e054dbfeac93419589d864e6a5eca60a4c3c5849d19a4c9558b189476eabe774bb81f164bb538011bdd3bf2 WHIRLPOOL 04c30fed16f14e62391e12c0b64fce95fe34f1ff527f3eceb98521f660d035cbbd926327967fa0fab258568ab69fbbbbc4989fcce63d35116a68e216741136a6
 EBUILD gitolite-gentoo-9999.ebuild 2867 SHA256 e9013df05af45770868bbfba423ce7d8537b67a09256423951912bf38f51008c SHA512 a91d00e00b55415f42a7d7af5a5deb63afd8130a1fe7ef274f019eece366837fe33c1c1381dfdb0277e5b59189aa0a5b30feed1b9100192ada909011568d8fa4 WHIRLPOOL 7a7f525f643f8009827e1d9767de4d9e4585d94a8d76dc5488f86fbc4cd35b8b02f04dc099296b6c11c40b5fdd8bcf6b5abc9a96450ab33f84c21c7f63228f25
-MISC ChangeLog 8813 SHA256 d71edd1ad49b28ad9845ccd3cb7e40db2114b13f873a3e0000d855256edcdf67 SHA512 61fd8a26cd914ef716897aae5c2cfae07549e12fce8380df76c92ef72fa00652110843f2e059ee710b95419fe1777ebaf8a40b9982b3ee1b0e8339d8543b85bb WHIRLPOOL 1cc116f60995459a679df4670b94f0ab288c636941d8cd3d6de1b390a1c959873db93d85549e28eb31c5af36fbb5e20d7e290b94fdafc39d6c6cb788c34e45d6
+MISC ChangeLog 9013 SHA256 e3692c0832f842930aa1d736bbccb8898e5b64713ced6b8774730c7c9ab1ba9c SHA512 4a4ae0c487571ce130ba1c77f8b69ca5169a13658eb50932c6827b99fbce26b5294e02475f7170e7a38c85ea75a1494961067dd712ad7caf50c11b8fb3b623e4 WHIRLPOOL e2d2c9f0a94a9bbea4a453dbac31078ab1134f361d2401ffd7d70b0238d0b37e03fc983f8bdca71ae2a180e18ced093824d185e1bc7c96f0394920471cf9add4
 MISC metadata.xml 462 SHA256 4f254ca85d9f1691c416f549328464a3156b5a5524d893b7444891be779d6de8 SHA512 8e35ba2c2682cc77565deb411dfff100423e21774ce4c7f4d5e93b6a0c355c2407413e73409824169160a0d76292758bdf120a289d3f500553932a70101181db WHIRLPOOL 0a78421d60535d27362e62dcc3f4c8b28b6dc8db6d6b8616ec8576bfa964b313dad656ed8849234dd61cff2cffd00d7eb798bb56fdf002dcc1033c02886abf81
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.1.ebuild
new file mode 100644
index 000000000000..05042a443cdd
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 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.3.1.ebuild,v 1.1 2015/05/26 22:29:57 robbat2 Exp $
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="http://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+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-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+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.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	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
+		dobin contrib/utils/rc-format-v3.4
+	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://gitolite.com/gitolite/migr.html 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
+}