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