Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-util/cmake: metadata.xml cmake-3.2.2.ebuild cmake-3.2.1.ebuild ChangeLog
Date: Thu, 28 May 2015 19:08:08
Message-Id: 20150528190802.F250AA0E@oystercatcher.gentoo.org
1 kensington 15/05/28 19:08:02
2
3 Modified: metadata.xml cmake-3.2.2.ebuild cmake-3.2.1.ebuild
4 ChangeLog
5 Log:
6 Replace internal-jsoncpp USE flag with system-jsoncpp to ensure that an initial install will succeed without user interaction.
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
9
10 Revision Changes Path
11 1.6 dev-util/cmake/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/metadata.xml?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/metadata.xml?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/metadata.xml?r1=1.5&r2=1.6
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/metadata.xml,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- metadata.xml 14 Apr 2015 07:42:24 -0000 1.5
24 +++ metadata.xml 28 May 2015 19:08:02 -0000 1.6
25 @@ -3,6 +3,6 @@
26 <pkgmetadata>
27 <herd>kde</herd>
28 <use>
29 - <flag name='internal-jsoncpp'>Use bundled copy of <pkg>dev-libs/jsoncpp</pkg>. Enable this in order solve the circular dependency between cmake and jsoncpp, disable afterwards.</flag>
30 + <flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
31 </use>
32 </pkgmetadata>
33
34
35
36 1.3 dev-util/cmake/cmake-3.2.2.ebuild
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild?rev=1.3&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild?rev=1.3&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild?r1=1.2&r2=1.3
41
42 Index: cmake-3.2.2.ebuild
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild,v
45 retrieving revision 1.2
46 retrieving revision 1.3
47 diff -u -r1.2 -r1.3
48 --- cmake-3.2.2.ebuild 15 May 2015 00:50:07 -0000 1.2
49 +++ cmake-3.2.2.ebuild 28 May 2015 19:08:02 -0000 1.3
50 @@ -1,6 +1,6 @@
51 # Copyright 1999-2015 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild,v 1.2 2015/05/15 00:50:07 floppym Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild,v 1.3 2015/05/28 19:08:02 kensington Exp $
55
56 EAPI=5
57
58 @@ -14,7 +14,7 @@
59 LICENSE="CMake"
60 SLOT="0"
61 KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
62 -IUSE="doc emacs internal-jsoncpp ncurses qt4 qt5"
63 +IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
64
65 REQUIRED_USE="?? ( qt4 qt5 )"
66
67 @@ -35,7 +35,7 @@
68 dev-qt/qtgui:5
69 dev-qt/qtwidgets:5
70 )
71 - !internal-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
72 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
73 "
74 DEPEND="${RDEPEND}
75 doc? ( dev-python/sphinx )
76 @@ -133,7 +133,7 @@
77 src_configure() {
78 local mycmakeargs=(
79 -DCMAKE_USE_SYSTEM_LIBRARIES=ON
80 - $(cmake-utils_useno internal-jsoncpp CMAKE_USE_SYSTEM_LIBRARY_JSONCPP)
81 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
82 -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
83 -DCMAKE_DOC_DIR=/share/doc/${PF}
84 -DCMAKE_MAN_DIR=/share/man
85
86
87
88 1.5 dev-util/cmake/cmake-3.2.1.ebuild
89
90 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild?rev=1.5&view=markup
91 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild?rev=1.5&content-type=text/plain
92 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild?r1=1.4&r2=1.5
93
94 Index: cmake-3.2.1.ebuild
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild,v
97 retrieving revision 1.4
98 retrieving revision 1.5
99 diff -u -r1.4 -r1.5
100 --- cmake-3.2.1.ebuild 15 May 2015 00:50:07 -0000 1.4
101 +++ cmake-3.2.1.ebuild 28 May 2015 19:08:02 -0000 1.5
102 @@ -1,6 +1,6 @@
103 # Copyright 1999-2015 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild,v 1.4 2015/05/15 00:50:07 floppym Exp $
106 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild,v 1.5 2015/05/28 19:08:02 kensington Exp $
107
108 EAPI=5
109
110 @@ -14,7 +14,7 @@
111 LICENSE="CMake"
112 SLOT="0"
113 KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
114 -IUSE="doc emacs internal-jsoncpp ncurses qt4 qt5"
115 +IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
116
117 REQUIRED_USE="?? ( qt4 qt5 )"
118
119 @@ -35,7 +35,7 @@
120 dev-qt/qtgui:5
121 dev-qt/qtwidgets:5
122 )
123 - !internal-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
124 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
125 "
126 DEPEND="${RDEPEND}
127 doc? ( dev-python/sphinx )
128 @@ -133,7 +133,7 @@
129 src_configure() {
130 local mycmakeargs=(
131 -DCMAKE_USE_SYSTEM_LIBRARIES=ON
132 - $(cmake-utils_useno internal-jsoncpp CMAKE_USE_SYSTEM_LIBRARY_JSONCPP)
133 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
134 -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
135 -DCMAKE_DOC_DIR=/share/doc/${PF}
136 -DCMAKE_MAN_DIR=/share/man
137
138
139
140 1.307 dev-util/cmake/ChangeLog
141
142 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.307&view=markup
143 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.307&content-type=text/plain
144 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.306&r2=1.307
145
146 Index: ChangeLog
147 ===================================================================
148 RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v
149 retrieving revision 1.306
150 retrieving revision 1.307
151 diff -u -r1.306 -r1.307
152 --- ChangeLog 15 May 2015 00:50:07 -0000 1.306
153 +++ ChangeLog 28 May 2015 19:08:02 -0000 1.307
154 @@ -1,6 +1,11 @@
155 # ChangeLog for dev-util/cmake
156 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
157 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.306 2015/05/15 00:50:07 floppym Exp $
158 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.307 2015/05/28 19:08:02 kensington Exp $
159 +
160 + 28 May 2015; Michael Palimaka <kensington@g.o> cmake-3.2.1.ebuild,
161 + cmake-3.2.2.ebuild, metadata.xml:
162 + Replace internal-jsoncpp USE flag with system-jsoncpp to ensure that an
163 + initial install will succeed without user interaction.
164
165 15 May 2015; Mike Gilbert <floppym@g.o> cmake-3.2.1.ebuild,
166 cmake-3.2.2.ebuild:
Report Message
Find on MARC Find on Google Groups