diff options
| author |   Benda XU <heroxbd@gentoo.org> | 2012-05-20 16:27:19 +0000 |
|---|---|---|
| committer | Benda XU <heroxbd@gentoo.org> | 2012-05-20 16:27:19 +0000 |
| commit | 8e041285c13019589d3f05cd4c6cb2252cd55e1b (patch) | |
| tree | 1af6f288be9bff48ec0046a922a687e397d5361b /sci-physics/geant/files | |
| parent | Use latest upstream revision to avoid using deprecated FFMPEG API. (diff) | |
| download | gentoo-2-8e041285c13019589d3f05cd4c6cb2252cd55e1b.tar.gz gentoo-2-8e041285c13019589d3f05cd4c6cb2252cd55e1b.tar.bz2 gentoo-2-8e041285c13019589d3f05cd4c6cb2252cd55e1b.zip | |
add back geant-4.9.5-r1.ebuild because geant-python cannot function correctly with 4.9.5_p01, upstream bug http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1317
(Portage version: 2.1.10.57/cvs/Linux x86_64)
Diffstat (limited to 'sci-physics/geant/files')
| -rw-r--r-- | sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch | 2 | ||||
| -rw-r--r-- | sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch | 56 |
2 files changed, 57 insertions, 1 deletions
diff --git a/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch b/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch index 0eb839dd2d13..db10e2640693 100644 --- a/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch +++ b/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch @@ -24,7 +24,7 @@ index ea8f104..db68b9c 100644 --- a/cmake/Templates/geant4-env-skeleton.in +++ b/cmake/Templates/geant4-env-skeleton.in @@ -1,30 +1,3 @@ --#!@GEANT4_TC_SHELL_PROGRAM@ +-#!@GEANT4_TC_SHELL_PROGRAM - -#---------------------------------------------------------------------------- -# @GEANT4_TC_SHELL_FAMILY@ environment setup script for Geant4 @Geant4_VERSION@ diff --git a/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch b/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch new file mode 100644 index 000000000000..0eb839dd2d13 --- /dev/null +++ b/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch @@ -0,0 +1,56 @@ +tweak Geant4ToolchainBackwardCompatibility.cmake to get the envvars we want. bug 409853 +diff --git a/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake b/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake +index 41a88c4..e93b923 100644 +--- a/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake ++++ b/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake +@@ -678,15 +678,4 @@ foreach(_shell bourne;cshell) + @ONLY + ) + +- # Install it to the required location +- install(FILES +- ${PROJECT_BINARY_DIR}/InstallTreeFiles/${_scriptfullname} +- DESTINATION ${CMAKE_INSTALL_BINDIR} +- PERMISSIONS +- OWNER_READ OWNER_WRITE OWNER_EXECUTE +- GROUP_READ GROUP_EXECUTE +- WORLD_READ WORLD_EXECUTE +- COMPONENT Runtime +- ) + endforeach() +- +diff --git a/cmake/Templates/geant4-env-skeleton.in b/cmake/Templates/geant4-env-skeleton.in +index ea8f104..db68b9c 100644 +--- a/cmake/Templates/geant4-env-skeleton.in ++++ b/cmake/Templates/geant4-env-skeleton.in +@@ -1,30 +1,3 @@ +-#!@GEANT4_TC_SHELL_PROGRAM@ +- +-#---------------------------------------------------------------------------- +-# @GEANT4_TC_SHELL_FAMILY@ environment setup script for Geant4 @Geant4_VERSION@ +-# +-# This script will configure your environment so that any Geant4 supplied +-# tools, libraries and data are available in your PATH, library paths etc. +-# Data libraries will only be setup if they were installed as part of the +-# Geant4 installation. +-# +-# Source this script to perform the setup. +-# +-# This script is autogenerated by CMake DO NOT EDIT +-# +- +-#---------------------------------------------------------------------------- +-# Locate directory of self +-# +-@GEANT4_ENV_SELFLOCATE_COMMAND@ +- +- +-#---------------------------------------------------------------------------- +-# Setup binary and library paths... +-# +-@GEANT4_ENV_BINPATH_SETUP@ +-@GEANT4_ENV_LIBPATH_SETUP@ +- + #---------------------------------------------------------------------------- + # Resource file paths + # Data Library Paths are only set if they were installed by CMake |