gentoo new year resync : 01.01.2021

21 files changed, 4 insertions, 1690 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 15a373772650..e027a0e16be3 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index cdc629cf1483..0ad19151879c 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -5,7 +5,7 @@ DIST cernlib_20061220+dfsg3-2.debian.tar.gz 257093 BLAKE2B 35ae90e38ddb935f25253
 DIST cernlib_20061220+dfsg3-4.1.debian.tar.xz 170100 BLAKE2B 7bc206a246cc437babae6cdb38bd5831ccf4f665bbe65f2ebabf7df8a68c0b7c317f4a7ed283024bf70b6fe50fa8f01bd9a2882cfba174020a23f768f69c237c SHA512 d259ab304b040c6bab8535c0db60aaa466ef7bb9bbcce9b2d8931505a180c92935d428e0dd45bfa6199ec939f67580a6d3ac1035c0384bdcf9e6601a351ce90a
 DIST cernlib_20061220+dfsg3-4.3.debian.tar.xz 168928 BLAKE2B 15147d1d84d3e4abb06620154425a035e64d6e5254177f9647634fdf63e4a5aa42deba6c8f638f338cf85e8766732388cc6298813dd5b007d1ef97fddcef3d39 SHA512 8cb666d9ef62627e7e3e55bd1986b40ca9ddfcc882101b1a3597c1d60870e30649b5c7716687f7e4106b30ba0aa88a9ca7bc3a3651b0d1405f55a6f611dc308b
 DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 BLAKE2B 069eda316ffbc4873e79952283a0aa2693ed58a3cc369bca72e29a4feaef4840922b4f62ababba1476f2aa0309f68833a4a35a3b5c6ac015bdbd85b3b58b2efe SHA512 11fade45c5ae69c858f37a82e74ab1a69416314a23c12ec5205ee6b918590d66f26d3ae68afa466ae3109d736212968ece956a444270ddd189a27a24c0ccece8
