Bump, also missing dep JSON for running "info -json".

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

5 files changed, 101 insertions, 22 deletions

diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
index f0b1bfdb7ecf..12bc0040b69e 100644
--- a/dev-vcs/gitolite/ChangeLog
+++ b/dev-vcs/gitolite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/gitolite
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.45 2014/11/15 21:02:43 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.46 2014/11/21 02:15:03 robbat2 Exp $
+
+*gitolite-3.6.2 (21 Nov 2014)
+
+  21 Nov 2014; Robin H. Johnson <robbat2@gentoo.org> +gitolite-3.6.2.ebuild,
+  gitolite-3.6.1.ebuild, gitolite-3.6.ebuild:
+  Bump, also missing dep JSON for running "info -json".
 
   15 Nov 2014; Christian Ruppert <idl0r@gentoo.org> -gitolite-3.5.3.1.ebuild,
   gitolite-3.6.ebuild, gitolite-3.6.1.ebuild:
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index d19d547f0b68..a7a517997de0 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST gitolite-2.3.1.tar.gz 255807 SHA256 53303fea0154914356830202d3de23f94682bab26197ead8ca05d58818c56e82 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee WHIRLPOOL 5d08b9c22e6a07478836cca3b7190b61729ef89e181e4746286a4cf48f253fe07647b165f22483d983bae1767d83b39f231414dc96b4e803140f64eb244fc241
 DIST gitolite-3.6.1.tar.gz 165506 SHA256 7ee03d715cc4d87c0b6dbca5d79daf6f50f657ab33b99da256d7ab02cefe3f6a SHA512 b568f9e96ddfa4cd482197a89cb0142fcb2717028227a0a2e9caa9864bb95379042ec464352a1d99dfd8ccff780b1211e8f926ad8de284245fc280038eda481a WHIRLPOOL 9101ba55ba1a94b53ba3e9421d170d5b650e3e72c390abb3aea186630638b4fa6b8a5d69d9553ed574444be00f263dabcfe11e63f89f2eb3787ab8765e67c4ce
+DIST gitolite-3.6.2.tar.gz 167670 SHA256 012c372b53d765558131ae0df23a590d41b042c8b88e38e952992caf52fc4fbf SHA512 f8f041fde1b7c533fcb9cc32beec99dd83bc0a81795115e7205585bbe2f25135e2347df437e123349525a0186fe702f265330b259d336389b437cecf0e894629 WHIRLPOOL 319a4d91950ad123fd9cd76c1bb0a2afc44843b42a8ff0309aef9eee0f15ae9b830286cd1040219ff7cd1c93e0818f9e0191e34b3f41037ea165a4e0d850601c
 DIST gitolite-3.6.tar.gz 156481 SHA256 ae9180a180a05cad344788eadc8340d6ebcb4cc60d96a1f5ab5fc355d395ba4b SHA512 91606a5fed202f0da2194310bc7da8e5d35cdfa2924b009ed3447ba41e2fd856b9043f1b57d16600ec44f17d640e9ee988b4086bea032827bf5fca83e5ff024f WHIRLPOOL 79b3a553dd25db9a3e99d7725c0932bb0b126f30bd013b9cc53d69f60d0c906eac4134b25f6759d9635e50df3324d731f16c30fb44c25e89df7e35560a3e00b1
 EBUILD gitolite-2.3.1-r1.ebuild 1762 SHA256 49fcc730ac048d22e66cda66a953cd9efd98eb0b0ebc18779b19a3017a2795f1 SHA512 c4743991ff8b46588c31a5130b6a7b94d885ccdd010b09fe6bd8f5bdfdceed5dcda65f742a60fad44fd64ae3e5c64cae6d570b2a8ddcc55a339bf7bbb5320a5b WHIRLPOOL 8ebe77072fcb1aa0d0ff06036f81995779486b868c6188d41ea3ebb898ddd7785ec30d75af7a818c4df5330d2cfdd2ee010c180701f6df55f3ad060664f34920
