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/msms-bin/Manifest                 |  2 +-
 sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild | 28 +++++++++++--------------
 2 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'sci-chemistry/msms-bin')

diff --git a/sci-chemistry/msms-bin/Manifest b/sci-chemistry/msms-bin/Manifest
index c3d88f6df9a9..f4893956b9dd 100644
--- a/sci-chemistry/msms-bin/Manifest
+++ b/sci-chemistry/msms-bin/Manifest
@@ -1,4 +1,4 @@
 DIST msms_i86Linux2_2.6.1.tar.gz 112762 BLAKE2B 8ceb55eef29234b38d631ea4aa63c7f11e4a606b8f14526412ed64d2ac9174604fd6ecb8c11c8e7629fd570b2298ee81d4f364c75ee64a41b1bc9fd9c661277b SHA512 814a5b5fa760b57c773f6900d42cacc5b68a2bf16d8792aa63cfa779aeabdab4e05064b86de6fb2551194543db925d83e07cf4ef74be8c08935ef5ecc8dcfe73
 DIST msms_i86_64Linux2_2.6.1.tar.gz 593147 BLAKE2B b66430303f732bc66c62577950671a947c2a81efa139857a255522fa5dc73f042b571e7756e76246aaeac30cb8cf3ac7383645b35a70bb08a15572de1c5fb2af SHA512 630da1ae57b2d8d072247b650636a71e5ef6f07a245c8c4d07b26e20618d9c5dbaffcff563d0504b9b899ca263ba5f3458447f0e649bbfb895aea34305c1c8f8
-EBUILD msms-bin-2.6.1-r1.ebuild 1075 BLAKE2B f324e286a4a567c34a7c4b1b6887eda3bcb53cc06b74c00bead500a4552cd367458d56d09e67cbdb84f2770486a531ea3a95d68536188995dd5ffd6fd427251c SHA512 be2c1c95d2a63c3471f47e6aac6bb086eb01fd4c23c98c53ada2ae5dbbd1db39fe0728a5439172b1a0163c1c20320ac48dda6feca22ce047a7571f08fae2a41d
+EBUILD msms-bin-2.6.1-r1.ebuild 991 BLAKE2B 14f67e7f92cfaedd3bfcba2063527d482645355393014fc25d3db791d8aaf1069aaf073333f4dec7a72e17af2d03cd5456d6bdc4b46fec9722553f75fc9d3782 SHA512 4041d972a774eddc85932c34a3bad7766d1778ec4ad59690683be2ec2e1fa51f3b7c6d2f7c80182c56275b4798fe392310d73cd4c054c0b720f7aed918d85c3c
 MISC metadata.xml 342 BLAKE2B e5edc8e8d81d013be77e02718bb4fe50564226ec1c028daad92c3c5b882b2eb840be28ce78dfc83ab3a58e1a428b55caed99971b9b84a8bec23349952496eea1 SHA512 2dbd8b2bdf37d4a2d4127cb373db2c6ff8fc4de6bf294e4518f1d424115860c0b083d538935a8b1a54543b396b968985e46a7ca293367ee1a0b462d11639b7ab
diff --git a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
index 13eebfcdc23e..6f6335e72bf8 100644
--- a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
+++ b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="MSMS very efficiently computes triangulations of Solvent Excluded Surfaces"
 HOMEPAGE="http://mgl.scripps.edu/people/sanner/html/msms_home.html"
 SRC_URI="
-			amd64? ( msms_i86_64Linux2_2.6.1.tar.gz )
-			x86? ( msms_i86Linux2_2.6.1.tar.gz )
-"
+	amd64? ( msms_i86_64Linux2_2.6.1.tar.gz )
+	x86? ( msms_i86Linux2_2.6.1.tar.gz )"
 
 LICENSE="MSMS"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
 RESTRICT="fetch"
 
 S="${WORKDIR}"
 
-QA_PREBUILT="${EROOT#/}opt/bin/.*"
+QA_PREBUILT="opt/bin/*"
 
 pkg_nofetch() {
 	einfo "Please download ${A} from http://mgltools.scripps.edu/downloads#msms and"
@@ -27,19 +24,18 @@ pkg_nofetch() {
 }
 
 src_install() {
-	doman msms.1
-	dodoc README msms.html ReleaseNotes
+	dobin pdb_to_xyz*
+
 	exeinto /opt/bin
-	if use amd64; then
-		newexe ${PN%-bin}.x86_64Linux2.${PV} msms
-	elif use x86; then
-		newexe ${PN%-bin}.i86Linux2.${PV} msms
-	fi
+	newexe ${PN%-bin}.$(usex amd64 x86_64Linux2 i86Linux2).${PV} msms
+
+	dodoc README msms.html ReleaseNotes
+	doman msms.1
+
 	insinto /usr/share/${PN}/
 	doins atmtypenumbers
 	sed \
 		-e 's:nawk:awk:g' \
 		-e "s:./atmtypenumbers:${EPREFIX}/usr/share/${PN}/atmtypenumbers:g" \
 		-i pdb_to_xyz* || die
-	dobin pdb_to_xyz*
 }
-- 
cgit v1.2.3