1 |
sping 09/12/30 22:23:45 |
2 |
|
3 |
Modified: layman-1.2.4.ebuild ChangeLog layman-1.1.1.ebuild |
4 |
layman-1.2.3.ebuild layman-9999.ebuild |
5 |
Log: |
6 |
app-portage/layman: Fix dependencies |
7 |
(Portage version: 2.2_rc61/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 app-portage/layman/layman-1.2.4.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-1.2.4.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-1.2.4.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-1.2.4.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: layman-1.2.4.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.4.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- layman-1.2.4.ebuild 5 Dec 2009 00:44:07 -0000 1.2 |
23 |
+++ layman-1.2.4.ebuild 30 Dec 2009 22:23:44 -0000 1.3 |
24 |
@@ -1,8 +1,9 @@ |
25 |
# Copyright 1999-2009 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.4.ebuild,v 1.2 2009/12/05 00:44:07 arfrever Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.4.ebuild,v 1.3 2009/12/30 22:23:44 sping Exp $ |
29 |
|
30 |
EAPI="2" |
31 |
+NEED_PYTHON=2.5 |
32 |
SUPPORT_PYTHON_ABIS="1" |
33 |
|
34 |
inherit eutils distutils |
35 |
@@ -16,9 +17,12 @@ |
36 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
37 |
IUSE="git subversion test" |
38 |
|
39 |
-DEPEND="dev-python/pyxml |
40 |
+COMMON_DEPS="|| ( |
41 |
+ dev-lang/python[xml] |
42 |
+ ( dev-lang/python dev-python/pyxml ) )" |
43 |
+DEPEND="${COMMON_DEPS} |
44 |
test? ( dev-util/subversion )" |
45 |
-RDEPEND=">=dev-lang/python-2.5 |
46 |
+RDEPEND="${COMMON_DEPS} |
47 |
git? ( dev-util/git ) |
48 |
subversion? ( |
49 |
|| ( |
50 |
|
51 |
|
52 |
|
53 |
1.82 app-portage/layman/ChangeLog |
54 |
|
55 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/ChangeLog?rev=1.82&view=markup |
56 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/ChangeLog?rev=1.82&content-type=text/plain |
57 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/ChangeLog?r1=1.81&r2=1.82 |
58 |
|
59 |
Index: ChangeLog |
60 |
=================================================================== |
61 |
RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v |
62 |
retrieving revision 1.81 |
63 |
retrieving revision 1.82 |
64 |
diff -u -r1.81 -r1.82 |
65 |
--- ChangeLog 29 Dec 2009 11:45:14 -0000 1.81 |
66 |
+++ ChangeLog 30 Dec 2009 22:23:44 -0000 1.82 |
67 |
@@ -1,6 +1,10 @@ |
68 |
# ChangeLog for app-portage/layman |
69 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
70 |
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.81 2009/12/29 11:45:14 sping Exp $ |
71 |
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.82 2009/12/30 22:23:44 sping Exp $ |
72 |
+ |
73 |
+ 30 Dec 2009; Sebastian Pipping <sping@g.o> layman-1.1.1.ebuild, |
74 |
+ layman-1.2.3.ebuild, layman-1.2.4.ebuild, layman-9999.ebuild: |
75 |
+ Fix dependency for xml.dom.minidom imports |
76 |
|
77 |
29 Dec 2009; Sebastian Pipping <sping@g.o> layman-1.1.1.ebuild: |
78 |
Add dependency on pyxml for xml.dom.minidom (bug #264263) |
79 |
|
80 |
|
81 |
|
82 |
1.16 app-portage/layman/layman-1.1.1.ebuild |
83 |
|
84 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-1.1.1.ebuild?rev=1.16&view=markup |
85 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-1.1.1.ebuild?rev=1.16&content-type=text/plain |
86 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-1.1.1.ebuild?r1=1.15&r2=1.16 |
87 |
|
88 |
Index: layman-1.1.1.ebuild |
89 |
=================================================================== |
90 |
RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.1.1.ebuild,v |
91 |
retrieving revision 1.15 |
92 |
retrieving revision 1.16 |
93 |
diff -u -r1.15 -r1.16 |
94 |
--- layman-1.1.1.ebuild 29 Dec 2009 11:45:14 -0000 1.15 |
95 |
+++ layman-1.1.1.ebuild 30 Dec 2009 22:23:44 -0000 1.16 |
96 |
@@ -1,6 +1,6 @@ |
97 |
# Copyright 1999-2009 Gentoo Foundation |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.1.1.ebuild,v 1.15 2009/12/29 11:45:14 sping Exp $ |
100 |
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.1.1.ebuild,v 1.16 2009/12/30 22:23:44 sping Exp $ |
101 |
|
102 |
EAPI="2" |
103 |
NEED_PYTHON=2.5 |
104 |
@@ -16,7 +16,9 @@ |
105 |
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
106 |
IUSE="subversion test" |
107 |
|
108 |
-COMMON_DEPS="dev-python/pyxml" |
109 |
+COMMON_DEPS="|| ( |
110 |
+ dev-lang/python[xml] |
111 |
+ ( dev-lang/python dev-python/pyxml ) )" |
112 |
DEPEND="${COMMON_DEPS} |
113 |
test? ( dev-util/subversion )" |
114 |
RDEPEND="${COMMON_DEPS} |
115 |
|
116 |
|
117 |
|
118 |
1.11 app-portage/layman/layman-1.2.3.ebuild |
119 |
|
120 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild?rev=1.11&view=markup |
121 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild?rev=1.11&content-type=text/plain |
122 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild?r1=1.10&r2=1.11 |
123 |
|
124 |
Index: layman-1.2.3.ebuild |
125 |
=================================================================== |
126 |
RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild,v |
127 |
retrieving revision 1.10 |
128 |
retrieving revision 1.11 |
129 |
diff -u -r1.10 -r1.11 |
130 |
--- layman-1.2.3.ebuild 24 May 2009 22:09:25 -0000 1.10 |
131 |
+++ layman-1.2.3.ebuild 30 Dec 2009 22:23:44 -0000 1.11 |
132 |
@@ -1,8 +1,9 @@ |
133 |
# Copyright 1999-2009 Gentoo Foundation |
134 |
# Distributed under the terms of the GNU General Public License v2 |
135 |
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild,v 1.10 2009/05/24 22:09:25 jer Exp $ |
136 |
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild,v 1.11 2009/12/30 22:23:44 sping Exp $ |
137 |
|
138 |
EAPI="2" |
139 |
+NEED_PYTHON=2.5 |
140 |
|
141 |
inherit eutils distutils |
142 |
|
143 |
@@ -15,9 +16,12 @@ |
144 |
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" |
145 |
IUSE="git subversion test" |
146 |
|
147 |
-DEPEND="dev-python/pyxml |
148 |
+COMMON_DEPS="|| ( |
149 |
+ dev-lang/python[xml] |
150 |
+ ( dev-lang/python dev-python/pyxml ) )" |
151 |
+DEPEND="${COMMON_DEPS} |
152 |
test? ( dev-util/subversion )" |
153 |
-RDEPEND=">=dev-lang/python-2.5 |
154 |
+RDEPEND="${COMMON_DEPS} |
155 |
git? ( dev-util/git ) |
156 |
subversion? ( |
157 |
|| ( |
158 |
|
159 |
|
160 |
|
161 |
1.2 app-portage/layman/layman-9999.ebuild |
162 |
|
163 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-9999.ebuild?rev=1.2&view=markup |
164 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-9999.ebuild?rev=1.2&content-type=text/plain |
165 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/layman/layman-9999.ebuild?r1=1.1&r2=1.2 |
166 |
|
167 |
Index: layman-9999.ebuild |
168 |
=================================================================== |
169 |
RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v |
170 |
retrieving revision 1.1 |
171 |
retrieving revision 1.2 |
172 |
diff -u -r1.1 -r1.2 |
173 |
--- layman-9999.ebuild 29 Dec 2009 00:29:40 -0000 1.1 |
174 |
+++ layman-9999.ebuild 30 Dec 2009 22:23:44 -0000 1.2 |
175 |
@@ -1,8 +1,9 @@ |
176 |
# Copyright 1999-2009 Gentoo Foundation |
177 |
# Distributed under the terms of the GNU General Public License v2 |
178 |
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.1 2009/12/29 00:29:40 sping Exp $ |
179 |
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.2 2009/12/30 22:23:44 sping Exp $ |
180 |
|
181 |
EAPI="2" |
182 |
+NEED_PYTHON=2.5 |
183 |
SUPPORT_PYTHON_ABIS="1" |
184 |
|
185 |
inherit eutils distutils git |
186 |
@@ -17,10 +18,13 @@ |
187 |
KEYWORDS="" |
188 |
IUSE="git subversion test" |
189 |
|
190 |
-DEPEND="dev-python/pyxml |
191 |
+COMMON_DEPS="|| ( |
192 |
+ dev-lang/python[xml] |
193 |
+ ( dev-lang/python dev-python/pyxml ) )" |
194 |
+DEPEND="${COMMON_DEPS} |
195 |
test? ( dev-util/subversion ) |
196 |
app-text/xmlto" |
197 |
-RDEPEND=">=dev-lang/python-2.5 |
198 |
+RDEPEND="${COMMON_DEPS} |
199 |
git? ( dev-util/git ) |
200 |
subversion? ( |
201 |
|| ( |