-EBUILD cernlib-2006-r5.ebuild 2941 BLAKE2B 7f46ad84ae5459772974be17007071fd5049584943ecaf9a3d5ea73da7d424efebe3c85cd4482617d0bd78765af9d6f343b1b6d47c021a928ceac2050d8547c7 SHA512 5b5de782e64937d08d7b748d16efbfcd927f99fe05f127426e5bd52be3ce21f741f6ac42157efb6c95318acd38e217c714e39c2c736f8cd5335d3bf26d961557
+EBUILD cernlib-2006-r5.ebuild 2942 BLAKE2B c284963abf6ce801a52eb1100e77c38636851f8b7b5f7740301796b642fd3f9793fe15b3e85fd4ef639b0795d48ffc4daa14c0a6d610017b21875ad416e1a6a9 SHA512 fc3ce4fbe0e4b5b23fb54bdebae1981d1de53237795c929e84bd2753523b2bf911a3401c6b7bf27fc404d8fa7006a2dacbae916c438ba3f8020ff8d4ecf8420a
 EBUILD cernlib-2006-r6.ebuild 2996 BLAKE2B 02602426dab1d77f98a8f70997d7357715f47eddc87c4a80c39dcf10684617db230a613396754dae7884eaed7805d914738a72aa12f29094bdf89a3d681c1c84 SHA512 d2721cd22118e0ab7bcbdd39cc94c2c5620f99775c089f3918e128ee23e0d34ae96238c0c1e0b80d2fe062c12434085993f7d84cd5f90bb4781ad130ff2e62a6
 EBUILD cernlib-2006-r7.ebuild 3010 BLAKE2B 17f778cd95128e09252be544144aa732b9767f767f92096bdf6b3b76c81192fe330f999111e1569eceeeb5a400e58355701e701af1c995b12f5824bce3f24c9c SHA512 9dde5fc5814cf0ce917a0aab2a37c4d5a55b155cf98db3c29e285df87fb8527002541e98f3a5817a0614fa6be7cf7b2bf5d2665027ef9cf43e72a3f936b4093c
 MISC metadata.xml 759 BLAKE2B f01fad2a4cead94f4c422f4f2906bb26c9c960f4a85c07bb1cc900a058184fb2b0774251e93f3d92e105f9ff4675cf0c9035d4ffe0841c63d54e344bb0b0d149 SHA512 133dd51ec200866d1886a1c077dad4a1a7ec786d77b59e1da147a7e95a5b6e8c9f1ce41dfcfa35c406625ed4aa966891cc5247ef35d7a82791d9b42c91fc7477
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 138f580b8e3c..11b9da7e9a08 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,10 +1,4 @@
-AUX 1056.patch 8628 BLAKE2B 435bd4f01c44142f91978603de0f276f6c16819325e48bda9a234b83d37fc926b56883ce4c3f480f3f27bdb6b2e240ba8e34bd3d0406cfda9a19a1869726c228 SHA512 7ecdb067e10cdb7c7c8568cdda5d9520844eeff44e8914beafc03a2f0cf90f178c872f0c126264952e6b9d8c62b79d0ddb38c1a5121b8beea5bc23da5dad16f2
-AUX 2277.patch 645 BLAKE2B 0314dce1d9ec6b95e3ebfecb6253494e52b732fb27446f146b73bcc8a14ecdc767f434069563b6c6275dc25c591ac4ed422ff693669a28b3ddada29f88efffbc SHA512 f8502c83f05d6328e669e9e0d7d05e1216f59667829432ef4c558398ec39d0ee888479fc8e6387934604ca53477829a9f709565fa10a7aaadd4d455ca35b12c7
-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
-EBUILD espresso-4.0.0-r2.ebuild 2835 BLAKE2B 744290f292afd7e793d339a2380a0ca8accadf7c0a7f23567dc663f415ac3af1e460669ebab60a9c8c2244696199126ef153d69ec476a081b32f3b45dc947a4c SHA512 17ba5ce4623325fdfe1aaa56c0cdacfca7500cf3b9bcfe5648eb1bccbc928452198388f685b669b40bb75d5af7468ef159751d63013af1f3dbffab237e560a2f
-EBUILD espresso-4.0_pre20170228.ebuild 2899 BLAKE2B dbc0f3fa8481c0de53ea6eb020f396900fa4804953b4daa26b8b5f91ed915597ee6b5065d8267c9b676f8acec98fab95f73d5d83cf0c2c59428e166ef95b3433 SHA512 ef9fecaa51bdcbd034aadf61a2fe560ebccb38836978f289589130f510236dcfd5dd414ae91197e8e1ba1cab2050b2336891d5cea51071b249c5af25d877084c
 EBUILD espresso-4.1.3.ebuild 2738 BLAKE2B d2ed0248389ab77d108a57a00a6941051e3c4be5c1b01a5cec90e9851f1d87daa3ab4c1c67254693b971a40d1459009b70eb9df3ede962e75e05a25b8a600c8a SHA512 ef2f0852551ddfbf427379a71ebd2c1924b0fabce083d0f9130b9de47eeb1099da833cd28bd89efe301db7df0ac5d215dc4a0635757e9ba2e2914533c8df01f0
 EBUILD espresso-9999.ebuild 2738 BLAKE2B d2ed0248389ab77d108a57a00a6941051e3c4be5c1b01a5cec90e9851f1d87daa3ab4c1c67254693b971a40d1459009b70eb9df3ede962e75e05a25b8a600c8a SHA512 ef2f0852551ddfbf427379a71ebd2c1924b0fabce083d0f9130b9de47eeb1099da833cd28bd89efe301db7df0ac5d215dc4a0635757e9ba2e2914533c8df01f0
 MISC metadata.xml 476 BLAKE2B f76690b14e947d107cab9c5601cbdc62fc3160e03114ceeca6b45f6d29960691bbdf2d740694198d88cbb31311e5bf0ef0d2b225d276da71030e643188394cf8 SHA512 be0595e319ca81b2293857b6365e8ec9397548a8f30ff5b39f8b267c51dd0a1c08835b2880bdc0714ae7c6264066c88ee9f6ac053c54c4419cdabe5808678184
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 0afbf393e9a9..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 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://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 e7c540b16298..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 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://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/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/lammps/Manifest b/sci-physics/lammps/Manifest
index 5662e6f87741..3626d767ab7c 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -1,25 +1,4 @@
-AUX 1080.patch 922 BLAKE2B 59325abb5d2f9d9e501c34b539a98efea521ee38872f1e2d3850442aac82adaea3a3c32e644f3d2982aa9aa86dbdfb5bd1373175a89acffac63d87ac542919a7 SHA512 a94bba2ad992f85db0f7d7d04cef235a79e4600e353897032d78ffc3e1f899bc340a5ad8aa1d8da41f9783b67d912dab8c3cd2f83a605a9e0c0ef51bdb909279
-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
-EBUILD lammps-20180117.ebuild 3051 BLAKE2B e37e610a7a2d80271a063b746d248e2bffebc227b3fff95028770831c21798edfc1fb00985c4b6e155356dd53fe8a5f99c483ccb8eeea4a01ae791d6f7f7f44b SHA512 4abb079bc63f1048317c38912b49a9ce05755ad9dac5adc7f787f2c2e5d9748568c80847a41cb2fd8cf3dcd251187c3ab9efce89ba593fd80b45ba17d0641baf
-EBUILD lammps-20180222.ebuild 3051 BLAKE2B e37e610a7a2d80271a063b746d248e2bffebc227b3fff95028770831c21798edfc1fb00985c4b6e155356dd53fe8a5f99c483ccb8eeea4a01ae791d6f7f7f44b SHA512 4abb079bc63f1048317c38912b49a9ce05755ad9dac5adc7f787f2c2e5d9748568c80847a41cb2fd8cf3dcd251187c3ab9efce89ba593fd80b45ba17d0641baf
-EBUILD lammps-20180308.ebuild 3051 BLAKE2B e37e610a7a2d80271a063b746d248e2bffebc227b3fff95028770831c21798edfc1fb00985c4b6e155356dd53fe8a5f99c483ccb8eeea4a01ae791d6f7f7f44b SHA512 4abb079bc63f1048317c38912b49a9ce05755ad9dac5adc7f787f2c2e5d9748568c80847a41cb2fd8cf3dcd251187c3ab9efce89ba593fd80b45ba17d0641baf
-EBUILD lammps-20180316.ebuild 3049 BLAKE2B 82781acaecd343ad423a2eb85fe609255c34244f7e10104248c69fa57dd6fa8bdc3876d17fa9facb13de21dfec4697f8b3ed59422cc27e6defa92188087906bf SHA512 3204a79cf3f72df83edb53eea1587d338510a94849ef9aa40cea3f97a34a753d11736057ce893493fed0b3a147cf940db6b5d5e9a0a96a1208d7ac08035b46c8
-EBUILD lammps-20180822.ebuild 2836 BLAKE2B fa3bf2118eab720539dcc1eb82b2d0e30e272f20ba321343927d05504e52d8a7b8688d592ed32581a90e03697d30a1ce0d94d3c8e7aa052800037f4d20932da3 SHA512 7acdf59d6d75821149e8ab1545398bd5621d664b905cb2b11f2be8771db234043efe72097d786c8d83bae59b4396d6522087312b735267b3aad3cb7c9e025bb8
-EBUILD lammps-20181212.ebuild 2977 BLAKE2B b5ea51f68299218d3d190f987786ec87b85beab0bab2e00eeba2bd2134e9d52feab21cd04679dc00b7946ab412289866409f60b32bd5f631deb9a75d150f1ecd SHA512 035e5ad6685ac59cefe8ba9bb5b5e1d4ed8a2101cf25f9a023929aaa27a48fd980394e172bbc772fcfe9da90e8a7a066087e49deb9aad2e3d71169711397323f
-EBUILD lammps-20190605.ebuild 2977 BLAKE2B 345d85601ce372b0632e8fd59cdca0b5e5ba0570309e507416abf48f63c62cca8b0c34db227490ee9e372f4d8de69162a8e4c65de3eaa574fb6fc4143b23503a SHA512 66a5d8d7a39160100b67834d5dda9f2650338c5202f037ea744f1f8a543b4a9dfabce1dfec0ce8376c40b2231be637e61ba1b001fd7e7ebe70e01ebb38c96ac1
-EBUILD lammps-20190807-r1.ebuild 2981 BLAKE2B 596bbab3fd8f1fc2e9704ff4f8a1820f60315f14f5d6ef3789f73cdc65ffeb2940d65f31dea29b729cbf88a2287791ba05a3b89e6a66bc694f6f47b8958be9d6 SHA512 a0f4c13dc9522fd12b683aedf8b8b4ce4f3cf7a94db166f7958beaede73d43ba021abb0b2cb2155faf101832f101adec741cf6ee9edb84e3a52205bf1de6fee9
-EBUILD lammps-20190807.ebuild 2977 BLAKE2B a3744848fa52a8a760380bc63d96827bbff4da11f8d2a920d2564d62420373205c4e86b3fa6854a3d3b8954566a7b1b61c9a104ba0dc858b869879f3074cb9e4 SHA512 bebd28215512949a6c6f99ba187aac9ce720114272c03033cc87bb3386a40778e153da97780d57cf8ffc95bc208ad9df649f1e840b123ebb3484e87b0279bfcc
 EBUILD lammps-20200303.ebuild 3043 BLAKE2B adc573dde316ae1b4e0f8730a998cb4fd4100ef7543f337d255034a2e2018428209d063977f4f1726a35b68ac46232a54b55e79ebada774d6dac106017e419b9 SHA512 65e11efe60e38b668a69a84922cb7130c7ce889b42e4a22c2c0ed1275d8b1a5df72e53da34102ff5e90f5507c36f4326c2dc0b8cd657703aa866990eb3799464
 MISC metadata.xml 1400 BLAKE2B 799d1c7a8a17a78af7de38cba5058ebe2b79eb577f8bcfa918459bccedecf151adc9442fe2031f16c6215b9126045a7472cb91fdf0d9a68c6f22271a5a2a5226 SHA512 8f864d325dfcbba719be7f7860485810a63a685739d0f2a0ec45989362b3eec28351d4ad34f579572f638291f2bad96ac04ca6eacd4c886ffbb77fb6d06dbe12
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 61fd0f7d4703..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 )
-
-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 61fd0f7d4703..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 )
-
-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 61fd0f7d4703..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 )
-
-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 81370f4910c0..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 )
-
-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 7cb2d7463222..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 )
-
-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 b63164986725..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 )
-
-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 c09f35787c0f..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 )
-
-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 b1341c65e68e..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} )
-
-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 1b0598ab8f6a..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 )
-
-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/Manifest b/sci-physics/paw/Manifest
index 86dd8276dd6d..9f99d4ce9d3d 100644
--- a/sci-physics/paw/Manifest
+++ b/sci-physics/paw/Manifest
@@ -2,6 +2,6 @@ AUX paw-2.14.04-glibc-2.10.patch 311 BLAKE2B c166583ac5197cda23cfc0594656af52140
 DIST paw_2.14.04.dfsg.2-8.debian.tar.gz 75788 BLAKE2B 1f9b5ec528e77cccf48a648b279509b9d36a98c3c7747ff6fa13e2072117b83ccbdd798a81d998f44924cc614d94ab6a713af9b05f54af1c43db4b0699d2b9d9 SHA512 63800b6071c0614d3d68eceffc23117703a9e48f6a9da3fd160b2eb27b326ffe7dc38718245d40e713b2c047967233e1aa56e7381754bbc95804b4c208d1d270
 DIST paw_2.14.04.dfsg.2-9.debian.tar.gz 79495 BLAKE2B cd398f5f4452eb160360b8dc9f4d16d95680821afe71f40ae11b4346a2cd29fb5cecf316dd00f1b89225230401a0dc0aaf2ab1a43cbfa55d71f9b4bf9c0e17af SHA512 e0ffd28aef621fbe7ff372bf1add2c3614897c755ada061d80835e43f0e7ebe342c44f5c989110ce53d8896d9738798277689bcb9fcba87c4eeae89e4d340b81
 DIST paw_2.14.04.dfsg.2.orig.tar.gz 3334317 BLAKE2B 9aa72ed2d99f7e0f3562dc2a2fc435343c4b1e7330bbfe0f482ab902465a2a7844d331c8941a31f01b6867b26b628b6951a99a46e908a1aa82209e18819df52c SHA512 6e4ef312195936b42ad641a63335586f48e0383e8a7f4330d52173492584f9d03c5fa4eab7e7de594e30556a1daacbe162b4f879718c9c489cb7a89f072b962e
