gentoo resync : 12.01.2019

3 files changed, 16 insertions, 94 deletions

diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 510dcd7e5258..3ca55592bfb1 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,17 +1,15 @@
 AUX gitolite-3.6.6-fix-shebang.patch 731 BLAKE2B 2e3bd0dbf56c955587dfc6a446ea2397875a0f9051e69ed891e9b630441407846f65bb2583999bb9f1c94693410d4bdd81e314da42e22ba978cb72af89968482 SHA512 dfffd0a7ef37e01edc690bba13f39edb4a751684addc1cfae8248c59fe48a59e51232ba21a1a9f1056756dcd6b51f04375f6652085f2dccad1f55073751bc105
 DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9cc908ed092b55272c59a4bd52145302e638612f1788d68b2445b8c665f025b24c47d50992dd3f6ef2fd6eb63ee7 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee
 DIST gitolite-3.6.10.tar.gz 198151 BLAKE2B 492732f92594871ac834ebd60eb24d7d6a07bcc1c66e35ef0963113d89a3e92204937c9c19342658eafe6a645fbaad3f0b830184b77f0298e5ab1422783f0a8e SHA512 a17fcc4922abdf3a03ebf83cae94501d142ad22cbf3ed3bdeb4b382d5e545a6b94fc3d33e402594565e29436ab5f54e498a285b4c1c814f8c475f9b1dcb5463d
-DIST gitolite-3.6.3.tar.gz 174689 BLAKE2B bf58c4991d4bb9b578b983854dcd5011d55f05515a13781910327bd07aa00ab7426367f5c084341326742796266f5648ce5470dec5247b74bc850f5cfa327c93 SHA512 afb8bcf27052d46725c4b3a6dd483e98ac3e574651bfe2ee35b442f044791acae8a17cbbab4237992a9755367e37f5160514d67cd2d863d623d32ed5fdf39362
+DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35ece2ad859de6c6d6295f453b6fa86d15240e964fdc58fc4ee5b1018b935b7032e6bacef9743487189857782220cd SHA512 7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212
 DIST gitolite-3.6.6.tar.gz 183469 BLAKE2B 91b1b04820f8abe427c7d6a81131a9fce1ff3df8d06c3f1d7515ead91b654048ef24b391fc28f2fe9c6dd0e502e24064a55b5fee8c1da34e3d07974c8f203c26 SHA512 1529330ed2afa315fcb650c55d515e5d4b61921f46b4d763a759537434492959f100d2219ab7673e568d46f397a25a45d4388fe3827ea988333fc8719820f8bc
 DIST gitolite-3.6.7.tar.gz 186298 BLAKE2B 32ccedce5cfe877d69f66ccc354300b1b363de0ac16bf8ec6d97010441d1e5a95e63252c833604d7e4e5b90dd4d84b4e262ee5ed092df80631e7478500e3da97 SHA512 d22bf5c34834f82df771e6d4527496a302da312f7f78dfe81c1284f5a1ea05de90ec217e03e94918d69a006a72fa16dc0006b1f555826ad6183d9dce2dd9d425
 DIST gitolite-3.6.8.tar.gz 197551 BLAKE2B 9788c06885fc7fc8edf422080628f465b33dea2aec8090daf330206041e4776bbae7189b343fc604b0959be556a15016d656b4df133f784d55bc7a6b701ad8ef SHA512 f65d4e4354079f868c9f9a943efb84ad4e29f96c69a3792c13dda383dac0133baa3d93925967c6be71e923b27e0ad91b57b5f1245cf64eeec0f0b719cbda4270
-DIST gitolite-3.6.tar.gz 156481 BLAKE2B 4cb36e631c458c529d51689bb9612ede34b352d523b62afefed70ab90fadbda1c1d954400c5ddf407ef57a3df8371814c73fdcc526bf3750dad9bfa10f1e7747 SHA512 91606a5fed202f0da2194310bc7da8e5d35cdfa2924b009ed3447ba41e2fd856b9043f1b57d16600ec44f17d640e9ee988b4086bea032827bf5fca83e5ff024f
 EBUILD gitolite-2.3.1-r1.ebuild 1647 BLAKE2B cf918594448f8cbb0d381118c5fdc6ba3bfcd3669a26b3ca5264f66deb2e4273c29554ba7edf0a04e350619fd45a8083e69017793eb48bf7facf2e4f4d3bb25f SHA512 77347b4575a9236a5e259e9c67eb29ecd023092c2713ca45d8871af2303222d827296405168126f7f88ff45c8bcb96427325391801baa5740a90b2548bb25da4
 EBUILD gitolite-3.6.10.ebuild 2427 BLAKE2B 7e3c7890b8943204bd93d0a70943218fbcec02376902797bb607744fc798427674b78c37a10f3792581a736b7cbeacc51d85cc0825972ed9affaab8100d49d65 SHA512 7846c0f2828fe01bd6b8b7b0afe3523d10b1bd725c5f8d2950499ed948fe2bdc161e27d89a12d2ab408e7ce09aa816daf7caef4965863991c13529ee25431f68
