diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2012-08-14 20:17:28 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-08-14 20:17:28 +0000 |
| commit | be510716b87fbf7f293d410d0adc1f0b0506e9e0 (patch) | |
| tree | 8cdee4a4e867a10e8814bb4bb4c328c6590bb0e5 /sci-physics/clhep | |
| parent | Bump eapi on bird to latest as dicussed on council meeting. Acked by chainsaw. (diff) | |
| download | gentoo-2-be510716b87fbf7f293d410d0adc1f0b0506e9e0.tar.gz gentoo-2-be510716b87fbf7f293d410d0adc1f0b0506e9e0.tar.bz2 gentoo-2-be510716b87fbf7f293d410d0adc1f0b0506e9e0.zip | |
Fix when lsb_release is installed by stripping whitespaces, bug #430656
(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)
Diffstat (limited to 'sci-physics/clhep')
| -rw-r--r-- | sci-physics/clhep/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-physics/clhep/clhep-2.1.2.4.ebuild | 3 | ||||
| -rw-r--r-- | sci-physics/clhep/files/clhep-2.1.2.4-lsb-whitespace.patch | 32 |
3 files changed, 39 insertions, 2 deletions
diff --git a/sci-physics/clhep/ChangeLog b/sci-physics/clhep/ChangeLog index cb7c78c81afb..e4866d29e5c7 100644 --- a/sci-physics/clhep/ChangeLog +++ b/sci-physics/clhep/ChangeLog @@ -1,6 +1,10 @@ # 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.42 2012/08/07 18:05:12 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.43 2012/08/14 20:17:28 bicatali Exp $ + + 14 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> + +files/clhep-2.1.2.4-lsb-whitespace.patch, clhep-2.1.2.4.ebuild: + Fix when lsb_release is installed by stripping whitespaces, bug #430656 *clhep-2.1.2.4 (07 Aug 2012) diff --git a/sci-physics/clhep/clhep-2.1.2.4.ebuild b/sci-physics/clhep/clhep-2.1.2.4.ebuild index 8bd81b8de833..495d8601f355 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.1 2012/08/07 18:05:12 bicatali Exp $ +# $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 $ EAPI=4 @@ -22,6 +22,7 @@ S="${WORKDIR}/${PV}/CLHEP" src_prepare() { epatch "${FILESDIR}"/${P}-libdir.patch + epatch "${FILESDIR}"/${P}-lsb-whitespace.patch # respect flags sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die # dont build test if not asked diff --git a/sci-physics/clhep/files/clhep-2.1.2.4-lsb-whitespace.patch b/sci-physics/clhep/files/clhep-2.1.2.4-lsb-whitespace.patch new file mode 100644 index 000000000000..9880dd88806a --- /dev/null +++ b/sci-physics/clhep/files/clhep-2.1.2.4-lsb-whitespace.patch @@ -0,0 +1,32 @@ +diff -Nur cmake/Modules.orig/ClhepPackageCompiler.cmake cmake/Modules/ClhepPackageCompiler.cmake +--- cmake/Modules.orig/ClhepPackageCompiler.cmake 2012-08-14 13:07:41.891381108 -0700 ++++ cmake/Modules/ClhepPackageCompiler.cmake 2012-08-14 13:08:39.826695769 -0700 +@@ -16,6 +16,7 @@ + execute_process(COMMAND ${CMAKE_CXX_COMPILER} + ${CMAKE_CXX_COMPILER_ARG1} -dumpversion + OUTPUT_VARIABLE _my_COMPILER_VERSION ++ OUTPUT_STRIP_TRAILING_WHITESPACE + ) + set( COMPILER_VERSION ${_my_COMPILER_VERSION} PARENT_SCOPE) + STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2" +diff -Nur cmake/Modules.orig/ClhepPackaging.cmake cmake/Modules/ClhepPackaging.cmake +--- cmake/Modules.orig/ClhepPackaging.cmake 2012-08-14 13:07:41.890381099 -0700 ++++ cmake/Modules/ClhepPackaging.cmake 2012-08-14 13:08:17.025571936 -0700 +@@ -68,7 +68,7 @@ + # We have linux, so incorporate Vendor info into package name + # - Distributor ID + ##exec_program(${LSB_RELEASE_PROGRAM} ARGS -s -i OUTPUT_VARIABLE LSB_VENDOR) +- execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -i OUTPUT_VARIABLE LSB_VENDOR) ++ execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -i OUTPUT_VARIABLE LSB_VENDOR OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REGEX REPLACE " " "-" LSB_VENDOR ${LSB_VENDOR}) + string(TOLOWER ${LSB_VENDOR} LSB_VENDOR) + if("${LSB_VENDOR}" MATCHES "scientificslf") +@@ -85,7 +85,7 @@ + + # - Distributor release + ##exec_program(${LSB_RELEASE_PROGRAM} ARGS -s -r OUTPUT_VARIABLE LSB_RELEASE) +- execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -r OUTPUT_VARIABLE LSB_RELEASE) ++ execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -r OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) + string(TOLOWER ${LSB_RELEASE} LSB_RELEASE) + string(REGEX REPLACE "([0-9])\\.([0-9])?" "\\1" LSB_RELEASE ${LSB_RELEASE}) + |