1 |
arfrever 10/12/30 00:58:58 |
2 |
|
3 |
Modified: ChangeLog pykde4-4.4.5.ebuild |
4 |
Log: |
5 |
Fix building with newer versions of dev-python/sip (bug #332503, bug #349707). |
6 |
|
7 |
(Portage version: 2.2.0_alpha10_p17/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.95 kde-base/pykde4/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.95&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.95&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?r1=1.94&r2=1.95 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v |
19 |
retrieving revision 1.94 |
20 |
retrieving revision 1.95 |
21 |
diff -u -r1.94 -r1.95 |
22 |
--- ChangeLog 2 Dec 2010 21:16:48 -0000 1.94 |
23 |
+++ ChangeLog 30 Dec 2010 00:58:57 -0000 1.95 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for kde-base/pykde4 |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.94 2010/12/02 21:16:48 alexxy Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.95 2010/12/30 00:58:57 arfrever Exp $ |
29 |
+ |
30 |
+ 29 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
31 |
+ pykde4-4.4.5.ebuild, +files/pykde4-4.4.5-sip-4.12.patch: |
32 |
+ Fix building with newer versions of dev-python/sip (bug #332503, bug #349707). |
33 |
|
34 |
*pykde4-4.5.4 (02 Dec 2010) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.8 kde-base/pykde4/pykde4-4.4.5.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.5.ebuild?rev=1.8&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.5.ebuild?rev=1.8&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.5.ebuild?r1=1.7&r2=1.8 |
44 |
|
45 |
Index: pykde4-4.4.5.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.5.ebuild,v |
48 |
retrieving revision 1.7 |
49 |
retrieving revision 1.8 |
50 |
diff -u -r1.7 -r1.8 |
51 |
--- pykde4-4.4.5.ebuild 9 Aug 2010 17:34:07 -0000 1.7 |
52 |
+++ pykde4-4.4.5.ebuild 30 Dec 2010 00:58:57 -0000 1.8 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.5.ebuild,v 1.7 2010/08/09 17:34:07 scarabeus Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.5.ebuild,v 1.8 2010/12/30 00:58:57 arfrever Exp $ |
58 |
|
59 |
EAPI="3" |
60 |
|
61 |
@@ -43,6 +43,9 @@ |
62 |
|
63 |
# See bug 322351 |
64 |
use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch" |
65 |
+ |
66 |
+ has_version ">=dev-python/sip-4.11" && epatch "${FILESDIR}/${PN}-mapped-type-fix.patch" |
67 |
+ has_version ">=dev-python/sip-4.12" && epatch "${FILESDIR}/${P}-sip-4.12.patch" |
68 |
} |
69 |
|
70 |
src_configure() { |