diff options
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/Manifest.gz | bin | 4186 -> 4192 bytes | |||
| -rw-r--r-- | sci-physics/geant/Manifest | 9 | ||||
| -rw-r--r-- | sci-physics/geant/files/geant4.10.7-hdf5.patch | 70 | ||||
| -rw-r--r-- | sci-physics/geant/geant-4.10.7-r3.ebuild (renamed from sci-physics/geant/geant-4.10.7-r2.ebuild) | 2 | ||||
| -rw-r--r-- | sci-physics/geant/geant-4.10.7.1-r3.ebuild (renamed from sci-physics/geant/geant-4.10.7.1-r2.ebuild) | 2 | ||||
| -rw-r--r-- | sci-physics/geant/geant-4.10.7.2-r3.ebuild (renamed from sci-physics/geant/geant-4.10.7.2-r2.ebuild) | 2 | ||||
| -rw-r--r-- | sci-physics/geant/geant-4.11.0_beta1-r2.ebuild (renamed from sci-physics/geant/geant-4.11.0_beta1-r1.ebuild) | 2 |
7 files changed, 83 insertions, 4 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz Binary files differindex 42b0067360f8..2f6e066c3550 100644 --- a/sci-physics/Manifest.gz +++ b/sci-physics/Manifest.gz diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest index ec0978c161be..086d40c8afc8 100644 --- a/sci-physics/geant/Manifest +++ b/sci-physics/geant/Manifest @@ -1,9 +1,10 @@ +AUX geant4.10.7-hdf5.patch 2733 BLAKE2B 58b2da9a27d09dbd16048b3da34397b49abd28fe12238d400a86d64fb02799b294c1b4313297de4397d6f8e5fc0feb735f8fc9352ff5b4c34721a445a33d2354 SHA512 a1f64e1e21b09e7b7335eb06110cd2c76f7bbbab80f0dd87bb1139c5d45ee5392f2f03a0466c27e8d796aa24e3b5400fe44f5c260969aa64f1e5e506393b0080 DIST geant4.10.07.p01.tar.gz 36217226 BLAKE2B 3bc5868db1328ac08582fef4a5246e2f3fc1b2d34bca668d27c6c272af3de230f680cff02c3a8b53ab5abc4186645935b042b456cdff3cba01bc180e0646a50d SHA512 d314d649bf349a4fc5dd09229897d3e4ca3bfba071daeb67ab4d4bde187ec59c120b2478d2b28d1c88615189bd38097666bf4a0c25ce5cb4bc3cf0d9815bea5d DIST geant4.10.07.p02.tar.gz 35729676 BLAKE2B 1727ab4e35f4dafe0b406bb189a008955c660922a4fc855a765a269ec8837242ba2372b346c189de6bd6d36c434e0636c483c292f90573726fa6d3b4cc67eb12 SHA512 fe5a387880218782570ff2b28cf8f6abc1457437652f349b8b81ac1045bdec7ee51fa2930451c1271708c02914ac60effd0ee8933d42c29d05819fe320356092 DIST geant4.10.07.tar.gz 36422877 BLAKE2B d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d SHA512 057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b DIST geant4.11.00.b01.tar.gz 35617362 BLAKE2B 654679f3876081931a80b8ee8dbf579ef45cbd8edb4e8a641ad1facc2edab470ff19f557672e901321e1993453110b4f1f5c5d7a6b0bb293e710def2d5871d12 SHA512 abc39b33d0570bc07db0e957a2e33db91b47e8ebe650bb79cb8f6fdf6f0e4938607a96011f9b0fba0294828afcf7e6f3ee20367e319f2b388f3b315bd615a6db -EBUILD geant-4.10.7-r2.ebuild 2973 BLAKE2B 0804d23fee3f47903249a1ad800621421c608fecf5379c4116077563da17ea0e484ee6b17620a9894dcf2f468c02849bed0790fbe25e7f036511bf771a0e3efe SHA512 7072276b508c6b9afcc1d3d46fdd49ea5090445b1da1a7bfa6fadd8adb22fda3b782b7bbaaa0b9c2255727a999142fdc708c34ca31d19cfc39f3dc1d412e27a0 -EBUILD geant-4.10.7.1-r2.ebuild 2973 BLAKE2B 0804d23fee3f47903249a1ad800621421c608fecf5379c4116077563da17ea0e484ee6b17620a9894dcf2f468c02849bed0790fbe25e7f036511bf771a0e3efe SHA512 7072276b508c6b9afcc1d3d46fdd49ea5090445b1da1a7bfa6fadd8adb22fda3b782b7bbaaa0b9c2255727a999142fdc708c34ca31d19cfc39f3dc1d412e27a0 -EBUILD geant-4.10.7.2-r2.ebuild 2978 BLAKE2B a3afb598bdb82415dec02e6856ee09693b323122b6837890421baecf48365003c64abc6e20b592458a2a7bf1390ceae237720e8489b5ca2f9f48768af98e068b SHA512 0faf72fe2fc6ec9c6e48dfc32b33c00bc3a56409c84e2d0b82e2a686fcd161c356bbc5d05a9fd85976c4a32dde6b4860e13536a141049264f159310c46c1e3bd -EBUILD geant-4.11.0_beta1-r1.ebuild 2931 BLAKE2B bbb9b29863bc1fb4037bcf3baaeb395f07f3222c8db14bcbe21c32955e1015bf5ade95a1269a9ad4deb4a965c0bc45173130c8ef91578cf2991c4b2ae2ad8979 SHA512 094a4a83080ca56cb93f5103ce37cd2865267b23193c88bb9ec27f7eede218181b261974f15935847449f60383768c3f3dc54f9b4990db1301fbbe23f93138dc +EBUILD geant-4.10.7-r3.ebuild 3023 BLAKE2B fc6736cd84396a2b3150e4cb11257e0a2f8a796b71bee008a2c9dc495f2804c19037b647c1f9a562b300455f793d3ab4d846c9bd47a336bbd04b05b3fab3ac2a SHA512 4965ff7ec1f669239c4fd8ba86323ad7d559db830141823351f14df6046896f5f54397b59276ebd512c0c8098a9dddcc06b8bc1f3aa9b6b1a89dfa1f3eff189f +EBUILD geant-4.10.7.1-r3.ebuild 3023 BLAKE2B fc6736cd84396a2b3150e4cb11257e0a2f8a796b71bee008a2c9dc495f2804c19037b647c1f9a562b300455f793d3ab4d846c9bd47a336bbd04b05b3fab3ac2a SHA512 4965ff7ec1f669239c4fd8ba86323ad7d559db830141823351f14df6046896f5f54397b59276ebd512c0c8098a9dddcc06b8bc1f3aa9b6b1a89dfa1f3eff189f +EBUILD geant-4.10.7.2-r3.ebuild 3028 BLAKE2B 94bf246880007086975506be8f42c614c935ec30ec26e341b717407c16f26dd521ceb939703808df3cc4ed224fc9843ce38a5d95506a2bb81c158f5ff3da2a46 SHA512 e2f5b172e01ab6267d1c80948b4183ce91c1b2ad033fdd5d8c951bde7a596734eee35da3a8b232392f255450a50026650e9ef8beb8e3e151013a5c168ca9aaad +EBUILD geant-4.11.0_beta1-r2.ebuild 2981 BLAKE2B 975509af637085168c64325f43e6da45e388bb324de80b9d044aa3a5f682923467edb7835b43216c0137db93b4baaf0141e9572f242e42bc914cd4d23a3999ec SHA512 99b3414f41db5af7971a8fad4512aeb4b7205dd3b1622efc948ea19f6f3f9ccf11b8bb8d4b2fc72477e119a651e82776bddf511a9a64afa1b6fdadaea563dba6 MISC metadata.xml 1616 BLAKE2B 3f098e0f66943474a142c2c05859f83449ab45296ba4e38c0de3f958517f626464f7b45d2f79ed273946c91b7e36fbd6d8d1e2f29da975a6212faf36126289b7 SHA512 fe5f63bde72af132440e8c76cfb864caf3fde1872a7a3e71f9b308b96778eaf47b7ac2e829c83bf5d81fc9c221bc50f04d4f0dd4303003a049d0dcf206c1020c 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 000000000000..679cdfbed9d6 --- /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 <amadio@gentoo.org> +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 index fcc836682744..085e5abcf44a 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 index fcc836682744..085e5abcf44a 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 index 2b4f8cd92a19..32f62303ec77 100644 --- a/sci-physics/geant/geant-4.10.7.2-r2.ebuild +++ b/sci-physics/geant/geant-4.10.7.2-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.11.0_beta1-r1.ebuild b/sci-physics/geant/geant-4.11.0_beta1-r2.ebuild index 19e28827a13d..0b9fdfbf25e5 100644 --- a/sci-physics/geant/geant-4.11.0_beta1-r1.ebuild +++ b/sci-physics/geant/geant-4.11.0_beta1-r2.ebuild @@ -62,6 +62,8 @@ RDEPEND=" x11-libs/libXmu )" +PATCHES=( "${FILESDIR}"/geant4.10.7-hdf5.patch ) + S="${WORKDIR}/${MY_P}" src_configure() { |