* [gentoo-commits] gentoo-x86 commit in dev-util/cmake: ChangeLog cmake-2.8.3.ebuild
@ 2010-12-16 12:33 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-12-16 12:33 UTC (permalink / raw
To: gentoo-commits
scarabeus 10/12/16 12:33:20
Modified: ChangeLog
Added: cmake-2.8.3.ebuild
Log:
Version bump. Per bug #344259. Thanks to Arseny Solokha for updated patches.
(Portage version: 2.2.0_alpha8/cvs/Linux x86_64)
Revision Changes Path
1.145 dev-util/cmake/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.144&r2=1.145
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- ChangeLog 11 Sep 2010 15:13:49 -0000 1.144
+++ ChangeLog 16 Dec 2010 12:33:20 -0000 1.145
@@ -1,6 +1,15 @@
# 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.144 2010/09/11 15:13:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.145 2010/12/16 12:33:20 scarabeus Exp $
+
+*cmake-2.8.3 (16 Dec 2010)
+
+ 16 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> +cmake-2.8.3.ebuild,
+ +files/cmake-2.8.3-FindLibArchive.patch,
+ +files/cmake-2.8.3-FindPythonInterp.patch,
+ +files/cmake-2.8.3-FindPythonLibs.patch,
+ +files/cmake-2.8.3-more-no_host_paths.patch:
+ Version bump. Per bug #344259. Thanks to Arseny Solokha for updated patches.
11 Sep 2010; Raúl Porcel <armin76@gentoo.org> cmake-2.8.1-r2.ebuild:
ia64/s390/sh/sparc stable wrt #325845
1.1 dev-util/cmake/cmake-2.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-2.8.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-2.8.3.ebuild?rev=1.1&content-type=text/plain
Index: cmake-2.8.3.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header $
EAPI="3"
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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="emacs ncurses qt4 vim-syntax"
DEPEND="
app-arch/libarchive
>=net-misc/curl-7.20.0-r1[ssl]
>=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_BINARY="${S}/Bootstrap.cmk/cmake"
CMAKE_IN_SOURCE_BUILD=1
PATCHES=(
"${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
"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
"${FILESDIR}"/${PN}-2.8.0-darwin-no-app-with-qt.patch
"${FILESDIR}"/${PN}-2.8.1-FindBoost.patch
"${FILESDIR}"/${PN}-2.8.1-libform.patch
"${FILESDIR}"/${PN}-2.8.3-FindLibArchive.patch
"${FILESDIR}"/${PN}-2.8.3-FindPythonLibs.patch
"${FILESDIR}"/${PN}-2.8.3-FindPythonInterp.patch
"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
)
_src_bootstrap() {
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
tc-export CC CXX LD
./bootstrap \
--prefix="${T}/cmakestrap/" \
${par_arg} \
|| die "Bootstrap failed"
}
src_prepare() {
base_src_prepare
# disable bootstrap cmake and make run, we use eclass for that
sed -i \
-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
bootstrap || die "sed failed"
# 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_bootstrap
}
src_configure() {
# make things work with gentoo java setup
# in case java-config cannot be run, the variable just becomes unset
# per bug #315229
export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
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
}
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 || die
insinto /usr/share/vim/vimfiles/indent
doins Docs/cmake-indent.vim || die
insinto /usr/share/vim/vimfiles/ftdetect
doins "${FILESDIR}/${VIMFILE}" || die
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.3.ebuild
@ 2010-12-20 13:40 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-12-20 13:40 UTC (permalink / raw
To: gentoo-commits
scarabeus 10/12/20 13:40:02
Modified: ChangeLog cmake-2.8.3.ebuild
Log:
Fix dependency on libarchive version. Fixes bug #348887.
(Portage version: 2.2.0_alpha9/cvs/Linux x86_64)
Revision Changes Path
1.147 dev-util/cmake/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.146&r2=1.147
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog 16 Dec 2010 12:36:21 -0000 1.146
+++ ChangeLog 20 Dec 2010 13:40:01 -0000 1.147
@@ -1,6 +1,9 @@
# 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.146 2010/12/16 12:36:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.147 2010/12/20 13:40:01 scarabeus Exp $
+
+ 20 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.3.ebuild:
+ Fix dependency on libarchive version. Fixes bug #348887.
16 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.1-r2.ebuild,
cmake-2.8.3.ebuild:
1.3 dev-util/cmake/cmake-2.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-2.8.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-2.8.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-2.8.3.ebuild?r1=1.2&r2=1.3
Index: cmake-2.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmake-2.8.3.ebuild 16 Dec 2010 12:36:21 -0000 1.2
+++ cmake-2.8.3.ebuild 20 Dec 2010 13:40:01 -0000 1.3
@@ -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.3.ebuild,v 1.2 2010/12/16 12:36:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.3.ebuild,v 1.3 2010/12/20 13:40:01 scarabeus Exp $
EAPI="3"
@@ -18,7 +18,7 @@
IUSE="emacs ncurses qt4 vim-syntax"
DEPEND="
- app-arch/libarchive
+ >=app-arch/libarchive-2.8.0
>=net-misc/curl-7.20.0-r1[ssl]
>=dev-libs/expat-2.0.1
sys-libs/zlib
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-20 13:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-16 12:33 [gentoo-commits] gentoo-x86 commit in dev-util/cmake: ChangeLog cmake-2.8.3.ebuild Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2010-12-20 13:40 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