[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/, sci-physics/geant/
commit: 144edbafdebe29ac1d2d3edede2385364d740ea6
Author: listout protonmail com>
AuthorDate: Tue Sep 13 10:20:17 2022 +
Commit: Guilherme Amadio gentoo org>
CommitDate: Wed Sep 14 14:54:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144edbaf
sci-physics/geant: Fix building on musl, avoid execinfo.h
Avoid including execinfo.h and calling backtrace function on system that
don't provide the header.
Closes: https://bugs.gentoo.org/829151
Closes: https://github.com/gentoo/gentoo/pull/26313
Signed-off-by: brahmajit das protonmail.com>
Signed-off-by: Guilherme Amadio gentoo.org>
.../files/geant-4.11.0.2-musl-avoid-execinfo.patch | 100 +
sci-physics/geant/geant-4.11.0.2-r1.ebuild | 4 +
2 files changed, 104 insertions(+)
diff --git a/sci-physics/geant/files/geant-4.11.0.2-musl-avoid-execinfo.patch
b/sci-physics/geant/files/geant-4.11.0.2-musl-avoid-execinfo.patch
new file mode 100644
index ..e73a9c24c597
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.11.0.2-musl-avoid-execinfo.patch
@@ -0,0 +1,100 @@
+# Avoid including execinfo and calling backtrace function when execinfo.h is
+# not present or supplied by system's libc
+#
+# Closes: https://bugs.gentoo.org/829151
+--- a/source/global/management/include/G4Backtrace.hh
b/source/global/management/include/G4Backtrace.hh
+@@ -85,23 +85,6 @@
+ # endif
+ #endif
+
+-#if defined(G4UNIX) && !defined(WIN32)
+-# include
+-# include
+-# include
+-#endif
+-
+-#if defined(G4LINUX)
+-# include
+-#endif
+-
+-#include
+-#include
+-#include
+-
+-template
+-using G4ResultOf_t = std::invoke_result_t;
+-
+ // compatible OS and compiler
+ #if defined(G4UNIX) &&
\
+ (defined(__GNUC__) || defined(__clang__) || defined(_INTEL_COMPILER))
+@@ -109,7 +92,9 @@ using G4ResultOf_t = std::invoke_result_t;
+ #define G4SIGNAL_AVAILABLE
+ # endif
+ # if !defined(G4DEMANGLE_AVAILABLE)
+-#define G4DEMANGLE_AVAILABLE
++#if defined(G4UNIX) && defined(HAVE_EXECINFO_H)
++# define G4DEMANGLE_AVAILABLE
++#endif
+ # endif
+ #endif
+
+@@ -121,6 +106,25 @@ using G4ResultOf_t = std::invoke_result_t;
+ # endif
+ #endif
+
++#if defined(G4UNIX) && !defined(WIN32)
++# include
++#if defined(HAVE_EXECINFO_H)
++# include
++#endif
++# include
++#endif
++
++#if defined(G4LINUX)
++# include
++#endif
++
++#include
++#include
++#include
++
++template
++using G4ResultOf_t = std::invoke_result_t;
++
+
////
+
+ inline G4String G4Demangle(const char* _str)
+@@ -368,6 +372,7 @@ G4Backtrace::GetMangled(FuncT&& func)
+ std::array btrace;
+ btrace.fill((std::is_pointer::value) ? nullptr : type{});
+
++#if defined(G4DEMANGLE_AVAILABLE)
+ // plus one for this stack-frame
+ std::array buffer;
+ // size of returned buffer
+@@ -387,6 +392,7 @@ G4Backtrace::GetMangled(FuncT&& func)
+ btrace[i] = func(bsym[i]);
+ free(bsym);
+ }
++#endif
+ return btrace;
+ }
+
+--- a/source/global/management/sources.cmake
b/source/global/management/sources.cmake
+@@ -6,6 +6,14 @@ set(G4MULTITHREADED ${GEANT4_BUILD_MULTITHREADED})
+ set(G4_STORE_TRAJECTORY ${GEANT4_BUILD_STORE_TRAJECTORY})
+ set(G4VERBOSE ${GEANT4_BUILD_VERBOSE_CODE})
+
++include(CheckIncludeFile)
++
++check_include_file(execinfo.h HAVE_EXECINFO_H)
++
++if(HAVE_SYS_TYPES_H)
++ list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_EXECINFO_H)
++endif()
++
+ configure_file(${CMAKE_CURRENT_LIST_DIR}/include/G4GlobalConfig.hh.in
+ ${CMAKE_CURRENT_BINARY_DIR}/include/G4GlobalConfig.hh)
+
diff --git a/sci-physics/geant/geant-4.11.0.2-r1.ebuild
b/sci-physics/geant/geant-4.11.0.2-r1.ebuild
index 1eaf3d9af34b..e43a735dfdc4 100644
--- a/sci-physics/geant/geant-4.11.0.2-r1.ebuild
+++ b/sci-physics/geant/geant-4.11.0.2-r1.ebuild
@@ -75,6 +75,10 @@ RDEPEND="
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.11.0.2-musl-avoid-execinfo.patch
+)
+
src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/
commit: bf7a3c800bfc18f9b3d9eadd388a42040918eed6
Author: Guilherme Amadio gentoo org>
AuthorDate: Tue Dec 14 15:13:55 2021 +
Commit: Guilherme Amadio gentoo org>
CommitDate: Tue Dec 14 15:13:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7a3c80
sci-physics/geant: drop unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Guilherme Amadio gentoo.org>
sci-physics/geant/files/geant4.10.7-hdf5.patch | 70 --
1 file changed, 70 deletions(-)
diff --git a/sci-physics/geant/files/geant4.10.7-hdf5.patch
b/sci-physics/geant/files/geant4.10.7-hdf5.patch
deleted file mode 100644
index 679cdfbed9d6..
--- a/sci-physics/geant/files/geant4.10.7-hdf5.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 4e86e523e7f0e419b990520a15ef7d524102cd06 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio
-Date: Mon, 23 Aug 2021 13:18:25 +0200
-Subject: [PATCH] Rename Geant4::HDF5 to hdf5::hdf5
-
-Needed to be compatible with CMake 3.20, which now provides imported
-targets for HDF5 (https://cmake.org/cmake/help/v3.20/module/FindHDF5.html).
- cmake/Modules/G4HDF5Shim.cmake | 16
- cmake/Modules/G4OptionalComponents.cmake | 2 +-
-
-diff --git a/cmake/Modules/G4HDF5Shim.cmake b/cmake/Modules/G4HDF5Shim.cmake
-index 963a7bb5be..97d97248d8 100644
a/cmake/Modules/G4HDF5Shim.cmake
-+++ b/cmake/Modules/G4HDF5Shim.cmake
-@@ -1,10 +1,10 @@
-- # - G4HDF5Shim
-+# - G4HDF5Shim
- #
- # Geant4's Geant4Config.cmake file aims to support CMake 3.8 and newer
- # The HDF5 dependency is located through CMake's builtin FindHDF5
--# module, but this does not supply imported targets as of CMake 3.16.
-+# module, but this does not supply imported targets until CMake 3.20.
- # It may use HDF5's hdf5-config.cmake file if available, so create
--# custom imported target Geant4::HDF5 to allow both cases to be handled
-+# custom imported target hdf5::hdf5 to allow both cases to be handled
- # without interference with either.
-
- if(HDF5_FOUND)
-@@ -24,18 +24,18 @@ if(HDF5_FOUND)
-endif()
- endif()
-
-- # As FindHDF5 does not yet supply imported targets, we
-+ # If FindHDF5 does not yet supply imported targets, we
- # create an internal INTERFACE target to wrap these.
- # This still hard-codes include/library paths, but limits it
- # to one place. Later, we'll create proper imported targets
- # with re-finds but for now this is the best minimally invasive proceedure
-- if(NOT TARGET Geant4::HDF5)
-- add_library(Geant4::HDF5 IMPORTED UNKNOWN)
-- set_target_properties(Geant4::HDF5 PROPERTIES
-+ if(NOT TARGET hdf5::hdf5)
-+ add_library(hdf5::hdf5 IMPORTED UNKNOWN)
-+ set_target_properties(hdf5::hdf5 PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${HDF5_C_LIBRARY_hdf5}"
- INTERFACE_INCLUDE_DIRECTORIES "${HDF5_C_INCLUDE_DIRS}"
- INTERFACE_LINK_LIBRARIES "${HDF5_C_LIBRARIES}"
- )
- endif()
--endif()
-\ No newline at end of file
-+endif()
-diff --git a/cmake/Modules/G4OptionalComponents.cmake
b/cmake/Modules/G4OptionalComponents.cmake
-index c0639a538b..77b3c91241 100644
a/cmake/Modules/G4OptionalComponents.cmake
-+++ b/cmake/Modules/G4OptionalComponents.cmake
-@@ -369,7 +369,7 @@ if(GEANT4_USE_HDF5)
- find_package(HDF5 1.8 REQUIRED)
- include("${CMAKE_CURRENT_LIST_DIR}/G4HDF5Shim.cmake")
- # Backward compatibility
-- set(HDF5_LIBRARIES Geant4::HDF5)
-+ set(HDF5_LIBRARIES hdf5::hdf5)
-
- # May have found via config mode...
- if(HDF5_DIR)
---
-2.33.0
-
[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/, sci-physics/geant/
commit: d18c2c2350f97e4eec032d01c672f6ced09cc2fa
Author: Guilherme Amadio gentoo org>
AuthorDate: Mon Aug 23 11:47:43 2021 +
Commit: Guilherme Amadio gentoo org>
CommitDate: Mon Aug 23 11:48:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18c2c23
sci-physics/geant: fix build with CMake 3.20 and above
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Guilherme Amadio gentoo.org>
sci-physics/geant/files/geant4.10.7-hdf5.patch | 70 ++
...ant-4.10.7-r2.ebuild => geant-4.10.7-r3.ebuild} | 2 +
...4.10.7.1-r2.ebuild => geant-4.10.7.1-r3.ebuild} | 2 +
...4.10.7.2-r2.ebuild => geant-4.10.7.2-r3.ebuild} | 2 +
...eta1-r1.ebuild => geant-4.11.0_beta1-r2.ebuild} | 2 +
5 files changed, 78 insertions(+)
diff --git a/sci-physics/geant/files/geant4.10.7-hdf5.patch
b/sci-physics/geant/files/geant4.10.7-hdf5.patch
new file mode 100644
index 000..679cdfbed9d
--- /dev/null
+++ b/sci-physics/geant/files/geant4.10.7-hdf5.patch
@@ -0,0 +1,70 @@
+From 4e86e523e7f0e419b990520a15ef7d524102cd06 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio
+Date: Mon, 23 Aug 2021 13:18:25 +0200
+Subject: [PATCH] Rename Geant4::HDF5 to hdf5::hdf5
+
+Needed to be compatible with CMake 3.20, which now provides imported
+targets for HDF5 (https://cmake.org/cmake/help/v3.20/module/FindHDF5.html).
+---
+ cmake/Modules/G4HDF5Shim.cmake | 16
+ cmake/Modules/G4OptionalComponents.cmake | 2 +-
+
+diff --git a/cmake/Modules/G4HDF5Shim.cmake b/cmake/Modules/G4HDF5Shim.cmake
+index 963a7bb5be..97d97248d8 100644
+--- a/cmake/Modules/G4HDF5Shim.cmake
b/cmake/Modules/G4HDF5Shim.cmake
+@@ -1,10 +1,10 @@
+- # - G4HDF5Shim
++# - G4HDF5Shim
+ #
+ # Geant4's Geant4Config.cmake file aims to support CMake 3.8 and newer
+ # The HDF5 dependency is located through CMake's builtin FindHDF5
+-# module, but this does not supply imported targets as of CMake 3.16.
++# module, but this does not supply imported targets until CMake 3.20.
+ # It may use HDF5's hdf5-config.cmake file if available, so create
+-# custom imported target Geant4::HDF5 to allow both cases to be handled
++# custom imported target hdf5::hdf5 to allow both cases to be handled
+ # without interference with either.
+
+ if(HDF5_FOUND)
+@@ -24,18 +24,18 @@ if(HDF5_FOUND)
+endif()
+ endif()
+
+- # As FindHDF5 does not yet supply imported targets, we
++ # If FindHDF5 does not yet supply imported targets, we
+ # create an internal INTERFACE target to wrap these.
+ # This still hard-codes include/library paths, but limits it
+ # to one place. Later, we'll create proper imported targets
+ # with re-finds but for now this is the best minimally invasive proceedure
+- if(NOT TARGET Geant4::HDF5)
+- add_library(Geant4::HDF5 IMPORTED UNKNOWN)
+- set_target_properties(Geant4::HDF5 PROPERTIES
++ if(NOT TARGET hdf5::hdf5)
++ add_library(hdf5::hdf5 IMPORTED UNKNOWN)
++ set_target_properties(hdf5::hdf5 PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+ IMPORTED_LOCATION "${HDF5_C_LIBRARY_hdf5}"
+ INTERFACE_INCLUDE_DIRECTORIES "${HDF5_C_INCLUDE_DIRS}"
+ INTERFACE_LINK_LIBRARIES "${HDF5_C_LIBRARIES}"
+ )
+ endif()
+-endif()
+\ No newline at end of file
++endif()
+diff --git a/cmake/Modules/G4OptionalComponents.cmake
b/cmake/Modules/G4OptionalComponents.cmake
+index c0639a538b..77b3c91241 100644
+--- a/cmake/Modules/G4OptionalComponents.cmake
b/cmake/Modules/G4OptionalComponents.cmake
+@@ -369,7 +369,7 @@ if(GEANT4_USE_HDF5)
+ find_package(HDF5 1.8 REQUIRED)
+ include("${CMAKE_CURRENT_LIST_DIR}/G4HDF5Shim.cmake")
+ # Backward compatibility
+- set(HDF5_LIBRARIES Geant4::HDF5)
++ set(HDF5_LIBRARIES hdf5::hdf5)
+
+ # May have found via config mode...
+ if(HDF5_DIR)
+--
+2.33.0
+
diff --git a/sci-physics/geant/geant-4.10.7-r2.ebuild
b/sci-physics/geant/geant-4.10.7-r3.ebuild
similarity index 98%
rename from sci-physics/geant/geant-4.10.7-r2.ebuild
rename to sci-physics/geant/geant-4.10.7-r3.ebuild
index fcc83668274..085e5abcf44 100644
--- a/sci-physics/geant/geant-4.10.7-r2.ebuild
+++ b/sci-physics/geant/geant-4.10.7-r3.ebuild
@@ -62,6 +62,8 @@ RDEPEND="
x11-libs/libXmu
)"
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
S="${WORKDIR}/${MY_P}"
src_configure() {
diff --git a/sci-physics/geant/geant-4.10.7.1-r2.ebuild
b/sci-physics/geant/geant-4.10.7.1-r3.ebuild
similarity index 98%
rename from sci-physics/geant/geant-4.10.7.1-r2.ebuild
rename to sci-physics/geant/geant-4.10.7.1-r3.ebuild
index fcc83668274..085e5abcf44 100644
--- a/sci-physics/geant/geant-4.10.7.1-r2.ebuild
+++ b/sci-physics/geant/geant-4.10.7.1-r3.ebuild
@@ -62,6 +62,8 @@ RDEPEND="
x11-libs/libXmu
)"
+PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch )
+
S="${WORKDIR}/${MY_P}"
src_configure() {
diff --git a/sci-physics/geant/geant-4.10.7.2-r2.ebuild
b/sci-physics/geant/geant-4.10.7.2-r3.ebuild
[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/, sci-physics/geant/
commit: 33ec5c643cea8bc391875f2b5fc38090f3726fe4
Author: Jakov Smolic sartura hr>
AuthorDate: Wed Jan 20 10:16:06 2021 +
Commit: David Seifert gentoo org>
CommitDate: Wed Jan 20 10:16:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ec5c64
sci-physics/geant: Remove old
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
sci-physics/geant/Manifest | 4 -
sci-physics/geant/files/geant-4.10.6-datadir.patch | 159 -
sci-physics/geant/geant-4.10.6-r1.ebuild | 108 --
sci-physics/geant/geant-4.10.6.3.ebuild| 113 ---
sci-physics/geant/geant-4.10.6_p1-r1.ebuild| 108 --
sci-physics/geant/geant-4.10.6_p2.ebuild | 106 --
6 files changed, 598 deletions(-)
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 2aadd1760dc..30465aa34b0 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,5 +1 @@
-DIST geant4.10.06.p01.tar.gz 34869969 BLAKE2B
0a27f34df213a0dcc2d87c6001c100269be7496519c614fa5b51cd6502d98232d09de0f3c44216c34b6788ec8a1f626d22a53cb7329027006c614a10777b6896
SHA512
d9bca66b086a309a577dcf018c0ca52f5d786b1ebe5ce9d30c29c579c342399816c34efbcb34af60871145b6713cb8151f5517c5a0aa9d24d00e4257a5c1c6c0
-DIST geant4.10.06.p02.tar.gz 34833550 BLAKE2B
c1a3b51cf5fc135edd8f547e5a88c80f8f6ed991be92439e161225afa0447473b67c0ef0757011e1e3a22a370f43ad9b14c9fe9cb3d5f5f0a78a762c86e0dd80
SHA512
bcfbea05c88a6021898e361ffa0c8e28637631e65b2f9ae2d694deae36a67c6af78785569c5971d1c63a4692a3dfbfc082cf14d7af209cb9f36efff9bec9bc20
-DIST geant4.10.06.p03.tar.gz 35099426 BLAKE2B
75668b87eb3f1d8be00c46dc3e6e2131707ad89f4d077d2c55b7c985803709da565dbddd2ebd6ee7b6a3f4d58dc84a41bcded3b1db926127b480fb8e9fab2765
SHA512
844769991e20f4397a336a8e94bb82434b4ce44c84c956935659d2407ebf29b388b672650466f9683d3c99f9c7fa4f2c81e3f27075427f1613d825f38a74df69
-DIST geant4.10.06.tar.gz 34834510 BLAKE2B
48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf
SHA512
e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044
DIST geant4.10.07.tar.gz 36422877 BLAKE2B
d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b60c4f9a1f971a5f1df27580d49b8906d
SHA512
057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b
diff --git a/sci-physics/geant/files/geant-4.10.6-datadir.patch
b/sci-physics/geant/files/geant-4.10.6-datadir.patch
deleted file mode 100644
index c26bf8914b4..000
--- a/sci-physics/geant/files/geant-4.10.6-datadir.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 44966c44635debaddd859c788b008cd4e6c7fab6 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio
-Date: Fri, 13 Mar 2020 15:36:27 +0100
-Subject: [PATCH] Allow customization of CMAKE_INSTALL_DATADIR
-
- cmake/Modules/G4CMakeMain.cmake | 2 +-
- cmake/Modules/G4ConfigureGNUMakeHelpers.cmake | 20 +--
- cmake/Modules/Geant4InstallData.cmake | 4 ++--
- source/analysis/CMakeLists.txt| 2 +-
- source/analysis/g4tools/CMakeLists.txt| 2 +-
- 5 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/cmake/Modules/G4CMakeMain.cmake b/cmake/Modules/G4CMakeMain.cmake
-index a6b984fcad..5ab63202ca 100644
a/cmake/Modules/G4CMakeMain.cmake
-+++ b/cmake/Modules/G4CMakeMain.cmake
-@@ -121,7 +121,7 @@ mark_as_advanced(GEANT4_INSTALL_EXAMPLES)
-
- if(GEANT4_INSTALL_EXAMPLES)
- install(DIRECTORY examples
--DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}
-+DESTINATION ${CMAKE_INSTALL_DATADIR}
- COMPONENT Examples
- PATTERN "CVS" EXCLUDE
- PATTERN ".svn" EXCLUDE
-diff --git a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
-index c2aeefee59..1052f43a45 100644
a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
-+++ b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
-@@ -729,7 +729,7 @@ _g4tc_configure_build_tree_scripts(geant4make)
- # +- CMAKE_INSTALL_PREFIX
- #+- LIBDIR/Geant4-VERSION (G4LIB)
- #+- INCLUDEDIR/Geant4 (G4INCLUDE)
--#+- DATAROOTDIR/Geant4-VERSION/
-+#+- DATADIR/
- # +- geant4make (THIS IS G4INSTALL!)
- # +- geant4make.(c)sh
- # +- config/
-@@ -742,7 +742,7 @@ set(G4INSTALL "\"\$geant4make_root\"")
- # - Include dir
- file(RELATIVE_PATH
- G4MAKE_TO_INCLUDEDIR
-- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
- ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}
- )
- set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \;
pwd`\"")
-@@ -750,7 +750,7 @@ set(G4IN
[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/
commit: 22ba0cc48b625e4b886f73d784e582653a687e9d
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Aug 20 12:59:10 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Sep 2 14:35:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ba0cc4
sci-physics/geant: remove unused patches
sci-physics/geant/files/geant-4.9.4-datadir.patch | 43 --
sci-physics/geant/files/geant-4.9.4-libdir.patch | 35 --
.../geant/files/geant-4.9.4-trajectory.patch | 11 --
3 files changed, 89 deletions(-)
diff --git a/sci-physics/geant/files/geant-4.9.4-datadir.patch
b/sci-physics/geant/files/geant-4.9.4-datadir.patch
deleted file mode 100644
index c691d90e8ce..000
--- a/sci-physics/geant/files/geant-4.9.4-datadir.patch
+++ /dev/null
@@ -1,43 +0,0 @@
cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake.orig
2011-01-22 00:49:11.096082056 +
-+++ cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake 2011-01-22
00:53:04.746078920 +
-@@ -74,9 +74,9 @@
- # Construct backward compatible variables
- #
- set(G4SYSTEM "${GEANT4_SYSTEM}-${GEANT4_COMPILER}")
--set(G4INSTALL ${GEANT4_DATADIR}/geant4-${geant4_VERSION})
-+set(G4INSTALL ${GEANT4_DATADIR}/geant4)
- set(G4INCLUDE ${GEANT4_INCLUDEDIR}/geant4)
--set(G4LIB ${GEANT4_LIBDIR}/geant4-${geant4_VERSION})
-+set(G4LIB ${GEANT4_LIBDIR}/geant4)
-
- message(STATUS "Geant4 backwards compatible variable G4SYSTEM : ${G4SYSTEM}")
- message(STATUS "Geant4 backwards compatible variable G4INSTALL: ${G4INSTALL}")
-@@ -125,7 +125,7 @@
- # Install targets
- # toolchain
- install(DIRECTORY config
--DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
-+DESTINATION ${GEANT4_DATAROOTDIR}/geant4
- FILES_MATCHING PATTERN "*.gmk"
- PATTERN "CVS" EXCLUDE
- PATTERN "scripts/" EXCLUDE)
-@@ -134,16 +134,16 @@
- install(FILES
- ${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.sh
- ${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.csh
--DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}/config
-+DESTINATION ${GEANT4_DATAROOTDIR}/geant4/config
- PERMISSIONS
- OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE)
-
- # compatibility softlink to library directory
--install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory
\$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})")
-+install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory
\$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)")
-
--install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
.. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY
\$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})")
-+install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
.. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY
\$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)")
-
- endif()
-
diff --git a/sci-physics/geant/files/geant-4.9.4-libdir.patch
b/sci-physics/geant/files/geant-4.9.4-libdir.patch
deleted file mode 100644
index 8934f73acfe..000
--- a/sci-physics/geant/files/geant-4.9.4-libdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
CMakeLists.txt.orig2011-01-17 06:25:14.536078940 +
-+++ CMakeLists.txt 2011-01-21 23:50:53.406082074 +
-@@ -195,7 +195,7 @@
- set(GEANT4_PREFIX ${CMAKE_INSTALL_PREFIX})
- set(GEANT4_EXEC_PREFIX ${GEANT4_PREFIX})
- set(GEANT4_BINDIR ${GEANT4_EXEC_PREFIX}/bin)
--set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib)
-+set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib${LIB_SUFFIX})
- set(GEANT4_DATAROOTDIR ${GEANT4_PREFIX}/share)
- set(GEANT4_DATADIR ${GEANT4_DATAROOTDIR})
- set(GEANT4_INCLUDEDIR ${GEANT4_PREFIX}/include)
cmake/Modules/Geant4MacroLibraryTargets.cmake.orig 2011-01-21
23:36:09.356079013 +
-+++ cmake/Modules/Geant4MacroLibraryTargets.cmake 2011-01-21
23:49:49.826082339 +
-@@ -35,8 +35,8 @@
- # NEEDS WORK TO REMOVE HARDCODED LIB/BIN DIR
- install(TARGETS ${G4LIBTARGET_NAME}
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib)
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX})
- endif()
-
- #
-@@ -59,8 +59,8 @@
-
- install(TARGETS ${G4LIBTARGET_NAME}-static
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
- endif()
- ENDMACRO()
-
diff --git a/sci-physics/geant/files/geant-4.9.4-trajectory.patch
b/sci-physics/geant/files/geant-4.9.4-trajectory.patch
deleted file mode 100644
index df45ae234e5..000
--- a/sci-physics/geant/files/gean
[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/
commit: 16397a3864ea2b2957856638981996a4546d1bd3
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Thu Feb 2 18:07:55 2017 +
Commit: Guilherme Amadio gentoo org>
CommitDate: Thu Feb 2 19:58:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16397a38
sci-physics/geant: remove unused patches
Signed-off-by: Guilherme Amadio gentoo.org>
sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch | 10 --
sci-physics/geant/files/geant-4.9.4-no-examples.patch | 15 ---
2 files changed, 25 deletions(-)
diff --git a/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch
b/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch
deleted file mode 100644
index 8c9d477..
--- a/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch
+++ /dev/null
@@ -1,10 +0,0 @@
source/geometry/CMakeLists.txt.orig2011-01-17 05:09:38.046080303
+
-+++ source/geometry/CMakeLists.txt 2011-01-17 05:09:59.636215548 +
-@@ -12,7 +12,6 @@
- #
-
#--
-
--add_subdirectory(benchmarks)
- add_subdirectory(biasing)
- add_subdirectory(divisions)
- add_subdirectory(magneticfield)
diff --git a/sci-physics/geant/files/geant-4.9.4-no-examples.patch
b/sci-physics/geant/files/geant-4.9.4-no-examples.patch
deleted file mode 100644
index 6db7b3f..
--- a/sci-physics/geant/files/geant-4.9.4-no-examples.patch
+++ /dev/null
@@ -1,15 +0,0 @@
CMakeLists.txt.orig2011-01-22 01:47:07.0 +
-+++ CMakeLists.txt 2011-01-22 02:00:58.676084146 +
-@@ -209,9 +209,9 @@
- # Install any extra files needed such as documentation and legacy Makefiles
- #
- # User example code
--install(DIRECTORY examples
--DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
--PATTERN "CVS" EXCLUDE)
-+#install(DIRECTORY examples
-+#DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
-+#PATTERN "CVS" EXCLUDE)
-
-
- #
