Updating liguros repo21.1.2

29 files changed, 155 insertions, 1802 deletions

diff --git a/sci-physics/bullet/bullet-3.07.ebuild b/sci-physics/bullet/bullet-3.07.ebuild
index 0ba0a2d387cd..2bdb63b430a1 100644
--- a/sci-physics/bullet/bullet-3.07.ebuild
+++ b/sci-physics/bullet/bullet-3.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc double-precision examples openmp tbb test threads"
 
 REQUIRED_USE="
diff --git a/sci-physics/cernlib/cernlib-2006-r5.ebuild b/sci-physics/cernlib/cernlib-2006-r5.ebuild
index 8a03a5909c64..0e409ed6a6cf 100644
--- a/sci-physics/cernlib/cernlib-2006-r5.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2 BSD"
-KEYWORDS="amd64 hppa sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index a4941b7d1888..366b7e767003 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,3 +1 @@
-DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
-DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
 DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
diff --git a/sci-physics/espresso/espresso-4.0.0-r2.ebuild b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
deleted file mode 100644
index 85256dfb48eb..000000000000
--- a/sci-physics/espresso/espresso-4.0.0-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="https://espressomd.org"
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
-	EGIT_BRANCH="python"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda doc examples +fftw +hdf5 test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	dev-libs/boost:=[mpi]
-	hdf5? ( sci-libs/hdf5:=[mpi] )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-latexextra
-		virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/2277.patch" )
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_CUDA=$(usex cuda)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DWITH_TESTS=$(usex test)
-		-DINSTALL_PYPRESSO=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
-		-DWITH_HDF5=$(usex hdf5)
-		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-		-DCMAKE_SKIP_RPATH=YES
-		-DLIBDIR=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doxygen
-	[[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
-}
-
-src_install() {
-	local i docdir="${S}"
-
-	cmake-utils_src_install
-
-	insinto /usr/share/${PN}/
-	doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
-
-	save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
-
-	if use doc; then
-		[[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
-		newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
-		newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
-		for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
-			newdoc "${i}" "tutorial_${i##*/}"
-		done
-		dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
-	fi
-
-	if use examples; then
-		insinto "/usr/share/${PN}/examples/python"
-		doins -r samples/${i}/.
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "Please read and cite:"
-	elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
-	elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
-	echo
-	elog "If you need more features, change"
-	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
-	elog "and reemerge with USE=savedconfig"
-	echo
-	elog "For a full feature list see:"
-	elog "/usr/share/${PN}/myconfig-sample.hpp"
-	echo
-}
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
deleted file mode 100644
index 3423b5f5dfa3..000000000000
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="https://espressomd.org"
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	KEYWORDS=""
-else
-	inherit vcs-snapshot
-	COMMIT="8a021f5e8b1d508f356f4419d360bd9dfb7fec2c"
-	SRC_URI="https://github.com/${PN}md/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda doc examples +fftw +hdf5 test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>dev-python/cython-0.22[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	dev-libs/boost:=[mpi]
-	hdf5? ( sci-libs/hdf5:=[cxx] )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-latexextra
-		virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-PATCHES=( "${FILESDIR}"/1056.patch )
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_CUDA=$(usex cuda)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DWITH_TESTS=$(usex test)
-		-DWITH_SCAFACOS=ON
-		-DINSTALL_PYPRESSO=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
-		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-		-DCMAKE_SKIP_RPATH=YES
-		-DLIBDIR=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doxygen
-	[[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
-}
-
-src_install() {
-	local i docdir="${S}"
-
-	cmake-utils_src_install
-
-	insinto /usr/share/${PN}/
-	doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
-
-	save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
-
-	if use doc; then
-		[[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
-		newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
-		newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
-		for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
-			newdoc "${i}" "tutorial_${i##*/}"
-		done
-		dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
-	fi
-
-	if use examples; then
-		insinto "/usr/share/${PN}/examples/"
-		doins -r samples/python/.
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "Please read and cite:"
-	elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
-	elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
-	echo
-	elog "If you need more features, change"
-	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
-	elog "and reemerge with USE=savedconfig"
-	echo
-	elog "For a full feature list see:"
-	elog "/usr/share/${PN}/myconfig-sample.hpp"
-	echo
-}
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index e74466c64eea..9967f6e3a2ca 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index e74466c64eea..9967f6e3a2ca 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sci-physics/espresso/files/1056.patch b/sci-physics/espresso/files/1056.patch
deleted file mode 100644
index 18a478e446b1..000000000000
--- a/sci-physics/espresso/files/1056.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From d075cbaa80ce0b484c8422be27c5b5680f6abee4 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Fri, 3 Mar 2017 16:05:45 -0700
-Subject: [PATCH] cmake: install all shared libs in back in libdir
-
-some libraries weren't installed and the python module path
-isn't in the LD_LIBRARY_PATH and hence partly revert
-80ad49e954f4a6590707fd86e4fd586682ad626d
----
- CMakeLists.txt                            | 4 ++++
- src/core/CMakeLists.txt                   | 4 ++--
- src/core/actor/CMakeLists.txt             | 4 ++--
- src/core/constraints/CMakeLists.txt       | 1 +
- src/core/correlators/CMakeLists.txt       | 1 +
- src/core/immersed_boundary/CMakeLists.txt | 4 ++--
- src/core/object-in-fluid/CMakeLists.txt   | 2 +-
- src/core/observables/CMakeLists.txt       | 1 +
- src/core/scafacos/CMakeLists.txt          | 2 +-
- src/core/shapes/CMakeLists.txt            | 1 +
- src/core/utils/CMakeLists.txt             | 1 +
- src/script_interface/CMakeLists.txt       | 1 +
- 12 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cf49c40..7a8bc15 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -238,6 +238,10 @@ if (NOT DEFINED DATA)
-   set(DATA "share/espresso")
- endif(NOT DEFINED DATA)
- 
-+if (NOT DEFINED LIBDIR)
-+  set(LIBDIR "lib")
-+endif(NOT DEFINED LIBDIR)
-+
- if (NOT DEFINED BINDIR)
-   set(BINDIR "bin")
- endif(NOT DEFINED BINDIR)
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 9982a54..13bb052 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,7 +23,7 @@ add_custom_target(EspressoConfig DEPENDS config-features.hpp config-features.cpp
- add_dependencies(EspressoConfig myconfig)
- 
- add_library(EspressoCore SHARED ${EspressoCore_SRC} config-features.cpp config-version.cpp)
--install(TARGETS EspressoCore LIBRARY DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS EspressoCore LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(EspressoCore EspressoConfig)
- 
- target_link_libraries(EspressoCore ${LIBRARIES} Actor ObjectInFluid ImmersedBoundary Shapes Constraints EspressoUtils Correlators Observables)
-@@ -43,7 +43,7 @@ if(CUDA)
-   cuda_include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
-   cuda_add_library(EspressoCuda SHARED ${EspressoCuda_SRC})
--  install(TARGETS EspressoCuda DESTINATION ${PYTHON_INSTDIR})
-+  install(TARGETS EspressoCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
-   add_dependencies(EspressoCuda EspressoConfig)
- 
-   set_target_properties(EspressoCuda PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/actor/CMakeLists.txt b/src/core/actor/CMakeLists.txt
-index 0421243..1b5eafe 100644
---- a/src/core/actor/CMakeLists.txt
-+++ b/src/core/actor/CMakeLists.txt
-@@ -1,7 +1,7 @@
- file(GLOB Actor_SRC *.cpp)
- 
- add_library(Actor SHARED ${Actor_SRC})
--install(TARGETS Actor LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS Actor LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
- add_dependencies(Actor EspressoConfig)
- 
- set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
-@@ -9,7 +9,7 @@ set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
- if(CUDA)
-   file(GLOB ActorCuda_SRC *.cu)
-   cuda_add_library(ActorCuda SHARED ${ActorCuda_SRC})
--  install(TARGETS ActorCuda DESTINATION ${PYTHON_INSTDIR})
-+  install(TARGETS ActorCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
-   add_dependencies(ActorCuda EspressoConfig)
- 
-   add_dependencies(Actor ActorCuda)
-diff --git a/src/core/constraints/CMakeLists.txt b/src/core/constraints/CMakeLists.txt
-index 0f5c043..d07ad77 100644
---- a/src/core/constraints/CMakeLists.txt
-+++ b/src/core/constraints/CMakeLists.txt
-@@ -1,4 +1,5 @@
- file(GLOB Constraints_SRC Constraint.cpp)
- add_library(Constraints SHARED ${Constraints_SRC})
-+install(TARGETS Constraints LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(Constraints EspressoConfig)
- set_target_properties(Constraints PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/correlators/CMakeLists.txt b/src/core/correlators/CMakeLists.txt
-index c5ff02f..fcc3611 100644
---- a/src/core/correlators/CMakeLists.txt
-+++ b/src/core/correlators/CMakeLists.txt
-@@ -1,4 +1,5 @@
- file(GLOB Correlators_SRC *.?pp)
- add_library(Correlators SHARED ${Correlators_SRC})
-+install(TARGETS Correlators LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(Correlators EspressoConfig)
- set_target_properties(Correlators PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/immersed_boundary/CMakeLists.txt b/src/core/immersed_boundary/CMakeLists.txt
-index ec7fb85..8e7285f 100644
---- a/src/core/immersed_boundary/CMakeLists.txt
-+++ b/src/core/immersed_boundary/CMakeLists.txt
-@@ -1,13 +1,13 @@
- file(GLOB ImmersedBoundary_SRC *.cpp)
- add_library(ImmersedBoundary SHARED ${ImmersedBoundary_SRC})
- set_target_properties(ImmersedBoundary PROPERTIES MACOSX_RPATH TRUE)
--install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
- add_dependencies(ImmersedBoundary EspressoConfig)
- 
- if(CUDA)
-   file(GLOB ImmersedBoundaryCuda_SRC *.cu)
-   cuda_add_library(ImmersedBoundaryCuda SHARED ${ImmersedBoundaryCuda_SRC})
--  install(TARGETS ImmersedBoundaryCuda DESTINATION ${PYTHON_INSTDIR})
-+  install(TARGETS ImmersedBoundaryCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
-   add_dependencies(ImmersedBoundaryCuda EspressoConfig)
- 
-   set_target_properties(ImmersedBoundaryCuda PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/object-in-fluid/CMakeLists.txt b/src/core/object-in-fluid/CMakeLists.txt
-index 7154486..c25228a 100644
---- a/src/core/object-in-fluid/CMakeLists.txt
-+++ b/src/core/object-in-fluid/CMakeLists.txt
-@@ -1,5 +1,5 @@
- file(GLOB ObjectInFluid_SRC *.cpp)
- add_library(ObjectInFluid SHARED ${ObjectInFluid_SRC})
--install(TARGETS ObjectInFluid LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS ObjectInFluid LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
- add_dependencies(ObjectInFluid EspressoConfig)
- set_target_properties(ObjectInFluid PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/observables/CMakeLists.txt b/src/core/observables/CMakeLists.txt
-index 9813d86..51ab79d 100644
---- a/src/core/observables/CMakeLists.txt
-+++ b/src/core/observables/CMakeLists.txt
-@@ -1,4 +1,5 @@
- file(GLOB Observables_SRC *.?pp)
- add_library(Observables SHARED ${Observables_SRC})
-+install(TARGETS Observables LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(Observables EspressoConfig)
- set_target_properties(Observables PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/scafacos/CMakeLists.txt b/src/core/scafacos/CMakeLists.txt
-index 1479683..3028ca0 100644
---- a/src/core/scafacos/CMakeLists.txt
-+++ b/src/core/scafacos/CMakeLists.txt
-@@ -2,7 +2,7 @@ include_directories(${SCAFACOS_INCLUDE_DIRS})
- 
- file(GLOB Scafacos_SRC *.cpp)
- add_library(Scafacos SHARED ${Scafacos_SRC})
--install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR}/espressomd)
- add_dependencies(Scafacos EspressoConfig)
- 
- target_link_libraries(Scafacos ${SCAFACOS_LDFLAGS})
-diff --git a/src/core/shapes/CMakeLists.txt b/src/core/shapes/CMakeLists.txt
-index 0e5ecaa..5be3a9d 100644
---- a/src/core/shapes/CMakeLists.txt
-+++ b/src/core/shapes/CMakeLists.txt
-@@ -1,4 +1,5 @@
- file(GLOB Shapes_SRC *.cpp)
- add_library(Shapes SHARED ${Shapes_SRC})
-+install(TARGETS Shapes LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(Shapes EspressoConfig)
- set_target_properties(Shapes PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/utils/CMakeLists.txt b/src/core/utils/CMakeLists.txt
-index ec0f6f7..4cd8ada 100644
---- a/src/core/utils/CMakeLists.txt
-+++ b/src/core/utils/CMakeLists.txt
-@@ -1,3 +1,4 @@
- file(GLOB EspressoUtils_SRC *.cpp)
- add_library(EspressoUtils SHARED ${EspressoUtils_SRC})
-+install(TARGETS EspressoUtils LIBRARY DESTINATION ${LIBDIR})
- set_target_properties(EspressoUtils PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
-index 8aff034..59c1c9d 100644
---- a/src/script_interface/CMakeLists.txt
-+++ b/src/script_interface/CMakeLists.txt
-@@ -28,6 +28,7 @@ if(H5MD)
-         )
- endif(H5MD)
- add_library(EspressoScriptInterface SHARED ${EspressoScriptInterface_SRC})
-+install(TARGETS EspressoScriptInterface LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(EspressoScriptInterface EspressoConfig EspressoConfig)
- set_target_properties(EspressoScriptInterface PROPERTIES MACOSX_RPATH TRUE)
- target_link_libraries(EspressoScriptInterface EspressoCore)
--- 
-2.10.2
-
diff --git a/sci-physics/espresso/files/2277.patch b/sci-physics/espresso/files/2277.patch
deleted file mode 100644
index 608bd2876121..000000000000
--- a/sci-physics/espresso/files/2277.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 46110a514ce2420a350cca8b9af28e0c4eb51861 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Fri, 21 Sep 2018 06:57:16 -0600
-Subject: [PATCH] cmake: install libH5mdCore
-
----
- src/core/io/writer/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/io/writer/CMakeLists.txt b/src/core/io/writer/CMakeLists.txt
-index e677ba273a..42b96c96af 100644
---- a/src/core/io/writer/h5md/CMakeLists.txt
-+++ b/src/core/io/writer/h5md/CMakeLists.txt
-@@ -4,4 +4,5 @@
-   "${CMAKE_SOURCE_DIR}/libs/h5xx"
-   )
- add_dependencies(H5mdCore EspressoConfig)
-+install(TARGETS H5mdCore LIBRARY DESTINATION ${LIBDIR})
- 
diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 173a1bead9d4..016c1ffe961e 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,2 +1,2 @@
 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
+DIST geant-vmc-4.5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94
diff --git a/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch b/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
deleted file mode 100644
index d3bf0dfdd308..000000000000
--- a/sci-physics/geant-vmc/files/geant-vmc-4.4.0-fix-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/g4root/test/OpNovice/CMakeLists.txt b/g4root/test/OpNovice/CMakeLists.txt
-index 1a8f316c..a2e144b6 100644
---- a/g4root/test/OpNovice/CMakeLists.txt
-+++ b/g4root/test/OpNovice/CMakeLists.txt
-@@ -44,7 +44,9 @@ endif()
- #----------------------------------------------------------------------------
- # Setup Geant4 include directories and compile definitions
- #
--include(${Geant4_USE_FILE})
-+# Workaround for upstream bug: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1663
-+#include(${Geant4_USE_FILE})
-+include(UseGeant4)
- 
- #----------------------------------------------------------------------------
- # Locate sources and headers for this project
diff --git a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
deleted file mode 100644
index fd7b60a33263..000000000000
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
+++ /dev/null
@@ -1,96 +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/geant4_vmc.git"
-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"
-fi
-
-DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="https://root.cern.ch/root/vmc/VirtualMC.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
-
-# 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:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-RESTRICT="
-	!examples? ( test )
-	!geant3? ( test )
-	!g4root? ( test )
-	!mtroot? ( test )
-	!test? ( test )
-	!vgm? ( test )"
-
-DOCS=(
-	history
-	README.md
-)
-PATCHES=(
-	"${FILESDIR}"/"${PN}-${PV}"-fix-cflags.patch
-)
-
-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() {
-	# 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
-	# Bug: Can not disable Garfield in test suite, fixed upstream.
-	sed -i 's/ExGarfield//' test_suite.sh || die
-	# Bug: Path for E03 sub-examples wrong, see https://github.com/vmc-project/geant4_vmc/pull/11 .
-	sed -i 's#only in E03 test#only in E03 test\nG4EXEDIR=${BUILDDIR}/examples/$EXAMPLE/$OPTION#' test_suite_exe.sh || die
-	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=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-4.5.3.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
new file mode 100644
index 000000000000..a4e3263f8afa
--- /dev/null
+++ b/sci-physics/geant-vmc/geant-vmc-4.5.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 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"
+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="https://github.com/vmc-project/vmc"
+
+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}"
+BDEPEND="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 db272c5e8dfa..a4e3263f8afa 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,6 @@ 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"
@@ -17,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="https://root.cern.ch/root/vmc/VirtualMC.html"
+HOMEPAGE="https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="4"
@@ -37,8 +36,8 @@ RDEPEND="
 	>=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 )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 RESTRICT="
 	!examples? ( test )
 	!geant3? ( test )
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 9265c08f59f1..4dd18e6d8f56 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -1,13 +1,2 @@
-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
-DIST lammps-patch_22Aug2018.tar.gz 108761265 BLAKE2B fc509ccd8f5fda9fea9cf7f54b888df235b5d499a0aa3eee24bba81d35c95355cfc72ebb60f32a4adb879c0ab176659ebe634f9bbaeefd54ffc0d02329054f9f SHA512 bb1c11ef9c287b101b9f3483d6b90e55dc69a048529e5076f6f7d46e54802d0d75efc899865d462f9dd76937089e1080a126c1dc4bbb2648eda91cb38ba142b0
-DIST lammps-patch_22Feb2018.tar.gz 91869050 BLAKE2B 09d364b489d4402145b879ca40b290a4e33f39b6e5e4183bcccb09001002cb742917c8792f942a8b64bd992cde5c0f8dcd8b76506048f1392d33d1192aa4551d SHA512 8d4ac0f9cdcf4caa10bfb48129eec21cf31f7ce881b4cbd803c20fb638f7e55a1e645d314e172fe70eab473a4976c7f482e8c059e0c4e82527eb9438437ae146
-DIST lammps-patch_5Jun2019.tar.gz 106437193 BLAKE2B ce2a89f58fcdc29fbfc6d5e8769e36402569e93182a19835a0482b228ae9f568c1b56d2fc5eb3dac8e94a1289b430279d88c15284e07b5f62049aaf86cca29d3 SHA512 d72a5de3068a902cd8a825c97cd071331d5e3c16429531809178c43930b363f6549bd6802b552c2667e8882f7f21c90bd815072deb5ac19c8687060c796e58b4
-DIST lammps-patch_7Aug2019.tar.gz 105303933 BLAKE2B 8609251a919a88da64f2c0578414567141f128bbce3a447be09a99fb1f96620c15db29b4a312afc536f60237f3010a0753dfefa09d0bdfb3222b8f1491995c70 SHA512 61fff23c90a0f9029363cb90ff972e7e97b0f3be6a8153263b6be4f11960603af7f6c8b26a76b8bdcf25009c68a7a7fab3405a3f47b923695798a60723694001
-DIST lammps-patch_8Mar2018.tar.gz 91878683 BLAKE2B a4cf307769b1ac27c9cbe781a70f307d5275d2ccd4f6f77a2a21f00413ffa0af499577207afd23afd95ef6126071e8b779f6c52d50ff7117afb63161613c9f5b SHA512 57885d12e9e0ea9a6735cc2f7a2a8a9314dacbe9eaf5a46cb6d20fd7e2d0e8b0ebb3e24731eb750861973efe4d3cf0cf5a739cc9d51407f26bf3d556243c186f
 DIST lammps-stable_3Mar2020.tar.gz 126001870 BLAKE2B 35ed6ff208fd6dcc8eae50b8e0562a6a0771aa6419c0225353f648d95512ca64b22250ad4a3f9b836b9a25a6838e24e070a1d190fdc02b896dc1ed9838648f01 SHA512 6608cd9f6ea18d8acb55d611a560cb4b329043b41aca23fafd91fac0dfbde5a5286e1a6563bd16b2414bb3bf95929e3a2f270a0b023ce5ede515eb3353d56f04
-DIST lammps-testing-7869c75cac38cb8a3d2ef7747ea12ec5812f5151.tar.gz 54374284 BLAKE2B a223ef3926540660ce28fd2673667840002f6bfbbd5565deb9fb01b994085eb4d6cd24807fab49117a1b328f151d1511b7aa4d2fcdd443d20927112b83d029f0 SHA512 c996f7109d6467ae8e6a8c187485afb7c55b6dcf2b2e7003a8edd271e7f7dfe275079fbb0d680455628c8fd2eb87640284e8a92ffe095fcb398133be587af57a
-DIST lammps-testing-827be7af84ca100d394ea1cf6d3bc49f6a8eef92.tar.gz 55706643 BLAKE2B 7f2753759e1048ee9af58f1b210fe42972cc40b6df3ab5495f66bcfd10f4818f6e2c4e27f759d6ca302024531849286c4709a869984bea3d385cb44412d4d668 SHA512 bfffb0501b7b254dfc2cfcd12945b14766c1addf680d1140a78116b97a2a70795244f3a5a439aaf69ae014e35c454a48e028ca8aa65179e5da5039d6f1676e02
-DIST lammps-testing-d0394a77fa2b4b2d545a73ea092cf6de7616aac8.tar.gz 55715042 BLAKE2B 326f0357b555c030f667c502fd2c2330aa588c4a1224434ef30637ad8c6be49a5b8ee58cbc525b874f665903cf21494b52403c3a53ec0898a8cf81906c614833 SHA512 4a980578ce584b5b9334b4177f4f9188f00ac50ca916ce63a4d2ef034a4fa218366a8f32cc7dc29dc99e6b01e40cf8c8bbf15566840fe07fc5c6c2e8c55ece93
 DIST lammps-testing-stable_3Mar2020.tar.gz 55729550 BLAKE2B d0de8efa83342b4a350f17a43d3fe96011534b3f410beb295e396a45200ea56298c14664b290b2e30ab4f2fd70b92c01c73927b2878e8171a166dedee8ecf379 SHA512 e3dc592ce57ae625eb66ddd9ca80d7bbaca57c47a07166a7196dcc3074b574a497e706da8baf93b5deacdf588702ceb141014533ac2aaccdd011836fb34943b9
diff --git a/sci-physics/lammps/files/1080.patch b/sci-physics/lammps/files/1080.patch
deleted file mode 100644
index 85538b2a638c..000000000000
--- a/sci-physics/lammps/files/1080.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a10bb4b96f40f3b5574b0fade2cfece8bf4c6fc9 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@lanl.gov>
-Date: Thu, 23 Aug 2018 15:02:36 -0600
-Subject: [PATCH] cmake: fix link issue with --as-needed
-
----
- cmake/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 460d177c92..51997593db 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -276,11 +276,14 @@ endif()
- 
- if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-QUIP OR PKG_LATTE)
-   find_package(LAPACK)
--  if(NOT LAPACK_FOUND)
-+  find_package(BLAS)
-+  if(NOT LAPACK_FOUND OR NOT BLAS_FOUND)
-     enable_language(Fortran)
-     file(GLOB LAPACK_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/linalg/*.[fF])
-     add_library(linalg STATIC ${LAPACK_SOURCES})
-     set(LAPACK_LIBRARIES linalg)
-+  else()
-+    list(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES})
-   endif()
- endif()
- 
diff --git a/sci-physics/lammps/lammps-20180117.ebuild b/sci-physics/lammps/lammps-20180117.ebuild
deleted file mode 100644
index d2db1e9f3a1b..000000000000
--- a/sci-physics/lammps/lammps-20180117.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-utils fortran-2 python-r1
-
-convert_month() {
-	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
-	echo ${months[${1#0}]}
-}
-
-MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="https://lammps.sandia.gov/"
-SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/gzip
-	media-libs/libpng:0
-	sys-libs/zlib
-	mpi? (
-		virtual/mpi
-		sci-libs/hdf5[mpi]
-	)
-	python? ( ${PYTHON_DEPS} )
-	sci-libs/voro++
-	virtual/blas
-	virtual/lapack
-	sci-libs/fftw:3.0
-	netcdf? ( sci-libs/netcdf )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	dev-cpp/eigen:3
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}/cmake"
-
-src_configure() {
-	local mycmakeargs=(
-	    -DBUILD_SHARED_LIBS=ON
-		-DENABLE_MPI=$(usex mpi)
-		-DENABLE_GPU=$(usex cuda)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_ASPHERE=ON
-		-DENABLE_BODY=ON
-		-DENABLE_CLASS2=ON
-		-DENABLE_COLLOID=ON
-		-DENABLE_COMPRESS=ON
-		-DENABLE_CORESHELL=ON
-		-DENABLE_DIPOLE=ON
-		-DENABLE_GRANULAR=ON
-		-DENABLE_KSPACE=ON
-		-DFFT=FFTW3
-		-DENABLE_MANYBODY=ON
-		-DENABLE_MC=ON
-		-DENABLE_MEAM=ON
-		-DENABLE_MISC=ON
-		-DLAMMPS_XDR=ON #630444
-		-DENABLE_MOLECULE=ON
-		-DENABLE_PERI=ON
-		-DENABLE_QEQ=ON
-		-DENABLE_REAX=ON
-		-DENABLE_REPLICA=ON
-		-DENABLE_RIGID=ON
-		-DENABLE_SHOCK=ON
-		-DENABLE_SNAP=ON
-		-DENABLE_SRD=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_MPIIO=$(usex mpi)
-		-DENABLE_VORONOI=ON
-		-DENABLE_USER-ATC=ON
-		-DENABLE_USER-AWPMD=ON
-		-DENABLE_USER-CGDNA=ON
-		-DENABLE_USER-CGSDK=ON
-		-DENABLE_USER-COLVARS=ON
-		-DENABLE_USER-DIFFRACTION=ON
-		-DENABLE_USER-DPD=ON
-		-DENABLE_USER-DRUDE=ON
-		-DENABLE_USER-EFF=ON
-		-DENABLE_USER-FEP=ON
-		-DENABLE_USER-H5MD=$(usex mpi)
-		-DENABLE_USER-LB=$(usex mpi)
-		-DENABLE_USER-MANIFOLD=ON
-		-DENABLE_USER-MEAMC=ON
-		-DENABLE_USER-MGPT=ON
-		-DENABLE_USER-MISC=ON
-		-DENABLE_USER-MOLFILE=ON
-		-DENABLE_USER-NETCDF=$(usex netcdf)
-		-DENABLE_USER-PHONON=ON
-		-DENABLE_USER-QTB=ON
-		-DENABLE_USER-REAXC=ON
-		-DENABLE_USER-SMD=ON
-		-DENABLE_USER-SMTBQ=ON
-		-DENABLE_USER-SPH=ON
-		-DENABLE_USER-TALLY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins "${S}"/../potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
-
-	if use examples; then
-		for d in examples bench; do
-			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
-			insinto "${LAMMPS_EXAMPLES}"
-			doins -r "${S}"/../${d}/*
-		done
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20180222.ebuild b/sci-physics/lammps/lammps-20180222.ebuild
deleted file mode 100644
index d2db1e9f3a1b..000000000000
--- a/sci-physics/lammps/lammps-20180222.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-utils fortran-2 python-r1
-
-convert_month() {
-	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
-	echo ${months[${1#0}]}
-}
-
-MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="https://lammps.sandia.gov/"
-SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/gzip
-	media-libs/libpng:0
-	sys-libs/zlib
-	mpi? (
-		virtual/mpi
-		sci-libs/hdf5[mpi]
-	)
-	python? ( ${PYTHON_DEPS} )
-	sci-libs/voro++
-	virtual/blas
-	virtual/lapack
-	sci-libs/fftw:3.0
-	netcdf? ( sci-libs/netcdf )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	dev-cpp/eigen:3
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}/cmake"
-
-src_configure() {
-	local mycmakeargs=(
-	    -DBUILD_SHARED_LIBS=ON
-		-DENABLE_MPI=$(usex mpi)
-		-DENABLE_GPU=$(usex cuda)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_ASPHERE=ON
-		-DENABLE_BODY=ON
-		-DENABLE_CLASS2=ON
-		-DENABLE_COLLOID=ON
-		-DENABLE_COMPRESS=ON
-		-DENABLE_CORESHELL=ON
-		-DENABLE_DIPOLE=ON
-		-DENABLE_GRANULAR=ON
-		-DENABLE_KSPACE=ON
-		-DFFT=FFTW3
-		-DENABLE_MANYBODY=ON
-		-DENABLE_MC=ON
-		-DENABLE_MEAM=ON
-		-DENABLE_MISC=ON
-		-DLAMMPS_XDR=ON #630444
-		-DENABLE_MOLECULE=ON
-		-DENABLE_PERI=ON
-		-DENABLE_QEQ=ON
-		-DENABLE_REAX=ON
-		-DENABLE_REPLICA=ON
-		-DENABLE_RIGID=ON
-		-DENABLE_SHOCK=ON
-		-DENABLE_SNAP=ON
-		-DENABLE_SRD=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_MPIIO=$(usex mpi)
-		-DENABLE_VORONOI=ON
-		-DENABLE_USER-ATC=ON
-		-DENABLE_USER-AWPMD=ON
-		-DENABLE_USER-CGDNA=ON
-		-DENABLE_USER-CGSDK=ON
-		-DENABLE_USER-COLVARS=ON
-		-DENABLE_USER-DIFFRACTION=ON
-		-DENABLE_USER-DPD=ON
-		-DENABLE_USER-DRUDE=ON
-		-DENABLE_USER-EFF=ON
-		-DENABLE_USER-FEP=ON
-		-DENABLE_USER-H5MD=$(usex mpi)
-		-DENABLE_USER-LB=$(usex mpi)
-		-DENABLE_USER-MANIFOLD=ON
-		-DENABLE_USER-MEAMC=ON
-		-DENABLE_USER-MGPT=ON
-		-DENABLE_USER-MISC=ON
-		-DENABLE_USER-MOLFILE=ON
-		-DENABLE_USER-NETCDF=$(usex netcdf)
-		-DENABLE_USER-PHONON=ON
-		-DENABLE_USER-QTB=ON
-		-DENABLE_USER-REAXC=ON
-		-DENABLE_USER-SMD=ON
-		-DENABLE_USER-SMTBQ=ON
-		-DENABLE_USER-SPH=ON
-		-DENABLE_USER-TALLY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins "${S}"/../potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
-
-	if use examples; then
-		for d in examples bench; do
-			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
-			insinto "${LAMMPS_EXAMPLES}"
-			doins -r "${S}"/../${d}/*
-		done
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20180308.ebuild b/sci-physics/lammps/lammps-20180308.ebuild
deleted file mode 100644
index d2db1e9f3a1b..000000000000
--- a/sci-physics/lammps/lammps-20180308.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-utils fortran-2 python-r1
-
-convert_month() {
-	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
-	echo ${months[${1#0}]}
-}
-
-MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="https://lammps.sandia.gov/"
-SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/gzip
-	media-libs/libpng:0
-	sys-libs/zlib
-	mpi? (
-		virtual/mpi
-		sci-libs/hdf5[mpi]
-	)
-	python? ( ${PYTHON_DEPS} )
-	sci-libs/voro++
-	virtual/blas
-	virtual/lapack
-	sci-libs/fftw:3.0
-	netcdf? ( sci-libs/netcdf )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	dev-cpp/eigen:3
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}/cmake"
-
-src_configure() {
-	local mycmakeargs=(
-	    -DBUILD_SHARED_LIBS=ON
-		-DENABLE_MPI=$(usex mpi)
-		-DENABLE_GPU=$(usex cuda)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_ASPHERE=ON
-		-DENABLE_BODY=ON
-		-DENABLE_CLASS2=ON
-		-DENABLE_COLLOID=ON
-		-DENABLE_COMPRESS=ON
-		-DENABLE_CORESHELL=ON
-		-DENABLE_DIPOLE=ON
-		-DENABLE_GRANULAR=ON
-		-DENABLE_KSPACE=ON
-		-DFFT=FFTW3
-		-DENABLE_MANYBODY=ON
-		-DENABLE_MC=ON
-		-DENABLE_MEAM=ON
-		-DENABLE_MISC=ON
-		-DLAMMPS_XDR=ON #630444
-		-DENABLE_MOLECULE=ON
-		-DENABLE_PERI=ON
-		-DENABLE_QEQ=ON
-		-DENABLE_REAX=ON
-		-DENABLE_REPLICA=ON
-		-DENABLE_RIGID=ON
-		-DENABLE_SHOCK=ON
-		-DENABLE_SNAP=ON
-		-DENABLE_SRD=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_MPIIO=$(usex mpi)
-		-DENABLE_VORONOI=ON
-		-DENABLE_USER-ATC=ON
-		-DENABLE_USER-AWPMD=ON
-		-DENABLE_USER-CGDNA=ON
-		-DENABLE_USER-CGSDK=ON
-		-DENABLE_USER-COLVARS=ON
-		-DENABLE_USER-DIFFRACTION=ON
-		-DENABLE_USER-DPD=ON
-		-DENABLE_USER-DRUDE=ON
-		-DENABLE_USER-EFF=ON
-		-DENABLE_USER-FEP=ON
-		-DENABLE_USER-H5MD=$(usex mpi)
-		-DENABLE_USER-LB=$(usex mpi)
-		-DENABLE_USER-MANIFOLD=ON
-		-DENABLE_USER-MEAMC=ON
-		-DENABLE_USER-MGPT=ON
-		-DENABLE_USER-MISC=ON
-		-DENABLE_USER-MOLFILE=ON
-		-DENABLE_USER-NETCDF=$(usex netcdf)
-		-DENABLE_USER-PHONON=ON
-		-DENABLE_USER-QTB=ON
-		-DENABLE_USER-REAXC=ON
-		-DENABLE_USER-SMD=ON
-		-DENABLE_USER-SMTBQ=ON
-		-DENABLE_USER-SPH=ON
-		-DENABLE_USER-TALLY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins "${S}"/../potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
-
-	if use examples; then
-		for d in examples bench; do
-			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
-			insinto "${LAMMPS_EXAMPLES}"
-			doins -r "${S}"/../${d}/*
-		done
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20180316.ebuild b/sci-physics/lammps/lammps-20180316.ebuild
deleted file mode 100644
index 04d0509c06f0..000000000000
--- a/sci-physics/lammps/lammps-20180316.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-utils fortran-2 python-r1
-
-convert_month() {
-	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
-	echo ${months[${1#0}]}
-}
-
-MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="https://lammps.sandia.gov/"
-SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/gzip
-	media-libs/libpng:0
-	sys-libs/zlib
-	mpi? (
-		virtual/mpi
-		sci-libs/hdf5[mpi]
-	)
-	python? ( ${PYTHON_DEPS} )
-	sci-libs/voro++
-	virtual/blas
-	virtual/lapack
-	sci-libs/fftw:3.0
-	netcdf? ( sci-libs/netcdf )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	dev-cpp/eigen:3
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}/cmake"
-
-src_configure() {
-	local mycmakeargs=(
-	    -DBUILD_SHARED_LIBS=ON
-		-DENABLE_MPI=$(usex mpi)
-		-DENABLE_GPU=$(usex cuda)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_ASPHERE=ON
-		-DENABLE_BODY=ON
-		-DENABLE_CLASS2=ON
-		-DENABLE_COLLOID=ON
-		-DENABLE_COMPRESS=ON
-		-DENABLE_CORESHELL=ON
-		-DENABLE_DIPOLE=ON
-		-DENABLE_GRANULAR=ON
-		-DENABLE_KSPACE=ON
-		-DFFT=FFTW3
-		-DENABLE_MANYBODY=ON
-		-DENABLE_MC=ON
-		-DENABLE_MEAM=ON
-		-DENABLE_MISC=ON
-		-DLAMMPS_XDR=ON #630444
-		-DENABLE_MOLECULE=ON
-		-DENABLE_PERI=ON
-		-DENABLE_QEQ=ON
-		-DENABLE_REAX=ON
-		-DENABLE_REPLICA=ON
-		-DENABLE_RIGID=ON
-		-DENABLE_SHOCK=ON
-		-DENABLE_SNAP=ON
-		-DENABLE_SRD=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_MPIIO=$(usex mpi)
-		-DENABLE_VORONOI=ON
-		-DENABLE_USER-ATC=ON
-		-DENABLE_USER-AWPMD=ON
-		-DENABLE_USER-CGDNA=ON
-		-DENABLE_USER-CGSDK=ON
-		-DENABLE_USER-COLVARS=ON
-		-DENABLE_USER-DIFFRACTION=ON
-		-DENABLE_USER-DPD=ON
-		-DENABLE_USER-DRUDE=ON
-		-DENABLE_USER-EFF=ON
-		-DENABLE_USER-FEP=ON
-		-DENABLE_USER-H5MD=$(usex mpi)
-		-DENABLE_USER-LB=$(usex mpi)
-		-DENABLE_USER-MANIFOLD=ON
-		-DENABLE_USER-MEAMC=ON
-		-DENABLE_USER-MGPT=ON
-		-DENABLE_USER-MISC=ON
-		-DENABLE_USER-MOLFILE=ON
-		-DENABLE_USER-NETCDF=$(usex netcdf)
-		-DENABLE_USER-PHONON=ON
-		-DENABLE_USER-QTB=ON
-		-DENABLE_USER-REAXC=ON
-		-DENABLE_USER-SMD=ON
-		-DENABLE_USER-SMTBQ=ON
-		-DENABLE_USER-SPH=ON
-		-DENABLE_USER-TALLY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins "${S}"/../potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
-
-	if use examples; then
-		for d in examples bench; do
-			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
-			insinto "${LAMMPS_EXAMPLES}"
-			doins -r "${S}"/../${d}/*
-		done
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20180822.ebuild b/sci-physics/lammps/lammps-20180822.ebuild
deleted file mode 100644
index ff5a1d9926ac..000000000000
--- a/sci-physics/lammps/lammps-20180822.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-utils fortran-2 python-r1
-
-convert_month() {
-	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
-	echo ${months[${1#0}]}
-}
-
-MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="https://lammps.sandia.gov/"
-SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/gzip
-	media-libs/libpng:0
-	sys-libs/zlib
-	mpi? (
-		virtual/mpi
-		sci-libs/hdf5[mpi]
-	)
-	python? ( ${PYTHON_DEPS} )
-	sci-libs/voro++
-	virtual/blas
-	virtual/lapack
-	sci-libs/fftw:3.0
-	netcdf? ( sci-libs/netcdf )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	dev-cpp/eigen:3
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# https://github.com/lammps/lammps/pull/1080
-PATCHES=( "${FILESDIR}/1080.patch" )
-
-S="${WORKDIR}/${MY_P}/cmake"
-
-src_configure() {
-	local mycmakeargs=(
-	    -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-	    -DBUILD_SHARED_LIBS=ON
-		-DBUILD_MPI=$(usex mpi)
-		-DBUILD_LIB=ON
-		-DPKG_GPU=$(usex cuda)
-		-DGPU_API=CUDA
-		-DENABLE_TESTING=$(usex test)
-		-DPKG_ASPHERE=ON
-		-DPKG_BODY=ON
-		-DPKG_CLASS2=ON
-		-DPKG_COLLOID=ON
-		-DPKG_COMPRESS=ON
-		-DPKG_CORESHELL=ON
-		-DPKG_DIPOLE=ON
-		-DPKG_GRANULAR=ON
-		-DPKG_KSPACE=ON
-		-DFFT=FFTW3
-		-DPKG_MANYBODY=ON
-		-DPKG_MC=ON
-		-DPKG_MEAM=ON
-		-DPKG_MISC=ON
-		-DPKG_MOLECULE=ON
-		-DPKG_PERI=ON
-		-DPKG_QEQ=ON
-		-DPKG_REAX=ON
-		-DPKG_REPLICA=ON
-		-DPKG_RIGID=ON
-		-DPKG_SHOCK=ON
-		-DPKG_SNAP=ON
-		-DPKG_SRD=ON
-		-DPKG_PYTHON=ON
-		-DPKG_MPIIO=$(usex mpi)
-		-DPKG_VORONOI=ON
-		-DPKG_USER-ATC=ON
-		-DPKG_USER-AWPMD=ON
-		-DPKG_USER-CGDNA=ON
-		-DPKG_USER-CGSDK=ON
-		-DPKG_USER-COLVARS=ON
-		-DPKG_USER-DIFFRACTION=ON
-		-DPKG_USER-DPD=ON
-		-DPKG_USER-DRUDE=ON
-		-DPKG_USER-EFF=ON
-		-DPKG_USER-FEP=ON
-		-DPKG_USER-H5MD=$(usex mpi)
-		-DPKG_USER-LB=$(usex mpi)
-		-DPKG_USER-MANIFOLD=ON
-		-DPKG_USER-MEAMC=ON
-		-DPKG_USER-MGPT=ON
-		-DPKG_USER-MISC=ON
-		-DPKG_USER-MOLFILE=ON
-		-DPKG_USER-NETCDF=$(usex netcdf)
-		-DPKG_USER-PHONON=ON
-		-DPKG_USER-QTB=ON
-		-DPKG_USER-REAXC=ON
-		-DPKG_USER-SMD=ON
-		-DPKG_USER-SMTBQ=ON
-		-DPKG_USER-SPH=ON
-		-DPKG_USER-TALLY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
-
-	if use examples; then
-		for d in examples bench; do
-			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
-			insinto "${LAMMPS_EXAMPLES}"
-			doins -r "${S}"/../${d}/*
-		done
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20181212.ebuild b/sci-physics/lammps/lammps-20181212.ebuild
deleted file mode 100644
index de9c0e9982d5..000000000000
--- a/sci-physics/lammps/lammps-20181212.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-utils fortran-2 python-r1
-
-convert_month() {
-	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
-	echo ${months[${1#0}]}
-}
-
-MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="https://lammps.sandia.gov/"
-TCOMMIT=7869c75cac38cb8a3d2ef7747ea12ec5812f5151
-SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
-	test? ( https://github.com/lammps/lammps-testing/archive/${TCOMMIT}.tar.gz -> ${PN}-testing-${TCOMMIT}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/gzip
-	media-libs/libpng:0
-	sys-libs/zlib
-	mpi? (
-		virtual/mpi
-		sci-libs/hdf5[mpi]
-	)
-	python? ( ${PYTHON_DEPS} )
-	sci-libs/voro++
-	virtual/blas
-	virtual/lapack
-	sci-libs/fftw:3.0
-	netcdf? ( sci-libs/netcdf )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	dev-cpp/eigen:3
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}/cmake"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_MPI=$(usex mpi)
-		-DBUILD_LIB=ON
-		-DPKG_GPU=$(usex cuda)
-		-DGPU_API=CUDA
-		-DENABLE_TESTING=$(usex test)
-		-DLAMMPS_TESTING_SOURCE_DIR=$(echo "${WORKDIR}"/lammps-testing-*)
-		-DPKG_ASPHERE=ON
-		-DPKG_BODY=ON
-		-DPKG_CLASS2=ON
-		-DPKG_COLLOID=ON
-		-DPKG_COMPRESS=ON
-		-DPKG_CORESHELL=ON
-		-DPKG_DIPOLE=ON
-		-DPKG_GRANULAR=ON
-		-DPKG_KSPACE=ON
-		-DFFT=FFTW3
-		-DPKG_MANYBODY=ON
-		-DPKG_MC=ON
-		-DPKG_MEAM=ON
-		-DPKG_MISC=ON
-		-DPKG_MOLECULE=ON
-		-DPKG_PERI=ON
-		-DPKG_QEQ=ON
-		-DPKG_REAX=ON
-		-DPKG_REPLICA=ON
-		-DPKG_RIGID=ON
-		-DPKG_SHOCK=ON
-		-DPKG_SNAP=ON
-		-DPKG_SRD=ON
-		-DPKG_PYTHON=ON
-		-DPKG_MPIIO=$(usex mpi)
-		-DPKG_VORONOI=ON
-		-DPKG_USER-ATC=ON
-		-DPKG_USER-AWPMD=ON
-		-DPKG_USER-CGDNA=ON
-		-DPKG_USER-CGSDK=ON
-		-DPKG_USER-COLVARS=ON
-		-DPKG_USER-DIFFRACTION=ON
-		-DPKG_USER-DPD=ON
-		-DPKG_USER-DRUDE=ON
-		-DPKG_USER-EFF=ON
-		-DPKG_USER-FEP=ON
-		-DPKG_USER-H5MD=$(usex mpi)
-		-DPKG_USER-LB=$(usex mpi)
-		-DPKG_USER-MANIFOLD=ON
-		-DPKG_USER-MEAMC=ON
-		-DPKG_USER-MGPT=ON
-		-DPKG_USER-MISC=ON
-		-DPKG_USER-MOLFILE=ON
-		-DPKG_USER-NETCDF=$(usex netcdf)
-		-DPKG_USER-PHONON=ON
-		-DPKG_USER-QTB=ON
-		-DPKG_USER-REAXC=ON
-		-DPKG_USER-SMD=ON
-		-DPKG_USER-SMTBQ=ON
-		-DPKG_USER-SPH=ON
-		-DPKG_USER-TALLY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
-
-	if use examples; then
-		for d in examples bench; do
-			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
-			insinto "${LAMMPS_EXAMPLES}"
-			doins -r "${S}"/../${d}/*
-		done
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20190605.ebuild b/sci-physics/lammps/lammps-20190605.ebuild
deleted file mode 100644
index f960c168086f..000000000000
--- a/sci-physics/lammps/lammps-20190605.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-utils fortran-2 python-r1
-
-convert_month() {
-	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
-	echo ${months[${1#0}]}
-}
-
-MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="https://lammps.sandia.gov/"
-TCOMMIT=827be7af84ca100d394ea1cf6d3bc49f6a8eef92
-SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
-	test? ( https://github.com/lammps/lammps-testing/archive/${TCOMMIT}.tar.gz -> ${PN}-testing-${TCOMMIT}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/gzip
-	media-libs/libpng:0
-	sys-libs/zlib
-	mpi? (
-		virtual/mpi
-		sci-libs/hdf5[mpi]
-	)
-	python? ( ${PYTHON_DEPS} )
-	sci-libs/voro++
-	virtual/blas
-	virtual/lapack
-	sci-libs/fftw:3.0
-	netcdf? ( sci-libs/netcdf )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	dev-cpp/eigen:3
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}/cmake"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_MPI=$(usex mpi)
-		-DBUILD_LIB=ON
-		-DPKG_GPU=$(usex cuda)
-		-DGPU_API=CUDA
-		-DENABLE_TESTING=$(usex test)
-		-DLAMMPS_TESTING_SOURCE_DIR=$(echo "${WORKDIR}"/lammps-testing-*)
-		-DPKG_ASPHERE=ON
-		-DPKG_BODY=ON
-		-DPKG_CLASS2=ON
-		-DPKG_COLLOID=ON
-		-DPKG_COMPRESS=ON
-		-DPKG_CORESHELL=ON
-		-DPKG_DIPOLE=ON
-		-DPKG_GRANULAR=ON
-		-DPKG_KSPACE=ON
-		-DFFT=FFTW3
-		-DPKG_MANYBODY=ON
-		-DPKG_MC=ON
-		-DPKG_MEAM=ON
-		-DPKG_MISC=ON
-		-DPKG_MOLECULE=ON
-		-DPKG_PERI=ON
-		-DPKG_QEQ=ON
-		-DPKG_REAX=ON
-		-DPKG_REPLICA=ON
-		-DPKG_RIGID=ON
-		-DPKG_SHOCK=ON
-		-DPKG_SNAP=ON
-		-DPKG_SRD=ON
-		-DPKG_PYTHON=ON
-		-DPKG_MPIIO=$(usex mpi)
-		-DPKG_VORONOI=ON
-		-DPKG_USER-ATC=ON
-		-DPKG_USER-AWPMD=ON
-		-DPKG_USER-CGDNA=ON
-		-DPKG_USER-CGSDK=ON
-		-DPKG_USER-COLVARS=ON
-		-DPKG_USER-DIFFRACTION=ON
-		-DPKG_USER-DPD=ON
-		-DPKG_USER-DRUDE=ON
-		-DPKG_USER-EFF=ON
-		-DPKG_USER-FEP=ON
-		-DPKG_USER-H5MD=$(usex mpi)
-		-DPKG_USER-LB=$(usex mpi)
-		-DPKG_USER-MANIFOLD=ON
-		-DPKG_USER-MEAMC=ON
-		-DPKG_USER-MGPT=ON
-		-DPKG_USER-MISC=ON
-		-DPKG_USER-MOLFILE=ON
-		-DPKG_USER-NETCDF=$(usex netcdf)
-		-DPKG_USER-PHONON=ON
-		-DPKG_USER-QTB=ON
-		-DPKG_USER-REAXC=ON
-		-DPKG_USER-SMD=ON
-		-DPKG_USER-SMTBQ=ON
-		-DPKG_USER-SPH=ON
-		-DPKG_USER-TALLY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
-
-	if use examples; then
-		for d in examples bench; do
-			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
-			insinto "${LAMMPS_EXAMPLES}"
-			doins -r "${S}"/../${d}/*
-		done
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20190807-r1.ebuild b/sci-physics/lammps/lammps-20190807-r1.ebuild
deleted file mode 100644
index 9bfbab5f2bec..000000000000
--- a/sci-physics/lammps/lammps-20190807-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-utils fortran-2 python-r1
-
-convert_month() {
-	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
-	echo ${months[${1#0}]}
-}
-
-MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="https://lammps.sandia.gov/"
-TCOMMIT=d0394a77fa2b4b2d545a73ea092cf6de7616aac8
-SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
-	test? ( https://github.com/lammps/lammps-testing/archive/${TCOMMIT}.tar.gz -> ${PN}-testing-${TCOMMIT}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/gzip
-	media-libs/libpng:0
-	sys-libs/zlib
-	mpi? (
-		virtual/mpi
-		sci-libs/hdf5[mpi]
-	)
-	python? ( ${PYTHON_DEPS} )
-	sci-libs/voro++
-	virtual/blas
-	virtual/lapack
-	sci-libs/fftw:3.0
-	netcdf? ( sci-libs/netcdf )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	dev-cpp/eigen:3
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}/cmake"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_MPI=$(usex mpi)
-		-DBUILD_LIB=ON
-		-DPKG_GPU=$(usex cuda)
-		-DGPU_API=CUDA
-		-DENABLE_TESTING=$(usex test)
-		-DLAMMPS_TESTING_SOURCE_DIR=$(echo "${WORKDIR}"/lammps-testing-*)
-		-DPKG_ASPHERE=ON
-		-DPKG_BODY=ON
-		-DPKG_CLASS2=ON
-		-DPKG_COLLOID=ON
-		-DPKG_COMPRESS=ON
-		-DPKG_CORESHELL=ON
-		-DPKG_DIPOLE=ON
-		-DPKG_GRANULAR=ON
-		-DPKG_KSPACE=ON
-		-DFFT=FFTW3
-		-DPKG_MANYBODY=ON
-		-DPKG_MC=ON
-		-DPKG_MEAM=ON
-		-DPKG_MISC=ON
-		-DPKG_MOLECULE=ON
-		-DPKG_PERI=ON
-		-DPKG_QEQ=ON
-		-DPKG_REAX=ON
-		-DPKG_REPLICA=ON
-		-DPKG_RIGID=ON
-		-DPKG_SHOCK=ON
-		-DPKG_SNAP=ON
-		-DPKG_SRD=ON
-		-DPKG_PYTHON=ON
-		-DPKG_MPIIO=$(usex mpi)
-		-DPKG_VORONOI=ON
-		-DPKG_USER-ATC=ON
-		-DPKG_USER-AWPMD=ON
-		-DPKG_USER-CGDNA=ON
-		-DPKG_USER-CGSDK=ON
-		-DPKG_USER-COLVARS=ON
-		-DPKG_USER-DIFFRACTION=ON
-		-DPKG_USER-DPD=ON
-		-DPKG_USER-DRUDE=ON
-		-DPKG_USER-EFF=ON
-		-DPKG_USER-FEP=ON
-		-DPKG_USER-H5MD=$(usex mpi)
-		-DPKG_USER-LB=$(usex mpi)
-		-DPKG_USER-MANIFOLD=ON
-		-DPKG_USER-MEAMC=ON
-		-DPKG_USER-MGPT=ON
-		-DPKG_USER-MISC=ON
-		-DPKG_USER-MOLFILE=ON
-		-DPKG_USER-NETCDF=$(usex netcdf)
-		-DPKG_USER-PHONON=ON
-		-DPKG_USER-QTB=ON
-		-DPKG_USER-REAXC=ON
-		-DPKG_USER-SMD=ON
-		-DPKG_USER-SMTBQ=ON
-		-DPKG_USER-SPH=ON
-		-DPKG_USER-TALLY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
-
-	if use examples; then
-		for d in examples bench; do
-			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
-			insinto "${LAMMPS_EXAMPLES}"
-			doins -r "${S}"/../${d}/*
-		done
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20190807.ebuild b/sci-physics/lammps/lammps-20190807.ebuild
deleted file mode 100644
index 9bfbab5f2bec..000000000000
--- a/sci-physics/lammps/lammps-20190807.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-utils fortran-2 python-r1
-
-convert_month() {
-	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
-	echo ${months[${1#0}]}
-}
-
-MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="https://lammps.sandia.gov/"
-TCOMMIT=d0394a77fa2b4b2d545a73ea092cf6de7616aac8
-SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
-	test? ( https://github.com/lammps/lammps-testing/archive/${TCOMMIT}.tar.gz -> ${PN}-testing-${TCOMMIT}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/gzip
-	media-libs/libpng:0
-	sys-libs/zlib
-	mpi? (
-		virtual/mpi
-		sci-libs/hdf5[mpi]
-	)
-	python? ( ${PYTHON_DEPS} )
-	sci-libs/voro++
-	virtual/blas
-	virtual/lapack
-	sci-libs/fftw:3.0
-	netcdf? ( sci-libs/netcdf )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	dev-cpp/eigen:3
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}/cmake"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_MPI=$(usex mpi)
-		-DBUILD_LIB=ON
-		-DPKG_GPU=$(usex cuda)
-		-DGPU_API=CUDA
-		-DENABLE_TESTING=$(usex test)
-		-DLAMMPS_TESTING_SOURCE_DIR=$(echo "${WORKDIR}"/lammps-testing-*)
-		-DPKG_ASPHERE=ON
-		-DPKG_BODY=ON
-		-DPKG_CLASS2=ON
-		-DPKG_COLLOID=ON
-		-DPKG_COMPRESS=ON
-		-DPKG_CORESHELL=ON
-		-DPKG_DIPOLE=ON
-		-DPKG_GRANULAR=ON
-		-DPKG_KSPACE=ON
-		-DFFT=FFTW3
-		-DPKG_MANYBODY=ON
-		-DPKG_MC=ON
-		-DPKG_MEAM=ON
-		-DPKG_MISC=ON
-		-DPKG_MOLECULE=ON
-		-DPKG_PERI=ON
-		-DPKG_QEQ=ON
-		-DPKG_REAX=ON
-		-DPKG_REPLICA=ON
-		-DPKG_RIGID=ON
-		-DPKG_SHOCK=ON
-		-DPKG_SNAP=ON
-		-DPKG_SRD=ON
-		-DPKG_PYTHON=ON
-		-DPKG_MPIIO=$(usex mpi)
-		-DPKG_VORONOI=ON
-		-DPKG_USER-ATC=ON
-		-DPKG_USER-AWPMD=ON
-		-DPKG_USER-CGDNA=ON
-		-DPKG_USER-CGSDK=ON
-		-DPKG_USER-COLVARS=ON
-		-DPKG_USER-DIFFRACTION=ON
-		-DPKG_USER-DPD=ON
-		-DPKG_USER-DRUDE=ON
-		-DPKG_USER-EFF=ON
-		-DPKG_USER-FEP=ON
-		-DPKG_USER-H5MD=$(usex mpi)
-		-DPKG_USER-LB=$(usex mpi)
-		-DPKG_USER-MANIFOLD=ON
-		-DPKG_USER-MEAMC=ON
-		-DPKG_USER-MGPT=ON
-		-DPKG_USER-MISC=ON
-		-DPKG_USER-MOLFILE=ON
-		-DPKG_USER-NETCDF=$(usex netcdf)
-		-DPKG_USER-PHONON=ON
-		-DPKG_USER-QTB=ON
-		-DPKG_USER-REAXC=ON
-		-DPKG_USER-SMD=ON
-		-DPKG_USER-SMTBQ=ON
-		-DPKG_USER-SPH=ON
-		-DPKG_USER-TALLY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
-
-	if use examples; then
-		for d in examples bench; do
-			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
-			insinto "${LAMMPS_EXAMPLES}"
-			doins -r "${S}"/../${d}/*
-		done
-	fi
-}
diff --git a/sci-physics/paw/paw-2.14.04-r4.ebuild b/sci-physics/paw/paw-2.14.04-r4.ebuild
index 74a1cbc75beb..1fdc4634f27b 100644
--- a/sci-physics/paw/paw-2.14.04-r4.ebuild
+++ b/sci-physics/paw/paw-2.14.04-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2 BSD"
-KEYWORDS="amd64 hppa sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-physics/vmc/Manifest b/sci-physics/vmc/Manifest
index 59a8546f3d83..8f62d6c40d23 100644
--- a/sci-physics/vmc/Manifest
+++ b/sci-physics/vmc/Manifest
@@ -1 +1,2 @@
 DIST vmc-1.0_p2.tar.gz 91400 BLAKE2B d444a003433f4939f1b737ee8aa117a3230f83428ff9a79f8219a88bf5146104460a8be80ada9ab3a0a0edebc7d85d02bc51de053d54b06739d26cb0bbec3429 SHA512 51d6a8462c854411b595a20a2657b8012f19cd9c139f3341ccd72eb262473d01f6909ad22ee8d083f01cc5a2e43b2af265a7ed7c62a1285e8fab34c1b68ee3cd
+DIST vmc-1.0_p3.tar.gz 91476 BLAKE2B 3005e0575a5835b832175e6a272d4e3c328990e28ac998aca60a42c4ddd03faba4d1b761867d8af597ca2468cf3072c49bb007852b5ec892c215df37297656dc SHA512 621c0cb3f2846f9401e3e4fff6fa47ab2afbff7c4dca5c19869abb1806ec19d4a221e5741aad9b3929a4e8b8207ee6008a9bf06ec8bf03ed73771cb29fda1b8d
diff --git a/sci-physics/vmc/vmc-1.0_p3.ebuild b/sci-physics/vmc/vmc-1.0_p3.ebuild
new file mode 100644
index 000000000000..91c335813c8d
--- /dev/null
+++ b/sci-physics/vmc/vmc-1.0_p3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 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/ https://github.com/vmc-project/vmc"
+
+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}"
+BDEPEND="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
index fdebc4ac86fa..91c335813c8d 100644
--- a/sci-physics/vmc/vmc-9999.ebuild
+++ b/sci-physics/vmc/vmc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,8 @@ else
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
-DESCRIPTION="The Virtual Monte Carlo core library."
-HOMEPAGE="https://vmc-project.github.io/"
+DESCRIPTION="The Virtual Monte Carlo core library"
+HOMEPAGE="https://vmc-project.github.io/ https://github.com/vmc-project/vmc"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,8 +25,8 @@ 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] )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=(README.md History)