Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-geosciences/qgis: ChangeLog qgis-1.5.0.ebuild
Date: Sun, 23 Jan 2011 17:15:28
Message-Id: 20110123171518.DFB6620057@flycatcher.gentoo.org
1 scarabeus 11/01/23 17:15:18
2
3 Modified: ChangeLog qgis-1.5.0.ebuild
4 Log:
5 Fix compilation with newest pyqt. Per bug #352493
6
7 (Portage version: 2.2.0_alpha15/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.17 sci-geosciences/qgis/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/ChangeLog?rev=1.17&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/ChangeLog?rev=1.17&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/ChangeLog?r1=1.16&r2=1.17
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v
19 retrieving revision 1.16
20 retrieving revision 1.17
21 diff -u -r1.16 -r1.17
22 --- ChangeLog 21 Dec 2010 14:37:08 -0000 1.16
23 +++ ChangeLog 23 Jan 2011 17:15:18 -0000 1.17
24 @@ -1,6 +1,10 @@
25 # ChangeLog for sci-geosciences/qgis
26 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.16 2010/12/21 14:37:08 scarabeus Exp $
28 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.17 2011/01/23 17:15:18 scarabeus Exp $
30 +
31 + 23 Jan 2011; Tomáš Chvátal <scarabeus@g.o> qgis-1.5.0.ebuild,
32 + +files/qgis-1.5.0-qset.patch:
33 + Fix compilation with newest pyqt. Per bug #352493
34
35 21 Dec 2010; Tomáš Chvátal <scarabeus@g.o> qgis-1.5.0.ebuild,
36 +files/qgis-1.5.0-sip.patch:
37
38
39
40 1.3 sci-geosciences/qgis/qgis-1.5.0.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild?rev=1.3&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild?rev=1.3&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild?r1=1.2&r2=1.3
45
46 Index: qgis-1.5.0.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild,v
49 retrieving revision 1.2
50 retrieving revision 1.3
51 diff -u -r1.2 -r1.3
52 --- qgis-1.5.0.ebuild 21 Dec 2010 14:37:08 -0000 1.2
53 +++ qgis-1.5.0.ebuild 23 Jan 2011 17:15:18 -0000 1.3
54 @@ -1,6 +1,6 @@
55 -# Copyright 1999-2010 Gentoo Foundation
56 +# Copyright 1999-2011 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild,v 1.2 2010/12/21 14:37:08 scarabeus Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild,v 1.3 2011/01/23 17:15:18 scarabeus Exp $
60
61 EAPI=3
62
63 @@ -45,7 +45,10 @@
64 sys-devel/bison
65 sys-devel/flex"
66
67 -PATCHES=( "${FILESDIR}/${P}-sip.patch" )
68 +PATCHES=(
69 + "${FILESDIR}/${P}-sip.patch"
70 + "${FILESDIR}/${P}-qset.patch"
71 +)
72
73 pkg_setup() {
74 python_set_active_version 2