sci-chemistry/gromacs: Cleanup 2021 versions

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

5 files changed, 3 insertions, 727 deletions

diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index b04f9954a649..d67ae5817a47 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -2,26 +2,20 @@ DIST gromacs-2018.8.tar.gz 29913703 BLAKE2B 8780032305928067fbfe1559efe9eedc4d47
 DIST gromacs-2019.6.tar.gz 33446147 BLAKE2B adc21fb6b841b06d499607f8c0166a673645ef5af0b40bd823d0fff5ea24397e6301c5e1e0070986ae1ce1deba8a42052b66da148b071c1e21f2fe3908fee275 SHA512 7c227a9539e5775d5d128ae9e872a24181d79cdcd2852b86453597987e8d7332ecec371da65d089f6e610c54aafbccc8824ce298743383dd6240719ebee692a8
 DIST gromacs-2020.4.tar.gz 29149899 BLAKE2B a07c8efd96137d58c1edf4ac9b5aafeb16d9e65234b9459b71471827032654acacb58ed6ae87ec6e0e593a0acd799683cc4461b06cc883b089d740708619345e SHA512 0c56f058741af70660baf0177724ec940dd984c05ea141ede91ee51ce3744f76d00e31bdb5db907e46fa1639de5dca637b3ace26e89f908c2e74c69f0c21ed3a
 DIST gromacs-2020.6.tar.gz 29196621 BLAKE2B b350fc62fd8eeb3f2b042fa74a4ed42e43a7b74efd8fddb60ec086a814048a52b8625da65fa5c4cf2cb1e22f8347562bc84d38bf34441fc5ebc6abaa38b0eea0 SHA512 4ce4d6b9ae33e9cd2a1ad3313e80acf63ded21dac897b01dbf87df2e318181796ef64c8a1d3e0a6058b972d8d88d00f710cd0277db12f38fc2c9b29772c98bea
-DIST gromacs-2021.2.tar.gz 37976386 BLAKE2B 8818321bbcbdee25356bbf909d9c667f9d7cf180e696a323a61017683234d1269decc8f8d72b8012a8cc207f69e5cd97e2ab48dbbff06d82bbb407bc0578854b SHA512 51b1728f41932274436ab807d569109e2b0e145abcb5cf9c9b7daf6a7396f2f8716dc28fb93cf178c97a7eaeab2a88878d0bc71dd6c6abe7e829d579e7968615
 DIST gromacs-2021.3.tar.gz 37987972 BLAKE2B d71995c7d5a34978246e33dc637ac3d273e547afcf72d1a107026650f03286ecdf27e4b9a70113b3c3a01af59ad49ac5c813aa6e5d2e8eb29fd05582a7a28d34 SHA512 da420917d06de2e192dfbb4e1b9f46989ed05b5c7e641c657104ed8f2bd8b22509bffd1ecfd7c965c80544eafa6af12d6d0aba7e1e7d9d14a4a88fb3fbf394a5
