Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/luakit: ChangeLog luakit-9999.ebuild
Date: Fri, 27 Aug 2010 12:00:36
Message-Id: 20100827120024.1839C20051@flycatcher.gentoo.org
1 wired 10/08/27 12:00:24
2
3 Modified: ChangeLog luakit-9999.ebuild
4 Log:
5 respect user-defined branch and/or commit. keep the develop branch as default since master tracks releases.
6
7 (Portage version: 2.2_rc69_p23/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.5 www-client/luakit/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/ChangeLog?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/ChangeLog?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/ChangeLog?r1=1.4&r2=1.5
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- ChangeLog 27 Aug 2010 10:09:16 -0000 1.4
23 +++ ChangeLog 27 Aug 2010 12:00:23 -0000 1.5
24 @@ -1,6 +1,10 @@
25 # ChangeLog for www-client/luakit
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.4 2010/08/27 10:09:16 wired Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.5 2010/08/27 12:00:23 wired Exp $
29 +
30 + 27 Aug 2010; Alex Alexander <wired@g.o> luakit-9999.ebuild:
31 + respect user-defined branch and/or commit. keep the develop branch as
32 + default since master tracks releases.
33
34 27 Aug 2010; Alex Alexander <wired@g.o> luakit-9999.ebuild:
35 new help2man dependency
36
37
38
39 1.5 www-client/luakit/luakit-9999.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/luakit-9999.ebuild?rev=1.5&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/luakit-9999.ebuild?rev=1.5&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/luakit-9999.ebuild?r1=1.4&r2=1.5
44
45 Index: luakit-9999.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v
48 retrieving revision 1.4
49 retrieving revision 1.5
50 diff -u -r1.4 -r1.5
51 --- luakit-9999.ebuild 27 Aug 2010 10:09:16 -0000 1.4
52 +++ luakit-9999.ebuild 27 Aug 2010 12:00:23 -0000 1.5
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.4 2010/08/27 10:09:16 wired Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.5 2010/08/27 12:00:23 wired Exp $
58
59 EAPI=3
60
61 @@ -9,8 +9,8 @@
62 if [[ ${PV} == *9999* ]]; then
63 inherit git
64 EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/mason-larobina/luakit.git"}
65 - EGIT_BRANCH="develop"
66 - EGIT_COMMIT="develop"
67 + [[ ${EGIT_BRANCH} == "master" ]] && EGIT_BRANCH="develop"
68 + [[ ${EGIT_COMMIT} == "master" ]] && EGIT_COMMIT=${EGIT_BRANCH}
69 KEYWORDS=""
70 SRC_URI=""
71 else