From 7f4b508a2da3c371c7e770aa6ab83b0c4237cd1c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Dec 2024 02:07:18 +0000 Subject: gentoo auto-resync : 03:12:2024 - 02:07:18 --- sci-physics/Manifest.gz | Bin 4208 -> 4205 bytes sci-physics/geant4_vmc/Manifest | 3 +- .../files/geant4_vmc-6.6_p1-no-g4root.patch | 44 +++++++++++++++++ sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild | 1 + sci-physics/siscone/Manifest | 5 +- sci-physics/siscone/metadata.xml | 3 ++ sci-physics/siscone/siscone-3.0.6.ebuild | 53 +++++++++++++++++++++ sci-physics/siscone/siscone-9999.ebuild | 53 +++++++++++++++++++++ 8 files changed, 160 insertions(+), 2 deletions(-) create mode 100644 sci-physics/geant4_vmc/files/geant4_vmc-6.6_p1-no-g4root.patch create mode 100644 sci-physics/siscone/siscone-3.0.6.ebuild create mode 100644 sci-physics/siscone/siscone-9999.ebuild (limited to 'sci-physics') diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz index c4b61fdeebeb..54e8a70d76e0 100644 Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest index ed03020f060c..1634c4b182a2 100644 --- a/sci-physics/geant4_vmc/Manifest +++ b/sci-physics/geant4_vmc/Manifest @@ -1,9 +1,10 @@ AUX geant4_vmc-6.6-fix-preinstall-tests.patch 881 BLAKE2B 51685a16bab32be8b1ee6f7d14ee544f4ee303d01f3dc3ef53a2f4eb1bef98914604d49c5f7eff7e576e099f3570a7c7e74b7542983d5e34040d0769bf729050 SHA512 fc1e28e736e26db792e2b5167bf1dcb96aac50e807ebedb6161bc3af1142554703d57c0dd9c0d0d9917cb540e7a937960e1e75babbb60089725aa6bc02b71605 +AUX geant4_vmc-6.6_p1-no-g4root.patch 1494 BLAKE2B 78ff41ee999965c29a00e1ab4f0a06642fc6761f163a139a9717a6ea23783b742a5cd3e7f3ac0623cfd00fb25c45c74dd2e47a0b4281a62c1b0bafafa4e6b7a0 SHA512 44c7bd7864781fe1161dcdb5a767cdbee1df87242196c33889bb88855fa45141bb090fd78fabe4f709be2152b840e3bef249ce8e08edecb2cdcd544085091ec9 DIST geant4_vmc-6.3_p2.tar.gz 5737615 BLAKE2B db6b27e2ff81d37f61c75f39b4bdc775fa2eeded4916b82de7a6e717b206f9648eb295058547d0eaf8bc30bb8f28dddd1b00dea334aeccf6c2cb53da25cee90a SHA512 d9994a291fd195737b94101cafeadbb18aa14a71046cf8c637ea42c8560f290edd7fa524056c472b164fbff8f07afe01b4f5c6b86eeecfa1cfd564e55839052f DIST geant4_vmc-6.5.tar.gz 5933744 BLAKE2B 8d797eb770a0627f11860c0c6f7544b2bbfd93de1d6cb1b7ad8ca0888e81ec01a8f07067f810d45a86546f08c08136221c425e4b82039b8e74d24ea01da558a7 SHA512 d81b38eab84fa8d6bcf66b9a755970e4aa79b8c212e528a1e91f4d8692a89180f9f16cefcd049ffc63894a29b258d04dfcd217f0b82cfbe7e5e911ce16b2184f DIST geant4_vmc-6.6_p1.tar.gz 5936947 BLAKE2B 7a44077314951bd33cc19615247b48a88df13f911603e631d818e97029a8de272cecd2ad6efe8aef2b622bd000385f25940e5cb744356b1e72f5312c6af616cd SHA512 244287a0412d00219a2838ae30f325a5f4b90b594973b4f61c5189e8e78a3585c8b4898c9bae574de871a8e0aaf4b7f25163a830489898279d7c4498422df29e EBUILD geant4_vmc-6.3_p2-r1.ebuild 1856 BLAKE2B c6bacb57587a9392640d21bae1c7de8d8914440c9043a50c8ab0916fd3d48d681a32e345b949f90b3fe70ad1176119e809bc2d3a096b6d8125523bc1547ba7a6 SHA512 b741ab855de9ae29e53c4b52f059b1f9cc6c4570e5899300ccef466200cc521f26e52a39f84d77957a446705a8ffdfaabede8107b9ae1db35a6f8b41fa10e835 EBUILD geant4_vmc-6.5.ebuild 1856 BLAKE2B c6bacb57587a9392640d21bae1c7de8d8914440c9043a50c8ab0916fd3d48d681a32e345b949f90b3fe70ad1176119e809bc2d3a096b6d8125523bc1547ba7a6 SHA512 b741ab855de9ae29e53c4b52f059b1f9cc6c4570e5899300ccef466200cc521f26e52a39f84d77957a446705a8ffdfaabede8107b9ae1db35a6f8b41fa10e835 -EBUILD geant4_vmc-6.6_p1.ebuild 1922 BLAKE2B a9a5e1ae6f196d696adf2f2972e027bb8b091ddd00e0caa401a1740a16e4a3b1d61f56c460d2806b909734b3d451238241c7d77a2f2aabf439ede7688a92a13b SHA512 388ab70c8e99326344dfe8635071b75bffb31e63ee342c2a2f330ce31317e168db4b83abec04f9921c7c51915f1742ef66a8f96fdf219ac0ecd6ead9f570a637 +EBUILD geant4_vmc-6.6_p1.ebuild 1967 BLAKE2B 0a2224b70f6d76663d651fc2b74728197b9518ba53a94963afaf51af991780118bc43fb44bcbf9cd4b63682d447ff92780f173dfcec7d6b3c403c771a97d0ffa SHA512 fa8289e5608ecf82458ff827678c78a0819ed5303ecacb22ad573eeefb86fe90c65438f645152e309ef3479495869c56e06bb07397456e974ce78c7010ecc0ca EBUILD geant4_vmc-9999.ebuild 1826 BLAKE2B adfcba483530fac69a17f9a75c78515add3f09477296315cf4abce2698d118d7dd4f2d0cc078f7b79453cec9cd4cbcb4f7293670be45d36386bbf8682b351673 SHA512 15372cb33a528f02dc87a22e496442a4c19e047b8429c688fdb7ffc2fbb854d90df2975974f79a3b1a3488963024f9af96183debb06f15d537ce3f57d4f183d7 MISC metadata.xml 898 BLAKE2B d938774267f72be00ef3ce6e483d5c1c2f84b20cc3ee46129cefc8677cbd7725760d7289863a5cb2ebb44a43e375831fa581597f75c2c4a1218acbd97872d181 SHA512 f2c0b0b9e6440975f0a322f57943c9eb40b244081927971377f355f4913d2db678cc6e65e49be6b7a67457440974c101fbe3a4ae3dbfb49c27f16175cd16dd6c diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.6_p1-no-g4root.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.6_p1-no-g4root.patch new file mode 100644 index 000000000000..ec645d18b4c8 --- /dev/null +++ b/sci-physics/geant4_vmc/files/geant4_vmc-6.6_p1-no-g4root.patch @@ -0,0 +1,44 @@ +From 528092d80bc6835efaf9a7b75e4da74f27ac4850 Mon Sep 17 00:00:00 2001 +From: Ivana Hrivnacova +Date: Thu, 28 Nov 2024 12:30:48 +0100 +Subject: [PATCH] Fix compilation with -DGeant4VMC_USE_G4Root=OFF: (#69) + +Added compilation flag for unprotected use of G4Root in TG4GeometryManager + +Bug: https://bugs.gentoo.org/943657 +Bug: https://github.com/vmc-project/geant4_vmc/issues/68 +--- + source/geometry/src/TG4GeometryManager.cxx | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/source/geometry/src/TG4GeometryManager.cxx b/source/geometry/src/TG4GeometryManager.cxx +index 02751e8458..d8d9db65ec 100644 +--- a/source/geometry/src/TG4GeometryManager.cxx ++++ b/source/geometry/src/TG4GeometryManager.cxx +@@ -29,12 +29,15 @@ + #include "TG4ModelConfigurationManager.h" + #include "TG4OpGeometryManager.h" + #include "TG4RadiatorDescription.h" +-#include "TG4RootDetectorConstruction.h" + #include "TG4SDManager.h" + #include "TG4StateManager.h" + #include "TG4VUserPostDetConstruction.h" + #include "TG4VUserRegionConstruction.h" + ++#ifdef USE_G4ROOT ++#include "TG4RootDetectorConstruction.h" ++#endif ++ + #include + #include + #include +@@ -521,7 +524,9 @@ void TG4GeometryManager::FillMediumMapFromRoot() + geoVolume = gGeoManager->GetVolume(volName.data()); + } + else { ++#ifdef USE_G4ROOT + geoVolume = fRootDetectorConstruction->GetVolume(lv); ++#endif + } + + if (!geoVolume) { diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild index a55c3bef5369..f30c81deccd9 100644 --- a/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild +++ b/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild @@ -42,6 +42,7 @@ DOCS=(history README.md) PATCHES=( "${FILESDIR}"/${PN}-6.6-fix-preinstall-tests.patch + "${FILESDIR}"/${PN}-6.6_p1-no-g4root.patch ) src_configure() { diff --git a/sci-physics/siscone/Manifest b/sci-physics/siscone/Manifest index 795040606dff..b1943514b72a 100644 --- a/sci-physics/siscone/Manifest +++ b/sci-physics/siscone/Manifest @@ -1,4 +1,7 @@ AUX 0001-configure-fix-broken-bashisms-resulting-in-logic-fai.patch 3191 BLAKE2B add4b0710e607c7e55bee0bfa7f9f2f4fa04ce4641c06231f7155cd437161a487275f3c9e7fd582b8427e7d6dd36b356e1096cd834ce7e4f2d278821ae6b9650 SHA512 cebed87f1df067c9cdb912e14562cd25089cc8cfc69740a239a3df8657ca99cf7b5c57bf28a61ed467588543c33d69194f45b187c5927471ef1068b7d3cbb00f DIST siscone-3.0.5.tar.gz 544738 BLAKE2B 7136acfc46d9414831d4e07cc428ad3858c1da02bdcd66817eb6406b9ae1d9d582800412dfcfae5477a720b7893ba070c9ef84816a517992be1762d356840bf8 SHA512 fb9f5e6b6677968e77eb9476abe8345711c69213209c153932adacd69b3c1219abe79655238fec1c0ca4e8ca91795c7693c68e2a48ec41a6afff1f046a781a61 +DIST siscone-3.0.6.tar.gz 553221 BLAKE2B e472fb0ee4ce23b420af9978f95225acf8a7c27a1534a85bf69da1235621770aa7a1c1c64b3775c30c81d3161058be6dae8aa446c795805f074bdda001a76edb SHA512 ee2d07e24912aefa5a1626182e60ecdc60e11442530e602cb4dd610d5e9c33bf28faac1359597aafbb92bba3758a181bd41e38fba5746ba3f39f61d8248081ea EBUILD siscone-3.0.5.ebuild 1052 BLAKE2B f5a5874484e9e8cf668373fc60614ba3ce99ff08f157ec25145398e0283430ae0238790fbc43463eb4a8e652e43e8968736ae491ca95244545822afc5e64b50e SHA512 07c34f05bd3684b33a344e5cb84e15ffa165ae795d6b8fa019d0740ae4f9ee836bda73d364434cbd9cdbf055b457f1efbf623a7f051d52843e11638cc05ba1b5 -MISC metadata.xml 487 BLAKE2B d1df4336770fb9ade97d6c75d1712253b0640d95b0a91f34ea2c22f3f9fe58c6b24f25bc7c415fb5bfa49de4c1ae7e5a99cbf336a9255cb74b4b972be3d694dd SHA512 9f442c9d835eb3021ed7dee8e565a24bf190df844920e35c4a92df2efecba3d9ba49856f2f6b7ce7c8dcd89f5fcc0e20a1f9d61ec8c8121b233696442e5c8029 +EBUILD siscone-3.0.6.ebuild 1158 BLAKE2B 253cdd5afeb3f5e577d4cbe8286bdc8780bd9b91519ebab9a8e3e85e39edbff69fc9a59f81f8110dcfdc3346263c25fdd7cb55878fdfd1db28ad4f870df769b7 SHA512 62660393b727a948a2f6a9bcf7d5e15c5767cdcac4ffc842a779b0ac6c4b13acd510a83d989c02d3d3017c7e6f44f3ed5bc2143b57a77dfd2d8f01ed6e4d39a6 +EBUILD siscone-9999.ebuild 1158 BLAKE2B 253cdd5afeb3f5e577d4cbe8286bdc8780bd9b91519ebab9a8e3e85e39edbff69fc9a59f81f8110dcfdc3346263c25fdd7cb55878fdfd1db28ad4f870df769b7 SHA512 62660393b727a948a2f6a9bcf7d5e15c5767cdcac4ffc842a779b0ac6c4b13acd510a83d989c02d3d3017c7e6f44f3ed5bc2143b57a77dfd2d8f01ed6e4d39a6 +MISC metadata.xml 567 BLAKE2B cb41c3f3e4cfbd164292e616f634a5c5c12e0e44316b712e1f275113da09ba16ceae2cd3cc1ca6ef1cbfdff7a41a67e6714766254a2e92e59223f3a2065d54c2 SHA512 6b460141d3f48f908f37c1d068cc02cbedf3fad668e3de1cf29e425cb0f9c22745c21063943f48de88550adee76321c8179f4036329368489136540da9efd65b diff --git a/sci-physics/siscone/metadata.xml b/sci-physics/siscone/metadata.xml index 858c1fe385e5..abbbdb4b8952 100644 --- a/sci-physics/siscone/metadata.xml +++ b/sci-physics/siscone/metadata.xml @@ -10,4 +10,7 @@ N^2*ln(N) time to find jets among N particles, comparing to N*2^N time of other algorithms. + + fastjet/siscone + diff --git a/sci-physics/siscone/siscone-3.0.6.ebuild b/sci-physics/siscone/siscone-3.0.6.ebuild new file mode 100644 index 000000000000..e646896d056d --- /dev/null +++ b/sci-physics/siscone/siscone-3.0.6.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Hadron Seedless Infrared-Safe Cone jet algorithm" +HOMEPAGE="https://siscone.hepforge.org/" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/fastjet/siscone" +else + SRC_URI="https://siscone.hepforge.org/downloads/${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="examples" +BDEPEND="dev-build/autoconf-archive" + +PATCHES=( + "${FILESDIR}"/0001-configure-fix-broken-bashisms-resulting-in-logic-fai.patch +) + +src_prepare() { + default + + # The included copy of this macro is from 2008 and totally broken. + # https://bugs.gentoo.org/890780 + rm m4/ax_prefix_config_h.m4 || die + + # Rebuild after patch to configure.ac, removal of broken macro + eautoreconf +} + +src_configure() { + econf --disable-static +} + +src_install() { + default + if use examples; then + docinto examples + dodoc examples/*.{cpp,h} + docinto examples/events + dodoc examples/events/*.dat + docompress -x /usr/share/doc/${PF}/examples + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-physics/siscone/siscone-9999.ebuild b/sci-physics/siscone/siscone-9999.ebuild new file mode 100644 index 000000000000..e646896d056d --- /dev/null +++ b/sci-physics/siscone/siscone-9999.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Hadron Seedless Infrared-Safe Cone jet algorithm" +HOMEPAGE="https://siscone.hepforge.org/" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/fastjet/siscone" +else + SRC_URI="https://siscone.hepforge.org/downloads/${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="examples" +BDEPEND="dev-build/autoconf-archive" + +PATCHES=( + "${FILESDIR}"/0001-configure-fix-broken-bashisms-resulting-in-logic-fai.patch +) + +src_prepare() { + default + + # The included copy of this macro is from 2008 and totally broken. + # https://bugs.gentoo.org/890780 + rm m4/ax_prefix_config_h.m4 || die + + # Rebuild after patch to configure.ac, removal of broken macro + eautoreconf +} + +src_configure() { + econf --disable-static +} + +src_install() { + default + if use examples; then + docinto examples + dodoc examples/*.{cpp,h} + docinto examples/events + dodoc examples/events/*.dat + docompress -x /usr/share/doc/${PF}/examples + fi + + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3