-EBUILD paw-2.14.04-r4.ebuild 1793 BLAKE2B 9227affde6ddfca99373ff7d09e7f8bcc2d0e0ac973035675dec77e9fcd4aab7ea32b50ae0cbffa7b67319dc5d1aee17a69a7c1f9d5cbbc892e69c020a06d6e8 SHA512 040d9795bc1115730c9fd7fe11e558759ff81085a16c44a5d94f50108fcc7a3f1368e842582699c40618027f95fb6d757dc27bb6c81a33965150714332f23d6d
+EBUILD paw-2.14.04-r4.ebuild 1794 BLAKE2B 4de6dabcf8bd7db730d6f91f0f9a64fd4a9517b631ace19e5562a77ab380134c1b58d0881c5cea92726e3e60ed21b476a2ebe1aeae367d7d33616b2117cdcbed SHA512 3f528eb6a2a68923a0c9a789a24c94f7c5b789410f74ecb62838cc6bdb7dfc3c02b069b1626c5f39c5b632143bfaabb73bb78b50eaaf95f7a05420a941c418a2
 EBUILD paw-2.14.04-r5.ebuild 1797 BLAKE2B 2e4960de0c9ef892b4ffd426d032d875f52797b224811c08c5575d352763d66581cd56475a6753c48f24f5d4d3c6bf9586dc3e8e6fe2dcf43e2c7486508e257e SHA512 545245d1ffcf864fa381a51dda25318348010c155b95b0b79f4f1f2e6b845d04f4401b5ce8452e788a510332e2aabddb947e93025fe35d4ab50035d6475a8fd8
 MISC metadata.xml 787 BLAKE2B faa020aa68b428c4f15e7447b7030c4f0e986e14ac108a32f2c96b9f198cf50e026f4d1ce7e5bbbf8d554ba18faeb401937147ea77b6ac6cd5ed27f199d1ee0e SHA512 a7b760e73901e6eebc1c39240450ca0e95326d120e8b54bee86004c65c3165a766b10d01de6fd4943a785afd009dff86f224476bb4bfadab3c8deb0b7270c37d
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="