gentoo resync : 13.06.2020

3 files changed, 2 insertions, 77 deletions

diff --git a/sci-chemistry/mopac7/Manifest b/sci-chemistry/mopac7/Manifest
index 8ac390352af4..978cbe206d0a 100644
--- a/sci-chemistry/mopac7/Manifest
+++ b/sci-chemistry/mopac7/Manifest
@@ -2,6 +2,5 @@ AUX Makefile 458 BLAKE2B dab61e16f1382f173c1f46b8bf1331cd27c5f26ad0d4a6ad9b13f29
 DIST dcart.f 11044 BLAKE2B 7414804ecfab9a7cbddee664b85e6e2e8c1d8fe1e1f73d480dd1a387c5e349d26ec4ae1a37f27e38b7c051fcce2c1bdf77de12ec628298fd3edf79040a8a0c5a SHA512 788a184fd8419ff742e49c1a652d5ea093f9114dbe4f272665b8fb9eeac2afb7f7042628c288f2b81d0f54d8a7ef2f400490cd3aff39dda59a6d70a0deab5b80
 DIST gmxmop.f 38956 BLAKE2B e411feca5104e91ae8fd2008de61d18cc214beb3b2a7aa09a80269fb935e27ba1b1cb89fa30eedbfc4f6c4734c22d932e57d5905c175ae9f56c4affee7b0ca04 SHA512 38bb2e5749c4d3c8c24f15682f72e40cb4edb6517c7916cecee1d21675b1870c0fe331ba2ec40312408dec473141e7742d1e155d4b64f1c2a25bfa4e11885194
 DIST mopac7-1.15.tar.gz 764547 BLAKE2B 6e037862007221955d0ad65f3c002a3d2e461950a2bc0efac9d195cf1d9d856842d02bc380ce236c3d48f863a144875950f5c86f8f3ac936b8b098472f7f7a0d SHA512 e0ccd643caa6dbd7e156867530d79e50e10243f5e3b5f8bc57781e68e1daf26f2a0e6987fff00afe07eb0fcb98cbd9f01e4cfa5d20acc0d8ab3cca632968636e
-EBUILD mopac7-1.15-r1.ebuild 1817 BLAKE2B 2b3df9f719350adf9ee767fd99def28c0f63d8eda49253fbbd6c0d00c2c22109cefd45cf2d9f60bd2808f82c1d0840c3c43cc1cc698e1e0429214c3d16eedbf9 SHA512 f540feba5eacff866a1ead1d1d2cf81a5ac07759e2298010748cadb9c7b7cf1cbb869f38be3dfa4532e5b9c2aafafb90e57bf3c25a594998a2480a574a479fbf
-EBUILD mopac7-1.15.ebuild 2044 BLAKE2B c4fa6bd512e0006c179cd58a3584c1343d088b5ba95f434c133f145f26882711f47effdbe5fe6c3dad50e63d43a01d667ca934c427078bb5d6f083f9383cc7d5 SHA512 55135a37436fc479539a769b8d0dd7a604cf9fe522243fe5105b4eed6862efaa9c333ede5cdf87b58e49110d41e4d445e80de2c991d38b28529bb610666cc8c7
+EBUILD mopac7-1.15-r1.ebuild 1816 BLAKE2B 6fe72656e446e1ef3e6a4c543c6a8703e8965ba751e1934c6c4673806283dc7a4bf41d121cc6e7a756fb4e599006ea368f75e753b8a5ec97cda8680e76a5d3bc SHA512 5e75215a6e8d2f18b01bab66d28b754cb0a9406051b089ac4415bed12a2425d1a15a9387668e680e51f33d29b782619f48acd50bf440a83b8e4ea57d458a4cf7
 MISC metadata.xml 434 BLAKE2B 011dd4486a917b69a58d398027b3af606bae6a6ea2b470b2f3f3d15f64b6db46a8a77ae4a52d78249ac8917d1a25bcbbcb5af62bea6677c5d4b433e47e9a8356 SHA512 77b3e0b69436a4f199c5ae3d9382c9b6cf2049ffd98144a2dc291495de9e8daa9deb6141d77b917f6e29902ad862c9044e7661ca7f0ae5e4fc68983857b3f6f2
diff --git a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
index 1decbcf89b24..98848fcad10d 100644
--- a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
+++ b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux"
 IUSE="gmxmopac7 static-libs"
 
 DEPEND="dev-libs/libf2c"
diff --git a/sci-chemistry/mopac7/mopac7-1.15.ebuild b/sci-chemistry/mopac7/mopac7-1.15.ebuild
deleted file mode 100644
index 9ee026f0d21b..000000000000
--- a/sci-chemistry/mopac7/mopac7-1.15.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools fortran-2 toolchain-funcs
-
-DESCRIPTION="Autotooled, updated version of a powerful, fast semi-empirical package"
-HOMEPAGE="https://sourceforge.net/projects/mopac7/"
-SRC_URI="
-	http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz
-	http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/dcart.f
-	http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/gmxmop.f"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux"
-IUSE="gmxmopac7 static-libs"
-
-DEPEND="dev-libs/libf2c"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Install the executable
-	sed -i \
-		-e "s:noinst_PROGRAMS = mopac7:bin_PROGRAMS = mopac7:g" \
-		fortran/Makefile.am \
-		|| die "sed failed: install mopac7"
-	# Install the script to run the executable
-	sed -i \
-		-e "s:EXTRA_DIST = autogen.sh run_mopac7:bin_SCRIPTS = run_mopac7:g" \
-		Makefile.am \
-		|| die "sed failed: install run_mopac7"
-
-	eautoreconf
-}
-
-src_configure() {
-	#set -std=legacy -fno-automatic according to
-	#http://www.bioinformatics.org/pipermail/ghemical-devel/2008-August/000763.html
-	FFLAGS="${FFLAGS} -std=legacy -fno-automatic" econf
-}
-
-src_compile() {
-	emake
-	if use gmxmopac7; then
-		einfo "Making mopac7 lib for gromacs"
-		mkdir "${S}"/fortran/libgmxmopac7 && cd "${S}"/fortran/libgmxmopac7
-		cp -f ../SIZES ../*.f "${FILESDIR}"/Makefile . || die
-		emake clean
-		cp -f "${DISTDIR}"/gmxmop.f "${DISTDIR}"/dcart.f . || die
-		sed "s:GENTOOVERSION:${PV}:g" -i Makefile
-		emake FC=$(tc-getFC)
-		if use static-libs; then
-			emake static
-		fi
-	fi
-}
-
-src_install() {
-	# A correct fix would have a run_mopac7.in with @bindir@ that gets
-	# replaced by configure, and run_mopac7 added to AC_OUTPUT in configure.ac
-	sed -i "s:./fortran/mopac7:mopac7:g" run_mopac7
-
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS README ChangeLog
-	if use gmxmopac7; then
-		cd "${S}"/fortran/libgmxmopac7
-		dolib.so libgmxmopac7.so*
-		if use static-libs; then
-			dolib.a libgmxmopac7.a
-		fi
-	fi
-}