summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-physics/geant/Manifest4
-rw-r--r--sci-physics/geant/files/geant-4.10.6-datadir.patch159
-rw-r--r--sci-physics/geant/geant-4.10.6-r1.ebuild108
-rw-r--r--sci-physics/geant/geant-4.10.6.3.ebuild113
-rw-r--r--sci-physics/geant/geant-4.10.6_p1-r1.ebuild108
-rw-r--r--sci-physics/geant/geant-4.10.6_p2.ebuild106
6 files changed, 0 insertions, 598 deletions
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 2aadd1760dca..30465aa34b06 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 d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d 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 c26bf8914b46..000000000000
--- 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 <amadio@cern.ch>
-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(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pw
- # - Bin dir
- file(RELATIVE_PATH
- G4MAKE_TO_BINDIR
-- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
- ${CMAKE_INSTALL_FULL_BINDIR}
- )
- set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\"")
-@@ -758,7 +758,7 @@ set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\"
- # - Lib dir
- file(RELATIVE_PATH
- G4MAKE_TO_LIBDIR
-- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
- ${CMAKE_INSTALL_FULL_LIBDIR}
- )
- set(G4LIB "\"`cd \$geant4make_root/${G4MAKE_TO_LIBDIR}/Geant4-${Geant4_VERSION} > /dev/null \; pwd`\"")
-@@ -775,7 +775,7 @@ foreach(_ds ${GEANT4_EXPORTED_DATASETS})
-
- file(RELATIVE_PATH
- G4MAKE_TO_DATADIR
-- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
- ${${_ds}_PATH}
- )
- set(${_ds}_PATH "\"`cd \$geant4make_root/${G4MAKE_TO_DATADIR} > /dev/null \; pwd`\"")
-@@ -788,7 +788,7 @@ set(TOOLS_FONT_PATH "\"`cd \$geant4make_root/../fonts > /dev/null ; pwd`\"")
- _g4tc_configure_install_tree_scripts(
- ${CMAKE_BINARY_DIR}/InstallTreeFiles
- geant4make
-- ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ ${CMAKE_INSTALL_DATADIR}/geant4make
- )
-
-
-@@ -797,7 +797,7 @@ _g4tc_configure_install_tree_scripts(
- # softlink to the G4SYSTEM directory.
- #
- install(DIRECTORY config
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/geant4make
- COMPONENT Development
- FILES_MATCHING PATTERN "*.gmk"
- PATTERN "CVS" EXCLUDE
-@@ -845,11 +845,11 @@ endforeach()
-
- # - Fonts
- file(RELATIVE_PATH
-- G4ENV_BINDIR_TO_DATAROOTDIR
-+ G4ENV_BINDIR_TO_DATADIR
- "${CMAKE_INSTALL_FULL_BINDIR}"
-- "${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}"
-+ "${CMAKE_INSTALL_FULL_DATADIR}"
- )
--set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATAROOTDIR}/fonts > /dev/null ; pwd`\"")
-+set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATADIR}/fonts > /dev/null ; pwd`\"")
-
-
- # - Configure for each shell
-diff --git a/cmake/Modules/Geant4InstallData.cmake b/cmake/Modules/Geant4InstallData.cmake
-index 496b0fc4df..55536e51d4 100644
---- a/cmake/Modules/Geant4InstallData.cmake
-+++ b/cmake/Modules/Geant4InstallData.cmake
-@@ -105,7 +105,7 @@ set(GEANT4_DATASETS_URL "https://cern.ch/geant4-data/datasets")
- set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data)
-
- # Where to install data in the install tree (a Default)
--set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}/data")
-+set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATADIR}/data")
-
- # File containing dataset list
- set(GEANT4_DATASETS_DEFINITIONS "Geant4DatasetDefinitions")
-@@ -596,7 +596,7 @@ endfunction()
- # Choose Physics Data Install Dir
- # This follows the pattern for interface and setting as in GNUInstallDirs
- if(NOT GEANT4_INSTALL_DATADIR)
-- set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATAROOTDIR/${GEANT4_INSTALL_DATADIR_DEFAULT}")
-+ set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATADIR/data")
- set(GEANT4_INSTALL_DATADIR "${GEANT4_INSTALL_DATADIR_DEFAULT}")
- endif()
-
-diff --git a/source/analysis/CMakeLists.txt b/source/analysis/CMakeLists.txt
-index 44fa4a97be..4c40c704be 100644
---- a/source/analysis/CMakeLists.txt
-+++ b/source/analysis/CMakeLists.txt
-@@ -67,7 +67,7 @@ endif()
- #
- if (GEANT4_USE_FREETYPE)
- install(DIRECTORY fonts/
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/fonts
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/fonts
- PATTERN ".svn" EXCLUDE
- )
- endif()
-diff --git a/source/analysis/g4tools/CMakeLists.txt b/source/analysis/g4tools/CMakeLists.txt
-index 54c72f1297..df87582bc1 100644
---- a/source/analysis/g4tools/CMakeLists.txt
-+++ b/source/analysis/g4tools/CMakeLists.txt
-@@ -43,7 +43,7 @@ install(DIRECTORY include/
- # We also need to install the tools license
- #
- install(FILES tools.license
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}
- )
-
- #------------------------------------------------------------------------------
---
-2.25.1
-
diff --git a/sci-physics/geant/geant-4.10.6-r1.ebuild b/sci-physics/geant/geant-4.10.6-r1.ebuild
deleted file mode 100644
index 59fedc8d7cc8..000000000000
--- a/sci-physics/geant/geant-4.10.6-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
- MY_P+=.b$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
- ;;
-*_p*)
- MY_P+=.p$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-*)
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
- inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
-
-RDEPEND="
- dev-libs/expat
- >=sci-physics/clhep-2.4.1.3:2=[threads?]
- data? ( ~sci-physics/geant-data-${PV} )
- dawn? ( media-gfx/dawn )
- doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
- gdml? ( dev-libs/xerces-c )
- hdf5? ( sci-libs/hdf5[threads?] )
- inventor? ( media-libs/SoXt )
- motif? ( x11-libs/motif:0 )
- opengl? ( virtual/opengl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raytracerx? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
- -DGEANT4_BUILD_MULTITHREADED=$(usex threads)
- -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
- -DGEANT4_INSTALL_EXAMPLES=$(usex examples)
- -DGEANT4_USE_FREETYPE=$(usex freetype)
- -DGEANT4_USE_G3TOG4=$(usex geant3)
- -DGEANT4_USE_GDML=$(usex gdml)
- -DGEANT4_USE_HDF5=$(usex hdf5)
- -DGEANT4_USE_INVENTOR=$(usex inventor)
- -DGEANT4_USE_NETWORKDAWN=$(usex dawn)
- -DGEANT4_USE_NETWORKVRML=$(usex vrml)
- -DGEANT4_USE_OPENGL_X11=$(usex opengl)
- -DGEANT4_USE_QT=$(usex qt5)
- -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
- -DGEANT4_USE_SYSTEM_CLHEP=ON
- -DGEANT4_USE_SYSTEM_EXPAT=ON
- -DGEANT4_USE_SYSTEM_ZLIB=ON
- -DGEANT4_USE_WT=OFF
- -DGEANT4_USE_XM=$(usex motif)
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- ${EXTRA_ECONF}
- )
- if use inventor; then
- mycmakeargs+=(
- -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
- -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
- )
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- # adjust clhep linking flags for system clhep
- # binmake.gmk is only useful for legacy build systems
- sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
- cmake-utils_src_install
- rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
- einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.6.3.ebuild b/sci-physics/geant/geant-4.10.6.3.ebuild
deleted file mode 100644
index 2339a156d897..000000000000
--- a/sci-physics/geant/geant-4.10.6.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
- MY_P+=.b$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
- ;;
-*)
- if [[ $(ver_cut 4) -gt 0 ]]; then
- MY_P+=.p$(printf %02d $(ver_cut 4))
- DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
- fi
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
- inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="
- ^^ ( c++11 c++14 c++17 )
- inventor? ( opengl )
- motif? ( opengl )
- qt5? ( opengl )
-"
-
-RDEPEND="
- dev-libs/expat
- >=sci-physics/clhep-2.4.1.3:2=[threads?]
- data? ( ~sci-physics/geant-data-${PV} )
- dawn? ( media-gfx/dawn )
- doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
- gdml? ( dev-libs/xerces-c )
- hdf5? ( sci-libs/hdf5[threads?] )
- inventor? ( media-libs/SoXt )
- motif? ( x11-libs/motif:0 )
- opengl? ( virtual/opengl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raytracerx? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
- -DGEANT4_BUILD_MULTITHREADED=$(usex threads)
- -DGEANT4_BUILD_STORE_TRAJECTORY=OFF
- -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
- -DGEANT4_BUILD_VERBOSE_CODE=OFF
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
- -DGEANT4_INSTALL_EXAMPLES=$(usex examples)
- -DGEANT4_INSTALL_PACKAGE_CACHE=OFF
- -DGEANT4_USE_FREETYPE=$(usex freetype)
- -DGEANT4_USE_G3TOG4=$(usex geant3)
- -DGEANT4_USE_GDML=$(usex gdml)
- -DGEANT4_USE_HDF5=$(usex hdf5)
- -DGEANT4_USE_INVENTOR=$(usex inventor)
- -DGEANT4_USE_NETWORKDAWN=$(usex dawn)
- -DGEANT4_USE_NETWORKVRML=$(usex vrml)
- -DGEANT4_USE_OPENGL_X11=$(usex opengl)
- -DGEANT4_USE_QT=$(usex qt5)
- -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
- -DGEANT4_USE_SYSTEM_CLHEP=ON
- -DGEANT4_USE_SYSTEM_EXPAT=ON
- -DGEANT4_USE_SYSTEM_ZLIB=ON
- -DGEANT4_USE_WT=OFF
- -DGEANT4_USE_XM=$(usex motif)
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- ${EXTRA_ECONF}
- )
- if use inventor; then
- mycmakeargs+=(
- -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
- -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
- )
- fi
- cmake_src_configure
-}
-
-src_install() {
- # adjust clhep linking flags for system clhep
- # binmake.gmk is only useful for legacy build systems
- sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
- cmake_src_install
- rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
- einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild b/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
deleted file mode 100644
index 59fedc8d7cc8..000000000000
--- a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
- MY_P+=.b$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
- ;;
-*_p*)
- MY_P+=.p$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-*)
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
- inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
-
-RDEPEND="
- dev-libs/expat
- >=sci-physics/clhep-2.4.1.3:2=[threads?]
- data? ( ~sci-physics/geant-data-${PV} )
- dawn? ( media-gfx/dawn )
- doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
- gdml? ( dev-libs/xerces-c )
- hdf5? ( sci-libs/hdf5[threads?] )
- inventor? ( media-libs/SoXt )
- motif? ( x11-libs/motif:0 )
- opengl? ( virtual/opengl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raytracerx? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
- -DGEANT4_BUILD_MULTITHREADED=$(usex threads)
- -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
- -DGEANT4_INSTALL_EXAMPLES=$(usex examples)
- -DGEANT4_USE_FREETYPE=$(usex freetype)
- -DGEANT4_USE_G3TOG4=$(usex geant3)
- -DGEANT4_USE_GDML=$(usex gdml)
- -DGEANT4_USE_HDF5=$(usex hdf5)
- -DGEANT4_USE_INVENTOR=$(usex inventor)
- -DGEANT4_USE_NETWORKDAWN=$(usex dawn)
- -DGEANT4_USE_NETWORKVRML=$(usex vrml)
- -DGEANT4_USE_OPENGL_X11=$(usex opengl)
- -DGEANT4_USE_QT=$(usex qt5)
- -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
- -DGEANT4_USE_SYSTEM_CLHEP=ON
- -DGEANT4_USE_SYSTEM_EXPAT=ON
- -DGEANT4_USE_SYSTEM_ZLIB=ON
- -DGEANT4_USE_WT=OFF
- -DGEANT4_USE_XM=$(usex motif)
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- ${EXTRA_ECONF}
- )
- if use inventor; then
- mycmakeargs+=(
- -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
- -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
- )
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- # adjust clhep linking flags for system clhep
- # binmake.gmk is only useful for legacy build systems
- sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
- cmake-utils_src_install
- rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
- einstalldocs
-}
diff --git a/sci-physics/geant/geant-4.10.6_p2.ebuild b/sci-physics/geant/geant-4.10.6_p2.ebuild
deleted file mode 100644
index b266de392cd4..000000000000
--- a/sci-physics/geant/geant-4.10.6_p2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
-
-case ${PV} in
-*_beta*)
- MY_P+=.b$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
- ;;
-*_p*)
- MY_P+=.p$(printf %02d $(ver_cut 5))
- DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-*)
- HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
- ;;
-esac
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.web.cern.ch/"
-SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
- inventor motif opengl qt5 raytracerx static-libs threads vrml"
-
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
-
-RDEPEND="
- dev-libs/expat
- >=sci-physics/clhep-2.4.1.3:2=[threads?]
- data? ( ~sci-physics/geant-data-4.10.6_p1 )
- dawn? ( media-gfx/dawn )
- doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
- gdml? ( dev-libs/xerces-c )
- hdf5? ( sci-libs/hdf5[threads?] )
- inventor? ( media-libs/SoXt )
- motif? ( x11-libs/motif:0 )
- opengl? ( virtual/opengl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raytracerx? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
- -DGEANT4_BUILD_MULTITHREADED=$(usex threads)
- -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
- -DGEANT4_INSTALL_EXAMPLES=$(usex examples)
- -DGEANT4_USE_FREETYPE=$(usex freetype)
- -DGEANT4_USE_G3TOG4=$(usex geant3)
- -DGEANT4_USE_GDML=$(usex gdml)
- -DGEANT4_USE_HDF5=$(usex hdf5)
- -DGEANT4_USE_INVENTOR=$(usex inventor)
- -DGEANT4_USE_NETWORKDAWN=$(usex dawn)
- -DGEANT4_USE_NETWORKVRML=$(usex vrml)
- -DGEANT4_USE_OPENGL_X11=$(usex opengl)
- -DGEANT4_USE_QT=$(usex qt5)
- -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
- -DGEANT4_USE_SYSTEM_CLHEP=ON
- -DGEANT4_USE_SYSTEM_EXPAT=ON
- -DGEANT4_USE_SYSTEM_ZLIB=ON
- -DGEANT4_USE_WT=OFF
- -DGEANT4_USE_XM=$(usex motif)
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- ${EXTRA_ECONF}
- )
- if use inventor; then
- mycmakeargs+=(
- -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
- -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
- )
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- # adjust clhep linking flags for system clhep
- # binmake.gmk is only useful for legacy build systems
- sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
- cmake-utils_src_install
- rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
-
- einstalldocs
-}