-DIST gromacs-2021.4.tar.gz 38023262 BLAKE2B 4e1c9ca23f8bd89a990bac2730f846ce9fd6423aa6934866734272ac8f5ca29cdb51daec440b7ef2af56c68bdbab504c0c1b1a4d5f4af0b16666850bf286c5b2 SHA512 35b26b3df02d151373fab49022281b89e987c867257a998acc926b2b7151f5d4e46f11c398a24f4a174f668dd24a828b07d36594ac5d5506e10e40d4578427a2
 DIST gromacs-2021.5.tar.gz 38023772 BLAKE2B 45e1f080b86626423e471f06b48b615db1913048f9f6998da8ce45408339b32f829d33dd2af57297a7d307fcffd556c333a58c309ee0f2adb021ca3755619b05 SHA512 56c1b312fc8e52ec6f86e445d2fa2d07107c461b35d4dc8cdf95580f05fd8e6c5fd671d0e72b2b9e74e3232bc8c41db496fe4bcaf2b9a3ae3c2cfa93489a31c5
 DIST gromacs-2022-rc1.tar.gz 39674628 BLAKE2B 8943a1e8445aa286305bb786e1303973e58325c01ce86883e5a72075b8ddd57453c61c8a0087a9ec73ea2903b04596109322151d8fadda350a4eace713cd962f SHA512 d6f45e46b653237154fefce95e3799ed2fc96d6a0365d027ef0aabd03cd3c3507108985caca8907c02479f05a10ab833efd3217e7def100897fa845e0ebf029f
 DIST manual-2018.8.pdf 10025023 BLAKE2B afb0a6e6a72d78df743fcb57e7c1716848589e571dd35167b957a9b407ca27978ccfb6cb9e0df9c9439b888f352501a00ba32281ed1e0b4193bd606f1d77152e SHA512 b1972f7ce965bfc9377542993c5943ea4868a8ed23a969d4203264746d6bea3a7a65c6379196ece37fd6d68ec7ec80f827bde87d1049284af7082759a124f1d5
 DIST manual-2019.6.pdf 12702376 BLAKE2B c350127bc06a9eb3dee73da39037c84daeb89500e23cb131bd19a150bf60602d4dde7611e0c6f0f344af4093e96a899303dac71b4df56fd0c44c3a48a56606b7 SHA512 dfdff67c2c1c9ce1f1c236b7686c5331b0fe86951da6c98eddd6a3e748815e0be0a9653ae4318469fcdd913c4e7c355d64a997cc80b9d9fbe6282ef6d98e61eb
 DIST manual-2020.4.pdf 11851608 BLAKE2B 7b7bdf08e8946fcc448543b08391b94a67fee60a8c810597c1f09f70443f9d7db817c99622dd0c21c6317f5fdcd6c4a88589ecac57055cb0cd8597d6021026e7 SHA512 928555663c77de36393e625c29d388d4e1c8c1298e7a993d871839e0d4d8d18d190221ad8f1d975bd072bdd6a061e9ea5b9295f2ecf45f24b6523ea5ea290fed
 DIST manual-2020.6.pdf 11850850 BLAKE2B 155e4eb9c200dcd0a38e3669b26077fcf310d437b82d9a593d333dada3989c2c8a936d62c642e195f98bb474b1673b8142405c467348fc96a74d57fb12106d76 SHA512 be508ebec597b82a2c4056029f8bb731b22cb8902628a45462ed21af54c554d28e07d5381efaaa96565202b7b47d33aea67950206cd9e8936211ae721b21b3e1
-DIST manual-2021.2.pdf 12252501 BLAKE2B 0dbf9024e1516076b0eeb46e41523b966d1d81f57504fe0501c7bc8575e74fb19e3452ac584757e425bcccbc737367fe83be87fd21a4287f4675cf87184b960b SHA512 14156d3b1017990e0be3ceb7ec055777a1aec4c347ac2e821a042d51c931f84ebca862f60644a90ed7ba4070cb14ff8babcde3e4351e4dbec84df8563e350984
 DIST manual-2021.3.pdf 12255076 BLAKE2B 6ca516b6832507c9d4100679d1f9bc9e3ab17d226849b050764b0d0626247dc57ce49985f9a7fc0061f3df278923a83faa367ca8ab91c37e5624dc584a51a822 SHA512 5d53798f30ea00fcb4e1b35f7eaa4bebfc05dafa4f2d0c197dcf2b57a624ad3a98b74fd90722e40d0ac13a6fff4ca231f9d6340f52ba94659c827c53c2f1cb16
