* [gentoo-commits] gentoo-x86 commit in dev-util/cmake: ChangeLog cmake-2.8.0-r1.ebuild
@ 2010-01-24 18:52 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-01-24 18:52 UTC (permalink / raw
To: gentoo-commits
scarabeus 10/01/24 18:52:22
Modified: ChangeLog
Added: cmake-2.8.0-r1.ebuild
Log:
Drop some deps. Still needs work on ncurses are harddep when bootstraping but optional otherwise.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Revision Changes Path
1.125 dev-util/cmake/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.124&r2=1.125
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog 11 Jan 2010 01:25:08 -0000 1.124
+++ ChangeLog 24 Jan 2010 18:52:21 -0000 1.125
@@ -1,6 +1,13 @@
# ChangeLog for dev-util/cmake
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.124 2010/01/11 01:25:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.125 2010/01/24 18:52:21 scarabeus Exp $
+
+*cmake-2.8.0-r1 (24 Jan 2010)
+
+ 24 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ +cmake-2.8.0-r1.ebuild:
+ Drop some deps. Still needs work on ncurses are harddep when bootstraping
+ but optional otherwise.
11 Jan 2010; Jonathan Callen <abcd@gentoo.org>
+files/cmake-2.6.0-interix.patch, +files/cmake-2.6.3-darwin-bundle.patch,
1.1 dev-util/cmake/cmake-2.8.0-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.8.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.8.0-r1.ebuild?rev=1.1&content-type=text/plain
Index: cmake-2.8.0-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0-r1.ebuild,v 1.1 2010/01/24 18:52:21 scarabeus Exp $
EAPI="2"
inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils
MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
DESCRIPTION="Cross platform Make"
HOMEPAGE="http://www.cmake.org/"
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="emacs ncurses qt4 vim-syntax"
DEPEND="
|| (
>=net-misc/curl-7.16.7[gnutls]
>=net-misc/curl-7.16.7[nss]
>=net-misc/curl-7.16.7[openssl]
)
>=dev-libs/expat-2.0.1
sys-libs/zlib
ncurses? ( sys-libs/ncurses )
qt4? ( x11-libs/qt-gui:4 )
"
RDEPEND="${DEPEND}
emacs? ( virtual/emacs )
vim-syntax? (
|| (
app-editors/vim
app-editors/gvim
)
)
"
SITEFILE="50${PN}-gentoo.el"
VIMFILE="${PN}.vim"
S="${WORKDIR}/${MY_P}"
CMAKE_IN_SOURCE_BUILD=1
PATCHES=(
"${FILESDIR}"/${PN}-FindPythonLibs.patch
"${FILESDIR}"/${PN}-FindPythonInterp.patch
"${FILESDIR}"/${PN}-2.6.0-interix.patch
"${FILESDIR}"/${P}-more-no_host_paths.patch
"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
)
src_prepare() {
base_src_prepare
use prefix || EPREFIX=
# Add gcc libs to the default link paths
sed -i \
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib|g" \
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
}
src_configure() {
if [[ "$(gcc-major-version)" -eq "3" ]] ; then
append-flags "-fno-stack-protector"
fi
bootstrap=0
has_version ">=dev-util/cmake-2.6.1" || bootstrap=1
if [[ ${bootstrap} = 0 ]]; then
# Required version of CMake found, now test if it works
cmake --version &> /dev/null || bootstrap=1
fi
if [[ ${bootstrap} = 1 ]]; then
local qt_arg par_arg
tc-export CC CXX LD
if use qt4; then
qt_arg="--qt-gui"
else
qt_arg="--no-qt-gui"
fi
echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
if [ $? -eq 0 ]; then
par_arg=$(echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
par_arg="--parallel=${par_arg}"
else
par_arg="--parallel=1"
fi
./bootstrap \
--system-libs \
--prefix="${EPREFIX}"/usr \
--docdir=/share/doc/${PF} \
--datadir=/share/${PN} \
--mandir=/share/man \
"$qt_arg" \
"$par_arg" || die "./bootstrap failed"
else
# this is way much faster so we should prefer it if some cmake is
# around.
local mycmakeargs=(
-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-DCMAKE_DOC_DIR=/share/doc/${PF}
-DCMAKE_MAN_DIR=/share/man
-DCMAKE_DATA_DIR=/share/${PN}
$(cmake_utils_use_build ncurses CursesDialog)
$(cmake-utils_use_build qt4 QtDialog)
)
cmake-utils_src_configure
fi
}
src_compile() {
cmake-utils_src_compile
if use emacs; then
elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
fi
}
src_test() {
emake test || die "Tests failed"
}
src_install() {
cmake-utils_src_install
if use emacs; then
elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed"
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/syntax
doins Docs/cmake-syntax.vim
insinto /usr/share/vim/vimfiles/indent
doins Docs/cmake-indent.vim
insinto /usr/share/vim/vimfiles/ftdetect
doins "${FILESDIR}/${VIMFILE}"
fi
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/cmake: ChangeLog cmake-2.8.0-r1.ebuild
@ 2010-01-24 22:12 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-01-24 22:12 UTC (permalink / raw
To: gentoo-commits
scarabeus 10/01/24 22:12:29
Modified: ChangeLog cmake-2.8.0-r1.ebuild
Log:
Fix typo.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Revision Changes Path
1.126 dev-util/cmake/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.125&r2=1.126
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ChangeLog 24 Jan 2010 18:52:21 -0000 1.125
+++ ChangeLog 24 Jan 2010 22:12:29 -0000 1.126
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/cmake
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.125 2010/01/24 18:52:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.126 2010/01/24 22:12:29 scarabeus Exp $
+
+ 24 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ cmake-2.8.0-r1.ebuild:
+ Fix typo.
*cmake-2.8.0-r1 (24 Jan 2010)
1.2 dev-util/cmake/cmake-2.8.0-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.8.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.8.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.8.0-r1.ebuild?r1=1.1&r2=1.2
Index: cmake-2.8.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.8.0-r1.ebuild 24 Jan 2010 18:52:21 -0000 1.1
+++ cmake-2.8.0-r1.ebuild 24 Jan 2010 22:12:29 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0-r1.ebuild,v 1.1 2010/01/24 18:52:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0-r1.ebuild,v 1.2 2010/01/24 22:12:29 scarabeus Exp $
EAPI="2"
@@ -114,7 +114,7 @@
-DCMAKE_DOC_DIR=/share/doc/${PF}
-DCMAKE_MAN_DIR=/share/man
-DCMAKE_DATA_DIR=/share/${PN}
- $(cmake_utils_use_build ncurses CursesDialog)
+ $(cmake-utils_use_build ncurses CursesDialog)
$(cmake-utils_use_build qt4 QtDialog)
)
cmake-utils_src_configure
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-24 22:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-24 22:12 [gentoo-commits] gentoo-x86 commit in dev-util/cmake: ChangeLog cmake-2.8.0-r1.ebuild Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2010-01-24 18:52 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox