1 |
johu 14/07/27 11:55:54 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cmake-3.0.0.ebuild |
5 |
Log: |
6 |
Version bump by Michael Palimaka <kensington@g.o>, bug #513682. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
9 |
|
10 |
Revision Changes Path |
11 |
1.291 dev-util/cmake/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.291&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.291&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.290&r2=1.291 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v |
20 |
retrieving revision 1.290 |
21 |
retrieving revision 1.291 |
22 |
diff -u -r1.290 -r1.291 |
23 |
--- ChangeLog 27 Jul 2014 11:38:49 -0000 1.290 |
24 |
+++ ChangeLog 27 Jul 2014 11:55:54 -0000 1.291 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for dev-util/cmake |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.290 2014/07/27 11:38:49 phajdan.jr Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.291 2014/07/27 11:55:54 johu Exp $ |
30 |
+ |
31 |
+*cmake-3.0.0 (27 Jul 2014) |
32 |
+ |
33 |
+ 27 Jul 2014; Johannes Huber <johu@g.o> +cmake-3.0.0.ebuild, |
34 |
+ +files/cmake-3.0.0-FindBLAS.patch, +files/cmake-3.0.0-FindBoost-python.patch, |
35 |
+ +files/cmake-3.0.0-FindLAPACK.patch, +files/cmake-3.0.0-prefix-dirs.patch: |
36 |
+ Version bump by Michael Palimaka <kensington@g.o>, bug #513682. |
37 |
|
38 |
26 Jul 2014; Pawel Hajdan jr <phajdan.jr@g.o> |
39 |
cmake-2.8.12.2-r1.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.1 dev-util/cmake/cmake-3.0.0.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.0.0.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.0.0.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: cmake-3.0.0.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.0.0.ebuild,v 1.1 2014/07/27 11:55:54 johu Exp $ |
53 |
|
54 |
EAPI=5 |
55 |
|
56 |
CMAKE_REMOVE_MODULES="no" |
57 |
inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx |
58 |
|
59 |
DESCRIPTION="Cross platform Make" |
60 |
HOMEPAGE="http://www.cmake.org/" |
61 |
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz" |
62 |
|
63 |
LICENSE="CMake" |
64 |
SLOT="0" |
65 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~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" |
66 |
IUSE="emacs ncurses qt4 qt5" |
67 |
|
68 |
REQUIRED_USE="?? ( qt4 qt5 )" |
69 |
|
70 |
DEPEND=" |
71 |
>=app-arch/libarchive-2.8.0:= |
72 |
>=dev-libs/expat-2.0.1 |
73 |
>=net-misc/curl-7.20.0-r1[ssl] |
74 |
sys-libs/zlib |
75 |
virtual/pkgconfig |
76 |
emacs? ( virtual/emacs ) |
77 |
ncurses? ( sys-libs/ncurses ) |
78 |
qt4? ( |
79 |
dev-qt/qtcore:4 |
80 |
dev-qt/qtgui:4 |
81 |
) |
82 |
qt5? ( |
83 |
dev-qt/qtcore:5 |
84 |
dev-qt/qtgui:5 |
85 |
dev-qt/qtwidgets:5 |
86 |
) |
87 |
" |
88 |
RDEPEND="${DEPEND}" |
89 |
|
90 |
SITEFILE="50${PN}-gentoo.el" |
91 |
|
92 |
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
93 |
|
94 |
PATCHES=( |
95 |
"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch |
96 |
"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch |
97 |
"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch |
98 |
"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch |
99 |
"${FILESDIR}"/${PN}-2.8.10-libform.patch |
100 |
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch |
101 |
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
102 |
"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch |
103 |
"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch |
104 |
"${FILESDIR}"/${PN}-3.0.0-FindLAPACK.patch |
105 |
"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch |
106 |
"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch |
107 |
) |
108 |
|
109 |
cmake_src_bootstrap() { |
110 |
# Cleanup args to extract only JOBS. |
111 |
# Because bootstrap does not know anything else. |
112 |
echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null |
113 |
if [ $? -eq 0 ]; then |
114 |
par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') |
115 |
par_arg="--parallel=${par_arg}" |
116 |
else |
117 |
par_arg="--parallel=1" |
118 |
fi |
119 |
|
120 |
# execinfo.h on Solaris isn't quite what it is on Darwin |
121 |
if [[ ${CHOST} == *-solaris* ]] ; then |
122 |
sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
123 |
fi |
124 |
|
125 |
tc-export CC CXX LD |
126 |
|
127 |
# bootstrap script isn't exactly /bin/sh compatible |
128 |
${CONFIG_SHELL:-sh} ./bootstrap \ |
129 |
--prefix="${T}/cmakestrap/" \ |
130 |
${par_arg} \ |
131 |
|| die "Bootstrap failed" |
132 |
} |
133 |
|
134 |
cmake_src_test() { |
135 |
# fix OutDir and SelectLibraryConfigurations tests |
136 |
# these are altered thanks to our eclass |
137 |
sed -i -e 's:#IGNORE ::g' \ |
138 |
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
139 |
|| die |
140 |
|
141 |
pushd "${BUILD_DIR}" > /dev/null |
142 |
|
143 |
local ctestargs |
144 |
[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
145 |
|
146 |
# Excluded tests: |
147 |
# BootstrapTest: we actualy bootstrap it every time so why test it. |
148 |
# CTest.updatecvs, which fails to commit as root |
149 |
# Qt4Deploy, which tries to break sandbox and ignores prefix |
150 |
# TestUpload, which requires network access |
151 |
"${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
152 |
-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ |
153 |
|| die "Tests failed" |
154 |
|
155 |
popd > /dev/null |
156 |
} |
157 |
|
158 |
src_prepare() { |
159 |
cmake-utils_src_prepare |
160 |
|
161 |
# disable running of cmake in boostrap command |
162 |
sed -i \ |
163 |
-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
164 |
bootstrap || die "sed failed" |
165 |
|
166 |
# Add gcc libs to the default link paths |
167 |
sed -i \ |
168 |
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
169 |
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
170 |
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
171 |
|
172 |
cmake_src_bootstrap |
173 |
} |
174 |
|
175 |
src_configure() { |
176 |
local mycmakeargs=( |
177 |
-DCMAKE_USE_SYSTEM_LIBRARIES=ON |
178 |
-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
179 |
-DCMAKE_DOC_DIR=/share/doc/${PF} |
180 |
-DCMAKE_MAN_DIR=/share/man |
181 |
-DCMAKE_DATA_DIR=/share/${PN} |
182 |
$(cmake-utils_use_build ncurses CursesDialog) |
183 |
) |
184 |
|
185 |
if use qt4 || use qt5 ; then |
186 |
mycmakeargs+=( |
187 |
-DBUILD_QtDialog=ON |
188 |
$(cmake-utils_use_find_package qt5 Qt5Widgets) |
189 |
) |
190 |
fi |
191 |
|
192 |
cmake-utils_src_configure |
193 |
} |
194 |
|
195 |
src_compile() { |
196 |
cmake-utils_src_compile |
197 |
use emacs && elisp-compile Auxiliary/cmake-mode.el |
198 |
} |
199 |
|
200 |
src_test() { |
201 |
VIRTUALX_COMMAND="cmake_src_test" virtualmake |
202 |
} |
203 |
|
204 |
src_install() { |
205 |
cmake-utils_src_install |
206 |
|
207 |
if use emacs; then |
208 |
elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
209 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
210 |
fi |
211 |
|
212 |
insinto /usr/share/vim/vimfiles/syntax |
213 |
doins Auxiliary/cmake-syntax.vim |
214 |
|
215 |
insinto /usr/share/vim/vimfiles/indent |
216 |
doins Auxiliary/cmake-indent.vim |
217 |
|
218 |
insinto /usr/share/vim/vimfiles/ftdetect |
219 |
doins "${FILESDIR}/${PN}.vim" |
220 |
|
221 |
dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
222 |
|
223 |
rm -rf "${D}/usr/share/cmake/{completions,editors}" || die |
224 |
} |
225 |
|
226 |
pkg_postinst() { |
227 |
use emacs && elisp-site-regen |
228 |
} |
229 |
|
230 |
pkg_postrm() { |
231 |
use emacs && elisp-site-regen |
232 |
} |