[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/moldy/

[David Seifert]

commit:     84e724fb340c02ae318e047889a44fb7cd797317
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 20:16:37 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 20:16:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e724fb

sci-chemistry/moldy: Port to EAPI 7

Closes: https://bugs.gentoo.org/742002
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-chemistry/moldy/moldy-2.16e-r2.ebuild | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
index 0d339986030..81b2d5bf314 100644
--- a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
+++ b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Molecular dynamics simulations platform"
 HOMEPAGE="http://www.ccp5.ac.uk/moldy/moldy.html"
@@ -12,15 +12,16 @@ SRC_URI="ftp://ftp.earth.ox.ac.uk/pub/keith/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples"
+IUSE="doc"
 
-DEPEND="doc? ( virtual/latex-base )"
-RDEPEND=""
+BDEPEND="doc? ( virtual/latex-base )"
 
 S="${WORKDIR}"
 
+PATCHES=( "${FILESDIR}"/${PV}-as-needed.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-as-needed.patch
+	default
 	sed \
 		-e 's:-O2::g' \
 		-e 's:-ffast-math::g' \
@@ -47,6 +48,7 @@ src_configure() {
 
 src_compile() {
 	emake
+
 	# To prevent sandbox violations by metafont
 	if use doc; then
 		VARTEXFONTS="${T}"/fonts emake moldy.pdf
@@ -58,13 +60,12 @@ src_install() {
 	emake prefix="${ED}"/usr install
 	dodoc BENCHMARK READ.ME RELNOTES
 
-	if use examples; then
-		rm Makefile.in configure.in config.h.in
-		insinto /usr/share/${PN}/examples/
-		doins *.in *.out control.*
-	fi
+	rm Makefile.in configure.in config.h.in || die
+	insinto /usr/share/${PN}/examples/
+	doins *.in *.out control.*
+
 	if use doc; then
-		insinto /usr/share/doc/${PF}/pdf
-		newins moldy.pdf moldy-manual.pdf
+		docinto pdf
+		newdoc moldy.pdf moldy-manual.pdf
 	fi
 }