gentoo resync : 15.01.2020

7 files changed, 131 insertions, 338 deletions

diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 203a5b921471..db87a7f4f9f2 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,23 +1,18 @@
 AUX gromacs-2020_beta1-pytest.patch 630 BLAKE2B 1036e06589c24459006f0b579ee89c9d9c4623c7ca32fae90b21646db13280549a23cad717ef7481b03cbf9f2629b6804c0727d4b8c7f3274d0463d2735f976a SHA512 b5880d3a21635892d52b2ac09cbf456194a3db0fa0676bbdd2c2500964da89fbb7f4ebed7ac7843304159bf11f44e279eb505b2af8833127d2e21f10cb254c1e
-DIST gromacs-2018.7.tar.gz 29912662 BLAKE2B 0714b28ec2443f3201275fc2fa6db1202a059161362134d4de03a900a3a67fe9d31ba8c058d5ee971198fecd69379fcd389f03d25c61f50b8460c43ba5c564d5 SHA512 fbc3b847b70b1396f412b8f4a1b977268651f8d53a222dcf6349fe563ff6319e096484209a24351e382bc9162a949b3900591f5b469c32dd9effeb894f03c172
 DIST gromacs-2018.8.tar.gz 29913703 BLAKE2B 8780032305928067fbfe1559efe9eedc4d47e27ab2f6ab54d6dba39edfcbeefbee4673d8910009048a850620b5a08ba8feb622db652c439cfa50a149ec5f0015 SHA512 6717895942f2ab7b54019511ed2aebadadde8e96d3c4b7414bb9168ffe418432d2dee330192e199f7b9d2f665c71f5d4f1ef0911aa7243d525a2ca182ef5b122
 DIST gromacs-2019.2.tar.gz 33437869 BLAKE2B bebe4942688dace148856d4491b687b8e0fd2c86d7fbd9eecdb46824d316a0fc3854464ecafa79d8db92327ee8467be204b050c11f1e71132184efd812c3bf09 SHA512 da7ff24e8485774e22d1c2464fbe64675c3305ef0e21a3d17e363201031952e5d4a9b81f572d5284fb6f2596ed99daf62fe78d653387d9d714274f46bc750183
-DIST gromacs-2019.3.tar.gz 33441419 BLAKE2B 79319dd23982c65c7c4d8e5f633cef0c7fd99a38a4e0cc9030a3ffb0fdfc07a4fbfbcfa942896f23a143b747e044fae645498a3e6992497d1f1a7d966f80b2b0 SHA512 de9f54d095b45ea7efd1043f83a40f6c778a6e3e2067a01f48d1ce843d68d226061933ca28a3edb635b795a8ddd5ef9deb8ed1114aa3235bc8039db8ff7d0218
-DIST gromacs-2019.4.tar.gz 33444527 BLAKE2B 5a01ed0e38faade037de701b72e8d52fd5a947a23228f0b5170a170dc963b00068a6b6880dd9a3f6f2a73140a3787952741dcbcc862bc357a8be8bf5640faa16 SHA512 adc6dea187b7f3a3c13fcd39445ae45248d46d56b0102fda47b1850b83ff1fb77a3fec99d4a4124b01ed04646dab6ab67749eae1bec36d1ba6f2205855cd29f8
-DIST gromacs-2020-beta1.tar.gz 29019829 BLAKE2B 1884e0984aa6cd8a6bf7d9c692c5f465247ed3c396a0b12fa67c1fc763d84dbeaee23905c95e902e9befe1af8617fc9dc46d7280140ce09ba1915bef58a86d0a SHA512 8992dbdd560fa5227d19f59d9a360cd9e5f0c3a1df435f43293bb044ca6414f177e04a4933b8c0f19d5121a44244a4c9c95d026f6c817fd4ba5b0e4f7b3a01a0
-DIST regressiontests-2018.7.tar.gz 67856738 BLAKE2B 955ae8b5e74f90fec704cf41fbd00bd8c09d754f950551fe0adfcd407db6fdb4491a3815149ea37d36c747316c79d462e823b9f6b26f2376bf90d87aad95731b SHA512 c2ff390750bd99faebcd8d5dd8ad6dbf2b00113ed888bddddf985dbf95d7f347093adb67f3c396547b3e2990de330fddb7efe83ded91a72cf97c82a1dac7e826
+DIST gromacs-2019.5.tar.gz 33445791 BLAKE2B 1e2e2764b0c8774c878abf4f32c2fa7ddd9b46f464cf1256deb48335433d92ef1b315f5534cdec9f766ae928a71361b5a4dd4a4def638269eb260ff98dbbe8bb SHA512 fdd177e4dfd29629b72bfbb4d61ff7bcdb37279f534883a9df8fd57569212fe1e9f8b8c9cec347fcc607539f31412d604d11ee3c0eb797251960435962b1bec6
+DIST gromacs-2020.tar.gz 28928068 BLAKE2B 72d4ff8f6b383284e61df9d3b2b53c51300f6961d4c19810670c8ee9ba2f1864d2a325e2774093b9338db785cb91a94461bf93f16cdf4caf0f690298a672d51c SHA512 15f0d58cd8d217eab39ef8e3535dec34127708797eaf6575fb340292cbee2303cd25deb84b3d4417a787076f4ae7be9e4958ec3a347a3aa9aed52ef337a4587c
 DIST regressiontests-2018.8.tar.gz 67855469 BLAKE2B 34c9b339f6229f483afbb5192ee6ba8b8f72d5c26907a853af9c53dfece0d88739e48f6b44b78d1c010f988f9385d077285300522164f533a5861e9dda879275 SHA512 3642389d27bd1942cd0f091c940ae97b197b94856a387fe581dc516b0d4169480f16551d4ba357f9282b3337d605c286d51dd38112ac87c826dda634904836bb
 DIST regressiontests-2019.2.tar.gz 67643003 BLAKE2B 4178de5d62f194a81f97e442c10f123dc59c5e63f2078f7f07135709f3f6e530e0d237bf40264b285c084519d5ace75dfcbcddc16dc740c4f17233dc33542e45 SHA512 c1f25bc770d3f0a873c887d5563c1cd88179e81211b70ce6f5015696e6fa0b6931a8da7a449f2b223f3105b9e2e7eca67248e96fbfc2a7fd5fb360ba616f22ff
