gentoo auto-resync : 17:07:2022 - 08:31:06

4 files changed, 7 insertions, 74 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 4b211227f50a..3596156196d6 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 54092fd43d5c..179bdc4d9335 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,5 +1,4 @@
-DIST gitolite-gentoo-2.3.1.tar.bz2 198849 BLAKE2B 88268e4588003cb1b8b4e340fd858a2be65b8156f3ff5033cf7f8c988d8373c4dc7c41b0d589126e143e8eaa19071fda87532f9052c06f7952f5f3ef549e486a SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e
+DIST 5df2b817255ee919991da6c310239e08c8fcc1ae.patch 4115 BLAKE2B 8f364eba7a1f3788ae6aacb76946d9cf963609ac3e6f093eedf4d5e17467eba0ceb88b5b4bbf3acc72ec17e6626f52836805ac07f6044d7712efcb499d0237ff SHA512 5098a82c860370edeec7c41cb71d0f10e6c03b3d1996f163e882d84ea64903d64e866bb67af45380f658870e2715cc805155380c96994854847b06a6db3e111d
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
-EBUILD gitolite-gentoo-2.3.1-r2.ebuild 1653 BLAKE2B 7af6010dcf5b536224c5e57755f454a931e8a4061aad2f7dddbe86891618c60bbe0c40fd579bc1527fe99799eac1d7f73f31eb9ac4dc1f7376fd5218c676eadb SHA512 dc8a8874d218fb56ce4666118e421d24ddf323bbb12541be79cc0d29481222155797fe1dc3d4fa69ace0a37e1e58cf2d17d51aad42de094579fc8d2efe55af74
-EBUILD gitolite-gentoo-3.6.6.1-r2.ebuild 2697 BLAKE2B b3000656f544084e3587bc37bc18e1730bfa9216cdc875dc38cd46ce818d21dd65a9532d5c26b0385c9008e5bb4c4403207b14dfcad9a9596189429ff1557d63 SHA512 9ecc7fc2ef804adbd8f05dfba6a5d668b7a1eda58a97a18c75171a795ca0fe5da3e5f5d87b467de67ec4fc0030cf537a0718b67e1a605d8d28dcf5cdd87cf148
+EBUILD gitolite-gentoo-3.6.6.1-r3.ebuild 2875 BLAKE2B 6d319fdbd9bd7f971c9d61c2c47ccc2c4ea004de3dfda5f9d94994b9ce92e4c991fa9f674eb004e99054fc9d21fddbadb8c558c5dd5a71f3b2e4387241f30689 SHA512 42852fd3a09fe5ccc919f454879a74be662c4539877a0e082aa8a714c706d0c3a3500d31a3e1e44c5e8e8cd931c9732d8174882022891a4e75f56fe0affab4af
 MISC metadata.xml 480 BLAKE2B d3524b1d64cf32814329c1cc96d92c816b333dec23a2f9fe03f22b7d361b449ef6700985d94e98253dcb60862e38fc6f5a36ac3bd92f110fa92291a85627b308 SHA512 bf7340f6554cd04dc1b8fc7c9d4f08023ce56514a38344f83a03a235b63389df4fb20b2f5d5761c4d82f1cf67e687420a52395b9afc807322d39d96e96ec7915
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
deleted file mode 100644
index 05571da3b29d..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-module
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="contrib vim-syntax"
-
-DEPEND="
-	dev-lang/perl
-	>=dev-vcs/git-1.6.6
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/git
-	acct-user/git[gitolite]
-	!dev-vcs/gitolite
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-src_prepare() {
-	default
-
-	rm Makefile doc/COPYING || die
-	rm -rf contrib/{gitweb,vim} || die
-
-	echo "${PF}-gentoo" > conf/VERSION
-}
-
-src_install() {
-	local gl_bin="${D}/usr/bin"
-	gl_bin=${gl_bin/\/\//\/}
-
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin
-
-	export PATH="${gl_bin}:${PATH}"
-	./src/gl-system-install ${gl_bin} \
-		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || 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}"
-	doins src/*.pm
-
-	dodoc README.mkd doc/*
-
-	use contrib && dodoc -r contrib
-}
-
-pkg_postinst() {
-	# 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
-	ewarn
-	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
-	elog "then please check the permissions of all repositories using the umask feature"
-	ewarn
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
index 0f02b78dc441..55176f69e41d 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
@@ -13,6 +13,7 @@ DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fo
 HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI+=" https://github.com/sitaramc/gitolite/commit/5df2b817255ee919991da6c310239e08c8fcc1ae.patch"
 	KEYWORDS="amd64 x86"
 else
 	SRC_URI=""
@@ -39,6 +40,10 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-gitosis )
 "
 
+PATCHES=(
+	"${DISTDIR}"/5df2b817255ee919991da6c310239e08c8fcc1ae.patch
+)
+
 src_prepare() {
 	default
 	echo "${PF}-gentoo" > src/VERSION || die