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-libs/libattica: libattica-0.4.2.ebuild ChangeLog
Date: Sun, 30 Nov 2014 14:05:13
Message-Id: 20141130140508.D84A4B396@oystercatcher.gentoo.org
1 kensington 14/11/30 14:05:08
2
3 Modified: libattica-0.4.2.ebuild ChangeLog
4 Log:
5 Force Qt4 build wrt bug #531184.
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
8
9 Revision Changes Path
10 1.6 dev-libs/libattica/libattica-0.4.2.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild?r1=1.5&r2=1.6
15
16 Index: libattica-0.4.2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- libattica-0.4.2.ebuild 2 Aug 2013 14:33:10 -0000 1.5
23 +++ libattica-0.4.2.ebuild 30 Nov 2014 14:05:08 -0000 1.6
24 @@ -1,6 +1,6 @@
25 -# Copyright 1999-2013 Gentoo Foundation
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-libs/libattica/libattica-0.4.2.ebuild,v 1.5 2013/08/02 14:33:10 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild,v 1.6 2014/11/30 14:05:08 kensington Exp $
30
31 EAPI=5
32
33 @@ -23,31 +23,15 @@
34
35 LICENSE="GPL-2 LGPL-2"
36 SLOT="0"
37 -IUSE="debug +qt4 qt5 test"
38 -
39 -REQUIRED_USE="^^ ( qt4 qt5 )"
40 +IUSE="debug test"
41
42 RDEPEND="
43 - qt4? ( dev-qt/qtcore:4 )
44 - qt5? (
45 - dev-qt/qtcore:5
46 - dev-qt/qtnetwork:5
47 - )
48 + dev-qt/qtcore:4
49 "
50 DEPEND="${RDEPEND}
51 - qt5? (
52 - dev-libs/extra-cmake-modules
53 - dev-qt/qtconcurrent:5
54 - )
55 test? (
56 - qt4? (
57 - dev-qt/qtgui:4
58 - dev-qt/qttest:4
59 - )
60 - qt5? (
61 - dev-qt/qttest:5
62 - dev-qt/qtwidgets:5
63 - )
64 + dev-qt/qtgui:4
65 + dev-qt/qttest:4
66 )
67 "
68
69 @@ -57,7 +41,7 @@
70
71 src_configure() {
72 local mycmakeargs=(
73 - $(cmake-utils_use_find_package qt5 Qt5Core)
74 + -DQT4_BUILD=true
75 $(cmake-utils_use test ATTICA_ENABLE_TESTS)
76 )
77 cmake-utils_src_configure
78
79
80
81 1.50 dev-libs/libattica/ChangeLog
82
83 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/ChangeLog?rev=1.50&view=markup
84 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/ChangeLog?rev=1.50&content-type=text/plain
85 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/ChangeLog?r1=1.49&r2=1.50
86
87 Index: ChangeLog
88 ===================================================================
89 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libattica/ChangeLog,v
90 retrieving revision 1.49
91 retrieving revision 1.50
92 diff -u -r1.49 -r1.50
93 --- ChangeLog 2 Aug 2013 17:30:09 -0000 1.49
94 +++ ChangeLog 30 Nov 2014 14:05:08 -0000 1.50
95 @@ -1,6 +1,9 @@
96 # ChangeLog for dev-libs/libattica
97 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
98 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/ChangeLog,v 1.49 2013/08/02 17:30:09 johu Exp $
99 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
100 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/ChangeLog,v 1.50 2014/11/30 14:05:08 kensington Exp $
101 +
102 + 30 Nov 2014; Michael Palimaka <kensington@g.o> libattica-0.4.2.ebuild:
103 + Force Qt4 build wrt bug #531184.
104
105 02 Aug 2013; Johannes Huber <johu@g.o>
106 -files/libattica-0.4.1-automagic.patch, -files/libattica-0.4.1-qt5.patch,