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 dev-python/qscintilla-python: ChangeLog qscintilla-python-2.3.2-r1.ebuild
Date: Mon, 01 Jun 2009 22:10:12
Message-Id: E1MBFhk-00014n-Jg@stork.gentoo.org
1 yngwin 09/06/01 22:10:04
2
3 Modified: ChangeLog qscintilla-python-2.3.2-r1.ebuild
4 Log:
5 Correct use dep, move patching to src_prepare
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.23 dev-python/qscintilla-python/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/ChangeLog?rev=1.23&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/ChangeLog?rev=1.23&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/ChangeLog?r1=1.22&r2=1.23
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v
18 retrieving revision 1.22
19 retrieving revision 1.23
20 diff -u -r1.22 -r1.23
21 --- ChangeLog 27 Mar 2009 23:03:30 -0000 1.22
22 +++ ChangeLog 1 Jun 2009 22:10:04 -0000 1.23
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-python/qscintilla-python
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.22 2009/03/27 23:03:30 yngwin Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.23 2009/06/01 22:10:04 yngwin Exp $
28 +
29 + 01 Jun 2009; Ben de Groot <yngwin@g.o>
30 + qscintilla-python-2.3.2-r1.ebuild:
31 + Correct use dep, move patching to src_prepare
32
33 27 Mar 2009; Ben de Groot <yngwin@g.o>
34 -files/qscintilla-python-2.1-nostrip.patch, -qscintilla-python-2.1.ebuild,
35
36
37
38 1.2 dev-python/qscintilla-python/qscintilla-python-2.3.2-r1.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r1.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r1.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r1.ebuild?r1=1.1&r2=1.2
43
44 Index: qscintilla-python-2.3.2-r1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r1.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- qscintilla-python-2.3.2-r1.ebuild 7 Mar 2009 20:28:35 -0000 1.1
51 +++ qscintilla-python-2.3.2-r1.ebuild 1 Jun 2009 22:10:04 -0000 1.2
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r1.ebuild,v 1.1 2009/03/07 20:28:35 patrick Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r1.ebuild,v 1.2 2009/06/01 22:10:04 yngwin Exp $
57
58 EAPI="2"
59
60 @@ -19,32 +19,14 @@
61 IUSE="qt4"
62
63 DEPEND=">=dev-python/sip-4.4
64 - =x11-libs/qscintilla-${PV}*[qt4?]
65 + =x11-libs/qscintilla-${PV}*[qt4=]
66 qt4? ( >=dev-python/PyQt4-4.4 )
67 !qt4? ( >=dev-python/PyQt-3.17.6 )"
68 RDEPEND="${DEPEND}"
69
70 S=${WORKDIR}/${MY_P}/Python
71
72 -#pkg_setup() {
73 -# # this package needs to have same qt flags with qscintilla.
74 -# if use qt4; then
75 -# if ! built_with_use 'x11-libs/qscintilla' 'qt4'; then
76 -# eerror "Please build qscintilla with qt4 useflag."
77 -# die "qscintilla built without qt4."
78 -# fi
79 -# else
80 -# if built_with_use 'x11-libs/qscintilla' 'qt4'; then
81 -# eerror "Please build qscintilla without qt4 useflag."
82 -# die "qscintilla built with qt4"
83 -# fi
84 -# fi
85 -#}
86 -
87 -src_unpack() {
88 - unpack ${A}
89 - cd "${S}"
90 -
91 +src_prepare() {
92 epatch "${FILESDIR}"/${PN}-2.2-nostrip.patch
93 }
94
95 @@ -59,6 +41,7 @@
96 python_version
97 ${python} configure.py ${myconf} || die "configure.py failed"
98 }
99 +
100 src_compile() {
101 emake || die "emake failed"
102 }