gentoo resync : 12.07.2021

3 files changed, 42 insertions, 50 deletions

diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 9d61213e2369..63a5c05253cb 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,5 +1,5 @@
 DIST gitolite-gentoo-2.3.1.tar.bz2 198849 BLAKE2B 88268e4588003cb1b8b4e340fd858a2be65b8156f3ff5033cf7f8c988d8373c4dc7c41b0d589126e143e8eaa19071fda87532f9052c06f7952f5f3ef549e486a SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
-EBUILD gitolite-gentoo-2.3.1-r1.ebuild 1820 BLAKE2B 687057c8198858602648cf877674d3804c0935b6a6189f3c9a6e2a1c052e213603e9d593ccc7e141daae7746cdf14db0cc13ba794dcb12c1fd6474af0246bf1a SHA512 8fc5e8894cfaa34bb0ffc7228dc8eb8691e4b0a2dc5bdc57e729810480483382e8b99efa19b99736b17ecc5c747b2dc862486bf6db265534e1b28a62571d501f
-EBUILD gitolite-gentoo-3.6.6.1-r1.ebuild 2809 BLAKE2B 0265b4bb9f492b7e624e6c17e4325d48b64adb0d2bbf18d90118db8988e7b8621b5b5cf901febe063bf75ae0c4493c9b132a36026485046931bf96ff2451ec35 SHA512 b93e509d49928cc1c7f5be1ff6a0af5f4583ed4427703f380530774c812380933bad199deb8dcecf11555af574c78fecc1df3c6349fe64c55cfa06b4c2f1f0bd
+EBUILD gitolite-gentoo-2.3.1-r2.ebuild 1643 BLAKE2B b9b1e6fcef1176889f5d9f1d87e1c43f437f37225b506122f4b950fd82fb8a8604479ad015c6e2167e96d3cdea22146f5fbc750983eaa6d7690c777c5001a1b9 SHA512 ce26427f097f4ef1b9fb5dfe583b29dfda3d60ef7a19737e7929a31eb2d079f0da759a3bff7b54edafb8958b15a11a51c28ab59b56de0b984b46ab4a5ebd8bdf
+EBUILD gitolite-gentoo-3.6.6.1-r2.ebuild 2701 BLAKE2B 2bfb51ea9f5990d14fd579b01f163819fbd1a1af5ab91a995a2549ae3c767b801f42709362805d7ebca28675beb9c1d315bb945706f5a6e97594314bad977cf4 SHA512 7bf3985927ebd2fa091bdc0939a94ff807fb36a1d01786a84b1924f633fb9fbfd2dd836d502f57987fb6a1f3da9432c1d954a8551426124524a5ebb704b7d0ab
 MISC metadata.xml 478 BLAKE2B c178da3340159b14dc13fed855672892da98d2bd1ded28759120d60c93823b48e3887f59991776b1b68ab3941124e98b1b224f64544bbae9ea363e4c91266a2e SHA512 c014b88113a5769aa13b2d898afef78df07a642c4ccc964ae62bb64f07d3dac3c6e81df0defd873bc85be4434714abfeac160be0b4b1e9b77510f6cb5ad54810
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
index 70ab60316c61..d86d7ba52941 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
@@ -1,9 +1,9 @@
 # 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, Gentoo fork"
 HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
@@ -14,20 +14,20 @@ 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
 	dev-perl/Net-SSH-AuthorizedKeysFile
 	vim-syntax? ( app-vim/gitolite-syntax )"
 
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /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-gentoo/gitolite-gentoo-3.6.6.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
index e70939ddb834..69ef11cfb53a 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r1.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.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="git://git.gentoo.org/proj/gitolite-gentoo"
 EGIT_MASTER=master
 
-inherit perl-module user versionator ${SCM}
+inherit perl-module ${SCM}
 
 DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
 HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
@@ -21,23 +22,22 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="selinux tools 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-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON
 	!dev-vcs/gitolite
 	vim-syntax? ( app-vim/gitolite-syntax )
 	selinux? ( sec-policy/selinux-gitosis )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-PATCHES=( )
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
+"
 
 src_prepare() {
 	default
@@ -77,24 +77,23 @@ 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.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
+	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.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
+	done
 
 	# bug 352291
 	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)