From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- sci-physics/Manifest.gz | Bin 5351 -> 5507 bytes sci-physics/geant-vmc/Manifest | 6 +- sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild | 92 +++++++++++++++++++++++ sci-physics/geant-vmc/geant-vmc-9999.ebuild | 43 ++++++----- sci-physics/geant-vmc/metadata.xml | 8 ++ sci-physics/lammps/Manifest | 6 -- sci-physics/lammps/files/fm_exp.patch | 11 --- sci-physics/lammps/files/gcc-6.patch | 11 --- sci-physics/lammps/files/lammps-python3-r1.patch | 11 --- sci-physics/lammps/files/lammps-python3-r2.patch | 11 --- sci-physics/lammps/files/lammps-python3.patch | 11 --- sci-physics/lammps/files/python-shebang.patch | 7 -- sci-physics/vgm/Manifest | 13 ++-- sci-physics/vgm/metadata.xml | 8 +- sci-physics/vgm/vgm-4.4-r1.ebuild | 82 -------------------- sci-physics/vgm/vgm-4.4.ebuild | 79 ------------------- sci-physics/vgm/vgm-4.5.ebuild | 11 +-- sci-physics/vgm/vgm-4.8.ebuild | 82 ++++++++++++++++++++ sci-physics/vgm/vgm-9999.ebuild | 19 +++-- sci-physics/vmc/Manifest | 4 + sci-physics/vmc/metadata.xml | 24 ++++++ sci-physics/vmc/vmc-1.0_p2.ebuild | 45 +++++++++++ sci-physics/vmc/vmc-9999.ebuild | 45 +++++++++++ 23 files changed, 357 insertions(+), 272 deletions(-) create mode 100644 sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild delete mode 100644 sci-physics/lammps/files/fm_exp.patch delete mode 100644 sci-physics/lammps/files/gcc-6.patch delete mode 100644 sci-physics/lammps/files/lammps-python3-r1.patch delete mode 100644 sci-physics/lammps/files/lammps-python3-r2.patch delete mode 100644 sci-physics/lammps/files/lammps-python3.patch delete mode 100644 sci-physics/lammps/files/python-shebang.patch delete mode 100644 sci-physics/vgm/vgm-4.4-r1.ebuild delete mode 100644 sci-physics/vgm/vgm-4.4.ebuild create mode 100644 sci-physics/vgm/vgm-4.8.ebuild create mode 100644 sci-physics/vmc/Manifest create mode 100644 sci-physics/vmc/metadata.xml create mode 100644 sci-physics/vmc/vmc-1.0_p2.ebuild create mode 100644 sci-physics/vmc/vmc-9999.ebuild (limited to 'sci-physics') diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz index 17653b51acc2..584fbeeba4ae 100644 Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest index 3bf35d888da4..60fee01a124d 100644 --- a/sci-physics/geant-vmc/Manifest +++ b/sci-physics/geant-vmc/Manifest @@ -1,5 +1,7 @@ AUX geant-vmc-4.4.0-fix-cflags.patch 661 BLAKE2B 121054bdcf8dfae328334221cc85c7d117a8dd9b0b096499ea07938bb05f303759c6478c2187f36e7b4ba22f4e1f0935d980802ce5195c1d2d9b5202d240b683 SHA512 7c6b7c253088a780101c51ac9a055fe79f65d78996206fce77d9e70a558e2b5b222eee4ccba689e68effc429cb8b2d41c6021fe4bead7d44f52daa1820a308a2 +DIST geant-vmc-4.5.1_p1.tar.gz 7441504 BLAKE2B 2bcb844a8fc79c800eec50f914cd7238a68ba0c1ffa1e8d185adcded70583118e39efbac3330f7942a098fc64f990c1e9e0eeb1796f71ebd98f97d121aa6c121 SHA512 760611c1df481ea3d9f9069061678677ffc2bcf9edd7cfd44789a6359b945bc341f705da0ee85ecda7f8ac2b096cd5b7aa9ea2c44b464e3085c16eeb33ee1316 DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648 EBUILD geant-vmc-4.4.0.ebuild 2442 BLAKE2B 60d7a84b777d2f87fde249a31b05a9a0e6fd90f1f9e5c7b74d0770e9dd6f2f40663316b39e68f56e9ccf9b4edf9d9a1aec2ae83f13435529992eb7fb88ca59ec SHA512 c533ceccfdeed7ecaa4596056a11f6fcec9828a7f3f82556dd24686d59313318b4982ac87f57ef20d44393cd9c7308904dd2f3dc4a0d155f7e304f280fe97d1c -EBUILD geant-vmc-9999.ebuild 2087 BLAKE2B 2c922fce9990e941b90bbc13d90e6938cfcbe9eb4b75bb67847e6b194530ec2c7441733d7d5a2cc128d90c30a57210c500cc17be30206e2a6a57e336e22cae4e SHA512 8db090fb5919def57b56f34bd0dba1d8dd461b16a664e2586e6b0f82d95030384450e395d606281c1f26363d89198d5127862af0f838fd42b53cc3c2943af08f -MISC metadata.xml 859 BLAKE2B 4bec2c6236dfc1bdb9ba9f1caff6c9b545861c6e51c58d90bfa652d2d5aaa323437473173912f1840ba3c690f92798929980e5bcb3cacb5fe4cdd8a0edb014d9 SHA512 15a0f421563051a8553e2bdf9a8f82dc5077e336513cc18ef7e9bea49e084ea4dc1aa32800fbc928743d8c09036d136518a5a6a74c2f57c61215da2f44dc9727 +EBUILD geant-vmc-4.5.1_p1.ebuild 2145 BLAKE2B 27addb17a3e05d8d635e6f2e57b2cb106857776d31862003f242a5a5c180cb2b5ec2162ab9a3d0f4124aa86560352f732f22e512b5a6f09fd738a7f5b1c49daf SHA512 85f23a09ba6ce4ddc905807955f944491d6e2ebc1889a0eda979ea82c89770cb822dfbc48c718103ae42075ef7d53160194689e562b993d7523ccdb47ff7ba2c +EBUILD geant-vmc-9999.ebuild 2145 BLAKE2B 27addb17a3e05d8d635e6f2e57b2cb106857776d31862003f242a5a5c180cb2b5ec2162ab9a3d0f4124aa86560352f732f22e512b5a6f09fd738a7f5b1c49daf SHA512 85f23a09ba6ce4ddc905807955f944491d6e2ebc1889a0eda979ea82c89770cb822dfbc48c718103ae42075ef7d53160194689e562b993d7523ccdb47ff7ba2c +MISC metadata.xml 1272 BLAKE2B 341ef37e4e2262b40fa6161af831f886a9ef2deb7691555323a8b464f731c526eaa2dc118e050b6fdbcd6f6663830ed238c6dc227ac2013617981d06c56731e5 SHA512 9e871ddf520845ea33f6db1f608a0ddfbf29e8c2c2a51a2cb39a419a8de7c0297747fe2c5a9da335923a7ad01795bd37e930da7b3fa6fd042c97acfb09a10a27 diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild new file mode 100644 index 000000000000..b28eff16cc8b --- /dev/null +++ b/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git" + KEYWORDS="" +else + MY_PV=$(ver_rs 1-2 - $(ver_cut 2-)) + SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/geant4_vmc-${MY_PV}" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Virtual Monte Carlo Geant4 implementation" +HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html" + +LICENSE="GPL-3" +SLOT="4" +IUSE="+c++11 c++14 c++17 doc examples geant3 +g4root +mtroot rootvmc vgm test" + +REQUIRED_USE="^^ ( c++11 c++14 c++17 )" + +RDEPEND=" + rootvmc? ( + >=sci-physics/root-6.18:=[vmc] + !!sci-physics/vmc + ) + !rootvmc? ( + >=sci-physics/root-6.18:=[-vmc] + sci-physics/vmc:=[c++11?,c++14?,c++17?] + ) + >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?] + >=sci-physics/root-6.18:=[c++11?,c++14?,c++17?] + vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" +RESTRICT=" + !examples? ( test ) + !geant3? ( test ) + !g4root? ( test ) + !mtroot? ( test ) + !test? ( test ) + !vgm? ( test )" + +DOCS=(history README.md) + +src_configure() { + local mycmakeargs=( + -DGeant4VMC_USE_VGM="$(usex vgm)" + -DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)" + -DGeant4VMC_USE_G4Root="$(usex g4root)" + -DGeant4VMC_BUILD_MTRoot="$(usex mtroot)" + -DGeant4VMC_BUILD_EXAMPLES="$(usex test)" + -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc ; then + local dirs=( + source + $(usev g4root) + $(usev mtroot) + $(usev examples) + ) + local d + for d in "${dirs[@]}"; do + pushd "${d}" > /dev/null || die + doxygen || die + popd > /dev/null || die + done + fi +} + +src_test() { + cd examples || die + ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die + ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die +} + +src_install() { + cmake_src_install + use doc && local HTML_DOCS=(doc/.) + einstalldocs +} diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild index 9c27c2d98efa..b28eff16cc8b 100644 --- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild +++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,26 +8,35 @@ inherit cmake if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git" + KEYWORDS="" else - DOWN_PV=$(ver_cut 2-) - SRC_URI="http://root.cern.ch/download/vmc/geant4_vmc.${DOWN_PV}.tar.gz" - SOURCE_PV=$(ver_rs 1- . ${DOWN_PV}) - S="${WORKDIR}/geant4_vmc.${SOURCE_PV}" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + MY_PV=$(ver_rs 1-2 - $(ver_cut 2-)) + SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/geant4_vmc-${MY_PV}" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Virtual Monte Carlo Geant4 implementation" HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html" -LICENSE="GPL-2" +LICENSE="GPL-3" SLOT="4" -IUSE="doc examples geant3 +g4root +mtroot vgm test" +IUSE="+c++11 c++14 c++17 doc examples geant3 +g4root +mtroot rootvmc vgm test" + +REQUIRED_USE="^^ ( c++11 c++14 c++17 )" -# sci-physics/root[c++11] required to match sci-physics/geant flags. RDEPEND=" - >=sci-physics/geant-4.10.03:=[opengl,geant3?] - sci-physics/root:=[c++11,vmc] - vgm? ( >=sci-physics/vgm-4.4:= )" + rootvmc? ( + >=sci-physics/root-6.18:=[vmc] + !!sci-physics/vmc + ) + !rootvmc? ( + >=sci-physics/root-6.18:=[-vmc] + sci-physics/vmc:=[c++11?,c++14?,c++17?] + ) + >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?] + >=sci-physics/root-6.18:=[c++11?,c++14?,c++17?] + vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" RESTRICT=" @@ -38,10 +47,7 @@ RESTRICT=" !test? ( test ) !vgm? ( test )" -DOCS=( - history - README.md -) +DOCS=(history README.md) src_configure() { local mycmakeargs=( @@ -74,12 +80,9 @@ src_compile() { } src_test() { - # Required by sci-physics/root for pointer validity checking, - # see e.g. https://sft.its.cern.ch/jira/browse/ROOT-8146 . - addwrite /dev/random cd examples || die ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die - ./test_suite_exe.sh -debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die + ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die } src_install() { diff --git a/sci-physics/geant-vmc/metadata.xml b/sci-physics/geant-vmc/metadata.xml index ef4bdfb269e8..02aa869b861c 100644 --- a/sci-physics/geant-vmc/metadata.xml +++ b/sci-physics/geant-vmc/metadata.xml @@ -5,6 +5,10 @@ o.freyermuth@googlemail.com Oliver Freyermuth + + amadio@gentoo.org + Guilherme Amadio + proxy-maint@gentoo.org Proxy Maintainers @@ -13,9 +17,13 @@ vmc-project/geant4_vmc + Build using the C++11 standard + Build using the C++14 standard + Build using the C++17 standard Enable the Virtual Geometry Model (sci-physics/vgm) Build G4Root (interface for GEANT4 simulation with a ROOT geometry) Build with Geant4 G3toG4 library Build MTRoot (provides ROOT IO manager classes with multi-threading support) + Use sci-physics/root[vmc] (deprecated) instead of sci-physics/vmc as VMC provider diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest index 9dfc240d4368..7f1eebad353b 100644 --- a/sci-physics/lammps/Manifest +++ b/sci-physics/lammps/Manifest @@ -1,10 +1,4 @@ AUX 1080.patch 922 BLAKE2B 59325abb5d2f9d9e501c34b539a98efea521ee38872f1e2d3850442aac82adaea3a3c32e644f3d2982aa9aa86dbdfb5bd1373175a89acffac63d87ac542919a7 SHA512 a94bba2ad992f85db0f7d7d04cef235a79e4600e353897032d78ffc3e1f899bc340a5ad8aa1d8da41f9783b67d912dab8c3cd2f83a605a9e0c0ef51bdb909279 -AUX fm_exp.patch 347 BLAKE2B 230da9c04160d445a3da1c813453a788ad04b1d174c494ab9dd1de628ba3c1bf7f9aeb5070b165ec545a280208f07254afaa4d9120fffff5ee98975233d9fc9e SHA512 d0c8303bfe623fe766a545e1614f7576709381597e56f7c7634e90768376bccb9fbe37d4c0eeb6491c9b45d911a913a37386e0280ec3f05a90388aad7bb23c3e -AUX gcc-6.patch 397 BLAKE2B 7ef1bf4e884763d84ea661ad09dc1e373db10a177e1bf09f617edfc6bcefef5d494def037ba62a8ea76d83cb2eba172dc0188ba4f0ad1877b7cadd3a91d1f583 SHA512 eebb9041347dbe260be6028d9462183188ce95f3114873b2a776990aa77c71dd4b0ba37d2fe3fbf0b8bff64f85dfafaec93ad7234502791a1048ab6bfd1d06ed -AUX lammps-python3-r1.patch 544 BLAKE2B dcde498a0d886f941aefef6818429efe2a9d253285239a122b983a5bc6ab7b7c053f3fa78b24b995b21891c190f3c82d7032d07015f9baf3c525320e7421a3c4 SHA512 833ec755ba4dadf072ced646220a7a68147023548da9eeebdd1d4a6c198ee48fed1e60a7fc26de7093b5d9b77a906e162a7ef4f5f929918196943564f69037d5 -AUX lammps-python3-r2.patch 459 BLAKE2B 4371e3dd2f0f07f4be0533df1b107eaa74851eeba5362931034f74696bbed221d776414d150c7cc3517d31193c45854c09899ba78cb96c76f864ed90275240ae SHA512 87e12b5089ca6d75e9ec02b773964fbde0170a56876ae990648362757ff110a817d7a968e9496cd6475faec22a8a6c9d71d3367f564b34bba297b8e8eb0940c7 -AUX lammps-python3.patch 509 BLAKE2B 1c3f0fec8e6ad27c58e70e32f073a9840fc3564b4f92ca27f4b755e7a2c4400a9cd4e8bdff4f7d6eae2316a842995e8fb0bb2d1b79bb70d320a12e471ab7d14f SHA512 e88b7e036c3ea86c032a7e8dde771073c08ed96c0a3da240a824fd7f424553ef4d5db2ba6c4fcfcb9f0ec4550a073e7370a163165352911ee4f1d64f91094056 -AUX python-shebang.patch 393 BLAKE2B 6c0558d2f288d6587724f1b0e7ac38d1c4b29a06f27e27a3d366f960ab18596053f3580d190fbf525eee873ed28118973777988d53a83b46486320903334bf72 SHA512 fd4663ac2ce6949e59509ab03a7eda4471e38350440fe6c64c9fe5321941a5951074578148d0da335292a4e19c6c0b13d3e97c174123eb1d9662bbd63247b5e7 DIST lammps-patch_12Dec2018.tar.gz 114619148 BLAKE2B 089e23681e46868d09991ca6525850838100aa74ce8796f3af602c76b74fd55618c91610193cfc22c1201e5417f11998f924642961b62824c0271e208f87b286 SHA512 4794fc9bed7974ec33d54b2843f17b29c61a63f91f76c75bec7f00f6f174901f703130564977f8cf7fa9274e7febe096878dc0fa84d65469a5eb8f9b17b58a5e DIST lammps-patch_16Mar2018.tar.gz 91908414 BLAKE2B 0d2363ba507765d439988be9f17390889539ecf22132145f5f5f5411c6c3bf097b278b24b005374e4b176efcfbd01edb48b55076bfa41403718ad14d3905e062 SHA512 2847f9ffa368b966cba4792ebe86ea38dfc1e147647e2b738753121a09689901cea7197d3d95fa69cd065cd1d30aa37cbeffcb78b62ec85d88cd9f3ab25e25c2 DIST lammps-patch_17Jan2018.tar.gz 91721592 BLAKE2B d606a5fd699f3e7aaa777065532f778e96a5b21b88de3fcce69e79c4931fea233ed1ad68f56120865061623c6e33282b9f23f927a7a9820f8f824a241e5cd823 SHA512 533ada073882e9bfc6431db62c4899005983d9efbbb043bcb50b2b0a7af2b11c411bbcc6523b2ffbd5d46531b24573f4b98a07dc757bacbc2f27bb056d7956ff diff --git a/sci-physics/lammps/files/fm_exp.patch b/sci-physics/lammps/files/fm_exp.patch deleted file mode 100644 index 3b6bd24028d6..000000000000 --- a/sci-physics/lammps/files/fm_exp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lammps-30Jul16-original/lib/meam/fm_exp.c 2016-04-18 14:00:58.000000000 +0000 -+++ lammps-30Jul16/lib/meam/fm_exp.c 2016-10-06 03:15:55.631053526 +0000 -@@ -112,7 +112,7 @@ - return epart.f*x; - } - --double fm_exp_(double *x) -+extern "C" double fm_exp_(double *x) - { - #if defined(__BYTE_ORDER__) - #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ diff --git a/sci-physics/lammps/files/gcc-6.patch b/sci-physics/lammps/files/gcc-6.patch deleted file mode 100644 index ca2bcceeedfa..000000000000 --- a/sci-physics/lammps/files/gcc-6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lammps-7Apr16-orig/lib/atc/Vector.h 2014-11-20 11:59:03.000000000 -0700 -+++ lammps-7Apr16/lib/atc/Vector.h 2016-10-13 06:04:44.328977960 -0600 -@@ -119,7 +119,7 @@ - { - DenseVector r(v); - r*=(1.0/s); // for integer types this may be worthless -- return ; -+ return r; - } - /////////////////////////////////////////////////////////////////////////////// - //* Operator for Vector-Vector sum diff --git a/sci-physics/lammps/files/lammps-python3-r1.patch b/sci-physics/lammps/files/lammps-python3-r1.patch deleted file mode 100644 index 2dc2bd744fa9..000000000000 --- a/sci-physics/lammps/files/lammps-python3-r1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lammps-4Sep15-orig/python/lammps.py 2015-09-02 14:41:38.000000000 -0600 -+++ lammps-4Sep15/python/lammps.py 2015-09-08 05:59:16.000000000 -0600 -@@ -33,7 +33,7 @@ - except: - type,value,tb = sys.exc_info() - traceback.print_exception(type,value,tb) -- raise OSError,"Could not load LAMMPS dynamic library from %s" % modpath -+ raise OSError("Could not load LAMMPS dynamic library from %s" % modpath) - - # if no ptr provided, create an instance of LAMMPS - # don't know how to pass an MPI communicator from PyPar diff --git a/sci-physics/lammps/files/lammps-python3-r2.patch b/sci-physics/lammps/files/lammps-python3-r2.patch deleted file mode 100644 index a447c4b3a303..000000000000 --- a/sci-physics/lammps/files/lammps-python3-r2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lammps-23Mar16/python/lammps.py (original) -+++ lammps-23Mar16/python/lammps.py (refactored) -@@ -208,7 +208,7 @@ - result = (c_double*nlocal)() - self.lib.lammps_extract_variable.restype = POINTER(c_double) - ptr = self.lib.lammps_extract_variable(self.lmp,name,group) -- for i in xrange(nlocal): result[i] = ptr[i] -+ for i in range(nlocal): result[i] = ptr[i] - self.lib.lammps_free(ptr) - return result - return None diff --git a/sci-physics/lammps/files/lammps-python3.patch b/sci-physics/lammps/files/lammps-python3.patch deleted file mode 100644 index 1937881c9339..000000000000 --- a/sci-physics/lammps/files/lammps-python3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lammps-11Apr15/python/lammps.py 2015-03-13 16:06:20.000000000 -0600 -+++ lammps-11Apr15-new/python/lammps.py 2015-04-13 09:40:43.000000000 -0600 -@@ -28,7 +28,7 @@ - except: - type,value,tb = sys.exc_info() - traceback.print_exception(type,value,tb) -- raise OSError,"Could not load LAMMPS dynamic library" -+ raise OSError("Could not load LAMMPS dynamic library") - - # if no ptr provided, create an instance of LAMMPS - # don't know how to pass an MPI communicator from PyPar diff --git a/sci-physics/lammps/files/python-shebang.patch b/sci-physics/lammps/files/python-shebang.patch deleted file mode 100644 index 7dd45797d4ad..000000000000 --- a/sci-physics/lammps/files/python-shebang.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- lammps-25Mar15/python/lammps.py 2015-03-13 16:06:20.000000000 -0600 -+++ lammps-25Mar15-new/python/lammps.py 2015-04-10 15:31:14.000000000 -0600 -@@ -1,3 +1,4 @@ -+#!/usr/bin/env python - # ---------------------------------------------------------------------- - # LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator - # http://lammps.sandia.gov, Sandia National Laboratories diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest index b0bef55f0999..db7b1a048d30 100644 --- a/sci-physics/vgm/Manifest +++ b/sci-physics/vgm/Manifest @@ -1,8 +1,7 @@ AUX vgm-fix-FindCLHEP.patch 2191 BLAKE2B 465bd6dfca5aaedaa85759092d4d66a65f5df8a3be9a78bfd5edf0630e5ea733f23d14a4d892e272d5062927ff2622560987f566d130324cbdb96c097d083800 SHA512 24d6cd832e496ebe573ee6b8a95ac7a777c16919626f9b7019d260295d12766f89f5832bb3d5ca794eb28dbd293828935a92627f11ca55381c6f7645f61893ac -DIST vgm.4.4.tar.gz 3064087 BLAKE2B 845d04fa3ebaaa07f90ef7f216cac10e5ca4129ebbd6161e3fecce39663379b2575026186fe2b88ae8bf08f71bed6d8afcbbd5d7aa9922d37b3f9ed900d35a33 SHA512 500ae0e2ac66b580bbc26b6cd1a8bd6d6e3127c99e6fe6babe5825406e576d72da5cd76d22d0d1b82d7df9eb74ddddf084ee9a96b544c97af5b12cbf948d3406 -DIST vgm.4.5.tar.gz 9602541 BLAKE2B 183c8ed91546e5421c4f1a873a48285e9d2ab6bf4bb6a7bb7b46ab2c3c80a5dfc50cd5f97890c3994ada67014067349726e9f4d65cda1e1e4f1ae9484a4249ef SHA512 a873e24ed2c6cfc09d1828b60af9059a0bee341410e5cb77c9312aa72f1650a913779a0ff929d98910f01fcc5a3e6a04b352dd1a780a8bf60b1fa925b1985491 -EBUILD vgm-4.4-r1.ebuild 1697 BLAKE2B 75b9591434bb99e5bea85f662326394930193e56ec62d9398ef345f16f4c760b9e9f832c0e3f70afbd81f471677c2d451a88c5fe6dc3707bd3d6ff1b98675aa1 SHA512 25a49d0867722fde3af879934b1f3a7622be8409ce8682f86d4b90eca9d9eac6c6c090f2d93cda62886ab84220eaa790ad0ca2aaa600eac626ddfe60eedd1e09 -EBUILD vgm-4.4.ebuild 1687 BLAKE2B 465f91a5943a39258201724d093dc5cefdf20fe5179c3215945f97bd8fea6b5b4c059daf9a8b652c604463bf3cdfce47c575814ad0db0112dc0e7588b1e807c6 SHA512 01dadc26e284d521c00cbeaa46ab1a3de612435c5e667e57d21f82b87bb9bb099a238c07a9b67bfb368edaa27447c265e666fd2330ebab867a8c15f496567be7 -EBUILD vgm-4.5.ebuild 1691 BLAKE2B 1cb8c51a0177247a5346b4562f08db7fe6f2602e8198b5100d23e0ec444539baffcd5c4ee81249db872eb12aeb803c2f715fa2ab2eacafe7e4c05427c091a99d SHA512 c917101788a8eac679dc02fd5ce65f696cae1f5c40bac7506521706b32fd8a2ae2ad3fbcebc17332e0003bc1369d78b8dc35bb75f3aad0c37500984832a5fa42 -EBUILD vgm-9999.ebuild 1642 BLAKE2B 63346114dcfe38e30e6e552c78c5c4f05c7991bf02d01df29e6ae1e63c1934b5e56d1b149a64cdd37a1ac9fb9fb29c7b491927875596db7229bed77e4e878792 SHA512 37f9b27b5ba784e56d81247684c55e3d2c207020af6e5b89fecf53fe6010a8de10c84e1525b3da596848f123d45d02535f1d346849e270da9d0a1fd2e499ea28 -MISC metadata.xml 887 BLAKE2B 2bed4c9deeb9bbda28704462bf45eaf31d810b115608bd66ccdd8f5e8494556b87962301395d0f0cbf229aaf8d497b1f07b9821600d6c101aad34c5ef49cf643 SHA512 5e52d57dc9cc78020a147c4984aa037b3441f910f6288e75a3919398a0b22d16f312fd910bf0a692bfb039c3540f2854e4f2c660f7d3c4a4c23cbc63f9885dbf +DIST vgm-4.5.tar.gz 3474063 BLAKE2B 70c4fe0bd5eb9bc94607553ad30ffb625e66ef4e6f8a965b1289c1c7ad6f71d7eba035d2825ba8cd94705a0c223aa56408d3285748b068045eee3a29f556e3b2 SHA512 541fde12e12cc51ba065900788dbceb8e5b9a4e4615a4e4e0bbd2ba199b8a203b6927dbe23ead7bc183bd61f6b641e3e954fe7b78451c2d423d3a2b737f00572 +DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58 +EBUILD vgm-4.5.ebuild 1731 BLAKE2B a47f04930ae347ad16a5aeece529d38f5cb69bc527316c6979d55e0e90640a33802838a2f6a614d697d0055eae80ef26ffe1bfc69d7fb06d16a60d5c1e273433 SHA512 3850bae4ba6a413579e0d00cb8963b44e99558b01ef386adaf86b4d953a12293049e5bf23e71ba1ee79aee68036cbdf95f394a90e25fa1e50be136d5b2729599 +EBUILD vgm-4.8.ebuild 1723 BLAKE2B e245ba4e11697a0afde229b6ddb4ae5c815c38ac03d44ae026f4c643cbf5dde0a09816f80ab58751849f73fa48002971d652ae1aa815de55e203ad34ef023ade SHA512 8bddb92ff4a061e0d24cce45afe3d1361e5d76dd666358ad87ced6f5b58a94aa95b888a1d052acf90d2e1241972bf5f87c774172118091e8f94c521f58eef2ce +EBUILD vgm-9999.ebuild 1723 BLAKE2B e245ba4e11697a0afde229b6ddb4ae5c815c38ac03d44ae026f4c643cbf5dde0a09816f80ab58751849f73fa48002971d652ae1aa815de55e203ad34ef023ade SHA512 8bddb92ff4a061e0d24cce45afe3d1361e5d76dd666358ad87ced6f5b58a94aa95b888a1d052acf90d2e1241972bf5f87c774172118091e8f94c521f58eef2ce +MISC metadata.xml 1125 BLAKE2B 68595b87c779be5084958e3b459a9d14da2a5a824fbd803a7e9cd8faf54929304b1f690cdc3263d816ba0a2f52268c60a450543ece3bc85587e3736378b8c95a SHA512 5e71328efba446a86aee20d30f455aa58de31002eb4cae2f375b9a9e7c282a37b7adfc7c43f751fd06c7bce2cb07c5d615629ab8f8c0dfebdb3e083461b99764 diff --git a/sci-physics/vgm/metadata.xml b/sci-physics/vgm/metadata.xml index cd1e3ea3587f..a056f1947583 100644 --- a/sci-physics/vgm/metadata.xml +++ b/sci-physics/vgm/metadata.xml @@ -4,7 +4,10 @@ o.freyermuth@googlemail.com Oliver Freyermuth - Proxy-maintainer, assign bugs + + + amadio@gentoo.org + Guilherme Amadio proxy-maint@gentoo.org @@ -15,6 +18,9 @@ abstraction layer between the Geant4 and ROOT software. + Build using the C++11 standard + Build using the C++14 standard + Build using the C++17 standard Enable interaction with Geant4(sci-physics/geant:4) Enable interaction with ROOT (sci-physics/root) diff --git a/sci-physics/vgm/vgm-4.4-r1.ebuild b/sci-physics/vgm/vgm-4.4-r1.ebuild deleted file mode 100644 index 1ef3af47246f..000000000000 --- a/sci-physics/vgm/vgm-4.4-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" -else - SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}.${PV}" -fi - -DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" -HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc examples +geant4 +root test" - -# sci-physics/root[c++11] required to match sci-physics/geant -RDEPEND=" - sci-physics/clhep:= - root? ( sci-physics/root:=[c++11] ) - geant4? ( >=sci-physics/geant-4.10.03 )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) - test? ( sci-physics/geant-vmc[g4root] )" -RESTRICT=" - !geant4? ( test ) - !root? ( test ) - !test? ( test )" - -DOCS=( - doc/README - doc/todo.txt - doc/VGMhistory.txt - doc/VGM.html - doc/VGMversions.html -) -PATCHES=( - "${FILESDIR}"/"${PN}-fix-FindCLHEP.patch" -) - -src_configure() { - local mycmakeargs=( - -DCLHEP_DIR="${EPREFIX}/usr" - -DWITH_EXAMPLES="$(usex examples)" - -DINSTALL_EXAMPLES="$(usex examples)" - -DWITH_GEANT4="$(usex geant4)" - -DWITH_ROOT="$(usex root)" - -DWITH_TEST="$(usex test)" - ) - if use test && use root && use geant4; then - mycmakeargs+=( -DWITH_G4ROOT=yes ) - else - mycmakeargs+=( -DWITH_G4ROOT=no ) - fi - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - cd packages - doxygen || die - fi -} - -src_test() { - cd "${BUILD_DIR}"/test || die - ./test_suite.sh || die -} - -src_install() { - cmake_src_install - use doc && local HTML_DOCS=( doc/html/. ) - einstalldocs -} diff --git a/sci-physics/vgm/vgm-4.4.ebuild b/sci-physics/vgm/vgm-4.4.ebuild deleted file mode 100644 index 831f0cc0c4a2..000000000000 --- a/sci-physics/vgm/vgm-4.4.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" -else - SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}.${PV}" -fi - -DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" -HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc examples +geant4 +root test" - -# sci-physics/root[root7] flag activates std=c++14, only supported from VGM >4.4. -RDEPEND=" - sci-physics/clhep:= - root? ( sci-physics/root:=[-root7] ) - geant4? ( >=sci-physics/geant-4.10.03 )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) - test? ( sci-physics/geant-vmc[g4root] )" -RESTRICT=" - !geant4? ( test ) - !root? ( test ) - !test? ( test )" - -DOCS=( - doc/README - doc/todo.txt - doc/VGMhistory.txt - doc/VGM.html - doc/VGMversions.html -) - -src_configure() { - local mycmakeargs=( - -DCLHEP_DIR="${EROOT}usr" - -DWITH_EXAMPLES="$(usex examples)" - -DINSTALL_EXAMPLES="$(usex examples)" - -DWITH_GEANT4="$(usex geant4)" - -DWITH_ROOT="$(usex root)" - -DWITH_TEST="$(usex test)" - ) - if use test && use root && use geant4; then - mycmakeargs+=( -DWITH_G4ROOT=yes ) - else - mycmakeargs+=( -DWITH_G4ROOT=no ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use doc; then - cd packages - doxygen || die - fi -} - -src_test() { - cd "${BUILD_DIR}"/test || die - ./test_suite.sh || die -} - -src_install() { - cmake-utils_src_install - use doc && local HTML_DOCS=( doc/html/. ) - einstalldocs -} diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild index 66433421fc47..6d8a518fd73f 100644 --- a/sci-physics/vgm/vgm-4.5.ebuild +++ b/sci-physics/vgm/vgm-4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,9 +9,10 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" else - SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}" + MY_PV=$(ver_rs 1- -) + SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" fi DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" @@ -24,7 +25,7 @@ IUSE="doc examples +geant4 +root test" # sci-physics/root[c++11] required to match sci-physics/geant RDEPEND=" sci-physics/clhep:= - root? ( sci-physics/root:=[c++11] ) + root? ( >=sci-physics/root-6.14:=[c++11] ) geant4? ( >=sci-physics/geant-4.10.03 )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen[dot] ) diff --git a/sci-physics/vgm/vgm-4.8.ebuild b/sci-physics/vgm/vgm-4.8.ebuild new file mode 100644 index 000000000000..5fba573e3f61 --- /dev/null +++ b/sci-physics/vgm/vgm-4.8.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" + KEYWORDS="" +else + MY_PV=$(ver_rs 1- -) + SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" +HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+c++11 c++14 c++17 doc examples +geant4 +root test" + +REQUIRED_USE="^^ ( c++11 c++14 c++17 )" + +RDEPEND=" + sci-physics/clhep:= + geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?] ) + root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen[dot] ) + test? ( sci-physics/geant-vmc[g4root] )" +RESTRICT=" + !geant4? ( test ) + !root? ( test ) + !test? ( test )" + +DOCS=( + doc/README + doc/todo.txt + doc/VGMhistory.txt + doc/VGM.html + doc/VGMversions.html +) + +src_configure() { + local mycmakeargs=( + -DCLHEP_DIR="${EPREFIX}/usr" + -DWITH_EXAMPLES="$(usex examples)" + -DINSTALL_EXAMPLES="$(usex examples)" + -DWITH_GEANT4="$(usex geant4)" + -DWITH_ROOT="$(usex root)" + -DWITH_TEST="$(usex test)" + ) + if use test && use root && use geant4; then + mycmakeargs+=( -DWITH_G4ROOT=yes ) + else + mycmakeargs+=( -DWITH_G4ROOT=no ) + fi + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cd packages + doxygen || die + fi +} + +src_test() { + cd "${BUILD_DIR}"/test || die + ./test_suite.sh || die +} + +src_install() { + cmake_src_install + use doc && local HTML_DOCS=( doc/html/. ) + einstalldocs +} diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild index 675c07b071b1..5fba573e3f61 100644 --- a/sci-physics/vgm/vgm-9999.ebuild +++ b/sci-physics/vgm/vgm-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,10 +8,12 @@ inherit cmake if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" + KEYWORDS="" else - SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}.${PV}" + MY_PV=$(ver_rs 1- -) + SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" fi DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" @@ -19,13 +21,14 @@ HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html" LICENSE="GPL-2" SLOT="0" -IUSE="doc examples +geant4 +root test" +IUSE="+c++11 c++14 c++17 doc examples +geant4 +root test" + +REQUIRED_USE="^^ ( c++11 c++14 c++17 )" -# sci-physics/root[c++11] required to match sci-physics/geant RDEPEND=" sci-physics/clhep:= - root? ( sci-physics/root:=[c++11] ) - geant4? ( >=sci-physics/geant-4.10.03 )" + geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?] ) + root? ( >=sci-physics/root-6.14:=[c++11?,c++14?,c++17?] )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen[dot] ) test? ( sci-physics/geant-vmc[g4root] )" diff --git a/sci-physics/vmc/Manifest b/sci-physics/vmc/Manifest new file mode 100644 index 000000000000..e76a68a4d446 --- /dev/null +++ b/sci-physics/vmc/Manifest @@ -0,0 +1,4 @@ +DIST vmc-1.0_p2.tar.gz 91400 BLAKE2B d444a003433f4939f1b737ee8aa117a3230f83428ff9a79f8219a88bf5146104460a8be80ada9ab3a0a0edebc7d85d02bc51de053d54b06739d26cb0bbec3429 SHA512 51d6a8462c854411b595a20a2657b8012f19cd9c139f3341ccd72eb262473d01f6909ad22ee8d083f01cc5a2e43b2af265a7ed7c62a1285e8fab34c1b68ee3cd +EBUILD vmc-1.0_p2.ebuild 1013 BLAKE2B 13342eb9c395fca1d4562c9822f877ef161122aa63770ff842cb58e526ff5bb761e5d560884dea39af41f0b68abaaf1e3a52f245dd4444be3f8a05763df8d24b SHA512 d5ac7b7ebf74ec367374efe4f40dd6d003f21a3be969b87d7b1155ba2f5587bedb74545790dbb13d91e701df444b281912f6f5901809e33801362df7c651cc8a +EBUILD vmc-9999.ebuild 1013 BLAKE2B 13342eb9c395fca1d4562c9822f877ef161122aa63770ff842cb58e526ff5bb761e5d560884dea39af41f0b68abaaf1e3a52f245dd4444be3f8a05763df8d24b SHA512 d5ac7b7ebf74ec367374efe4f40dd6d003f21a3be969b87d7b1155ba2f5587bedb74545790dbb13d91e701df444b281912f6f5901809e33801362df7c651cc8a +MISC metadata.xml 789 BLAKE2B e58e20f9b0e3254b2cc437d069f2d45d6cc02a8827a6015edcec1a47028b0089f5283dde64c62c5ea2e6d811ec12ecbcc9562e3c5605b47fc2d951009c732275 SHA512 850ccb5bb65bad8767756c4869f3b368d4a7664425287a23ae60aebb6d9b22d10586289a838a195bcbc74b15eef923eb10b005a30958d9d6541efc208a517516 diff --git a/sci-physics/vmc/metadata.xml b/sci-physics/vmc/metadata.xml new file mode 100644 index 000000000000..3cf146831ddf --- /dev/null +++ b/sci-physics/vmc/metadata.xml @@ -0,0 +1,24 @@ + + + + + o.freyermuth@googlemail.com + Oliver Freyermuth + + + amadio@gentoo.org + Guilherme Amadio + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Build using the C++11 standard + Build using the C++14 standard + Build using the C++17 standard + + + vmc-project/vmc + + diff --git a/sci-physics/vmc/vmc-1.0_p2.ebuild b/sci-physics/vmc/vmc-1.0_p2.ebuild new file mode 100644 index 000000000000..fdebc4ac86fa --- /dev/null +++ b/sci-physics/vmc/vmc-1.0_p2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" +else + MY_PV=$(ver_rs 1-2 -) + SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +DESCRIPTION="The Virtual Monte Carlo core library." +HOMEPAGE="https://vmc-project.github.io/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+c++11 c++14 c++17 doc" + +REQUIRED_USE="^^ ( c++11 c++14 c++17 )" + +RDEPEND=">=sci-physics/root-6.18:=[c++11?,c++14?,c++17?,-vmc]" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen[dot] )" + +DOCS=(README.md History) + +src_compile() { + cmake_src_compile + if use doc; then + # TRAVIS_BUILD_DIR hardcoded in Doxyfile by upstream. + TRAVIS_BUILD_DIR="${S}" doxygen doc/doxygen/Doxyfile || die + fi +} + +src_install() { + cmake_src_install + use doc && local HTML_DOCS=( doc/html/. ) + einstalldocs +} diff --git a/sci-physics/vmc/vmc-9999.ebuild b/sci-physics/vmc/vmc-9999.ebuild new file mode 100644 index 000000000000..fdebc4ac86fa --- /dev/null +++ b/sci-physics/vmc/vmc-9999.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" +else + MY_PV=$(ver_rs 1-2 -) + SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +DESCRIPTION="The Virtual Monte Carlo core library." +HOMEPAGE="https://vmc-project.github.io/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+c++11 c++14 c++17 doc" + +REQUIRED_USE="^^ ( c++11 c++14 c++17 )" + +RDEPEND=">=sci-physics/root-6.18:=[c++11?,c++14?,c++17?,-vmc]" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen[dot] )" + +DOCS=(README.md History) + +src_compile() { + cmake_src_compile + if use doc; then + # TRAVIS_BUILD_DIR hardcoded in Doxyfile by upstream. + TRAVIS_BUILD_DIR="${S}" doxygen doc/doxygen/Doxyfile || die + fi +} + +src_install() { + cmake_src_install + use doc && local HTML_DOCS=( doc/html/. ) + einstalldocs +} -- cgit v1.2.3