From d81599f57b2c0d249848bae3b589c7572c0b8394 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Fri, 30 Nov 2012 21:59:52 +0000 Subject: Version bump. Fixed parallel doc building (bug #437482) and doc installation directory (Portage version: 2.2.01.21313-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) --- sci-physics/clhep/ChangeLog | 9 +++++- sci-physics/clhep/clhep-2.1.2.3.ebuild | 47 ----------------------------- sci-physics/clhep/clhep-2.1.2.4.ebuild | 10 ++++++- sci-physics/clhep/clhep-2.1.3.1.ebuild | 55 ++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 49 deletions(-) delete mode 100644 sci-physics/clhep/clhep-2.1.2.3.ebuild create mode 100644 sci-physics/clhep/clhep-2.1.3.1.ebuild (limited to 'sci-physics/clhep') diff --git a/sci-physics/clhep/ChangeLog b/sci-physics/clhep/ChangeLog index e4866d29e5c7..669e19af0b79 100644 --- a/sci-physics/clhep/ChangeLog +++ b/sci-physics/clhep/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-physics/clhep # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.43 2012/08/14 20:17:28 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.44 2012/11/30 21:59:52 bicatali Exp $ + +*clhep-2.1.3.1 (30 Nov 2012) + + 30 Nov 2012; Sébastien Fabbro +clhep-2.1.3.1.ebuild, + -clhep-2.1.2.3.ebuild, clhep-2.1.2.4.ebuild: + Version bump. Fixed parallel doc building (bug #437482) and doc installation + directory 14 Aug 2012; Sébastien Fabbro +files/clhep-2.1.2.4-lsb-whitespace.patch, clhep-2.1.2.4.ebuild: diff --git a/sci-physics/clhep/clhep-2.1.2.3.ebuild b/sci-physics/clhep/clhep-2.1.2.3.ebuild deleted file mode 100644 index 9760f1fcd507..000000000000 --- a/sci-physics/clhep/clhep-2.1.2.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.2.3.ebuild,v 1.1 2012/06/28 00:31:06 bicatali Exp $ - -EAPI=4 - -inherit cmake-utils multilib - -DESCRIPTION="High Energy Physics C++ library" -HOMEPAGE="http://www.cern.ch/clhep" -SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux" - -IUSE="doc static-libs test" -RDEPEND="" -DEPEND="${RDEPEND} - doc? ( virtual/latex-base )" - -S="${WORKDIR}/${PV}/CLHEP" - -src_prepare() { - epatch "${FILESDIR}"/${P}-libdir.patch - # respect flags - sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die - # dont build test if not asked - if ! use test; then - sed -i \ - -e '/add_subdirectory(test)/d' \ - */CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable test TESTING) - $(cmake-utils_use doc CLHEP_BUILD_DOCS) - ) - DESTDIR="${ED}" cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a - dodoc README ChangeLog -} diff --git a/sci-physics/clhep/clhep-2.1.2.4.ebuild b/sci-physics/clhep/clhep-2.1.2.4.ebuild index 495d8601f355..adc252072fd5 100644 --- a/sci-physics/clhep/clhep-2.1.2.4.ebuild +++ b/sci-physics/clhep/clhep-2.1.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.2.4.ebuild,v 1.2 2012/08/14 20:17:28 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.2.4.ebuild,v 1.3 2012/11/30 21:59:52 bicatali Exp $ EAPI=4 @@ -25,6 +25,14 @@ src_prepare() { epatch "${FILESDIR}"/${P}-lsb-whitespace.patch # respect flags sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die + # no batch mode to allow parallel building (bug #437482) + sed -i \ + -e 's:-interaction=batchmode::g' \ + cmake/Modules/ClhepBuildTex.cmake || die + # gentoo doc directory + sed -i \ + -e "/DESTINATION/s:doc:share/doc/${PF}:" \ + cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die # dont build test if not asked if ! use test; then sed -i \ diff --git a/sci-physics/clhep/clhep-2.1.3.1.ebuild b/sci-physics/clhep/clhep-2.1.3.1.ebuild new file mode 100644 index 000000000000..bbe047cccbc3 --- /dev/null +++ b/sci-physics/clhep/clhep-2.1.3.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.3.1.ebuild,v 1.1 2012/11/30 21:59:52 bicatali Exp $ + +EAPI=4 + +inherit cmake-utils multilib + +DESCRIPTION="High Energy Physics C++ library" +HOMEPAGE="http://www.cern.ch/clhep" +SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz" +LICENSE="GPL-3 LGPL-3" +SLOT="2" +KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux" + +IUSE="doc static-libs test" +RDEPEND="" +DEPEND="${RDEPEND} + doc? ( virtual/latex-base )" + +S="${WORKDIR}/${PV}/CLHEP" + +src_prepare() { + # respect flags + sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die + # no batch mode to allow parallel building (bug #437482) + sed -i \ + -e 's:-interaction=batchmode::g' \ + cmake/Modules/ClhepBuildTex.cmake || die + # gentoo doc directory + sed -i \ + -e "/DESTINATION/s:doc:share/doc/${PF}:" \ + cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die + # dont build test if not asked + if ! use test; then + sed -i \ + -e '/add_subdirectory(test)/d' \ + */CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_enable test TESTING) + $(cmake-utils_use doc CLHEP_BUILD_DOCS) + ) + DESTDIR="${ED}" cmake-utils_src_configure + use doc && MAKEOPTS+=" -j1" +} + +src_install() { + cmake-utils_src_install + use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a + dodoc README ChangeLog +} -- cgit v1.2.3-65-gdbad