Drop old; EAPI bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/sci-chemistry/mopac7/ChangeLog b/sci-chemistry/mopac7/ChangeLog
index 033e4223240090d0ded0a982755450082a490cf4..d43b80a90898a2ea81febb249121a21ef1c57659 100644 (file)
--- a/sci-chemistry/mopac7/ChangeLog
+++ b/sci-chemistry/mopac7/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/mopac7
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/ChangeLog,v 1.31 2014/01/03 15:28:32 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/ChangeLog,v 1.32 2015/03/05 11:44:08 jlec Exp $
+
+*mopac7-1.15-r1 (05 Mar 2015)
+
+  05 Mar 2015; Justin Lecher <jlec@gentoo.org> +mopac7-1.15-r1.ebuild,
+  -mopac7-1.10-r1.ebuild, metadata.xml:
+  Drop old; EAPI bump
 
   03 Jan 2014; Ulrich Müller <ulm@gentoo.org> mopac7-1.10-r1.ebuild,
   mopac7-1.15.ebuild:
@@ -138,4 +144,3 @@
   +mopac7-1.00.ebuild:
   Initial commit, ebuild by me. This will be useful for the new ghemical. It's
   a quite solid semi-empirical package.
-

diff --git a/sci-chemistry/mopac7/Manifest b/sci-chemistry/mopac7/Manifest
index 150ecf9ded96e83716cce713ba3d5cd1d6509d1e..bcd6c6f20ba747bee2aa4c8dffa25006967c0c44 100644 (file)
--- a/sci-chemistry/mopac7/Manifest
+++ b/sci-chemistry/mopac7/Manifest
@@ -1,26 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX Makefile 458 SHA256 5c44af6922cc7cadd7dafc7f26ee9f62c6614ccba2fbdedab365126d2ad8d742 SHA512 e127a839ea7363e0ad68e522311e953900d262c6712bd7fcb58d971ff0a80d0d587c8f9d43f698f2295b2ec218a31aad47259c4a42925064110b4ff46a6d62b5 WHIRLPOOL 8bf67d88814908c55bffc152c6a0d2cda3b6f59fc4318811e49857110174b1d4b354828cb30898d3513eb72a652233ad1e6b7c0c352b15385f8b7b30c52c6775
-DIST dcart.f 11044 SHA256 cdc4082b6b3811eca25eaf674e9345fcd37f58dfbdca3c5d72e9c4e88c47dec9
-DIST gmxmop.f 38956 SHA256 918bfac91b1dab65f7a8f759c3fd49e40be19bbddb6869d95f8e345830b93b67
-DIST mopac7-1.10.tgz 1596446 SHA256 993ace860c77345d1c8629f416bfc765610b9f264e9885b3777f44b745817ab5
-DIST mopac7-1.15.tar.gz 764547 SHA256 6d7ac5d78522db70f7794fd816cea32829cfa9e93774202fe80ba5a54375fbaa
-EBUILD mopac7-1.10-r1.ebuild 1558 SHA256 78d276823d49e0bdb05121bd326fa46cc9c840386551174793b01e253bf9b83e SHA512 04c634c0e55f80921b9e8bf11dcfda99cea1d8d88f211eb578239926bd5687d4247c21afb98fbfd43f6525a4ced45c21075c75a14e102123808f86d287233d33 WHIRLPOOL 5a1ee6aa314f8974d1d7725b584fbb02e62a683e7bee222924cf11b440e3d60f50af51c588c9780580124c9fada1156033c03d5b5aceb5966649782ceb6cf4ca
+DIST dcart.f 11044 SHA256 cdc4082b6b3811eca25eaf674e9345fcd37f58dfbdca3c5d72e9c4e88c47dec9 SHA512 788a184fd8419ff742e49c1a652d5ea093f9114dbe4f272665b8fb9eeac2afb7f7042628c288f2b81d0f54d8a7ef2f400490cd3aff39dda59a6d70a0deab5b80 WHIRLPOOL 399d7cf92d6fd27bb785c3f81eb24ec9615144b3e8605779d1f1f645ea16644a858428d8dfce44c102a495f984e1ae158fe7743ad0bef2b957ea10adc94ccb73
+DIST gmxmop.f 38956 SHA256 918bfac91b1dab65f7a8f759c3fd49e40be19bbddb6869d95f8e345830b93b67 SHA512 38bb2e5749c4d3c8c24f15682f72e40cb4edb6517c7916cecee1d21675b1870c0fe331ba2ec40312408dec473141e7742d1e155d4b64f1c2a25bfa4e11885194 WHIRLPOOL a0adaf3df1167d9675197f71ae2cd5a9a583eef4523b9a074d39291032dbfe0428349ebf78fabd88ed7e1deb5af093be319c9f19cab019deb52f0fb6e3924998
+DIST mopac7-1.15.tar.gz 764547 SHA256 6d7ac5d78522db70f7794fd816cea32829cfa9e93774202fe80ba5a54375fbaa SHA512 e0ccd643caa6dbd7e156867530d79e50e10243f5e3b5f8bc57781e68e1daf26f2a0e6987fff00afe07eb0fcb98cbd9f01e4cfa5d20acc0d8ab3cca632968636e WHIRLPOOL fe4d71e3900b8fe09697275c25bc239e8f94e97d2a570bf6df03c5bd59a3b2ab80bc7f255f739f09c0fc54037e9739b38cec205590ad3cb31ad58fe2067562d2
+EBUILD mopac7-1.15-r1.ebuild 1936 SHA256 c5e5427fc0f20b0b2c219259a74a4d5efd79fa99055ff3cc43baa378654f9579 SHA512 fefaa6d64115843ed9a5e70359a33639ae2ceb8a4fd0b46f598a9ecfe31fe4252ae0b44986c406782b208dcda88016d3e81aaed70919254cbe4e650ab503f544 WHIRLPOOL fcd738538dd03555e65861ca0cab54367583ba08846c54ca40e3ae1074e398b86c0d09282678ca3f673f6ac980fa8ac9d57f78f68e80d77de6b19b9218f93fd2
 EBUILD mopac7-1.15.ebuild 2155 SHA256 cf898eb22e36b23128dcd48aa44c59c72f5513e52d7f74e5ddb704e6b6873667 SHA512 8488c8b70aa91a56e347a600a5d048e2b3fe00b911bedf4467f9c594fcce6dc8f6c3ddcab49c7b36ddc186b3b4ab06d15deb9996cc2c31ac18b1365249d0a8b9 WHIRLPOOL 6e9e27fea836e4f3f6bb15f6edb2a249d762a71b7c991bb3a20f79c7cc10a339aa3627a68a24daac989de5494138a22494f61ecb9a126a36711d7b2c108e4ea4
