sci-chemistry/dl_poly: EAPI bump, fix fetch, fix build

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>

4 files changed, 27 insertions, 46 deletions

diff --git a/sci-chemistry/dl_poly/Manifest b/sci-chemistry/dl_poly/Manifest
index 1d2781521..c0fef1a08 100644
--- a/sci-chemistry/dl_poly/Manifest
+++ b/sci-chemistry/dl_poly/Manifest
@@ -1,2 +1,2 @@
-DIST dl_class_1.9.tar.gz 3280421 SHA256 eac3d0de86bfc9cfec9ee3024ef46114e85c501aec025d61e22c2c6ffda1cae8 SHA512 c87537c71552f8e9f190bfe6d216a498c0d9d202b8aa2d0ade3bca3120d67eb6b880661320119fa98e9a791cb8fa3075d617657d15f311fdb327e07e3eee4106 WHIRLPOOL 9b2caadd1bee363bbae78d5325acc0366ac6cf4f9c3a107c805c4d0bb3d94257b56a5b11857fe446383aad9235999a709d96f366ccb2ee901b461f72a118f605
-DIST dl_poly_4.05.tar.gz 3133828 SHA256 ff3854a005148b55563d9994af4d449276ebb774a334ba9effb491bd3b13475d SHA512 926bb105537a70d7974a824872ca67edf1596896c01eecc2d6ca6c9cd10e828f2d33addcecceee72aa8e169c3813f8e8d2e5674d059f6f128bafcb1b63891fed WHIRLPOOL 8eff43198f24763b60de1eb6bf18e68609faf1649c1c0e3e408b2f12bf43c4bf2b39034d25db00ed0fdd003a7c806ce4f1551a301ecc47dc48014de42354a2c5
+DIST dl_poly-1.10.tar.gz 9158743 BLAKE2B 422c384c4dada15d1dd96f919ca8056152a9f718cba158e60b7037fbbe2d473b6b797dbe0d4b6820046a8239496ea26e11da73c3a10d35b2ea485e72d70e7999 SHA512 60b82bfe35de34353be465dad5a668ab4280913fa8171305f0f9c498e3d3233eca0641e1bf671d8213a74fe426d60504a95cde1589830f62551a77944c7cc1b8
+DIST dl_poly-5.0.0.tar.gz 3013573 BLAKE2B cde37b38d79d6216abb9becec3f30db3959e97e85c5491f5d95b3bd560db590b1b882b48827d4bfa494016f97c5389a8fe383d232ef55c2b2318b206aee2ded9 SHA512 1432867aa808f91d6dad4e109508b9d9e182bad52c38c423aa3dc37b5a81be344cb393a913d5416952a157986e9466f2b2d51ae32d2a523971930941c9e841dc
diff --git a/sci-chemistry/dl_poly/dl_poly-1.9.ebuild b/sci-chemistry/dl_poly/dl_poly-1.10.ebuild
index 61056c7bc..d93ef8576 100644
--- a/sci-chemistry/dl_poly/dl_poly-1.9.ebuild
+++ b/sci-chemistry/dl_poly/dl_poly-1.10.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit fortran-2 toolchain-funcs
 
 DESCRIPTION="a general purpose molecular dynamics simulation package"
 HOMEPAGE="http://www.ccp5.ac.uk/DL_POLY_CLASSIC/"
-SRC_URI="http://ccpforge.cse.rl.ac.uk/gf/download/frsrelease/255/2627/dl_class_1.9.tar.gz"
+SRC_URI="https://gitlab.com/DL_POLY_Classic/dl_poly/-/archive/RELEASE-${PV//./-}/${PN}-RELEASE-${PV//./-}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
-DEPEND=""
+DEPEND="virtual/mpi[fortran]"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/dl_class_1.9/source"
+S="${WORKDIR}/${PN}-RELEASE-${PV//./-}/source"
 
 src_prepare() {
+	default
 	cp ../build/MakeSEQ Makefile || die
 }
 
diff --git a/sci-chemistry/dl_poly/dl_poly-4.05.ebuild b/sci-chemistry/dl_poly/dl_poly-4.05.ebuild
deleted file mode 100644
index 330034af5..000000000
--- a/sci-chemistry/dl_poly/dl_poly-4.05.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="a general purpose molecular dynamics simulation package"
-HOMEPAGE="http://www.ccp5.ac.uk/DL_POLY/"
-SRC_URI="dl_poly_4.05.tar.gz"
-
-LICENSE="STFC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-RESTRICT="fetch"
-
-DEPEND="virtual/mpi[fortran]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P//-/_}/source"
-
-pkg_nofetch() {
-	einfo "Go to ${HOMEPAGE} and download ${A}"
-	einfo "into ${DISTDIR}"
-}
-
-src_prepare() {
-	cp ../build/Makefile_MPI Makefile || die
-}
-
-src_compile() {
-	emake -j1 FC="mpif77 -c" FCFLAGS="${FFLAGS}" LD="mpif77 -o" LDFLAGS="${LDFLAGS}" EXE="${PN}" master
-}
-
-src_install() {
-	newbin "${PN}" DLPOLY.Z
-	use doc && dodoc ../manual/USRMAN*.pdf
-}
diff --git a/sci-chemistry/dl_poly/dl_poly-5.0.0.ebuild b/sci-chemistry/dl_poly/dl_poly-5.0.0.ebuild
new file mode 100644
index 000000000..313216aa7
--- /dev/null
+++ b/sci-chemistry/dl_poly/dl_poly-5.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="a general purpose molecular dynamics simulation package"
+HOMEPAGE="http://www.ccp5.ac.uk/DL_POLY/"
+SRC_URI="https://gitlab.com/ccp5/dl-poly/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="STFC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="virtual/mpi[fortran]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P//_/-}-f8aaa10e91f07107c6cc2a0501a7c5064ec598d6"