gentoo auto-resync : 21:01:2024 - 08:09:25

4 files changed, 112 insertions, 4 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 6fdbe1f28f4d..f90689e43984 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 42e1f4e0a828..4c295f060d74 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,4 +1,6 @@
 DIST 5df2b817255ee919991da6c310239e08c8fcc1ae.patch 4115 BLAKE2B 8f364eba7a1f3788ae6aacb76946d9cf963609ac3e6f093eedf4d5e17467eba0ceb88b5b4bbf3acc72ec17e6626f52836805ac07f6044d7712efcb499d0237ff SHA512 5098a82c860370edeec7c41cb71d0f10e6c03b3d1996f163e882d84ea64903d64e866bb67af45380f658870e2715cc805155380c96994854847b06a6db3e111d
+DIST gitolite-gentoo-3.6.13.tar.bz2 169403 BLAKE2B 9eb628b92845a4ea5f36dce6b092568a70ceca8f6623854173f7d855502316aa77d458fb85e170f4c91d24167a3bc4ae9fd366a6c3925af3d42f1f597912f830 SHA512 6cf000750b652337ec728b23e1801fe8acc01cb8da9929cf797c3bbacc0246104a39ce204c2558e76ce1d3eda37fe4b15ef665827a8330745fc54bc193367bbc
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
-EBUILD gitolite-gentoo-3.6.6.1-r3.ebuild 2877 BLAKE2B e3d1ff7dfae4e75e354939a1a547a00c4518d83d00c52e53769289f777654b9a68b61ed3c48355d83bf17ab5835806cd838a97f75dad6f79565a4ac0c7bee6c0 SHA512 c94e69f2f6d65e1ff8c266dc0e297ecb52d1cfa2933bbacac369eb9d51f16098d0670e1965b055d572ee90f613b6d344466ad363983ce3f60cae1caa424f40c3
+EBUILD gitolite-gentoo-3.6.13.ebuild 2722 BLAKE2B 9db8dbf2adc2df7b0d68520111a2c989196412fce54b6ca8f3f1e416f83d00d6567ecce5a57218b24732add31111e1a4f6882404b09ea063bd2c064ace651ad1 SHA512 05eeeda9b76d1fc59e6d6221dbf2ce405e2ef4908c6d67bf185e7bfb3e3ae3cd1b6f87fb737a24f692e735f8e1fab04e38b1d16501b2c9d22de191d3460e2500
+EBUILD gitolite-gentoo-3.6.6.1-r3.ebuild 2860 BLAKE2B 1980bc08482a8e685e103cffd4df65b4503d8db85f510421d42d2620ab76b04e8031742d5facd817096bfe7371cb45e5a3e50b47b06f20ef0c78361d4cdda163 SHA512 c8aeb496e0a34a80bad48a8b5dffefdc83272a08dc8beb9bff2c231863e29f9cfd771fbbf7f8a8ec24e07ebc915be93322902fc290847e0269e48c95e62164b0
 MISC metadata.xml 419 BLAKE2B 5d3723cd4cca89ecc3c8d7b2b3d3137d4ab3057d1e6247a2f5e826e56ab34c4504b947ef35eda3d791d13ef38c85ade2b5941aaa3df61bccffc313b83d7f583d SHA512 45c81176984268aef059164a2d3d7cf82c966256e1aaf8348ae715073bb675fa87d63a8567441bc093e5266ac2f74598f0025f52bdf2c06bca8d6b68497cc655
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.ebuild
new file mode 100644
index 000000000000..17962475c774
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/fork/gitolite-gentoo.git/"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools 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-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+"
+
+PATCHES=(
+)
+
+src_prepare() {
+	default
+	echo "${PF}-gentoo" > src/VERSION || die
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym ../libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	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)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		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
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
index 9904c1756019..6df3b7931720 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,6 @@ 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=""
 fi
 
 LICENSE="GPL-2"