Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/etckeeper: metadata.xml ChangeLog etckeeper-0.63.ebuild
Date: Sat, 16 Jun 2012 18:51:47
Message-Id: 20120616185131.C64132004B@flycatcher.gentoo.org
1 hasufell 12/06/16 18:51:31
2
3 Modified: metadata.xml ChangeLog etckeeper-0.63.ebuild
4 Log:
5 add bazaar useflag to fix dependency issues
6
7 (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 sys-apps/etckeeper/metadata.xml
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/metadata.xml?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/metadata.xml?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/metadata.xml?r1=1.1&r2=1.2
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/metadata.xml,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- metadata.xml 16 Jun 2012 16:01:51 -0000 1.1
23 +++ metadata.xml 16 Jun 2012 18:51:31 -0000 1.2
24 @@ -11,5 +11,8 @@
25 <name>Manuel RĂ¼ger</name>
26 <description>Proxy maintainer. CC him on bugs</description>
27 </maintainer>
28 + <use>
29 + <flag name='bazaar'>Support <pkg>dev-vcs/bzr</pkg> based repository</flag>
30 + </use>
31 </pkgmetadata>
32
33
34
35
36 1.2 sys-apps/etckeeper/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/ChangeLog?rev=1.2&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/ChangeLog?rev=1.2&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/ChangeLog?r1=1.1&r2=1.2
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v
45 retrieving revision 1.1
46 retrieving revision 1.2
47 diff -u -r1.1 -r1.2
48 --- ChangeLog 16 Jun 2012 16:01:51 -0000 1.1
49 +++ ChangeLog 16 Jun 2012 18:51:31 -0000 1.2
50 @@ -1,6 +1,9 @@
51 # ChangeLog for sys-apps/etckeeper
52 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.1 2012/06/16 16:01:51 hasufell Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.2 2012/06/16 18:51:31 hasufell Exp $
55 +
56 + 16 Jun 2012; Julian Ospald <hasufell@g.o> etckeeper-0.63.ebuild:
57 + add bazaar useflag to fix dependency issues
58
59 *etckeeper-0.63 (16 Jun 2012)
60
61
62
63
64 1.2 sys-apps/etckeeper/etckeeper-0.63.ebuild
65
66 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/etckeeper-0.63.ebuild?rev=1.2&view=markup
67 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/etckeeper-0.63.ebuild?rev=1.2&content-type=text/plain
68 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/etckeeper-0.63.ebuild?r1=1.1&r2=1.2
69
70 Index: etckeeper-0.63.ebuild
71 ===================================================================
72 RCS file: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-0.63.ebuild,v
73 retrieving revision 1.1
74 retrieving revision 1.2
75 diff -u -r1.1 -r1.2
76 --- etckeeper-0.63.ebuild 16 Jun 2012 16:01:51 -0000 1.1
77 +++ etckeeper-0.63.ebuild 16 Jun 2012 18:51:31 -0000 1.2
78 @@ -1,10 +1,10 @@
79 # Copyright 1999-2012 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-0.63.ebuild,v 1.1 2012/06/16 16:01:51 hasufell Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-0.63.ebuild,v 1.2 2012/06/16 18:51:31 hasufell Exp $
83
84 EAPI=4
85
86 -PYTHON_DEPEND="2:2.6"
87 +PYTHON_DEPEND="bazaar? 2:2.6"
88 SUPPORT_PYTHON_ABIS="1"
89 RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"
90
91 @@ -15,15 +15,15 @@
92 SRC_URI="http://git.kitenet.net/?p=${PN}.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
93
94 LICENSE="GPL-2"
95 -IUSE=""
96 +IUSE="bazaar"
97 KEYWORDS="~amd64 ~x86"
98 SLOT="0"
99
100 VCS_DEPEND="
101 dev-vcs/git
102 dev-vcs/mercurial
103 - dev-vcs/bzr
104 - dev-vcs/darcs"
105 + dev-vcs/darcs
106 + bazaar? ( dev-vcs/bzr )"
107 RDEPEND="app-portage/portage-utils
108 || ( ${VCS_DEPEND} )"
109
110 @@ -31,6 +31,10 @@
111 epatch "${FILESDIR}"/${P}-gentoo.patch
112 }
113
114 +src_compile() {
115 + use bazaar && emake
116 +}
117 +
118 src_install(){
119 default
120
121 @@ -38,7 +42,7 @@
122 $(PYTHON) ./etckeeper-bzr/__init__.py install --root="${D}" ||
123 die "bzr support installation failed!"
124 }
125 - python_execute_function bzr_install
126 + use bazaar && python_execute_function bzr_install
127
128 newbashcomp bash_completion ${PN}
129 insinto /usr/share/doc/${PN}/examples