-DIST manual-2021.4.pdf 12253232 BLAKE2B 0b859c08a07d5a615ac7a822b61d5a4f4296ca9773d383a07960dc629d6b1df23e1dec51561a4ac26789b84e49cc98b6d7cc10d943c61d7784052664ac1bacf9 SHA512 024f17a670518fc19a2a462186ed2a74f331c5c83b8ba4bbe148a53767515ba19e6af887a1baae3a7770af2095fad5c513784cc54f9d0f881395ad8a89760cba
 DIST manual-2021.5.pdf 12253641 BLAKE2B 8850715a2bb21345e1c9735aca1a5dd2ad916e5a18881e7c9f3dda6f055ca12d9d379b74218138999ce50769efd8b9dd6447afbf70bbbefa2564dfb9fb276b91 SHA512 7635108c935e4953d722df6a16ee43edf97eef7e49f047218728f68f61f8f185192ff1d8b13a573b643b040955af211355a7b560c8a894c858d7f71249d41296
 DIST manual-2022_rc1.pdf 13051892 BLAKE2B 99b0a2110a0a7601d4e2d00f4bb3210fed8e0e4dcc2c3a17fa8e902cc713c8aee90eebbcd9b0cb3fd20fb539be6bcf32414fcd3c35a3f9b4677240877623ca93 SHA512 5ff91b2486792a525fc5fc08bfd31225e3c64018b519592ce899ce0a6f92fb366ea4d1b5df3473d264bc93a651c11583757b6603a855cdcd9ad18ec86e160fdc
 DIST regressiontests-2018.8.tar.gz 67855469 BLAKE2B 34c9b339f6229f483afbb5192ee6ba8b8f72d5c26907a853af9c53dfece0d88739e48f6b44b78d1c010f988f9385d077285300522164f533a5861e9dda879275 SHA512 3642389d27bd1942cd0f091c940ae97b197b94856a387fe581dc516b0d4169480f16551d4ba357f9282b3337d605c286d51dd38112ac87c826dda634904836bb
 DIST regressiontests-2019.6.tar.gz 67643195 BLAKE2B 1e054e24b187946f7ea28090d4f20cf8e1d79a26253f57ba07d130e0773d8541b8a1552a38023d31a68ce8bc62d8e0af1d98609234bb3e7d3e6d567307ebb386 SHA512 eacf1c55b982515a305c29459fe80a7cd558a8481e5689962aa956148af542568b1d1ce59c6784ecb0afd4768c2b664afa21e12af2d89ae2b06b1ba61ad72036
 DIST regressiontests-2020.4.tar.gz 48542144 BLAKE2B 1dcde67525d40ababa74d9e8ba2dd3fdef1de7d1018491e102edd71d3a622925f213b5a0812e5448882b4cb5fb578317e8e5029bdc4bd53008aa8441a3d9dea1 SHA512 7c71f36a1cef22562f14dcd233e90ad2fe370ae1a7d3b5268727259b374e12d4754253735ac8745d3738bdbc1cc2067780fda5e393be2ff264f632fe4e0c1978
 DIST regressiontests-2020.6.tar.gz 48541232 BLAKE2B dbb405bd9168775984de8c9fb9e3fa2398d2790e2e4de23711c51a01dc3ea570d172a35d4924742ad5eda463eb0a885e6924512801e82b241600ceaefd5db70d SHA512 497a9e7d438b0b7b0734a97cf3683baf480ecc056e96b09f1e143c362ff047a4e51e323216750501c954559579716dc024d3c51319bd2c85fa719466ce4330b2
-DIST regressiontests-2021.2.tar.gz 48514312 BLAKE2B 81b007d5e5e1d054349c73dc8bc3589db328752e48a66687c0ad36be87ebe580df9cbd93b193a724669bd5765af06ec306f2e12af00a228af616de03943d6f05 SHA512 b687ddfd3dc6ec1051af2a3253633703ef1c82335d1df23379819ea47e44dfcd417e81e29610cc584d4c5fb1ee1cbc76731a3fd31b529d8cdd0b9c22f432c7ec
 DIST regressiontests-2021.3.tar.gz 48515038 BLAKE2B ee79d8adddc9c68f7d59d9e568b12bf4d1fe0e44c2810fee846ad6f689bbcacf60f5c266433946329e64e3127bc2d37a3f81f69c070c636b411b38067650c2cf SHA512 e14baa22ef2902a23125bbd9143ae7a9a4810498b321794ff1989f8d044d47db5db41d5225798fda08016c05e5f7f315178b5a6e35cdf01e3b6604670a8ce7a2
