From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 23 Sep 2020 10:22:15 +0100
Subject: gentoo resync : 23.09.2020

---
 sci-chemistry/moldy/Manifest              |  2 +-
 sci-chemistry/moldy/moldy-2.16e-r2.ebuild | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'sci-chemistry/moldy')

diff --git a/sci-chemistry/moldy/Manifest b/sci-chemistry/moldy/Manifest
index 6ab473c01cc1..8774ffcf18f3 100644
--- a/sci-chemistry/moldy/Manifest
+++ b/sci-chemistry/moldy/Manifest
@@ -1,4 +1,4 @@
 AUX 2.16e-as-needed.patch 3226 BLAKE2B 777b34d43da82b036e401c398d0f59a5f268905a399f38277be73ba6bdaefd6f1de2ec748302edfc68c6389acb22fa50d72b465522b1f2d5bbd14eca289d7595 SHA512 b32461bb052c908106f0f8d74be4eba52daa41ba592a7ba6083edc2a54c4a14003cf33560572e57f2b370ad5ea1f703e388855e8e7fa67ccec40e3015a8f5803
 DIST moldy-2.16e.tar.gz 488410 BLAKE2B 44ff1dacc66922ba11297ca54c645f209b782b8cde50e427d54d1d249a93b718eeb865357ea47b820801fdbca325d5f0d6027fe11ce6e0a842e77d1970a0467c SHA512 b672f4e5c8843277d1b66eedf5f7ad87be0b4c014e0d6bfda4ef941cd9bfeec68d94a361e28531cc3794ee2e4a6937f15c462c69f9adcfcfe5254c3c677fe877
-EBUILD moldy-2.16e-r2.ebuild 1804 BLAKE2B 3c4865ada8baec131c5bb92e6856e3526a4aea05cb754423bf7cb896992c6e2732ad42b31808059c602549de7fd5054de780cfbe85218056c975f7c4c5fbda90 SHA512 5b8b76efa8f2132b50abd4ce3f0a137a8ed433c4e88b5b60df7043df00d5c78696c08dcfaade590842625429fa67656fa2d4537b158bedfb54da1eb79224bdcf
+EBUILD moldy-2.16e-r2.ebuild 1747 BLAKE2B 961cd390e657e578d9873bc7a15634333c3f451591610cf44936b94360e644118fca4254e88c62a020fbaaa169cce2b2d970335b550571e9bf75780bba0cc2b4 SHA512 c8458f6d37289c6ecb147c1a0b53d7888a58207d1bf1a6de891bcd9c8ce463355f3b350f744bbc3a299c1b1c10b3b237352572c95245d629f62bb8bbbc317733
 MISC metadata.xml 265 BLAKE2B d5a98b9309829a0486c4b8a4336c2d24a0fe34e926d52afd0cc87e16fcc887ca4c18851e58afb33866823121fa8f221a90e0d726dbd85552a4caf66cf03b7b4a SHA512 470f6c178e88c4e83afa46d5e901a45fc2427a779ae832df7fa2d6e25e9e8b4ce77cd3a8fe191e6242d6df3b673f0de6b4f90f1e147aa8b8dd566f18163cc73a
diff --git a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
index 0d3399860306..81b2d5bf314b 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
 }
-- 
cgit v1.2.3