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/PyQt4: metadata.xml ChangeLog PyQt4-4.4.4-r5.ebuild
Date: Wed, 03 Jun 2009 22:53:28
Message-Id: E1MBzKm-0005xw-Vp@stork.gentoo.org
1 yngwin 09/06/03 22:53:24
2
3 Modified: metadata.xml ChangeLog PyQt4-4.4.4-r5.ebuild
4 Log:
5 Add kde useflag, for selecting media-sound/phonon, bug 270188
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.5 dev-python/PyQt4/metadata.xml
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/metadata.xml?rev=1.5&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/metadata.xml?rev=1.5&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/metadata.xml?r1=1.4&r2=1.5
14
15 Index: metadata.xml
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/metadata.xml,v
18 retrieving revision 1.4
19 retrieving revision 1.5
20 diff -u -r1.4 -r1.5
21 --- metadata.xml 1 Jun 2009 16:30:48 -0000 1.4
22 +++ metadata.xml 3 Jun 2009 22:53:24 -0000 1.5
23 @@ -1,17 +1,20 @@
24 <?xml version="1.0" encoding="UTF-8"?>
25 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
26 <pkgmetadata>
27 -<herd>python</herd>
28 -<herd>qt</herd>
29 -<use>
30 - <flag name='X'>Build the QtGui and QtDesigner modules</flag>
31 - <flag name='assistant'>Build the QtHelp and QtAssistant modules</flag>
32 - <flag name='opengl'>Build the QtOpenGL module</flag>
33 - <flag name='phonon'>Build the phonon module</flag>
34 - <flag name='qt3support'>Enable the Qt3Support libraries for Qt4</flag>
35 - <flag name='sql'>Build the QtSql module</flag>
36 - <flag name='svg'>Build the QtSvg module</flag>
37 - <flag name='webkit'>Build the QtWebKit module</flag>
38 - <flag name='xmlpatterns'>Build the QtXmlPatterns module</flag>
39 -</use>
40 + <herd>python</herd>
41 + <herd>qt</herd>
42 + <use>
43 + <flag name='X'>Build the QtGui and QtDesigner modules</flag>
44 + <flag name='assistant'>Build the QtHelp and QtAssistant modules</flag>
45 + <flag name='kde'>
46 + Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde
47 + </flag>
48 + <flag name='opengl'>Build the QtOpenGL module</flag>
49 + <flag name='phonon'>Build the phonon module</flag>
50 + <flag name='qt3support'>Enable the Qt3Support libraries for Qt4</flag>
51 + <flag name='sql'>Build the QtSql module</flag>
52 + <flag name='svg'>Build the QtSvg module</flag>
53 + <flag name='webkit'>Build the QtWebKit module</flag>
54 + <flag name='xmlpatterns'>Build the QtXmlPatterns module</flag>
55 + </use>
56 </pkgmetadata>
57
58
59
60 1.60 dev-python/PyQt4/ChangeLog
61
62 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.60&view=markup
63 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.60&content-type=text/plain
64 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.59&r2=1.60
65
66 Index: ChangeLog
67 ===================================================================
68 RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v
69 retrieving revision 1.59
70 retrieving revision 1.60
71 diff -u -r1.59 -r1.60
72 --- ChangeLog 2 Jun 2009 21:14:33 -0000 1.59
73 +++ ChangeLog 3 Jun 2009 22:53:24 -0000 1.60
74 @@ -1,6 +1,10 @@
75 # ChangeLog for dev-python/PyQt4
76 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
77 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.59 2009/06/02 21:14:33 yngwin Exp $
78 +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.60 2009/06/03 22:53:24 yngwin Exp $
79 +
80 + 03 Jun 2009; Ben de Groot <yngwin@g.o> PyQt4-4.4.4-r5.ebuild,
81 + metadata.xml:
82 + Add kde useflag, for selecting media-sound/phonon, bug 270188
83
84 02 Jun 2009; Ben de Groot <yngwin@g.o> PyQt4-4.4.4-r5.ebuild:
85 QtDesigner is triggered by USE=X, so hide sed behind X useflag. Thanks
86
87
88
89 1.3 dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild
90
91 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild?rev=1.3&view=markup
92 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild?rev=1.3&content-type=text/plain
93 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild?r1=1.2&r2=1.3
94
95 Index: PyQt4-4.4.4-r5.ebuild
96 ===================================================================
97 RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild,v
98 retrieving revision 1.2
99 retrieving revision 1.3
100 diff -u -r1.2 -r1.3
101 --- PyQt4-4.4.4-r5.ebuild 2 Jun 2009 21:14:33 -0000 1.2
102 +++ PyQt4-4.4.4-r5.ebuild 3 Jun 2009 22:53:24 -0000 1.3
103 @@ -1,6 +1,6 @@
104 # Copyright 1999-2009 Gentoo Foundation
105 # Distributed under the terms of the GNU General Public License v2
106 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild,v 1.2 2009/06/02 21:14:33 yngwin Exp $
107 +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild,v 1.3 2009/06/03 22:53:24 yngwin Exp $
108
109 EAPI="2"
110
111 @@ -16,7 +16,7 @@
112 SLOT="0"
113 LICENSE="GPL-2"
114 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
115 -IUSE="X assistant +dbus debug doc examples opengl phonon +qt3support sql svg webkit xmlpatterns"
116 +IUSE="X assistant +dbus debug doc examples kde opengl phonon +qt3support sql svg webkit xmlpatterns"
117
118 DEPEND=">=dev-python/sip-4.7.8
119 >=x11-libs/qt-core-${QTVER}:4[qt3support?]
120 @@ -29,7 +29,10 @@
121 >=x11-libs/qt-dbus-${QTVER}:4
122 )
123 opengl? ( >=x11-libs/qt-opengl-${QTVER}:4[qt3support?] )
124 - phonon? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
125 + phonon? (
126 + || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon )
127 + kde? ( media-sound/phonon )
128 + )
129 qt3support? ( >=x11-libs/qt-qt3support-${QTVER}:4 )
130 sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
131 svg? ( >=x11-libs/qt-svg-${QTVER}:4 )