-MISC ChangeLog 4894 SHA256 49e4295b769d1115477655fa33c88693086e5b98b360022a5013ae1877785db8 SHA512 9e5c58eb42b0eee3904d9f2cbf4aeb5db3a3cfe1c1fe76e39b1a785f658b18019f4a8737162c7ecd583930e01c1c850024accd66415b7e2c45118cfd57f9741d WHIRLPOOL b15b7f9c3a7be61b49db25c05baa547b2a28425cf5803f67a5a422ce492be5a705069480c86d34abfbc7b71babe3ffc42837a2378839b157ee00fadfce61f1f0
-MISC metadata.xml 246 SHA256 08d762761a0c00fbc9ba0b9f8b3a81b95b4826fb5e588e7352dc8917f0e96b92 SHA512 ae71df3b5ae158b85e0353a16985d646e78fa8b0c0483922266d804a8064dea1b96f801cf494d8c66a38543b94962447784083ef98fc417b2216b2818bb968fa WHIRLPOOL 597c8d1843b09e7ca556a499988c20e4a420615e7fd8d2774703e595fd7cbcbd85794ac525b12a644974f3fcc25e6851d8187e91a257503eba430f285f399657
+MISC ChangeLog 5059 SHA256 dfa188434b91d3d7918fca2b5dc2739f5bcf94f356c5042ceb826f595979244b SHA512 38e3a72438d7f7d29423b01c5f7df1e064f98ac14d42d497926b8e0b7abf595847f056b67ca42224fde259ba22469996a60b239af4bf19bf067d36e66b947c18 WHIRLPOOL fbbbeaf4ac7c47a454f5e71ede83fc7006ec912dbbbe5958286bfde3c12f62eb1acfcf967e2b3a38f58c5888143b7050a861734ef659044d491802db844cc24d
+MISC metadata.xml 251 SHA256 4765b48d3bcb9255397ec61c5deacbe229e2301e4f9a74bd4d7f43d20e0d879f SHA512 dd3b07f52f8415b25beab5164e6af27251f723743cd3b21a888d26c068b1d771db63ff5843150457122720c22012ece46cde0ed51b3c5e6315e5963a79487d37 WHIRLPOOL 056367a2a4ef105617078b6dc48a2d569db9198010f077ce2b5de33881e5ee5f1e3809097e8d32680b6a16adaf89f8cf1d0271309a442deca7049544ed98cdef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJSxtgSAAoJEJQzkH1pP7W4XX0L/0ptQxfzi9AzXVNNvzdrmIXc
-6Nfj84Hx4BP+cNTsiH5Epp064Ls52f9k7BYcp/4UYlWHZBDwV3KiRr3mDnpBUk8j
-1pq35byJVhX8jIIQl6LjMu+3vwmtSl+fbrJVj0m2TgAs9hWQwM/fSaUd6PdPZHWD
-eC1OEghbqgRlIwSBUuQ1MJYUNEeYDzKcCBzGDPbLFWQmgdBoIPcbtKQv41OGXcu0
-C2BUz976xECwjPKdHQkTOpoXO3ABYuslIWR3njutMkaOV8vTvgNYVxJDhl8Tm+qX
-z9T+LLBLUGGr90rHVBo2yCOSGz44ig9ytEE2Wa12BLQasal6dsBHzGZLcjFhkC0R
-hWtfTrdcDZqKG8zuYhkppq7f/n/yxfTJp5HqH14fhXzOlDJMaFxBf4kT5DPOBemv
-Jgz3ewdENsDCXjKWBog8G/gnd+3c6k1nIDmLWaY0M9UNiby7RCbcSgyqmey8mo9t
-d8O0JL+u8Ne6Kd8o0JrJe9qUtZdeTJPq8PPfZmeoGg==
-=1JEn
+iQJ8BAEBCgBmBQJU+EGJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirKgMP/RIwj0PBBbv8ZeZAdFO3XVVd
+TNs1sPAyWf96CR20jDQNizj0auK+qjNOEFY/mGhdbCsuaQ7Oc8eonl38h3gsg+cu
+vffLrny+kjXvn46W0X2V2xnUn3D3Y+Kvw+rxT65NbisTMJSerlRY99CxrQcuCCnp
+JNWnViH/B9eYyHubyrdrCCK11jvjzmrI6HwWUnbIv2GFgGuV/LAIjD3Rv3/DfaJG
+q3Oyz3N54iT+nPMvlm+ZCrGBwneGtNy+4MdYU56XJPCyPilK+icr4ZF45VjMimp+
+XNszDbQF4U5xWler1uWAO6dqpQRp7cpCXkAWz7KbXbnYAkcTjVan1D6Eh1YfLUMk
+QYwHOyHQqrHhhxT6VsVGjkl0tjK1WAV3b2WrQKG9IHaw/dSflSOmTvYH0bEt20iA
+UWh7LuDW7eg2nVUQyBJyK3673TiiB9F16zcY/NE2IaZ7yNB9Z456NrML8c7x5SgZ
+3PuJbt3ETYVsfk7MUEJgN0C/MuQWfju8BEhqQrtLrvZgiYoE78B8ufoR7JWqHxLp
+6xsfSfBY8+upqW6NGjxNrPJ/4RA7VnaMwWVy/7E4NkboFTEJ2nCMkVyJbH7w1oAU
+GzyoXBnebLIFXVNMY/mbA8hrAhjJs82g/dD60vFl5E7Dts9ZpjhVsDnPWZgyTJVc
+urg4v0VND7qxrloYprV7
+=dsb+
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/mopac7/metadata.xml b/sci-chemistry/mopac7/metadata.xml
index 99c3f3e5f7e15e80c0c32066455ae2e0319c613b..839734dd5d8b1c953804cb0b4449d03bc062c238 100644 (file)
--- a/sci-chemistry/mopac7/metadata.xml
+++ b/sci-chemistry/mopac7/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>sci-chemistry</herd>
-       <use>
-               <flag name="gmxmopac7">Add support library for gromacs</flag>
-       </use>
+  <herd>sci-chemistry</herd>
+  <use>
+    <flag name="gmxmopac7">Add support library for gromacs</flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-chemistry/mopac7/mopac7-1.10-r1.ebuild b/sci-chemistry/mopac7/mopac7-1.10-r1.ebuild
deleted file mode 100644 (file)
index e8f090a..0000000
--- a/sci-chemistry/mopac7/mopac7-1.10-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/mopac7-1.10-r1.ebuild,v 1.9 2014/01/03 15:28:32 ulm Exp $
-
-WANT_AUTOMAKE="1.8"
-
-inherit autotools fortran-2
-
-DESCRIPTION="Autotooled, updated version of a powerful, fast semi-empirical package"
-HOMEPAGE="http://sourceforge.net/projects/mopac7/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/libf2c"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       # Install the executable
-       sed -i \
-               -e "s:noinst_PROGRAMS = mopac7:bin_PROGRAMS = mopac7:g" \
-               src/Makefile.am \
-               || die "sed failed: install mopac7"
-       # Install the script to run the executable
-       sed -i \
-               -e "s:EXTRA_DIST = run_mopac7:if HAVE_F2C\nbin_SCRIPTS = run_mopac7\nendif:g" \
-               Makefile.am \
-               || die "sed failed: install run_mopac7"
-
-       # Fix parallel build by adding internal dependency on libmopac7.la from
-       # executable
-       sed -i \
-               -e "s:mopac7_LDFLAGS = -lmopac7 -lf2c -lm:mopac7_LDFLAGS = -lf2c -lm:g" \
-               -e "s:\(mopac7_LDFLAGS.*\):\1\nmopac7_LDADD = libmopac7.la:g" \
-               src/Makefile.am \
-               || die "sed failed: fix dependencies"
-
-       eautoreconf
-}
-
-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:./src/mopac7:mopac7:g" run_mopac7
-
-       make DESTDIR="${D}" install || die
-       dodoc AUTHORS README ChangeLog || die
-}

diff --git a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
new file mode 100644 (file)
index 0000000..e965cad
--- /dev/null
+++ b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild,v 1.1 2015/03/05 11:44:08 jlec Exp $
+
+EAPI=5
+
+inherit autotools fortran-2 flag-o-matic toolchain-funcs
+
+DESCRIPTION="Autotooled, updated version of a powerful, fast semi-empirical package"
+HOMEPAGE="http://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
+       append-fflags -std=legacy -fno-automatic
+}
+
+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)
+               use static-libs && emake static
+       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 || die
+
+       default
+
+       if use gmxmopac7; then
+               cd "${S}"/fortran/libgmxmopac7
+               dolib.so libgmxmopac7.so*
+               use static-libs && dolib.a libgmxmopac7.a
+       fi
+}