Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qscintilla: ChangeLog qscintilla-2.3.2.ebuild
Date: Mon, 01 Jun 2009 22:28:52
Message-Id: E1MBFzt-0001aT-P2@stork.gentoo.org
1 yngwin 09/06/01 22:28:49
2
3 Modified: ChangeLog qscintilla-2.3.2.ebuild
4 Log:
5 Move to EAPI=2, and add use dep
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.25 x11-libs/qscintilla/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/ChangeLog?rev=1.25&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/ChangeLog?rev=1.25&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/ChangeLog?r1=1.24&r2=1.25
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v
18 retrieving revision 1.24
19 retrieving revision 1.25
20 diff -u -r1.24 -r1.25
21 --- ChangeLog 29 May 2009 23:22:53 -0000 1.24
22 +++ ChangeLog 1 Jun 2009 22:28:49 -0000 1.25
23 @@ -1,6 +1,9 @@
24 # ChangeLog for x11-libs/qscintilla
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.24 2009/05/29 23:22:53 yngwin Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.25 2009/06/01 22:28:49 yngwin Exp $
28 +
29 + 01 Jun 2009; Ben de Groot <yngwin@g.o> qscintilla-2.3.2.ebuild:
30 + Move to EAPI=2, and add use dep
31
32 29 May 2009; Ben de Groot <yngwin@g.o> qscintilla-2.3.2.ebuild:
33 Remove monolithic qt4 dep, as only split is in tree
34
35
36
37 1.9 x11-libs/qscintilla/qscintilla-2.3.2.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild?rev=1.9&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild?rev=1.9&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild?r1=1.8&r2=1.9
42
43 Index: qscintilla-2.3.2.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v
46 retrieving revision 1.8
47 retrieving revision 1.9
48 diff -u -r1.8 -r1.9
49 --- qscintilla-2.3.2.ebuild 29 May 2009 23:22:53 -0000 1.8
50 +++ qscintilla-2.3.2.ebuild 1 Jun 2009 22:28:49 -0000 1.9
51 @@ -1,8 +1,8 @@
52 # Copyright 1999-2009 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.8 2009/05/29 23:22:53 yngwin Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.9 2009/06/01 22:28:49 yngwin Exp $
56
57 -EAPI=1
58 +EAPI=2
59 inherit eutils toolchain-funcs multilib
60
61 MY_P="${PN/qs/QS}-gpl-${PV}"
62 @@ -22,11 +22,9 @@
63 DEPEND="${RDEPEND}"
64 # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
65 # need dev-python/PyQt, bug 199543
66 -PDEPEND="python? ( dev-python/qscintilla-python )"
67 -
68 -src_unpack() {
69 - unpack ${A}
70 +PDEPEND="python? ( dev-python/qscintilla-python[qt4=] )"
71
72 +src_configure() {
73 local myqmake myqtdir
74 if use qt4; then
75 myqmake=/usr/bin/qmake