Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-apps/cgit: ChangeLog cgit-0.9.0.1.ebuild cgit-9999.ebuild
Date: Mon, 27 Jun 2011 08:58:19
Message-Id: 20110627085808.E71D520057@flycatcher.gentoo.org
1 pva 11/06/27 08:58:08
2
3 Modified: ChangeLog cgit-9999.ebuild
4 Added: cgit-0.9.0.1.ebuild
5 Log:
6 Version bump, bump EAPI, add instructions for apache2 installation bug 370681 wrt to Oliver Schinagl. Thank Nikoli for all this job.
7
8 (Portage version: 2.1.10.3/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.7 www-apps/cgit/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/cgit/ChangeLog?rev=1.7&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/cgit/ChangeLog?rev=1.7&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/cgit/ChangeLog?r1=1.6&r2=1.7
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v
20 retrieving revision 1.6
21 retrieving revision 1.7
22 diff -u -r1.6 -r1.7
23 --- ChangeLog 27 Jun 2011 05:41:07 -0000 1.6
24 +++ ChangeLog 27 Jun 2011 08:58:08 -0000 1.7
25 @@ -1,6 +1,13 @@
26 # ChangeLog for www-apps/cgit
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.6 2011/06/27 05:41:07 pva Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.7 2011/06/27 08:58:08 pva Exp $
30 +
31 +*cgit-0.9.0.1 (27 Jun 2011)
32 +
33 + 27 Jun 2011; Peter Volkov <pva@g.o> +cgit-0.9.0.1.ebuild,
34 + cgit-9999.ebuild, files/postinstall-en.txt:
35 + Version bump, bump EAPI, add instructions for apache2 installation bug 370681
36 + wrt to Oliver Schinagl. Thank Nikoli for all this job.
37
38 27 Jun 2011; Peter Volkov <pva@g.o> -cgit-0.8.3.1-r1.ebuild:
39 Drop old and vulnerable version.
40
41
42
43 1.2 www-apps/cgit/cgit-9999.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/cgit/cgit-9999.ebuild?rev=1.2&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/cgit/cgit-9999.ebuild?rev=1.2&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/cgit/cgit-9999.ebuild?r1=1.1&r2=1.2
48
49 Index: cgit-9999.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v
52 retrieving revision 1.1
53 retrieving revision 1.2
54 diff -u -r1.1 -r1.2
55 --- cgit-9999.ebuild 29 Apr 2011 19:02:19 -0000 1.1
56 +++ cgit-9999.ebuild 27 Jun 2011 08:58:08 -0000 1.2
57 @@ -1,12 +1,12 @@
58 # Copyright 1999-2011 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v 1.1 2011/04/29 19:02:19 pva Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v 1.2 2011/06/27 08:58:08 pva Exp $
62
63 -EAPI="2"
64 +EAPI="4"
65
66 WEBAPP_MANUAL_SLOT="yes"
67
68 -inherit webapp eutils multilib git
69 +inherit webapp eutils multilib git-2
70
71 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
72
73 @@ -41,12 +41,6 @@
74 enewuser "${PN}"
75 }
76
77 -src_unpack() {
78 - git_src_unpack
79 -
80 - cd "${WORKDIR}" && unpack ${A}
81 -}
82 -
83 src_prepare() {
84 rmdir git || die
85 mv "${WORKDIR}"/git-"${GIT_V}" git || die
86 @@ -57,21 +51,19 @@
87 }
88
89 src_compile() {
90 - emake || die
91 - if use doc ; then
92 - emake doc-man || die
93 - fi
94 + emake
95 + use doc && emake doc-man
96 }
97
98 src_install() {
99 webapp_src_preinst
100
101 emake \
102 - prefix=/usr \
103 - libdir=/usr/$(get_libdir) \
104 + prefix="${EPREFIX}"/usr \
105 + libdir="${EPREFIX}"/usr/$(get_libdir) \
106 CGIT_SCRIPT_PATH="${MY_CGIBINDIR}" \
107 CGIT_DATA_PATH="${MY_HTDOCSDIR}" \
108 - DESTDIR="${D}" install || die
109 + DESTDIR="${D}" install
110
111 insinto /etc
112 doins "${FILESDIR}"/cgitrc
113 @@ -89,5 +81,5 @@
114
115 pkg_postinst() {
116 ewarn "If you intend to run cgit using web server's user"
117 - ewarn "you should change /var/cache/cgit/ permissions."
118 + ewarn "you should change ${CGIT_CACHEDIR} permissions."
119 }
120
121
122
123 1.1 www-apps/cgit/cgit-0.9.0.1.ebuild
124
125 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/cgit/cgit-0.9.0.1.ebuild?rev=1.1&view=markup
126 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/cgit/cgit-0.9.0.1.ebuild?rev=1.1&content-type=text/plain
127
128 Index: cgit-0.9.0.1.ebuild
129 ===================================================================
130 # Copyright 1999-2011 Gentoo Foundation
131 # Distributed under the terms of the GNU General Public License v2
132 # $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.9.0.1.ebuild,v 1.1 2011/06/27 08:58:08 pva Exp $
133
134 EAPI="4"
135
136 WEBAPP_MANUAL_SLOT="yes"
137
138 inherit webapp eutils multilib
139
140 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
141
142 GIT_V="1.7.4"
143
144 DESCRIPTION="a fast web-interface for git repositories"
145 HOMEPAGE="http://hjemli.net/git/cgit/about/"
146 SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.bz2
147 http://hjemli.net/git/cgit/snapshot/${P}.tar.bz2"
148
149 LICENSE="GPL-2"
150 SLOT="0"
151 KEYWORDS="~amd64 ~x86"
152 IUSE="doc highlight"
153
154 RDEPEND="
155 dev-vcs/git
156 sys-libs/zlib
157 dev-libs/openssl
158 virtual/httpd-cgi
159 highlight? ( app-text/highlight )
160 "
161 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
162 DEPEND="${RDEPEND}
163 !<www-apps/cgit-0.8.3.3
164 doc? ( app-text/docbook-xsl-stylesheets
165 >=app-text/asciidoc-8.5.1 )
166 "
167
168 pkg_setup() {
169 webapp_pkg_setup
170 enewuser "${PN}"
171 }
172
173 src_prepare() {
174 rmdir git || die
175 mv "${WORKDIR}"/git-"${GIT_V}" git || die
176
177 sed -i \
178 -e "/^CACHE_ROOT =/s:/var/cache/cgit:${CGIT_CACHEDIR}:" \
179 Makefile || die
180 }
181
182 src_compile() {
183 emake
184 use doc && emake doc-man
185 }
186
187 src_install() {
188 webapp_src_preinst
189
190 emake \
191 prefix="${EPREFIX}"/usr \
192 libdir="${EPREFIX}"/usr/$(get_libdir) \
193 CGIT_SCRIPT_PATH="${MY_CGIBINDIR}" \
194 CGIT_DATA_PATH="${MY_HTDOCSDIR}" \
195 DESTDIR="${D}" install
196
197 insinto /etc
198 doins "${FILESDIR}"/cgitrc
199
200 dodoc README
201 use doc && doman cgitrc.5
202
203 webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
204 webapp_src_install
205
206 keepdir "${CGIT_CACHEDIR}"
207 fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
208 fperms 700 "${CGIT_CACHEDIR}"
209 }
210
211 pkg_postinst() {
212 ewarn "If you intend to run cgit using web server's user"
213 ewarn "you should change ${CGIT_CACHEDIR} permissions."
214 }
Report Message
Find on MARC Find on Google Groups