-EBUILD gitolite-3.6.3.ebuild 2350 BLAKE2B 085ed29e81b5c2914201168b94dd4d01b86dbc0bb4c221956f8ff382bade290c41a76e62d417e42cb2c03a1b220704e029240c3cce7b93d02a75e7d0aaef17b1 SHA512 c0a6ba41dc2854d273f780b4f59f9350d660e18861ea6153d4e42ae05235db16caeb10c2ae7f13a462eeb370b8e4e6879d7336949e4563d9d507848581e98d83
+EBUILD gitolite-3.6.11.ebuild 2427 BLAKE2B 673516c57ac3a47f6ef616cd905e97a79250a788df5375aa6f2f9f9bb1f224baee347643de3a18b182c509af454d0bac189b03b2c84c2fca42d66fc183baff28 SHA512 43afd5f2c92ba86dc81c1be394f36ef4534d402d400c694ac080734a9e12eddf780876c9ee0a86da0cdbe25ad3e2bbaee16d2fc52d8012394c8ebbb1b3df54e8
 EBUILD gitolite-3.6.6.ebuild 2431 BLAKE2B 3d34e9ddf77bb044de9a1bd1984082e33d8f6fd6cafc71e63bf4860c2cf94e934dba75346b0648badf0637cbbe77a57c9bce5971c1e4d01c597c9d951cfe0164 SHA512 8b4cf676c8a3434e97962301be3608b7ea10b48e8b5f0f8d185b274c1d9e2bc3d6f7c046879d2b825d16bdc5d514d9c790caa6bb4922b1a1d5a5827a17858c3d
 EBUILD gitolite-3.6.7.ebuild 2398 BLAKE2B 864703fc35faa76894bb8a7c82dd97fe80cc5ebd02a607cab670ebf168eaf6ca97b10ca93824023da02974f5fd740002084f0d08f9eb6411c6b2082bcae16f95 SHA512 1584babccb49c0d491bc749d804bf6ff5e3c4adcb1dfdf80d04d577a076e11315ceec5989f7e9be0e410b86b450aa8637d2cca177a75216a66bcc8577a28384b
 EBUILD gitolite-3.6.8.ebuild 2430 BLAKE2B f383d1280a6a525da61d8b616b986264ba96ed49b9c0935ae7eaed6bd8f84987f3d4a20b4bba0a2618af1106768436c7be624edce1d62ce277b1b89e87a73f1f SHA512 7cfaa7d4b3c4a5e22995f6db00ecbfa040c440df8534f98d951d106cf332df8dae1a6dab4bcb7b9e7e171e03597fa0950987cee34c6fa887514d487832cbfeee
-EBUILD gitolite-3.6.ebuild 1866 BLAKE2B cd81d9ee5108877d42a2cc3ccf3f6ae57f870838c2a11b17638e49d47ab56e6dd54c31481a226b31c8a22fb4c2d1407153d0e7b349c492831614f271a917818b SHA512 be5e90a8996a7c9f433d28e975de5d1a462fe57b134f903572069c43a373f81b6ba4253395f62b66e467a8b3de4e8036b6db37dac3dae9b1c1d4cacc94365b58
 EBUILD gitolite-9999.ebuild 2358 BLAKE2B c414943bbddd70c1d8ac111b11d6cc8c740a2468f64c1f292a3818fbb5877899a49c37429abebce15ca14ad6cd207d887da56fde9ba8f67bf87d54725f5a5b50 SHA512 f86cf6dbe5ea43932dc240868d5c5f098484cc4585ca1b5a21ab657f665d866ac44c87152dd386fff35e0833e5e3d7a66934c481d3dd31f087bc24d243b71111
 MISC metadata.xml 780 BLAKE2B e496a65ffe9f06db9f4ef1c74a16fafb434c9c8a7309f0effc02515270bcc0137b1bf7861ac11f6dd1a7c06fd4ef4eb7d72b27b60a73ed535ba4fad3e08a2066 SHA512 0a7c6ac8bc127892e5f6fe24774f095cb0bcf5971926c65b4d8a52748cfb7ae22d1ddc47365ece99612bc64853dfa224d42ded5093f0cd0976a2ae1b544eb5c8
diff --git a/dev-vcs/gitolite/gitolite-3.6.3.ebuild b/dev-vcs/gitolite/gitolite-3.6.11.ebuild
index 4fc564404802..8da763ed6c3b 100644
--- a/dev-vcs/gitolite/gitolite-3.6.3.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.6.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
 EGIT_MASTER=master
@@ -12,33 +12,36 @@ DESCRIPTION="Highly flexible server for git directory version tracker"
 HOMEPAGE="https://github.com/sitaramc/gitolite"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 else
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="selinux tools vim-syntax"
+IUSE="selinux tools"
 
 DEPEND="dev-lang/perl
 	virtual/perl-File-Path
 	virtual/perl-File-Temp
 	>=dev-vcs/git-1.6.6"
 RDEPEND="${DEPEND}
+	!app-vim/gitolite-syntax
 	!dev-vcs/gitolite-gentoo
 	selinux? ( sec-policy/selinux-gitosis )
-	vim-syntax? ( app-vim/gitolite-syntax )
 	dev-perl/JSON"
 
+PATCHES=( )
+
 pkg_setup() {
 	enewgroup git
 	enewuser git -1 /bin/sh /var/lib/gitolite git
 }
 
 src_prepare() {
-	echo $PF > src/VERSION
+	default
+	echo $PF > src/VERSION || die
 }
 
 src_install() {
@@ -53,10 +56,13 @@ src_install() {
 	# customize them for your needs.
 	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
 
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/vim/*
+
 	insopts -m0755
 	insinto $uexec
 	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
+	doins -r contrib/{commands,triggers,hooks}
 
 	insopts -m0644
 	doins src/VERSION
diff --git a/dev-vcs/gitolite/gitolite-3.6.ebuild b/dev-vcs/gitolite/gitolite-3.6.ebuild
deleted file mode 100644
index 91aadb960309..000000000000
--- a/dev-vcs/gitolite/gitolite-3.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module user versionator
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="https://github.com/sitaramc/gitolite"
-SRC_URI="https://github.com/sitaramc/${PN}/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/index.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
-}