-DIST regressiontests-2021.4.tar.gz 48541736 BLAKE2B 37b8e65e333dcfcfc795da631475807ffa4ecc3a85426b4de6dd2ccb50f40a78159149789da13f988340a62d21e7d6b1d4f0c6e7fe69120d4c94ab2252b4c440 SHA512 18663693cf9ce2ca3bd8df0f668e7a0c8236a7f5ae4ee02f621cbe52c139c506b61ac4cab200cc59caab41e9983ea93dfa062d7b52f6558a619096a8d439fb56
 DIST regressiontests-2021.5.tar.gz 48537298 BLAKE2B 860ac34aa8706ecdafab4472162775ce12726d93839079ebf9b7df8c2c6a1b47baa8a635c24cf4cb4551a32237c3de7da3197ec136b5bbf48663edc3943720ad SHA512 3605d04b2602339fb7d33e2776da2ada337ca58a3802472d47f490d4e8dd04249a950bf34608a498eedebf69f344c0311bac8f7fcb58ce0ebbb6d608ee39aa2e
 DIST regressiontests-2022-rc1.tar.gz 48609151 BLAKE2B b5ec84b9f3f506636136bf9112ea71f7ce5bad8b3dbec6d8c6b21ab13ddab8252a3038f1dd06e1f97cde47f918aff2c62325d09d51bc5632e1db7b84311dbd91 SHA512 a378f724a728fbadbad3b9013f85bf6fb1945e500151d9dacdaea9371f432ce3449dc812f672b77896800c3c46a3893b239101404a1fab63364e62afd7f18097
