Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: xdch47@××××××.de, nemunaire@×××××××.re, idl0r@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH v2 4/5] dev-vcs/gitolite: Use acct-{group,user}/git
Date: Sat, 17 Aug 2019 20:50:04
Message-Id: 20190817204826.406692-4-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH v2 1/5] acct-group/git: Add git group, GID 196 by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild | 91 ++++++++++++++++++++++
4 dev-vcs/gitolite/gitolite-9999.ebuild | 23 ++----
5 2 files changed, 97 insertions(+), 17 deletions(-)
6 create mode 100644 dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
7
8 diff --git a/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild b/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
9 new file mode 100644
10 index 000000000000..5ee33241a771
11 --- /dev/null
12 +++ b/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
13 @@ -0,0 +1,91 @@
14 +# Copyright 1999-2019 Gentoo Authors
15 +# Distributed under the terms of the GNU General Public License v2
16 +
17 +EAPI=6
18 +[[ ${PV} == *9999 ]] && SCM="git-2"
19 +EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
20 +EGIT_MASTER=master
21 +
22 +inherit perl-module user versionator ${SCM}
23 +
24 +DESCRIPTION="Highly flexible server for git directory version tracker"
25 +HOMEPAGE="https://github.com/sitaramc/gitolite"
26 +if [[ ${PV} != *9999 ]]; then
27 + SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
28 + KEYWORDS="~amd64 ~arm ~x86"
29 +else
30 + SRC_URI=""
31 + KEYWORDS="~amd64 ~arm ~x86"
32 +fi
33 +
34 +LICENSE="GPL-2"
35 +SLOT="0"
36 +IUSE="selinux tools"
37 +
38 +DEPEND="
39 + acct-group/git
40 + acct-user/git[gitolite]
41 + dev-lang/perl
42 + virtual/perl-File-Path
43 + virtual/perl-File-Temp
44 + >=dev-vcs/git-1.6.6"
45 +RDEPEND="${DEPEND}
46 + !app-vim/gitolite-syntax
47 + !dev-vcs/gitolite-gentoo
48 + !www-apps/gitea
49 + selinux? ( sec-policy/selinux-gitosis )
50 + dev-perl/JSON"
51 +
52 +PATCHES=( )
53 +
54 +src_prepare() {
55 + default
56 + echo $PF > src/VERSION || die
57 +}
58 +
59 +src_install() {
60 + local uexec=/usr/libexec/${PN}
61 +
62 + rm -rf src/lib/Gitolite/Test{,.pm}
63 + insinto $VENDOR_LIB
64 + doins -r src/lib/Gitolite
65 +
66 + dodoc README.markdown CHANGELOG
67 + # These are meant by upstream as examples, you are strongly recommended to
68 + # customize them for your needs.
69 + dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
70 +
71 + insinto /usr/share/vim/vimfiles
72 + doins -r contrib/vim/*
73 +
74 + insopts -m0755
75 + insinto $uexec
76 + doins -r src/{commands,syntactic-sugar,triggers,VREF}/
77 + doins -r contrib/{commands,triggers,hooks}
78 +
79 + insopts -m0644
80 + doins src/VERSION
81 +
82 + exeinto $uexec
83 + doexe src/gitolite{,-shell}
84 +
85 + dodir /usr/bin
86 + for bin in gitolite{,-shell}; do
87 + dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
88 + done
89 +
90 + if use tools; then
91 + dobin check-g2-compat convert-gitosis-conf
92 + dobin contrib/utils/rc-format-v3.4
93 + fi
94 +
95 + fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
96 +}
97 +
98 +pkg_postinst() {
99 + if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
100 + ewarn
101 + elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
102 + elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
103 + fi
104 +}
105 diff --git a/dev-vcs/gitolite/gitolite-9999.ebuild b/dev-vcs/gitolite/gitolite-9999.ebuild
106 index 928bbe83926c..ba689d0e780b 100644
107 --- a/dev-vcs/gitolite/gitolite-9999.ebuild
108 +++ b/dev-vcs/gitolite/gitolite-9999.ebuild
109 @@ -1,4 +1,4 @@
110 -# Copyright 1999-2017 Gentoo Foundation
111 +# Copyright 1999-2019 Gentoo Authors
112 # Distributed under the terms of the GNU General Public License v2
113
114 EAPI=5
115 @@ -22,21 +22,20 @@ LICENSE="GPL-2"
116 SLOT="0"
117 IUSE="selinux tools vim-syntax"
118
119 -DEPEND="dev-lang/perl
120 +DEPEND="
121 + acct-group/git
122 + acct-user/git[gitolite]
123 + dev-lang/perl
124 virtual/perl-File-Path
125 virtual/perl-File-Temp
126 >=dev-vcs/git-1.6.6"
127 RDEPEND="${DEPEND}
128 !dev-vcs/gitolite-gentoo
129 + !www-apps/gitea
130 selinux? ( sec-policy/selinux-gitosis )
131 vim-syntax? ( app-vim/gitolite-syntax )
132 dev-perl/JSON"
133
134 -pkg_setup() {
135 - enewgroup git
136 - enewuser git -1 /bin/sh /var/lib/gitolite git
137 -}
138 -
139 src_prepare() {
140 echo $PF > src/VERSION
141 }
142 @@ -74,10 +73,6 @@ src_install() {
143 dobin contrib/utils/rc-format-v3.4
144 fi
145
146 - keepdir /var/lib/gitolite
147 - fowners git:git /var/lib/gitolite
148 - fperms 750 /var/lib/gitolite
149 -
150 fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
151 }
152
153 @@ -87,10 +82,4 @@ pkg_postinst() {
154 elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
155 elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
156 fi
157 -
158 - # bug 352291
159 - ewarn
160 - elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
161 - elog "Especially if you're migrating from gitosis."
162 - ewarn
163 }
164 --
165 2.23.0.rc2