-DIST regressiontests-2019.3.tar.gz 67640462 BLAKE2B ed6c176a144e0407be66585be5d6090c31c047498bc5f48f59685108de91f2f9ddb2d22b291a15e6ffa1db848aae19b94a79c8c3d34b1067680f759a179953dd SHA512 822e905fb488ce308eb9324d93f78106da5252c773c7941d49c6162e73bdff109aeca1f0d57216c6dd6536a4c41d80013fa1cee2f5206b0c4160a3e5b4a31315
-DIST regressiontests-2019.4.tar.gz 67639728 BLAKE2B aba912863669a4a6a6a74e385f9b0974d0c0aa30d3aea7834d77c8bb3f4f59effcbe10a480e74e7aa31fe32d64ba6628d67703ca1894839ce7ddfc8da93902dc SHA512 45de03d368da4e6e5c647f3fea61d64defe6d1cbc1c4219eeac2db27559e3cea7f15f9acb3e56ab934b44ca3ae4ce199b4e4969f704776bb9f0b23f1a34ff56d
-DIST regressiontests-2020-beta1.tar.gz 48263088 BLAKE2B 2c5cacb0ff7d5b31e639388bebc755355837242643ad6dc48b7722918328214c8271f894d956960743641eb9cd4ec9df0013ad8490b73f2006b75fc8ebefcb51 SHA512 fba198e5560c01e6239bcddaa8d574c79062684b3f94f71b06436d83da9b9efd865998cea3a1b9369938e8fec69383d3fd6278c22c7a1a72eb50cc282f4b42c2
-EBUILD gromacs-2018.7.ebuild 7852 BLAKE2B 3c9625b06e391e1a28e804ccc9eb196cfd6adc14144867947f7a98052709cc1c400887383d164bfb1d558cf77447ca28924598e2d9b3222d00ca9930d80a2a3e SHA512 63e58f86c5ba37f5e7b52db46f7c665e77686a7f4722807658f7552fbd1f2b5f4555b2a273f9a1a74ef27966462d89a9357ab57821d3e049ff8d4dc565c9f8c8
-EBUILD gromacs-2018.8.ebuild 8787 BLAKE2B 9edbb2ae0bd3f76af41cee9971b70fdc957f22bb61ec131abd3cf44a2da56c208b0b103f72754e17cccfa054d79c1e95a9477228b0c14f4476e58bd7656b641a SHA512 c4548c8436dadf1daaf7f4f41e3c957029a10f5eb7fd11c5c8f42046d2ba38c6baf9f47e69fb8e8eeef550e0463d76bf738d6f708ffce6b4cf556e29d725ed5a
+DIST regressiontests-2019.5.tar.gz 67643634 BLAKE2B c4d9535d9a8a650869d67544ad5f367324f45e55325bb5074ece9b010f232f2f0dd97c9af97924d3f2368ed63015ca7330baff1cc681310e1439ec330b70ee8d SHA512 7c0917b76e7db35ab4e3271d523d268e0e2d858091e68ead863bfe6d1e56b381e30fdbf44f479f6e065c029e2eb27cfa0dbaa1b243f185144321aaf5084c55ce
+DIST regressiontests-2020.tar.gz 48536146 BLAKE2B 9511db78b5d6a5ea431fdb73782f28dde4b94655139886c0ad519888ef3e435fe81807f158d66c1a4284cb88fe730f62d039ac23549f17d0ce5984764ef35f10 SHA512 5a35aaf6fe2f3b146c7045e9c967dc1c8bf754748cc1f2a7300193ae3f206a9f5058329380ae7b03b181410303bcd434584571e6161a75f99e52bd48f8ba1821
+EBUILD gromacs-2018.8.ebuild 8784 BLAKE2B 8c08b6c4f4278ed6455a0489b765c97c748835e49973bb83b7fe8e15d9453c8c9b6c6e26cd27a2d5a927aa87a36bfdef3874020f6658c9b2dcb774043e4547e3 SHA512 b66644847daa453b9a764faaa7f3145e16f3819d0d7ffdad12c1209a398cd03dbf7c2d60e0510f514b18f6ed8c09dfadb77bca6ff2f1eb044c65632842a7499a
 EBUILD gromacs-2018.9999.ebuild 8787 BLAKE2B 9edbb2ae0bd3f76af41cee9971b70fdc957f22bb61ec131abd3cf44a2da56c208b0b103f72754e17cccfa054d79c1e95a9477228b0c14f4476e58bd7656b641a SHA512 c4548c8436dadf1daaf7f4f41e3c957029a10f5eb7fd11c5c8f42046d2ba38c6baf9f47e69fb8e8eeef550e0463d76bf738d6f708ffce6b4cf556e29d725ed5a
 EBUILD gromacs-2019.2.ebuild 9200 BLAKE2B d4c6bbca2dfc3d376d3c98893a273d405735a2b10ea7034622a56beb544a9c0af494e7aac71d477c4800b2d45bfea0cbae3cd8ba764ebf3f463aa0b2d613b7e4 SHA512 60170844324d3542ee5043a6ac624e9eb6838a15a16fe58e65b5f3df12a74fe1bc383c505217b2fe85183c0eb7a1b421c21e1574329a9e84bb9b86159ad90e5d
