Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-python/qscintilla-python/
Date: Mon, 27 Feb 2012 17:32:48
Message-Id: 1330363923.5cd6c3370640dd3914a0acd35467927e0d9bc90b.pesa@gentoo
1 commit: 5cd6c3370640dd3914a0acd35467927e0d9bc90b
2 Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 27 17:32:03 2012 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 27 17:32:03 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5cd6c337
7
8 [dev-python/qscintilla-python] Sync with portage.
9
10 ---
11 dev-python/qscintilla-python/Manifest | 2 +-
12 dev-python/qscintilla-python/metadata.xml | 18 +++++++-------
13 .../qscintilla-python-2.6.1_pre20111231.ebuild | 24 ++++++++++++-------
14 3 files changed, 25 insertions(+), 19 deletions(-)
15
16 diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
17 index 8bfaef1..26f1b18 100644
18 --- a/dev-python/qscintilla-python/Manifest
19 +++ b/dev-python/qscintilla-python/Manifest
20 @@ -1 +1 @@
21 -DIST QScintilla-gpl-snapshot-2.6.1-3171bb05b1d8.tar.gz 2725724 RMD160 f9f7e40071d58504aaf528b8e94190f7624895eb SHA1 3f9084cf417881dfeba096061b2a2a8c71ebdb1f SHA256 31c608150cdd0df95c92a72d3e2080b9123b3c106c6f4ea3e05f77fd0c340ff6
22 +DIST QScintilla-gpl-snapshot-2.6.1-3171bb05b1d8.tar.gz 2725724 SHA256 31c608150cdd0df95c92a72d3e2080b9123b3c106c6f4ea3e05f77fd0c340ff6 SHA512 3f31653b7b3253985856fb8140b4b58e7224a80d079999b8179c914d7f02298f81777c5aa7413aa4e372b37cc62fa7ebb36a759e8aa488691df5f7d3f5cbdf87 WHIRLPOOL f6ad5ce7625d75226d37b38fdd4c2ee40f5e0fbcaf8dc00afa6f57313e5b6af62e629603ba5709040d5d34ba47f038a76805dee2d7fff5841d40a00e79f4cc81
23
24 diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla-python/metadata.xml
25 index 7830f29..df82e70 100644
26 --- a/dev-python/qscintilla-python/metadata.xml
27 +++ b/dev-python/qscintilla-python/metadata.xml
28 @@ -1,13 +1,13 @@
29 <?xml version="1.0" encoding="UTF-8"?>
30 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
31 <pkgmetadata>
32 -<herd>python</herd>
33 -<herd>qt</herd>
34 -<upstream>
35 - <maintainer status="active">
36 - <email>phil@××××××××××××××××××.com</email>
37 - <name>Phil Thompson</name>
38 - </maintainer>
39 - <bugs-to>mailto:qscintilla@××××××××××××××××××.com</bugs-to>
40 -</upstream>
41 + <herd>python</herd>
42 + <herd>qt</herd>
43 + <upstream>
44 + <maintainer status="active">
45 + <email>phil@××××××××××××××××××.com</email>
46 + <name>Phil Thompson</name>
47 + </maintainer>
48 + <bugs-to>mailto:qscintilla@××××××××××××××××××.com</bugs-to>
49 + </upstream>
50 </pkgmetadata>
51
52 diff --git a/dev-python/qscintilla-python/qscintilla-python-2.6.1_pre20111231.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.6.1_pre20111231.ebuild
53 index d8cf256..156eaa9 100644
54 --- a/dev-python/qscintilla-python/qscintilla-python-2.6.1_pre20111231.ebuild
55 +++ b/dev-python/qscintilla-python/qscintilla-python-2.6.1_pre20111231.ebuild
56 @@ -1,10 +1,11 @@
57 -# Copyright 1999-2010 Gentoo Foundation
58 +# Copyright 1999-2012 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 # $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.3.ebuild,v 1.1 2010/03/18 01:12:23 yngwin Exp $
61
62 -EAPI="2"
63 +EAPI="3"
64 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
65 SUPPORT_PYTHON_ABIS="1"
66 +RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
67
68 inherit eutils python toolchain-funcs
69
70 @@ -17,10 +18,10 @@ SRC_URI="http://gentoo-el.org/~hwoarang/distfiles/${MY_P}.tar.gz"
71
72 LICENSE="|| ( GPL-2 GPL-3 )"
73 SLOT="0"
74 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
75 +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
76 IUSE="debug"
77
78 -DEPEND=">=dev-python/sip-4.10
79 +DEPEND=">=dev-python/sip-4.12
80 >=dev-python/PyQt4-4.7[X]
81 ~x11-libs/qscintilla-${PV}"
82 RDEPEND="${DEPEND}"
83 @@ -29,16 +30,21 @@ S="${WORKDIR}/${MY_P}/Python"
84
85 src_prepare() {
86 epatch "${FILESDIR}"/${PN}-2.5-nostrip.patch
87 +
88 python_copy_sources
89 }
90
91 src_configure() {
92 configuration() {
93 - local myconf="$(PYTHON) configure.py -p 4
94 - --destdir=$(python_get_sitedir)/PyQt4
95 - $(use debug && echo '--debug')"
96 - echo ${myconf}
97 - ${myconf}
98 + local myconf=("$(PYTHON)"
99 + configure.py
100 + --destdir="${EPREFIX}$(python_get_sitedir)/PyQt4"
101 + $(use debug && echo --debug)
102 + -p 4
103 + --no-timestamp
104 + )
105 + echo "${myconf[@]}"
106 + "${myconf[@]}"
107 }
108 python_execute_function -s configuration
109 }