Gentoo Archives: gentoo-commits

From: "Michael Palimaka (kensington)" <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-qt/qtdemo: qtdemo-4.8.6-r1.ebuild qtdemo-4.8.5-r1.ebuild ChangeLog
Date: Wed, 31 Dec 2014 13:11:37
Message-Id: 20141231131133.15743E914@oystercatcher.gentoo.org
1 kensington 14/12/31 13:11:33
2
3 Modified: qtdemo-4.8.6-r1.ebuild qtdemo-4.8.5-r1.ebuild
4 ChangeLog
5 Log:
6 Enforce USE dependency for media-libs/phonon.
7
8 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
9
10 Revision Changes Path
11 1.2 dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild?r1=1.1&r2=1.2
16
17 Index: qtdemo-4.8.6-r1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- qtdemo-4.8.6-r1.ebuild 15 Nov 2014 02:36:28 -0000 1.1
24 +++ qtdemo-4.8.6-r1.ebuild 31 Dec 2014 13:11:33 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:36:28 pesa Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild,v 1.2 2014/12/31 13:11:33 kensington Exp $
30
31 EAPI=5
32
33 @@ -31,8 +31,8 @@
34 opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
35 openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
36 phonon? (
37 - kde? ( media-libs/phonon[aqua=] )
38 - !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=] ) )
39 + kde? ( media-libs/phonon[aqua=,qt4] )
40 + !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=,qt4] ) )
41 )
42 webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
43 xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
44
45
46
47 1.7 dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild?rev=1.7&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild?rev=1.7&content-type=text/plain
51 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild?r1=1.6&r2=1.7
52
53 Index: qtdemo-4.8.5-r1.ebuild
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v
56 retrieving revision 1.6
57 retrieving revision 1.7
58 diff -u -r1.6 -r1.7
59 --- qtdemo-4.8.5-r1.ebuild 28 Dec 2013 02:06:13 -0000 1.6
60 +++ qtdemo-4.8.5-r1.ebuild 31 Dec 2014 13:11:33 -0000 1.7
61 @@ -1,6 +1,6 @@
62 -# Copyright 1999-2013 Gentoo Foundation
63 +# Copyright 1999-2014 Gentoo Foundation
64 # Distributed under the terms of the GNU General Public License v2
65 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.6 2013/12/28 02:06:13 pesa Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.7 2014/12/31 13:11:33 kensington Exp $
67
68 EAPI=4
69
70 @@ -30,8 +30,8 @@
71 opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] )
72 openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] )
73 phonon? (
74 - kde? ( media-libs/phonon[aqua=] )
75 - !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
76 + kde? ( media-libs/phonon[aqua=,qt4] )
77 + !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=,qt4] ) )
78 )
79 qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
80 webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
81
82
83
84 1.13 dev-qt/qtdemo/ChangeLog
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/ChangeLog?rev=1.13&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/ChangeLog?rev=1.13&content-type=text/plain
88 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/ChangeLog?r1=1.12&r2=1.13
89
90 Index: ChangeLog
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v
93 retrieving revision 1.12
94 retrieving revision 1.13
95 diff -u -r1.12 -r1.13
96 --- ChangeLog 15 Nov 2014 02:36:28 -0000 1.12
97 +++ ChangeLog 31 Dec 2014 13:11:33 -0000 1.13
98 @@ -1,6 +1,10 @@
99 # ChangeLog for dev-qt/qtdemo
100 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
101 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.12 2014/11/15 02:36:28 pesa Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.13 2014/12/31 13:11:33 kensington Exp $
103 +
104 + 31 Dec 2014; Michael Palimaka <kensington@g.o> qtdemo-4.8.5-r1.ebuild,
105 + qtdemo-4.8.6-r1.ebuild:
106 + Enforce USE dependency for media-libs/phonon.
107
108 *qtdemo-4.8.6-r1 (15 Nov 2014)