Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-embedded/bitbake: ChangeLog bitbake-9999.ebuild bitbake-1.10.2.ebuild
Date: Wed, 26 Jan 2011 16:40:31
Message-Id: 20110126164021.DE6D320054@flycatcher.gentoo.org
1 arfrever 11/01/26 16:40:21
2
3 Modified: ChangeLog bitbake-9999.ebuild bitbake-1.10.2.ebuild
4 Log:
5 Fix dependencies. Call python_pkg_setup().
6
7 (Portage version: 2.2.0_alpha19_p2/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.27 dev-embedded/bitbake/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/bitbake/ChangeLog?rev=1.27&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/bitbake/ChangeLog?rev=1.27&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/bitbake/ChangeLog?r1=1.26&r2=1.27
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v
19 retrieving revision 1.26
20 retrieving revision 1.27
21 diff -u -r1.26 -r1.27
22 --- ChangeLog 26 Jan 2011 07:19:28 -0000 1.26
23 +++ ChangeLog 26 Jan 2011 16:40:21 -0000 1.27
24 @@ -1,6 +1,10 @@
25 # ChangeLog for dev-embedded/bitbake
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.26 2011/01/26 07:19:28 radhermit Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.27 2011/01/26 16:40:21 arfrever Exp $
29 +
30 + 26 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
31 + bitbake-1.10.2.ebuild, bitbake-9999.ebuild:
32 + Fix dependencies. Call python_pkg_setup().
33
34 *bitbake-1.10.2 (26 Jan 2011)
35
36
37
38
39 1.8 dev-embedded/bitbake/bitbake-9999.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild?rev=1.8&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild?rev=1.8&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild?r1=1.7&r2=1.8
44
45 Index: bitbake-9999.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v
48 retrieving revision 1.7
49 retrieving revision 1.8
50 diff -u -r1.7 -r1.8
51 --- bitbake-9999.ebuild 26 Jan 2011 07:19:28 -0000 1.7
52 +++ bitbake-9999.ebuild 26 Jan 2011 16:40:21 -0000 1.8
53 @@ -1,11 +1,11 @@
54 # Copyright 1999-2011 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.7 2011/01/26 07:19:28 radhermit Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.8 2011/01/26 16:40:21 arfrever Exp $
58
59 EAPI="3"
60 PYTHON_DEPEND="2:2.5"
61
62 -inherit distutils python
63 +inherit distutils
64
65 if [[ ${PV} == "9999" ]] ; then
66 EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
67 @@ -24,16 +24,13 @@
68 SLOT="0"
69 IUSE="doc"
70
71 -RDEPEND="
72 - || (
73 - >=dev-lang/python-2.5[sqlite]
74 - >=dev-python/pysqlite-2.3.2
75 - )"
76 +RDEPEND="|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 )"
77 DEPEND="${RDEPEND}
78 doc? ( dev-libs/libxslt )"
79
80 pkg_setup() {
81 python_set_active_version 2
82 + python_pkg_setup
83 }
84
85 src_prepare() {
86
87
88
89 1.2 dev-embedded/bitbake/bitbake-1.10.2.ebuild
90
91 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/bitbake/bitbake-1.10.2.ebuild?rev=1.2&view=markup
92 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/bitbake/bitbake-1.10.2.ebuild?rev=1.2&content-type=text/plain
93 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/bitbake/bitbake-1.10.2.ebuild?r1=1.1&r2=1.2
94
95 Index: bitbake-1.10.2.ebuild
96 ===================================================================
97 RCS file: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.10.2.ebuild,v
98 retrieving revision 1.1
99 retrieving revision 1.2
100 diff -u -r1.1 -r1.2
101 --- bitbake-1.10.2.ebuild 26 Jan 2011 07:19:28 -0000 1.1
102 +++ bitbake-1.10.2.ebuild 26 Jan 2011 16:40:21 -0000 1.2
103 @@ -1,11 +1,11 @@
104 # Copyright 1999-2011 Gentoo Foundation
105 # Distributed under the terms of the GNU General Public License v2
106 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.10.2.ebuild,v 1.1 2011/01/26 07:19:28 radhermit Exp $
107 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.10.2.ebuild,v 1.2 2011/01/26 16:40:21 arfrever Exp $
108
109 EAPI="3"
110 PYTHON_DEPEND="2:2.5"
111
112 -inherit distutils python
113 +inherit distutils
114
115 if [[ ${PV} == "9999" ]] ; then
116 EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
117 @@ -24,16 +24,13 @@
118 SLOT="0"
119 IUSE="doc"
120
121 -RDEPEND="
122 - || (
123 - >=dev-lang/python-2.5[sqlite]
124 - >=dev-python/pysqlite-2.3.2
125 - )"
126 +RDEPEND="|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 )"
127 DEPEND="${RDEPEND}
128 doc? ( dev-libs/libxslt )"
129
130 pkg_setup() {
131 python_set_active_version 2
132 + python_pkg_setup
133 }
134
135 src_prepare() {