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

Gentoo Archives: gentoo-commits

From: "Christian Faulhammer (fauli)" <fauli@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/bzr: ChangeLog bzr-2.0.4.ebuild bzr-2.1.0_beta4.ebuild
Date: Tue, 23 Feb 2010 21:48:03
Message-Id: E1Nk2bg-0007Ym-U2@stork.gentoo.org
1 fauli 10/02/23 21:47:52
2
3 Modified: ChangeLog bzr-2.0.4.ebuild bzr-2.1.0_beta4.ebuild
4 Log:
5 Transfer changes from Prefix tree, use PYTHON_DEPEND variable
6 (Portage version: 2.1.7.17/cvs/Linux i686)
7
8 Revision Changes Path
9 1.126 dev-util/bzr/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bzr/ChangeLog?rev=1.126&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bzr/ChangeLog?rev=1.126&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bzr/ChangeLog?r1=1.125&r2=1.126
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v
18 retrieving revision 1.125
19 retrieving revision 1.126
20 diff -u -r1.125 -r1.126
21 --- ChangeLog 13 Feb 2010 18:21:54 -0000 1.125
22 +++ ChangeLog 23 Feb 2010 21:47:51 -0000 1.126
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-util/bzr
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.125 2010/02/13 18:21:54 armin76 Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.126 2010/02/23 21:47:51 fauli Exp $
28 +
29 + 23 Feb 2010; Christian Faulhammer <fauli@g.o> bzr-2.0.4.ebuild,
30 + bzr-2.1.0_beta4.ebuild:
31 + Transfer changes from Prefix tree, use PYTHON_DEPEND variable
32
33 13 Feb 2010; Raúl Porcel <armin76@g.o> bzr-2.0.1.ebuild,
34 bzr-2.0.3.ebuild, bzr-2.0.4.ebuild, bzr-2.1.0_beta4.ebuild:
35
36
37
38 1.4 dev-util/bzr/bzr-2.0.4.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bzr/bzr-2.0.4.ebuild?rev=1.4&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bzr/bzr-2.0.4.ebuild?rev=1.4&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bzr/bzr-2.0.4.ebuild?r1=1.3&r2=1.4
43
44 Index: bzr-2.0.4.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.0.4.ebuild,v
47 retrieving revision 1.3
48 retrieving revision 1.4
49 diff -u -r1.3 -r1.4
50 --- bzr-2.0.4.ebuild 13 Feb 2010 18:21:54 -0000 1.3
51 +++ bzr-2.0.4.ebuild 23 Feb 2010 21:47:51 -0000 1.4
52 @@ -1,10 +1,10 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.0.4.ebuild,v 1.3 2010/02/13 18:21:54 armin76 Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.0.4.ebuild,v 1.4 2010/02/23 21:47:51 fauli Exp $
57
58 -EAPI=1
59 +EAPI=3
60
61 -NEED_PYTHON=2.4
62 +PYTHON_DEPEND=2:2.4
63
64 inherit distutils bash-completion elisp-common eutils versionator
65
66 @@ -19,7 +19,7 @@
67
68 LICENSE="GPL-2"
69 SLOT="0"
70 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
71 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
72 IUSE="curl doc emacs +sftp test"
73
74 RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
75 @@ -57,7 +57,7 @@
76 }
77
78 src_install() {
79 - distutils_src_install --install-data /usr/share
80 + distutils_src_install --install-data "${EPREFIX}"/usr/share
81
82 if use doc; then
83 docinto developers
84 @@ -74,7 +74,7 @@
85
86 # don't add automatically to the load-path, so the sitefile
87 # can do a conditional loading
88 - touch "${D}${SITELISP}/${PN}/.nosearch"
89 + touch "${ED}${SITELISP}/${PN}/.nosearch"
90 fi
91
92 insinto /usr/share/zsh/site-functions
93
94
95
96 1.4 dev-util/bzr/bzr-2.1.0_beta4.ebuild
97
98 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild?rev=1.4&view=markup
99 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild?rev=1.4&content-type=text/plain
100 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild?r1=1.3&r2=1.4
101
102 Index: bzr-2.1.0_beta4.ebuild
103 ===================================================================
104 RCS file: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild,v
105 retrieving revision 1.3
106 retrieving revision 1.4
107 diff -u -r1.3 -r1.4
108 --- bzr-2.1.0_beta4.ebuild 13 Feb 2010 18:21:54 -0000 1.3
109 +++ bzr-2.1.0_beta4.ebuild 23 Feb 2010 21:47:51 -0000 1.4
110 @@ -1,10 +1,10 @@
111 # Copyright 1999-2010 Gentoo Foundation
112 # Distributed under the terms of the GNU General Public License v2
113 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild,v 1.3 2010/02/13 18:21:54 armin76 Exp $
114 +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild,v 1.4 2010/02/23 21:47:51 fauli Exp $
115
116 -EAPI=1
117 +EAPI=3
118
119 -NEED_PYTHON=2.4
120 +PYTHON_DEPEND=2:2.4
121
122 inherit distutils bash-completion elisp-common eutils versionator
123
124 @@ -20,7 +20,7 @@
125
126 LICENSE="GPL-2"
127 SLOT="0"
128 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
129 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
130 IUSE="curl doc emacs +sftp test"
131
132 RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
133 @@ -53,29 +53,29 @@
134 distutils_src_compile
135
136 if use emacs; then
137 - elisp-compile contrib/emacs/bzr-mode.el || die "Emacs modules failed!"
138 + elisp-compile contrib/emacs/bzr-mode.el || die
139 fi
140 }
141
142 src_install() {
143 - distutils_src_install --install-data /usr/share
144 + distutils_src_install --install-data "${EPREFIX}"/usr/share
145
146 if use doc; then
147 docinto developers
148 - dodoc doc/developers/* || die "dodoc failed"
149 + dodoc doc/developers/* || die
150 for doc in mini-tutorial tutorials user-{guide,reference}; do
151 docinto $doc
152 - dodoc doc/en/$doc/* || die "dodoc failed"
153 + dodoc doc/en/$doc/* || die
154 done
155 fi
156
157 if use emacs; then
158 - elisp-install ${PN} contrib/emacs/*.el* || die "elisp-install failed"
159 - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed"
160 + elisp-install ${PN} contrib/emacs/*.el* || die
161 + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
162
163 # don't add automatically to the load-path, so the sitefile
164 # can do a conditional loading
165 - touch "${D}${SITELISP}/${PN}/.nosearch"
166 + touch "${ED}${SITELISP}/${PN}/.nosearch"
167 fi
168
169 insinto /usr/share/zsh/site-functions
170 @@ -115,9 +115,9 @@
171 python_enable_pyc
172 if [[ -n ${skip_tests} ]]; then
173 einfo "Skipping tests known to fail: ${skip_tests}"
174 - "${python}" bzr --no-plugins selftest -x ${skip_tests} || die "bzr selftest failed"
175 + "${python}" bzr --no-plugins selftest -x ${skip_tests} || die
176 else
177 - "${python}" bzr --no-plugins selftest || die "bzr selftest failed"
178 + "${python}" bzr --no-plugins selftest || die
179 fi
180 # Just to make sure we don't hit any errors on later stages.
181 python_disable_pyc
Report Message
Find on MARC Find on Google Groups