Signed-off-by: Michał Górny <mgo...@gentoo.org>
---
.../gitolite-gentoo-3.6.6.1-r2.ebuild | 93 +++++++++++++++++++
.../gitolite-gentoo-9999.ebuild | 25 +----
2 files changed, 98 insertions(+), 20 deletions(-)
create mode 100644 dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
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-r2.ebuild
new file mode 100644
index 000000000000..79f26e40c16f
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo
fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git";
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="
+ acct-group/git
+ acct-user/git[gitolite]
+ dev-lang/perl
+ virtual/perl-File-Path
+ virtual/perl-File-Temp
+ >=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+ !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=( )
+
+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 /usr/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() {
+ 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
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
b/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
index 7120a4c7c21d..325697741407 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,7 +22,10 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="selinux tools vim-syntax"
-DEPEND="dev-lang/perl
+DEPEND="
+ acct-group/git
+ acct-user/git[gitolite]
+ dev-lang/perl
virtual/perl-File-Path
virtual/perl-File-Temp
>=dev-vcs/git-1.6.6"
@@ -33,11 +36,6 @@ RDEPEND="${DEPEND}
>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
dev-perl/JSON"
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
src_prepare() {
echo "${PF}-gentoo" > src/VERSION
}
@@ -75,10 +73,6 @@ 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
}
@@ -93,13 +87,4 @@ pkg_postinst() {
elog "And you'll also have to enable the \"RepoUmask\" module
in your .gitolite.rc"
ewarn
fi
-
- # 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
}
--
2.23.0.rc2
