gentoo resync : 12.07.2021

3 files changed, 37 insertions, 45 deletions

diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 802d99321412..c99defddf9c1 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,5 +1,5 @@
 DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9cc908ed092b55272c59a4bd52145302e638612f1788d68b2445b8c665f025b24c47d50992dd3f6ef2fd6eb63ee7 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee
 DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35ece2ad859de6c6d6295f453b6fa86d15240e964fdc58fc4ee5b1018b935b7032e6bacef9743487189857782220cd SHA512 7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212
-EBUILD gitolite-2.3.1-r1.ebuild 1626 BLAKE2B a3dced25c4d0ffc9602fb47c59d5b1f67b44cdadcbb53c034a5fe1928c05ab1f3066e62fce3ad7f8d78f1d95aedffc1510d6dba14d3c4eb40ea5727c76825e7c SHA512 2552f1bcfb254cff06bacb65c30b279b87f3da1ce1548aad2ed05099f0dc20f0004498d81e0482f2f0c58294910464fb7c3b7d051b20670f1f3454ad19c60bd9
-EBUILD gitolite-3.6.11.ebuild 2402 BLAKE2B 5b509c5d9aa7d77fb8098a9097c515e7ed1599473e2a4bf4fd3e8ee2bf8e8123eb2ecf66169ec904caf247c9bb2ab22bd81d3601404844ec590edc97c7ffa0e9 SHA512 cb65120a3061ef3810e9155f24b2701dfdb5d16d9eb2df9814b751fd9bb9e0d0f83c5d062c56282f3b8c8964ffe31830e822eb942aa09874f91b7c75c456467c
+EBUILD gitolite-2.3.1-r2.ebuild 1448 BLAKE2B 5635d6b5666137d57635d399edf6c9d8715f509019848cadaa69f297d7c340361ea2c12e5b22b3f5ecf877cf4e231268142a0e50da25d92defdfec6c3dd3854e SHA512 1a313c4ad8bf4dc6c61c569cdf0ca1ba3f8f566f2156756c6fd3f4881b7330b299f8e6a6e4b1b774dabfb6f271323ea686d093f928d19a69f173362c500baeb2
+EBUILD gitolite-3.6.11-r1.ebuild 2289 BLAKE2B bbef6eb06d89f93a645f7fba5e5758d3a7ae1ba1d35f24efad7d606aa270798a7347cfea38e556239397e31f5fd35491b06795d89e5d364c2c52456ca39e6943 SHA512 0c2d25c27980391a0f23218857be340e7a9e14600dfb23c3bac92d79c0e39127b9d4a5bc2b21fd042276e9cf2cb98886611e1149c8b2dd1d3c444773a79cce8c
 MISC metadata.xml 780 BLAKE2B e496a65ffe9f06db9f4ef1c74a16fafb434c9c8a7309f0effc02515270bcc0137b1bf7861ac11f6dd1a7c06fd4ef4eb7d72b27b60a73ed535ba4fad3e08a2066 SHA512 0a7c6ac8bc127892e5f6fe24774f095cb0bcf5971926c65b4d8a52748cfb7ae22d1ddc47365ece99612bc64853dfa224d42ded5093f0cd0976a2ae1b544eb5c8
diff --git a/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild b/dev-vcs/gitolite/gitolite-2.3.1-r2.ebuild
index 8f8730181c0a..51044fbe8182 100644
--- a/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild
+++ b/dev-vcs/gitolite/gitolite-2.3.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit perl-module user
+inherit perl-module
 
 DESCRIPTION="Highly flexible server for git directory version tracker"
 HOMEPAGE="https://github.com/sitaramc/gitolite"
@@ -14,19 +14,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="contrib vim-syntax"
 
-DEPEND="dev-lang/perl
+DEPEND="
+	dev-lang/perl
+	>=dev-vcs/git-1.6.6
 	virtual/perl-File-Path
 	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/git
+	acct-user/git[gitolite]
 	!dev-vcs/gitolite-gentoo
 	vim-syntax? ( app-vim/gitolite-syntax )"
 
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
 src_prepare() {
 	rm Makefile doc/COPYING || die
 	rm -rf contrib/{gitweb,vim} || die
@@ -44,8 +44,8 @@ src_install() {
 	export PATH="${gl_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
+	sed -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		-i "${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
 
 	rm "${D}"/usr/bin/*.pm
 	insinto "${VENDOR_LIB}"
@@ -53,14 +53,7 @@ src_install() {
 
 	dodoc README.mkd doc/*
 
-	if use contrib; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib/
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
+	use contrib && dodoc -r contrib
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/gitolite/gitolite-3.6.11.ebuild b/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
index 2dbeff8e9137..c83049e8e95e 100644
--- a/dev-vcs/gitolite/gitolite-3.6.11.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
 EGIT_MASTER=master
 
-inherit perl-module user versionator ${SCM}
+inherit perl-module ${SCM}
 
 DESCRIPTION="Highly flexible server for git directory version tracker"
 HOMEPAGE="https://github.com/sitaramc/gitolite"
@@ -21,22 +22,21 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="selinux tools"
 
-DEPEND="dev-lang/perl
+DEPEND="
+	dev-lang/perl
+	>=dev-vcs/git-1.6.6
 	virtual/perl-File-Path
 	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/git
+	acct-user/git[gitolite]
 	!app-vim/gitolite-syntax
 	!dev-vcs/gitolite-gentoo
 	selinux? ( sec-policy/selinux-gitosis )
-	dev-perl/JSON"
-
-PATCHES=( )
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
+	dev-perl/JSON
+"
 
 src_prepare() {
 	default
@@ -79,19 +79,18 @@ src_install() {
 		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/index.html first!"
-	fi
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${old_ver} -lt "3" ; 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
+	done
 
 	# bug 352291
 	ewarn