-EBUILD gitolite-3.6.1.ebuild 1961 SHA256 239a02691fd2911eda84595a1fddeb45e3292de66365e7f7998f5b53e7d66e32 SHA512 e3a6131a637f797a501d3f95cb23a670b0754e728822333766cfc11ba7c298ae52fa5a5718986cc0f82addd13afc8bcceab4337af2218d349e18f3028bc9bb0d WHIRLPOOL 8390b4c1a22063d5116a20fcc9824f11767b34c6ef70f6260cdf943bb8e34ad2fc0eca96bea8e9a62f767b1042b929db0b0709b88748b5aac260dfcc116cf1a9
-EBUILD gitolite-3.6.ebuild 1957 SHA256 b571cf77a1b405a08c7b95eb2b48513c5326be9347b599083571541d9ac14fa0 SHA512 0726639eeb536631bd84337c64730603f6a9cc4c1ed20c6d4df97d848b2ad3ffa06d6ba4319b33f2b6b3b9c18ec7035fba824f67c79d790ab723d1146b2af8b9 WHIRLPOOL 5dcf85c7062cac27e22a13c01f10f28ed7772ead28c25ccd6bf867cb731c78a67842780196f2f7b1c9ee857d3c4b7e49026530e40939022cccb326919f13f83c
-MISC ChangeLog 6710 SHA256 243cfab43e9ffcadba08d873ae4a20dafef946282a6a8662c874814b91a6d1fb SHA512 6f9af4c34629ee2ba477e6a3e5878cce083a7c74294b3eb3086f544308f752629dd32443254c7caec08036cb985732e1e4fa24fbb2086e5d46aeb1b8471114d2 WHIRLPOOL f5ad388bf44f95fbfbadfca03a3b287a5df7ab3e381e24cb689d4367cfddc06316f7ddc2148aa8dacc15dee92e94b86c020bdcee1b51aba225b9268712e5e61b
+EBUILD gitolite-3.6.1.ebuild 1978 SHA256 8a2de901edc03c4d0478af41a916f8ac1314065e7ba37a7f8656870cb28eee68 SHA512 12c2f49326dcc140f18f440a8840cf60970b96174a52ed0cf6a8a508f0ab5ec0f775d5388b22cb18cd70a66bcf0eab820f4ba28349a1e6993165554308e05321 WHIRLPOOL baa9a21cf97becd75aa36941a4f6db89f0a6d0ece2e53f765b0069f7f80a207f9e44c47ac989afcf7b7c3550f1c20c69ea955e9278aeca2943d521df9ac7327a
+EBUILD gitolite-3.6.2.ebuild 1978 SHA256 331c82bfb8d197135f8c0c7f625134eccab241fd14b3cfb530e79154e01cdecc SHA512 1e265af717c28f6f66b62b059165fb0597b2d305577025f71583b9a1aa07f0ba64491b0e5ef1a3aa1d73433b09eaff509fc62f1234289ea405b3c845e1f0e3de WHIRLPOOL c336477cb9c1f5cb5185aeed5cfca2073a5cd5f2360599521152336dcce78a4f71cb19759076ffcd5b1348ccb89c377b34d1443a6f44cffd1c23c1d8e91e80be
+EBUILD gitolite-3.6.ebuild 1974 SHA256 91b40fbe0def1ae972ffafb2e4f109099ba1c92b7e9daa48c55406448abbff8f SHA512 5cf48b1e6a2001bfb75d8e0e92e344e0cbb2300991c241a80d0c22c3d25d707156e5ee88c358e24816453d59a0e4599bce68662f72879aa784ecccc26b4da592 WHIRLPOOL c47fd47a2aac19f723332dbc536f0e460a71f3d0dcc228929330e392c323427211087cc77702744cd2e341d5e315abdf43736154de7d0110c42fe275b5ccefd2
+MISC ChangeLog 6923 SHA256 7e62d6f340eb14d43e7bff89da8861a8482ac57a037f8d1b3c10280ad8484198 SHA512 f4ed1242fd069068ddd14cf368b7a25289e73ebc525518bdaa85094c3223c00d379e7822a14e1c2ffc643a0075f5179ac2565bed8c75fd8c029a7ee00a3a9525 WHIRLPOOL f767e97f46ebb303dbb1afab45dd942e092ad1aa7a5cb90a424b652b3cc83017b6cabc00ec7fe0bd17f8ea1de354a1d69050afc2b77cbfc3e5fb3af9dcd799de
 MISC metadata.xml 682 SHA256 18d0866ea7ff65085f758309dcd2d624558e5324ac754ecdb3db0a7c0153dbc7 SHA512 6ebad19229eed70cb9c53dc11ae850eb376bb7d58c0d039bd3f12d9a8d0d4ebdf749b28ee601dfefa2e6e9b9bc4d37bbed7da56b787fa87f0720ed199110f401 WHIRLPOOL 002c556a8b8276910a815ee5e387820fd7d5f575012edbc11503303d846397cad43a5cfa6e762b312728ba6cbbf2fabfc9f7251ec783f1c21272db84429b122a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJUZ790AAoJEMOx0zmdw4Z1XM4H/A5pQGIJwm+NeHAljOs8lIy4
