[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/, sci-physics/geant/files/
commit: 92adce0f85a9027e5426c6578c4c31310d037c90 Author: Guilherme Amadio gentoo org> AuthorDate: Mon Apr 8 17:49:24 2024 + Commit: Guilherme Amadio gentoo org> CommitDate: Mon Apr 8 17:57:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92adce0f sci-physics/geant: fix bug 928657 Closes: https://bugs.gentoo.org/928657 Signed-off-by: Guilherme Amadio gentoo.org> .../files/geant-4.11.2.1-find-soxt-noversion.patch | 20 sci-physics/geant/geant-4.11.2.1.ebuild | 1 + 2 files changed, 21 insertions(+) diff --git a/sci-physics/geant/files/geant-4.11.2.1-find-soxt-noversion.patch b/sci-physics/geant/files/geant-4.11.2.1-find-soxt-noversion.patch new file mode 100644 index ..a35e184ffccb --- /dev/null +++ b/sci-physics/geant/files/geant-4.11.2.1-find-soxt-noversion.patch @@ -0,0 +1,20 @@ +Remove versions from find_package(SoXt/SoWin), bug 928657. +Patch submitted upstream. + +--- a/cmake/Modules/G4InterfaceOptions.cmake b/cmake/Modules/G4InterfaceOptions.cmake +@@ -153,12 +153,12 @@ if(GEANT4_USE_INVENTOR) + geant4_save_package_variables(Inventor SoQt_DIR) + else() + if(UNIX) +- find_package(SoXt 1.4.0 REQUIRED) ++ find_package(SoXt REQUIRED) + check_sobind_version(SoXt 1.4.0) + geant4_save_package_variables(Inventor SoXt_DIR) + set(GEANT4_USE_INVENTOR_XT ON) + elseif(WIN32) +- find_package(SoWin 1.4.0 REQUIRED) ++ find_package(SoWin REQUIRED) + check_sobind_version(SoWin 1.4.0) + geant4_save_package_variables(Inventor SoWin_DIR) + set(GEANT4_USE_INVENTOR_WIN ON) diff --git a/sci-physics/geant/geant-4.11.2.1.ebuild b/sci-physics/geant/geant-4.11.2.1.ebuild index 2e384cbf7fc8..798bd3585b77 100644 --- a/sci-physics/geant/geant-4.11.2.1.ebuild +++ b/sci-physics/geant/geant-4.11.2.1.ebuild @@ -67,6 +67,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-4.11.0.2-musl-avoid-execinfo.patch + "${FILESDIR}"/${PN}-4.11.2.1-find-soxt-noversion.patch ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/, sci-physics/geant/files/
commit: 4752ad90f0e5096cebe36782a4c098a45d2ae67e Author: Guilherme Amadio gentoo org> AuthorDate: Mon Mar 16 16:22:13 2020 + Commit: Guilherme Amadio gentoo org> CommitDate: Mon Mar 16 16:58:49 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4752ad90 sci-physics/geant: version bumps for Geant4 10.6 This set of new ebuilds for Geant4 have been updated to offer more functionality and be easier to maintain in the future. Here is a list of the improvements made: - Moved to EAPI=7 - Same ebuild can be used for regular, beta, and patch releases - Dropped extra zeros from version numbers to follow upstream more closely - SRC_URI has been updated to the new upstream location - Fixed dependency on CLHEP to require matching USE=threads - Added USE=c++XX flags to allow users to choose C++ standard (this is useful for packages that depend on both sci-physics/root and geant to ensure that they have been compiled with matching C++ standards). - New USE=hdf5 and USE=freetype have been added - Removed obsolete scripts and unnecessary dependency on app-shells/tcsh - Always use system's zlib instead of bundled one - Removed usage of PDEPEND by updating geant-docs and geant-data - Added patch to allow customization of CMAKE_INSTALL_DATADIR - Added ${EXTRA_ECONF} to allow users to customize installation further without patching ebuild itself or using an overlay Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Guilherme Amadio gentoo.org> sci-physics/geant/Manifest | 3 + sci-physics/geant/files/geant-4.10.6-datadir.patch | 159 + sci-physics/geant/geant-4.10.6.ebuild | 107 ++ sci-physics/geant/geant-4.10.6_beta1.ebuild| 107 ++ sci-physics/geant/geant-4.10.6_p1.ebuild | 107 ++ sci-physics/geant/metadata.xml | 7 +- 6 files changed, 488 insertions(+), 2 deletions(-) diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest index 7fde0b416a8..7b80e804491 100644 --- a/sci-physics/geant/Manifest +++ b/sci-physics/geant/Manifest @@ -1,2 +1,5 @@ DIST geant4.10.03.tar.gz 33143770 BLAKE2B f84c4dc680c45bc5728485e3e38852de90ae0f89dfe4cf65677aa86f6d90b4cbe5d2ffec812b08d05c88f8abb73f006f3a5319bcfd48c20872299ccfd91c7e39 SHA512 61d67e57f1576ab10562f2309995897008b4be1aa60f7e471b4f5efc2d852788d5faf60e64ea7024a4af4035d98c04c0be23df8593a4ed3a510af6b476013c56 DIST geant4.10.05.p01.tar.gz 34413415 BLAKE2B d98a9308e37f166dccf8f9640a54ee74ab2b1d07275609666aec6d929b0193269a18075762cebaa154abcad5c8359a128b6629ff973cb6cdc8f54535151997a3 SHA512 ace2097251ee4cdda3511c3dd8191c97e1001f73d421797e3cd517ed41fa5adc73efcddfb2c8b6fb75231e5af8ddb4bd63a402ccb99b40ce2c140588d328b582 +DIST geant4.10.06.b01.tar.gz 34511064 BLAKE2B d20bd338ea0ac47b11464b581aa0dec3725da56902dbaab233fcaad28ba6b3ce302a8d7e2c27f4532bed2db991467b4bde837675f3837f066c9e7e3d78c7acd6 SHA512 3916a0ad13891fc5a189c0be6c2e57abe29281696c9d16c0c54fd11940146586feb550a61403ab6451e6575d2ad1f4349590d9c564d7b5d7fc5ab9e9b2356ccb +DIST geant4.10.06.p01.tar.gz 34869969 BLAKE2B 0a27f34df213a0dcc2d87c6001c100269be7496519c614fa5b51cd6502d98232d09de0f3c44216c34b6788ec8a1f626d22a53cb7329027006c614a10777b6896 SHA512 d9bca66b086a309a577dcf018c0ca52f5d786b1ebe5ce9d30c29c579c342399816c34efbcb34af60871145b6713cb8151f5517c5a0aa9d24d00e4257a5c1c6c0 +DIST geant4.10.06.tar.gz 34834510 BLAKE2B 48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf SHA512 e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044 diff --git a/sci-physics/geant/files/geant-4.10.6-datadir.patch b/sci-physics/geant/files/geant-4.10.6-datadir.patch new file mode 100644 index 000..c26bf8914b4 --- /dev/null +++ b/sci-physics/geant/files/geant-4.10.6-datadir.patch @@ -0,0 +1,159 @@ +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
[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/, sci-physics/geant/files/
commit: 1b8ddffa1ecb546b5b84078d7d18aa4b1e77acda Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 12 18:25:07 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 19 18:39:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8ddffa sci-physics/geant: Drop old Closes: https://bugs.gentoo.org/573118 Closes: https://bugs.gentoo.org/573778 Closes: https://bugs.gentoo.org/589622 Closes: https://bugs.gentoo.org/644358 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-physics/geant/Manifest | 8 -- .../files/geant-4.10.0-TrackingNavigator.patch | 60 --- .../geant/files/geant-4.10.0-no-examples.patch | 22 -- .../geant/files/geant-4.10.02-std-isnan.patch | 17 - .../geant/files/geant-4.10.2-no-examples.patch | 18 - sci-physics/geant/files/geant-4.9.4-zlib.patch | 35 - sci-physics/geant/geant-3.21.14-r4.ebuild | 67 sci-physics/geant/geant-4.10.00.ebuild | 88 -- sci-physics/geant/geant-4.10.00_p01.ebuild | 85 - sci-physics/geant/geant-4.10.01.ebuild | 86 - sci-physics/geant/geant-4.10.01_p02.ebuild | 87 - sci-physics/geant/geant-4.10.02.ebuild | 87 - sci-physics/geant/geant-4.9.6_p02-r1.ebuild| 85 - 13 files changed, 745 deletions(-) diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest index c2a7073accf..80ea674df07 100644 --- a/sci-physics/geant/Manifest +++ b/sci-physics/geant/Manifest @@ -1,9 +1 @@ -DIST geant321_3.21.14.dfsg-11.debian.tar.gz 52237 BLAKE2B 0266a91be654c7a40a24e1ad72a296bd33acdbf145c349909526194ccd5070392dd5a97073b075811dd362cdfcdfd40054d88e322693be3f5ab1fec66d356de3 SHA512 a3b6dea7b0df1ecb89bfb974339d3b5aed6815874f453040b37377ab9e9217d6970429d7a346c62f2b289bb8911aafa3569edc7499c13b7b2d3fac23e2a773c9 -DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 BLAKE2B 1a32a9857e3afffae48b0b81003b4a91c9505d18c780de247545a5b29cf9618399bd3b8df1ba1db5c2fda957d9513ed18d5a946d0440d7be68a02ade8a2eedf3 SHA512 733a77e529ecfe17c35d1e0bf44cf9062dbd9f2e3880e12cbfabf7372e6c60ea9690df010574094b44aef6fe306dfd85dfd4f42641b8f03efda3938a50313734 -DIST geant4.10.00.p01.tar.gz 29701289 BLAKE2B fa3a012d1e98ae643c2649b3eaee0f9ed4e38bd271ec7ee6106f938b8841b64e5fb576b34b873f9db8b53813bce3f550be349a0d01266a70194fa3acdd19711e SHA512 d7be39580a8dafa55b1a52b498e4a24312499a33d41954d8684385ce57c903430b2c56386728ad9a70d21af6634fbb8d6b55b2ef9c56b6c9272671e66bf9119d -DIST geant4.10.00.tar.gz 30780131 BLAKE2B 22702e73f3e2f973e3251dc650f4cfd38c905edabc27f2d09d40bb9a518ea46fafc55be9f91b35eb4bcc7a35a442905347b652a1388055eebb856e998184d8f2 SHA512 c9288b26df8b858622e728158b687cd7bc257c49f26a21b93d1b9fa4619c22dfea2a7604689118ac493b407888690db42d1ec9c8048aa1f45bf8beeb6a657e87 -DIST geant4.10.01.p02.tar.gz 33708464 BLAKE2B d780783a61e70d7a9c04abda50ea60a14f8d1196655b474075b015d9ddec0cc2840ab3ac08084e637aa6231c8189a46ad698f045208419c89ef4ffbf359a4d89 SHA512 056ffca00b6e0496748aa1ca34a0a349eea607505b093f7148557a4e2a704cdb6949731f5313508eff311a3075b53841c4f332f057604c0826b76db0089fc082 -DIST geant4.10.01.tar.gz 43759041 BLAKE2B 21ca42e4f8e14670d6a45e2a7889b06f40037e4d47c47df0f90b8d2a30cb384857b6e9d6c5cf130016d27aafc75b9f027dee8300c76ef7a48b3fe8a354b1e8b1 SHA512 6b9f154f705e7ca4918dea3e2a9ccc0e6fa8806fd4466b4b947f9beec35968640dbe32d383c2a138f15e40b10085c717256cc1604f4d8407e7cb28e5772b52e6 -DIST geant4.10.02.tar.gz 32312192 BLAKE2B 882a07b9dc52c391ad43b09227b627240bf276692a06c0bad9b8e26b97c635b7cd447620b28c1ab39ceebe66b4b1f86e0b0ca5aea3312b7170b0e5bb55cb2835 SHA512 f10fd1205b986f0ad069727ac867f1cd13e2a9da088462e70ba1eb58dee84276c0e5a5f764eee44e3ca832ed0ac4591b29645cd3dcc6b0e57e5fb1bc0c0dc6ea DIST geant4.10.03.tar.gz 33143770 BLAKE2B f84c4dc680c45bc5728485e3e38852de90ae0f89dfe4cf65677aa86f6d90b4cbe5d2ffec812b08d05c88f8abb73f006f3a5319bcfd48c20872299ccfd91c7e39 SHA512 61d67e57f1576ab10562f2309995897008b4be1aa60f7e471b4f5efc2d852788d5faf60e64ea7024a4af4035d98c04c0be23df8593a4ed3a510af6b476013c56 -DIST geant4.9.6.p02.tar.gz 25480383 BLAKE2B db0e1a8997d91a4e989bf3d038fd0898a2612fa79d6ad195ea3280b49e1290712926ac04de2501d2f75f99de54868f1214284db70de47bd3661345b9bb7503e1 SHA512 dab5f31568074869adecbbfb8855be0c0a2e92e5ba3119dbeb9cd414878721df3052198a05e5e3c19d0e2942a22602c6618dc0628b05134d3403a50c2bc2032c diff --git a/sci-physics/geant/files/geant-4.10.0-TrackingNavigator.patch b/sci-physics/geant/files/geant-4.10.0-TrackingNavigator.patch deleted file mode 100644 index e3cc8d6594a..000 --- a/sci-physics/geant/files/geant-4.10.0-TrackingNavigator.patch +++ /dev/null @@ -1,60 +0,0 @@ -accepted upstream. to be removed in the next minor release. - -https://bugs.gentoo.org/show_bug.cgi?id=496678 -http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1537
[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/, sci-physics/geant/files/
commit: 43524c9b7983800ae991b5d295d2588e3db50c2e Author: David Seifert gentoo org> AuthorDate: Thu May 5 20:38:39 2016 + Commit: David Seifert gentoo org> CommitDate: Thu May 5 21:11:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43524c9b sci-physics/geant: Add std:: qualifier to isnan for C++11 Gentoo-Bug: 581322 Package-Manager: portage-2.2.28 sci-physics/geant/files/geant-4.10.02-std-isnan.patch | 17 + sci-physics/geant/geant-4.10.02.ebuild| 1 + 2 files changed, 18 insertions(+) diff --git a/sci-physics/geant/files/geant-4.10.02-std-isnan.patch b/sci-physics/geant/files/geant-4.10.02-std-isnan.patch new file mode 100644 index 000..6d26a6c --- /dev/null +++ b/sci-physics/geant/files/geant-4.10.02-std-isnan.patch @@ -0,0 +1,17 @@ +Fully qualify isnan: +* /var/tmp/portage/sci-physics/geant-4.10.02/work/geant4.10.02/source/processes/hadronic/models/lend/src/nf_utilities.cc:61:22: error: ‘isnan’ was not declared in this scope +* return( isnan( d ) ); +See also: +https://bugs.gentoo.org/show_bug.cgi?id=581322 + +--- geant4.10.02/source/processes/hadronic/models/lend/src/nf_utilities.cc geant4.10.02/source/processes/hadronic/models/lend/src/nf_utilities.cc +@@ -58,7 +58,7 @@ + */ + int nfu_isNAN( double d ) { + +-return( isnan( d ) ); ++return( std::isnan( d ) ); + } + /* + diff --git a/sci-physics/geant/geant-4.10.02.ebuild b/sci-physics/geant/geant-4.10.02.ebuild index 5dd41ee..89b1e12 100644 --- a/sci-physics/geant/geant-4.10.02.ebuild +++ b/sci-physics/geant/geant-4.10.02.ebuild @@ -41,6 +41,7 @@ PDEPEND=" S="${WORKDIR}/${MYP}" src_prepare() { + epatch -p1 "${FILESDIR}/${P}-std-isnan.patch" use examples || epatch "${FILESDIR}"/${PN}-${PV1}.${PV2}.${SPV3}-no-examples.patch }
[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/, sci-physics/geant/files/
commit: c91eed68bc313c17f51477bcc428bceaa18717b9 Author: Guilherme Amadio gentoo org> AuthorDate: Wed Jan 13 17:07:20 2016 + Commit: Guilherme Amadio gentoo org> CommitDate: Wed Jan 13 17:40:42 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91eed68 sci-physics/geant: update no-examples patch (bug #571754) Package-Manager: portage-2.2.26 sci-physics/geant/files/geant-4.10.2-no-examples.patch | 18 ++ sci-physics/geant/geant-4.10.02.ebuild | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/sci-physics/geant/files/geant-4.10.2-no-examples.patch b/sci-physics/geant/files/geant-4.10.2-no-examples.patch new file mode 100644 index 000..7675478 --- /dev/null +++ b/sci-physics/geant/files/geant-4.10.2-no-examples.patch @@ -0,0 +1,18 @@ +diff -ur geant4.10.02.orig/CMakeLists.txt geant4.10.02/CMakeLists.txt +--- geant4.10.02.orig/CMakeLists.txt 2016-01-13 15:00:07.009259839 -0200 geant4.10.02/CMakeLists.txt2016-01-13 15:01:00.369257669 -0200 +@@ -134,14 +134,6 @@ + add_subdirectory(examples) + endif() + +-# - Install example code to datarootdir +-install(DIRECTORY examples +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION} +- COMPONENT Examples +- PATTERN "CVS" EXCLUDE +- PATTERN ".svn" EXCLUDE +- ) +- + #--- + # - CPack-aging + include(Geant4CPackBase) diff --git a/sci-physics/geant/geant-4.10.02.ebuild b/sci-physics/geant/geant-4.10.02.ebuild index 58e0a76..5dd41ee 100644 --- a/sci-physics/geant/geant-4.10.02.ebuild +++ b/sci-physics/geant/geant-4.10.02.ebuild @@ -41,7 +41,7 @@ PDEPEND=" S="${WORKDIR}/${MYP}" src_prepare() { - use examples || epatch "${FILESDIR}"/${PN}-4.10.0-no-examples.patch + use examples || epatch "${FILESDIR}"/${PN}-${PV1}.${PV2}.${SPV3}-no-examples.patch } src_configure() {