-EBUILD gromacs-2019.3.ebuild 9229 BLAKE2B 6c7f24dd45eb3d576d069b153f2af1b69eee620e7cbee9157daec43d52b32bdfc9944f9177126b8660df94191bba4191f21181862390751f955b7ba84784b26a SHA512 a32bebd21d3492b5ef30d9440e269b07c2e08010c0ae7eb83f03ebc8316efcd00c7a7b652a107fa1374673d715d3fd930848686396f128425eeeac78f19e2c22
-EBUILD gromacs-2019.4.ebuild 9234 BLAKE2B 076a2a9ff537342156ca94f138c738fbff5a0b8167b7cd34ebab388357acc2f08249675428d19b13abe4d8489aaf94afb69fb32bba1cf7658550a984319dcb30 SHA512 da0007f5e8162efd53b061a564908167f8388c4cf4288d56167e0ab313140d92641d51f1c7384d52a55998de8baf23eaf56a04d633cd20525fbc0e2c46ba4256
+EBUILD gromacs-2019.5.ebuild 9233 BLAKE2B ecc2f17bf17bdd5df1696b9877d996c44450001412bd887fff13fd53b332d3fe63556e77c01e624b0f12a445fb8a4fda688fd409f30a7c94ebfc5107ddf30f3e SHA512 e52498f36fbe36dfc33f0aaf3c4ebac0d2c643127c2c70e901d01d6223f9537889f08530db61e0167673cb6528b1b5fc2d8311b397d7cb4389cd37e7fd71259f
 EBUILD gromacs-2019.9999.ebuild 9234 BLAKE2B 076a2a9ff537342156ca94f138c738fbff5a0b8167b7cd34ebab388357acc2f08249675428d19b13abe4d8489aaf94afb69fb32bba1cf7658550a984319dcb30 SHA512 da0007f5e8162efd53b061a564908167f8388c4cf4288d56167e0ab313140d92641d51f1c7384d52a55998de8baf23eaf56a04d633cd20525fbc0e2c46ba4256