-nyOt6hneVzMSMdzllkbU9SmwWlNqHiGjllpZczGzne7sQnENjk5yjmeG2k1sQtXT
-JgmMCAPmFmaJ7KTJk4KikbPyrbn2ZpBfh9/cy1HoU1JreVE+L4E4MOR4+a67Wu0f
-WipeHtOzSF/HBTes/hShLlrI07oNJRMjwOmdpIB1Fyvzmw7VqLiKzOQ2b/zXLmV7
-pYu68RBa/zEsVb1W5ABrzYE9oo1fewoQ9HklKCLSfST76TJfwQTQXt6X38uqqG1f
-zwT55WNBoUxR6a9aVHXmHjVh4bWdB9L//WqDUeUEPZTszgHFXpBHT4VaNUvSGSk=
-=mcZT
------END PGP SIGNATURE-----
diff --git a/dev-vcs/gitolite/gitolite-3.6.1.ebuild b/dev-vcs/gitolite/gitolite-3.6.1.ebuild
index e025db755c0e..afc75c8787fc 100644
--- a/dev-vcs/gitolite/gitolite-3.6.1.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.6.1.ebuild,v 1.2 2014/11/15 21:02:43 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.6.1.ebuild,v 1.3 2014/11/21 02:15:03 robbat2 Exp $
 
 EAPI=5
 
@@ -21,7 +21,8 @@ DEPEND="dev-lang/perl
 	>=dev-vcs/git-1.6.6"
 RDEPEND="${DEPEND}
 	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
 
 pkg_setup() {
 	enewgroup git
diff --git a/dev-vcs/gitolite/gitolite-3.6.2.ebuild b/dev-vcs/gitolite/gitolite-3.6.2.ebuild
new file mode 100644
index 000000000000..bc1a19173b3f
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.6.2.ebuild,v 1.1 2014/11/21 02:15:03 robbat2 Exp $
+
+EAPI=5
+
+inherit perl-module user versionator
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="http://github.com/sitaramc/gitolite"
+SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > 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://gitolite.com/gitolite/migr.html first!"
+	fi
+
+	# 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
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.ebuild b/dev-vcs/gitolite/gitolite-3.6.ebuild
index ab488117b589..6edc0b57f23e 100644
--- a/dev-vcs/gitolite/gitolite-3.6.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.6.ebuild,v 1.4 2014/11/15 21:02:43 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.6.ebuild,v 1.5 2014/11/21 02:15:03 robbat2 Exp $
 
 EAPI=5
 
@@ -21,7 +21,8 @@ DEPEND="dev-lang/perl
 	>=dev-vcs/git-1.6.6"
 RDEPEND="${DEPEND}
 	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
 
 pkg_setup() {
 	enewgroup git