Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-visualization/scidavis: ChangeLog scidavis-0.2.3.ebuild
Date: Wed, 06 Jan 2010 02:42:19
Message-Id: E1NSLqf-0000ua-LS@stork.gentoo.org
1 bicatali 10/01/06 02:42:13
2
3 Modified: ChangeLog scidavis-0.2.3.ebuild
4 Log:
5 Forced python, seems to be unavoidable, bug #289532
6 (Portage version: 2.2_rc61/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.11 sci-visualization/scidavis/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/scidavis/ChangeLog?rev=1.11&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/scidavis/ChangeLog?rev=1.11&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/scidavis/ChangeLog?r1=1.10&r2=1.11
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v
18 retrieving revision 1.10
19 retrieving revision 1.11
20 diff -u -r1.10 -r1.11
21 --- ChangeLog 3 Jan 2010 20:42:38 -0000 1.10
22 +++ ChangeLog 6 Jan 2010 02:42:13 -0000 1.11
23 @@ -1,6 +1,10 @@
24 # ChangeLog for sci-visualization/scidavis
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.10 2010/01/03 20:42:38 ssuominen Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.11 2010/01/06 02:42:13 bicatali Exp $
28 +
29 + 06 Jan 2010; Sébastien Fabbro <bicatali@g.o>
30 + scidavis-0.2.3.ebuild:
31 + Forced python, seems to be unavoidable, bug #289532
32
33 03 Jan 2010; Samuli Suominen <ssuominen@g.o> scidavis-0.2.3.ebuild:
34 Unrestrict x11-libs/qwt depend to allow also 5.2.0 (latest) wrt #299511.
35
36
37
38 1.4 sci-visualization/scidavis/scidavis-0.2.3.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild?rev=1.4&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild?rev=1.4&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild?r1=1.3&r2=1.4
43
44 Index: scidavis-0.2.3.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild,v
47 retrieving revision 1.3
48 retrieving revision 1.4
49 diff -u -r1.3 -r1.4
50 --- scidavis-0.2.3.ebuild 3 Jan 2010 20:42:38 -0000 1.3
51 +++ scidavis-0.2.3.ebuild 6 Jan 2010 02:42:13 -0000 1.4
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild,v 1.3 2010/01/03 20:42:38 ssuominen Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild,v 1.4 2010/01/06 02:42:13 bicatali Exp $
57
58 EAPI=2
59 inherit eutils qt4 fdo-mime
60 @@ -12,7 +12,7 @@
61 LICENSE="GPL-2"
62 SLOT="0"
63 KEYWORDS="~amd64 ~x86"
64 -IUSE="python"
65 +IUSE=""
66
67 LANGS="de es fr ja ru sv"
68 for l in ${LANGS}; do
69 @@ -31,12 +31,12 @@
70
71 DEPEND="${CDEPEND}
72 dev-util/pkgconfig
73 - python? ( >=dev-python/sip-4.7 )"
74 + >=dev-python/sip-4.7"
75
76 RDEPEND="${CDEPEND}
77 - python? ( >=dev-python/PyQt4-4.4[X]
78 - dev-python/pygsl
79 - sci-libs/scipy )"
80 + >=dev-python/PyQt4-4.4[X]
81 + dev-python/pygsl
82 + sci-libs/scipy"
83
84 src_prepare() {
85 epatch "${FILESDIR}"/${P}-profile.patch
86 @@ -50,11 +50,9 @@
87 -e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
88 -i fit*/*/*.pro || die "sed plugins failed"
89
90 - if use python; then
91 - sed -i \
92 - -e '/^include( python.pri )$/d' \
93 - ${PN}/${PN}.pro || die "sed python failed"
94 - fi
95 + sed -i \
96 + -e '/^include( python.pri )$/d' \
97 + ${PN}/${PN}.pro || die "sed python failed"
98 }
99
100 src_configure() {