-EBUILD gromacs-2020_beta1.ebuild 9703 BLAKE2B 686a81e3267b0a17b43e19ff884221ee4692bfecc21fa3fdc295d6b2ad6156f51688aa5cbe0312e940fea1171ece11794623114ea364ad6dc8d92ff25cf43bd7 SHA512 e29cf02cb175b12d26bd099511b2b2f5692a931772b75a2685333fad16b1ad39422cca28295e3b003f289860c102d4b86df9996d808b396a22a1ac980311a6b3
-EBUILD gromacs-9999.ebuild 8122 BLAKE2B 657e68df7563277a327984be5e23597d80b99cb3eac54c1f07037063ca1b2b7838cb07e00d4c4d41ef65f9bee622c7bba4527dea3d2792bb20b3969b8f5ea546 SHA512 97f5850567b25ca0bd11fc57331770a8d93383299d50b216e2089cd89d23b6618aad8a532d81da9f0d5cf19fc4a315c9f648e5c1dbbc5351fecb1255a02922f6
+EBUILD gromacs-2020.9999.ebuild 9793 BLAKE2B 0a689e24c71085d134e51a091d647e64a3bdfdbc9678f27cc0fb86b7caa8b4e1e4bdda4e8a379bfe593408fc0ea236141db9e8fd89e58987aadb2003054227d6 SHA512 0efe1abfcd815248f6a77d47e33867b88aae79d71c3be146da3264ae91036fd5305129515b3ae12cad757ad802c18ba79e588581c910fe06606883cacb2c9a19
+EBUILD gromacs-2020.ebuild 9793 BLAKE2B 0a689e24c71085d134e51a091d647e64a3bdfdbc9678f27cc0fb86b7caa8b4e1e4bdda4e8a379bfe593408fc0ea236141db9e8fd89e58987aadb2003054227d6 SHA512 0efe1abfcd815248f6a77d47e33867b88aae79d71c3be146da3264ae91036fd5305129515b3ae12cad757ad802c18ba79e588581c910fe06606883cacb2c9a19
+EBUILD gromacs-9999.ebuild 9789 BLAKE2B 661122ba2791c7af9e6db3439ee166d4a29278d06b43f4281e7e467638bb4babdb554af35148d51732cc4686ffd5460943d5b74b96d169e8eb98fdb6c8cd1324 SHA512 487f42c089de666e832d5ce25c5d1c63de977557362b0018be09a69a261ad5096908443295b609b3c8a1d059dab603d340a481ebe2c46ef63677b265b97db8c3
 MISC metadata.xml 1192 BLAKE2B 560c1c792102747fc16c22d475114480b9897263405da05946721dae5b781c599a02e1401adfa4d929bfb41b4d52791376438aa37d33de18beabc9edbeb779fa SHA512 136c49bfaca76e714e811077c7f7d214a5984c7b6c891c79ad4a754c304752e17450c9aee100dafce04d7bf3893a53224ef9b54504a278654d59fae9acdd0f77
diff --git a/sci-chemistry/gromacs/gromacs-2018.7.ebuild b/sci-chemistry/gromacs/gromacs-2018.7.ebuild
deleted file mode 100644
index 8e5e3827188b..000000000000
--- a/sci-chemistry/gromacs/gromacs-2018.7.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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"
-
-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 +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +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-4.2.9-r1 )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( <sys-apps/hwloc-2 )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )"
-
-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"
-}
-
-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-utils_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"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	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"
-
-	#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
-
-	mycmakeargs_pre+=(
-		"${fft_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 doc)
-		-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)
-		${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 cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( "-DGMX_GPU=ON" )
-		local opencl=( "-DGMX_USE_OPENCL=OFF" )
-		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${opencl[@]}"
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_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 ${cuda}
-			-DGMX_OPENMM=OFF
-			-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-utils_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-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_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-2018.8.ebuild b/sci-chemistry/gromacs/gromacs-2018.8.ebuild
index 4db9e9672b08..3e5988a06d24 100644
--- a/sci-chemistry/gromacs/gromacs-2018.8.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2018.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ $PV = *9999* ]]; then
 else
 	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
 		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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"
