1 |
arfrever 10/12/30 18:08:19 |
2 |
|
3 |
Modified: ChangeLog PyQt4-4.8.1.ebuild PyQt4-4.8.2.ebuild |
4 |
PyQt4-4.8.1-r1.ebuild |
5 |
Log: |
6 |
Require x11-libs/qt-opengl[-egl] until bug #344513 is fixed. |
7 |
|
8 |
(Portage version: 2.2.0_alpha10_p22/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.141 dev-python/PyQt4/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.141&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.141&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.140&r2=1.141 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v |
20 |
retrieving revision 1.140 |
21 |
retrieving revision 1.141 |
22 |
diff -u -r1.140 -r1.141 |
23 |
--- ChangeLog 30 Dec 2010 01:11:19 -0000 1.140 |
24 |
+++ ChangeLog 30 Dec 2010 18:08:19 -0000 1.141 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for dev-python/PyQt4 |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.140 2010/12/30 01:11:19 arfrever Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.141 2010/12/30 18:08:19 arfrever Exp $ |
30 |
+ |
31 |
+ 30 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
32 |
+ PyQt4-4.8.1.ebuild, PyQt4-4.8.1-r1.ebuild, PyQt4-4.8.2.ebuild: |
33 |
+ Require x11-libs/qt-opengl[-egl] until bug #344513 is fixed. |
34 |
|
35 |
*PyQt4-4.8.1-r1 (30 Dec 2010) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.6 dev-python/PyQt4/PyQt4-4.8.1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild?rev=1.6&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild?rev=1.6&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild?r1=1.5&r2=1.6 |
45 |
|
46 |
Index: PyQt4-4.8.1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v |
49 |
retrieving revision 1.5 |
50 |
retrieving revision 1.6 |
51 |
diff -u -r1.5 -r1.6 |
52 |
--- PyQt4-4.8.1.ebuild 30 Dec 2010 01:11:19 -0000 1.5 |
53 |
+++ PyQt4-4.8.1.ebuild 30 Dec 2010 18:08:19 -0000 1.6 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2010 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.5 2010/12/30 01:11:19 arfrever Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.6 2010/12/30 18:08:19 arfrever Exp $ |
59 |
|
60 |
EAPI="3" |
61 |
PYTHON_DEPEND="*" |
62 |
@@ -35,7 +35,7 @@ |
63 |
>=x11-libs/qt-dbus-${QT_VER}:4 |
64 |
) |
65 |
multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 ) |
66 |
- opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 ) |
67 |
+ opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) |
68 |
phonon? ( |
69 |
!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) ) |
70 |
kde? ( media-sound/phonon ) |
71 |
|
72 |
|
73 |
|
74 |
1.3 dev-python/PyQt4/PyQt4-4.8.2.ebuild |
75 |
|
76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild?rev=1.3&view=markup |
77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild?rev=1.3&content-type=text/plain |
78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild?r1=1.2&r2=1.3 |
79 |
|
80 |
Index: PyQt4-4.8.2.ebuild |
81 |
=================================================================== |
82 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild,v |
83 |
retrieving revision 1.2 |
84 |
retrieving revision 1.3 |
85 |
diff -u -r1.2 -r1.3 |
86 |
--- PyQt4-4.8.2.ebuild 25 Dec 2010 15:01:17 -0000 1.2 |
87 |
+++ PyQt4-4.8.2.ebuild 30 Dec 2010 18:08:19 -0000 1.3 |
88 |
@@ -1,6 +1,6 @@ |
89 |
# Copyright 1999-2010 Gentoo Foundation |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild,v 1.2 2010/12/25 15:01:17 arfrever Exp $ |
92 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild,v 1.3 2010/12/30 18:08:19 arfrever Exp $ |
93 |
|
94 |
EAPI="3" |
95 |
PYTHON_DEPEND="*" |
96 |
@@ -36,7 +36,7 @@ |
97 |
) |
98 |
declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 ) |
99 |
multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 ) |
100 |
- opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 ) |
101 |
+ opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) |
102 |
phonon? ( |
103 |
!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) ) |
104 |
kde? ( media-sound/phonon ) |
105 |
|
106 |
|
107 |
|
108 |
1.2 dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild |
109 |
|
110 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild?rev=1.2&view=markup |
111 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild?rev=1.2&content-type=text/plain |
112 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild?r1=1.1&r2=1.2 |
113 |
|
114 |
Index: PyQt4-4.8.1-r1.ebuild |
115 |
=================================================================== |
116 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v |
117 |
retrieving revision 1.1 |
118 |
retrieving revision 1.2 |
119 |
diff -u -r1.1 -r1.2 |
120 |
--- PyQt4-4.8.1-r1.ebuild 30 Dec 2010 01:11:19 -0000 1.1 |
121 |
+++ PyQt4-4.8.1-r1.ebuild 30 Dec 2010 18:08:19 -0000 1.2 |
122 |
@@ -1,6 +1,6 @@ |
123 |
# Copyright 1999-2010 Gentoo Foundation |
124 |
# Distributed under the terms of the GNU General Public License v2 |
125 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v 1.1 2010/12/30 01:11:19 arfrever Exp $ |
126 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v 1.2 2010/12/30 18:08:19 arfrever Exp $ |
127 |
|
128 |
EAPI="3" |
129 |
PYTHON_DEPEND="*" |
130 |
@@ -36,7 +36,7 @@ |
131 |
) |
132 |
declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 ) |
133 |
multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 ) |
134 |
- opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 ) |
135 |
+ opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) |
136 |
phonon? ( |
137 |
!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) ) |
138 |
kde? ( media-sound/phonon ) |