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

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/midori: midori-0.2.4.ebuild ChangeLog midori-9999.ebuild midori-0.2.2.ebuild
Date: Wed, 31 Mar 2010 15:04:01
Message-Id: E1NwzSO-0005XT-Sk@stork.gentoo.org
1 ssuominen 10/03/31 15:03:48
2
3 Modified: midori-0.2.4.ebuild ChangeLog midori-9999.ebuild
4 Removed: midori-0.2.2.ebuild
5 Log:
6 Use Python 2.x instead of Python 3.x for ./waf wrt #302555.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 www-client/midori/midori-0.2.4.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-0.2.4.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-0.2.4.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-0.2.4.ebuild?r1=1.2&r2=1.3
15
16 Index: midori-0.2.4.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.4.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- midori-0.2.4.ebuild 10 Mar 2010 15:51:16 -0000 1.2
23 +++ midori-0.2.4.ebuild 31 Mar 2010 15:03:48 -0000 1.3
24 @@ -1,9 +1,12 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.4.ebuild,v 1.2 2010/03/10 15:51:16 ssuominen Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.4.ebuild,v 1.3 2010/03/31 15:03:48 ssuominen Exp $
29
30 EAPI=2
31 -inherit eutils xfconf multilib
32 +
33 +PYTHON_DEPEND="2:2.6"
34 +
35 +inherit eutils multilib python xfconf
36
37 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
38 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
39 @@ -23,15 +26,17 @@
40 idn? ( net-dns/libidn )
41 sqlite? ( >=dev-db/sqlite-3.0 )
42 unique? ( dev-libs/libunique )"
43 -
44 DEPEND="${RDEPEND}
45 - dev-lang/python
46 dev-util/intltool
47 dev-util/pkgconfig
48 doc? ( dev-util/gtk-doc )
49 html? ( dev-python/docutils )
50 nls? ( sys-devel/gettext )"
51
52 +pkg_setup() {
53 + python_set_active_version 2
54 +}
55 +
56 src_prepare() {
57 # moving docs to version-specific directory
58 sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript || die
59
60
61
62 1.28 www-client/midori/ChangeLog
63
64 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/ChangeLog?rev=1.28&view=markup
65 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/ChangeLog?rev=1.28&content-type=text/plain
66 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/ChangeLog?r1=1.27&r2=1.28
67
68 Index: ChangeLog
69 ===================================================================
70 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v
71 retrieving revision 1.27
72 retrieving revision 1.28
73 diff -u -r1.27 -r1.28
74 --- ChangeLog 10 Mar 2010 15:51:16 -0000 1.27
75 +++ ChangeLog 31 Mar 2010 15:03:48 -0000 1.28
76 @@ -1,6 +1,10 @@
77 # ChangeLog for www-client/midori
78 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
79 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.27 2010/03/10 15:51:16 ssuominen Exp $
80 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.28 2010/03/31 15:03:48 ssuominen Exp $
81 +
82 + 31 Mar 2010; Samuli Suominen <ssuominen@g.o> midori-0.2.4.ebuild,
83 + midori-9999.ebuild:
84 + Use Python 2.x instead of Python 3.x for ./waf wrt #302555.
85
86 10 Mar 2010; Samuli Suominen <ssuominen@g.o> midori-0.2.4.ebuild,
87 midori-9999.ebuild:
88
89
90
91 1.15 www-client/midori/midori-9999.ebuild
92
93 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.15&view=markup
94 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.15&content-type=text/plain
95 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.14&r2=1.15
96
97 Index: midori-9999.ebuild
98 ===================================================================
99 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v
100 retrieving revision 1.14
101 retrieving revision 1.15
102 diff -u -r1.14 -r1.15
103 --- midori-9999.ebuild 10 Mar 2010 15:51:16 -0000 1.14
104 +++ midori-9999.ebuild 31 Mar 2010 15:03:48 -0000 1.15
105 @@ -1,9 +1,12 @@
106 # Copyright 1999-2010 Gentoo Foundation
107 # Distributed under the terms of the GNU General Public License v2
108 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.14 2010/03/10 15:51:16 ssuominen Exp $
109 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.15 2010/03/31 15:03:48 ssuominen Exp $
110
111 -EAPI="2"
112 -inherit eutils xfconf multilib git
113 +EAPI=2
114 +
115 +PYTHON_DEPEND="2:2.6"
116 +
117 +inherit eutils multilib python xfconf git
118
119 DESCRIPTION="A lightweight web browser"
120 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
121 @@ -25,14 +28,16 @@
122 idn? ( net-dns/libidn )
123 sqlite? ( >=dev-db/sqlite-3.0 )
124 unique? ( dev-libs/libunique )"
125 -
126 DEPEND="${RDEPEND}
127 - dev-lang/python
128 dev-util/pkgconfig
129 doc? ( dev-util/gtk-doc )
130 html? ( dev-python/docutils )
131 nls? ( sys-devel/gettext )"
132
133 +pkg_setup() {
134 + python_set_active_version 2
135 +}
136 +
137 src_prepare() {
138 # moving docs to version-specific directory
139 sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript
Report Message
Find on MARC Find on Google Groups