diff --git a/sci-chemistry/gromacs/gromacs-2019.4.ebuild b/sci-chemistry/gromacs/gromacs-2019.5.ebuild
index a08d3ecc9027..7775143d0ae9 100644
--- a/sci-chemistry/gromacs/gromacs-2019.4.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ if [[ $PV = *9999* ]]; then
 else
 	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
 		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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"
@@ -93,7 +93,7 @@ src_unpack() {
 		if use test; then
 			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
 			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests" \
 				git-r3_src_unpack
 		fi
 	fi
diff --git a/sci-chemistry/gromacs/gromacs-2020_beta1.ebuild b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
index a47062613711..f40242167fd7 100644
--- a/sci-chemistry/gromacs/gromacs-2020_beta1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
@@ -50,6 +52,7 @@ CDEPEND="
 	mkl? ( sci-libs/mkl )
 	mpi? ( virtual/mpi )
 	${PYTHON_DEPS}
+	!sci-chemistry/gmxapi
 	"
 BDEPEND="${CDEPEND}
 	virtual/pkgconfig
@@ -79,7 +82,7 @@ if [[ ${PV} != *9999 ]]; then
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
-PATCHES=( "${FILESDIR}/${P}-pytest.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2020_beta1-pytest.patch" )
 
 pkg_pretend() {
 	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
@@ -87,6 +90,10 @@ pkg_pretend() {
 		die "Please switch to an openmp compatible compiler"
 }
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		default
@@ -229,6 +236,7 @@ src_configure() {
 			"$(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-utils_src_configure
 		[[ ${CHOST} != *-darwin* ]] || \
@@ -253,11 +261,6 @@ src_configure() {
 		[[ ${CHOST} != *-darwin* ]] || \
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
 	done
-	if use python; then
-		cd python_packaging
-		distutils-r1_src_configure
-		cd ..
-	fi
 }
 
 src_compile() {
@@ -265,6 +268,12 @@ src_compile() {
 		einfo "Compiling for ${x} precision"
 		BUILD_DIR="${WORKDIR}/${P}_${x}"\
 			cmake-utils_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_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 doc; then
 			BUILD_DIR="${WORKDIR}/${P}_${x}"\
@@ -275,11 +284,6 @@ src_compile() {
 		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
 			cmake-utils_src_compile
 	done
-	if use python; then
-		cd python_packaging
-		distutils-r1_src_compile
-		cd ..
-	fi
 }
 
 src_test() {
@@ -287,17 +291,16 @@ src_test() {
 		BUILD_DIR="${WORKDIR}/${P}_${x}"\
 			cmake-utils_src_make check
 	done
-	if use python; then
-		cd python_packaging
-		distutils-r1_src_test
-		cd ..
-	fi
 }
 
 src_install() {
 	for x in ${GMX_DIRS}; do
 		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install ${GMX_PYTHON_INSTALL}
+			cmake-utils_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake-utils_src_install	python_packaging/install
+		fi
 		if use doc; then
 			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
 		fi
@@ -310,17 +313,12 @@ src_install() {
 		insinto /usr/include/tng
 		doins src/external/tng_io/include/tng/*h
 	fi
-	if use python; then
-		cd python_packaging
-		distutils-r1_src_install
-		cd ..
-	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
+		cat "${ED}"/usr/bin/gmx-completion-gmx.bash "$x" > "${T}/${n}" || die
 		newbashcomp "${T}"/"${n}" "${n}"
 	done
 	rm "${ED}"/usr/bin/gmx-completion*.bash || die
diff --git a/sci-chemistry/gromacs/gromacs-2019.3.ebuild b/sci-chemistry/gromacs/gromacs-2020.ebuild
index 5254b1f3f38b..f40242167fd7 100644
--- a/sci-chemistry/gromacs/gromacs-2019.3.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit bash-completion-r1 cmake-utils cuda eutils multilib python-single-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
 if [[ $PV = *9999* ]]; then
 	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
@@ -32,7 +34,7 @@ HOMEPAGE="http://www.gromacs.org/"
 #        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 +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
+IUSE="X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
 
 CDEPEND="
 	X? (
@@ -50,8 +52,9 @@ CDEPEND="
 	mkl? ( sci-libs/mkl )
 	mpi? ( virtual/mpi )
 	${PYTHON_DEPS}
+	!sci-chemistry/gmxapi
 	"
-DEPEND="${CDEPEND}
+BDEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -79,12 +82,18 @@ if [[ ${PV} != *9999 ]]; then
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
+PATCHES=( "${FILESDIR}/${PN}-2020_beta1-pytest.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
@@ -221,11 +230,13 @@ src_configure() {
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
 			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
 			"${opencl[@]}"
 			"${cuda[@]}"
 			"$(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-utils_src_configure
 		[[ ${CHOST} != *-darwin* ]] || \
@@ -257,6 +268,12 @@ src_compile() {
 		einfo "Compiling for ${x} precision"
 		BUILD_DIR="${WORKDIR}/${P}_${x}"\
 			cmake-utils_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_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 doc; then
 			BUILD_DIR="${WORKDIR}/${P}_${x}"\
@@ -280,6 +297,10 @@ src_install() {
 	for x in ${GMX_DIRS}; do
 		BUILD_DIR="${WORKDIR}/${P}_${x}" \
 			cmake-utils_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake-utils_src_install	python_packaging/install
+		fi
 		if use doc; then
 			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
 		fi
@@ -293,14 +314,14 @@ src_install() {
 		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
+	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
+		cat "${ED}"/usr/bin/gmx-completion-gmx.bash "$x" > "${T}/${n}" || die
 		newbashcomp "${T}"/"${n}" "${n}"
 	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
 	readme.gentoo_create_doc
 }
 
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index f9d980d7c0f3..aa6382b595a9 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -1,11 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
 if [[ $PV = *9999* ]]; then
 	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
@@ -30,7 +34,7 @@ HOMEPAGE="http://www.gromacs.org/"
 #        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 +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
+IUSE="X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
 
 CDEPEND="
 	X? (
@@ -47,13 +51,16 @@ CDEPEND="
 	lmfit? ( sci-libs/lmfit )
 	mkl? ( sci-libs/mkl )
 	mpi? ( virtual/mpi )
+	${PYTHON_DEPS}
+	!sci-chemistry/gmxapi
 	"
-DEPEND="${CDEPEND}
+BDEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
-		dev-python/sphinx
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		media-gfx/mscgen
+		media-gfx/graphviz
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 		media-gfx/imagemagick
@@ -64,7 +71,8 @@ REQUIRED_USE="
 	|| ( single-precision double-precision )
 	cuda? ( single-precision )
 	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )"
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
 
 DOCS=( AUTHORS README )
 
@@ -74,12 +82,18 @@ if [[ ${PV} != *9999 ]]; then
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
+PATCHES=( "${FILESDIR}/${PN}-2020_beta1-pytest.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
@@ -116,6 +130,28 @@ src_prepare() {
 	fi
 
 	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+
+	# 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
 }
 
 src_configure() {
@@ -172,6 +208,7 @@ src_configure() {
 		-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}
 	)
 
@@ -193,11 +230,13 @@ src_configure() {
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
 			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
 			"${opencl[@]}"
 			"${cuda[@]}"
 			"$(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-utils_src_configure
 		[[ ${CHOST} != *-darwin* ]] || \
@@ -207,9 +246,11 @@ src_configure() {
 		mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
+			-DGMX_MPI=ON
 			-DGMX_OPENMM=OFF
 			-DGMXAPI=OFF
+			"${opencl[@]}"
+			"${cuda[@]}"
 			-DGMX_BUILD_MDRUN_ONLY=ON
 			-DBUILD_SHARED_LIBS=OFF
 			-DGMX_BUILD_MANUAL=OFF
@@ -227,6 +268,12 @@ src_compile() {
 		einfo "Compiling for ${x} precision"
 		BUILD_DIR="${WORKDIR}/${P}_${x}"\
 			cmake-utils_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_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 doc; then
 			BUILD_DIR="${WORKDIR}/${P}_${x}"\
@@ -250,6 +297,10 @@ src_install() {
 	for x in ${GMX_DIRS}; do
 		BUILD_DIR="${WORKDIR}/${P}_${x}" \
 			cmake-utils_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake-utils_src_install	python_packaging/install
+		fi
 		if use doc; then
 			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
 		fi
@@ -263,14 +314,14 @@ src_install() {
 		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
+	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
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
 		newbashcomp "${T}"/"${n}" "${n}"
 	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
 	readme.gentoo_create_doc
 }