diff --git a/sci-chemistry/gromacs/gromacs-2021.2-r1.ebuild b/sci-chemistry/gromacs/gromacs-2021.2-r1.ebuild
deleted file mode 100644
index 5067010bc65f..000000000000
--- a/sci-chemistry/gromacs/gromacs-2021.2-r1.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="
-		https://gitlab.com/gromacs/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		git://git.gromacs.org/gromacs.git"
-	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="
-		http://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
-		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
-		test? ( http://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( sys-apps/hwloc:= )
-	lapack? ( virtual/lapack )
-	lmfit? ( sci-libs/lmfit:= )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	${PYTHON_DEPS}
-	!sci-chemistry/gmxapi
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	build-manual? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	doc? ( !build-manual )
-	cuda? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2020-pytest.patch"
-	"${FILESDIR}/${PN}-2021-nblib.patch"
-)
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	if use build-manual; then
-		# try to create policy for imagemagik
-		mkdir -p ${HOME}/.config/ImageMagick
-		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-		<?xml version="1.0" encoding="UTF-8"?>
-		<!DOCTYPE policymap [
-		<!ELEMENT policymap (policy)+>
-		!ATTLIST policymap xmlns CDATA #FIXED ''>
-		<!ELEMENT policy EMPTY>
-		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-		]>
-		<policymap>
-			<policy domain="coder" rights="read | write" pattern="PS" />
-			<policy domain="coder" rights="read | write" pattern="PS2" />
-			<policy domain="coder" rights="read | write" pattern="PS3" />
-			<policy domain="coder" rights="read | write" pattern="EPS" />
-			<policy domain="coder" rights="read | write" pattern="PDF" />
-			<policy domain="coder" rights="read | write" pattern="XPS" />
-		</policymap>
-		EOF
-	fi
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	if use custom-cflags; then
-		#go from slowest to fastest acceleration
-		local acce="None"
-		if (use amd64 || use x86); then
-		use cpu_flags_x86_sse2 && acce="SSE2"
-		use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-		use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-		use cpu_flags_x86_avx && acce="AVX_256"
-		use cpu_flags_x86_avx2 && acce="AVX2_256"
-		use cpu_flags_x86_avx512f && acce="AVX_512"
-		elif (use arm); then
-			use cpu_flags_arm_neon && acce="ARM_NEON"
-		elif (use arm64); then
-			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
-		fi
-	else
-		strip-flags
-	fi
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	if use lmfit; then
-		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
-	else
-		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex build-manual)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local gpu=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
-		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
-			"${gpu[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			-DGMX_PYTHON_PACKAGE=$(usex python)
-		)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMXAPI=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile	python_packaging/all
-			BUILD_DIR="${WORKDIR}/${P}" \
-				distutils-r1_src_compile
-		fi
-		# not 100% necessary for rel ebuilds as available from website
-		if use build-manual; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}" \
-				cmake_src_install	python_packaging/install
-		fi
-		if use build-manual; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-
-		if use doc; then
-			if [[ ${PV} != *9999* ]]; then
-				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
-			fi
-		fi
-
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2021.4.ebuild b/sci-chemistry/gromacs/gromacs-2021.4.ebuild
deleted file mode 100644
index ab6c1d40dd0b..000000000000
--- a/sci-chemistry/gromacs/gromacs-2021.4.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="
-		https://gitlab.com/gromacs/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		git://git.gromacs.org/gromacs.git"
-	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="
-		http://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
-		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
-		test? ( http://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( sys-apps/hwloc:= )
-	lapack? ( virtual/lapack )
-	lmfit? ( sci-libs/lmfit:= )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	${PYTHON_DEPS}
-	!sci-chemistry/gmxapi
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	build-manual? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	doc? ( !build-manual )
-	cuda? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	if use build-manual; then
-		# try to create policy for imagemagik
-		mkdir -p ${HOME}/.config/ImageMagick
-		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-		<?xml version="1.0" encoding="UTF-8"?>
-		<!DOCTYPE policymap [
-		<!ELEMENT policymap (policy)+>
-		!ATTLIST policymap xmlns CDATA #FIXED ''>
-		<!ELEMENT policy EMPTY>
-		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-		]>
-		<policymap>
-			<policy domain="coder" rights="read | write" pattern="PS" />
-			<policy domain="coder" rights="read | write" pattern="PS2" />
-			<policy domain="coder" rights="read | write" pattern="PS3" />
-			<policy domain="coder" rights="read | write" pattern="EPS" />
-			<policy domain="coder" rights="read | write" pattern="PDF" />
-			<policy domain="coder" rights="read | write" pattern="XPS" />
-		</policymap>
-		EOF
-	fi
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-	local acce="AUTO"
-
-	if use custom-cflags; then
-		#go from slowest to fastest acceleration
-		acce="None"
-		if (use amd64 || use x86); then
-			use cpu_flags_x86_sse2 && acce="SSE2"
-			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-			use cpu_flags_x86_avx && acce="AVX_256"
-			use cpu_flags_x86_avx2 && acce="AVX2_256"
-			use cpu_flags_x86_avx512f && acce="AVX_512"
-		elif (use arm); then
-			use cpu_flags_arm_neon && acce="ARM_NEON"
-		elif (use arm64); then
-			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
-		fi
-	else
-		strip-flags
-	fi
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	if use lmfit; then
-		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
-	else
-		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex build-manual)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local gpu=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
-		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
-			"${gpu[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			-DGMX_PYTHON_PACKAGE=$(usex python)
-		)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMXAPI=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile	python_packaging/all
-			BUILD_DIR="${WORKDIR}/${P}" \
-				distutils-r1_src_compile
-		fi
-		# not 100% necessary for rel ebuilds as available from website
-		if use build-manual; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}" \
-				cmake_src_install	python_packaging/install
-		fi
-		if use build-manual; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-
-		if use doc; then
-			if [[ ${PV} != *9999* ]]; then
-				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
-			fi
-		fi
-
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2021.5.ebuild b/sci-chemistry/gromacs/gromacs-2021.5.ebuild
index c40fa7838c07..69016d2eab59 100644
--- a/sci-chemistry/gromacs/gromacs-2021.5.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.5.ebuild
@@ -55,7 +55,6 @@ CDEPEND="
 	mkl? ( sci-libs/mkl )
 	mpi? ( virtual/mpi )
 	${PYTHON_DEPS}
-	!sci-chemistry/gmxapi
 	"
 BDEPEND="${CDEPEND}
 	virtual/pkgconfig
diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
index c135dc43d747..30f361601b7b 100644
--- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_SINGLE_IMPL=1
 
-inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="
@@ -55,7 +55,6 @@ CDEPEND="
 	mkl? ( sci-libs/mkl )
 	mpi? ( virtual/mpi )
 	${PYTHON_DEPS}
-	!sci-chemistry/gmxapi
 	"
 BDEPEND="${CDEPEND}
 	virtual/pkgconfig