sci-chemistry/solve-resolve-bin: Bump EAPI; do some QA

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

diff --git a/sci-chemistry/solve-resolve-bin/ChangeLog b/sci-chemistry/solve-resolve-bin/ChangeLog
index 4070ac6ef404ed80e5b6cedb325949c1c5fb751b..073bed0576abd142b778f9008bfce897afba366b 100644 (file)
--- a/sci-chemistry/solve-resolve-bin/ChangeLog
+++ b/sci-chemistry/solve-resolve-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/solve-resolve-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/solve-resolve-bin/ChangeLog,v 1.4 2012/02/03 14:00:34 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/solve-resolve-bin/ChangeLog,v 1.5 2015/01/09 08:11:22 jlec Exp $
+
+  09 Jan 2015; Justin Lecher <jlec@gentoo.org> solve-resolve-bin-2.13.ebuild,
+  metadata.xml:
+  Bump EAPI; do some QA
 
   03 Feb 2012; Justin Lecher <jlec@gentoo.org> solve-resolve-bin-2.13.ebuild,
   metadata.xml:

diff --git a/sci-chemistry/solve-resolve-bin/Manifest b/sci-chemistry/solve-resolve-bin/Manifest
index 343604c4c4815578310b5c1b3d7cc4a6c6cbe3df..7cc579a69ff9656cda2be1dbca2f19c6b86581e4 100644 (file)
--- a/sci-chemistry/solve-resolve-bin/Manifest
+++ b/sci-chemistry/solve-resolve-bin/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST solve-2.13-linux-64.tar.gz 74444830 RMD160 0da15aa19b37186479d72c6ce57f401aeb2a4344 SHA1 f0ef948ef1fddec2d80e2612553608fc1be676a3 SHA256 e03250bb550686fc6e5f59d4e885b83b88cd342dfb4975eb31ddf95d9515650e
-DIST solve-2.13-linux.tar.gz 71902534 RMD160 510e67345dd3517c479719c3ea93696f0210f508 SHA1 1acc33b5b6119ac82cf6bb4e0958ebbbc74c5d14 SHA256 975466fe92d8f6256de20ea0b5101876f3e5a7e3093199946c9f4824236c79d3
-EBUILD solve-resolve-bin-2.13.ebuild 1787 RMD160 4450fdbadc4e637f9d1bad9eeb8db0a22ab19f18 SHA1 a06f17e417c56635ac104234943932414660abd1 SHA256 0f7bfe6832f0a4ad7fd002ca40c00dcd655a1c6349d14d69e90cfd7068a394b8
-MISC ChangeLog 919 RMD160 f43a52001bdb623476c760a5cf9b04f599265c34 SHA1 686c3691cb2e700679361f7baab8857295a8b35e SHA256 46325e320947a390d6a34bf2ff0bd02d9ff631e890a16bd3ec8f4be4837312b7
-MISC metadata.xml 229 RMD160 e5d681054ef371ecfe4d6828e8b722b716968b37 SHA1 e91b223d4c687993ccca1be424e4feedad208570 SHA256 0f110645272f37341c3729c03cf88dbb871ed82db98c8b0dbda8734343b88567
+DIST solve-2.13-linux-64.tar.gz 74444830 SHA256 e03250bb550686fc6e5f59d4e885b83b88cd342dfb4975eb31ddf95d9515650e SHA512 8f20715c3fb73940f03ba8a4bb3528f89ba01520cacead001796609bc15259ab7ab7f2d4960ea97efc43029863bc31e630c9e93f528a233652928220dafe0b4d WHIRLPOOL 125efe76024148656f3bb357ad1bc78d17f51eb8268c83241f4da9a94356170d0259fe48fadf6bf1ffe4b10b57bb27ed79199063dc95d0eef8d9e22de653c84a
+DIST solve-2.13-linux.tar.gz 71902534 SHA256 975466fe92d8f6256de20ea0b5101876f3e5a7e3093199946c9f4824236c79d3
+EBUILD solve-resolve-bin-2.13.ebuild 1745 SHA256 03792f5cc9504cc440e3eadc582ddca8b19fcd821196542531f6b7ff709fe9de SHA512 c6b475d0c70df29e940a99e9179c1d79f045d102cffe755d72fc4512a7505f89a3cf07a9d16034e7d6f7c6b060979eac07f3cf691abda47ceae286d5040bc4ac WHIRLPOOL 4ad854207ab55d9d6ea0e2417be8496a9c758455e1734cccf55abc9182cff0c6401215183b3845974c89794cd0db2476061bb308e323307f336a134e8a6fa481
+MISC ChangeLog 1038 SHA256 b7c23936f8e815d39857d140517a8972a6d382072cbe390a554fbda16b14f975 SHA512 6c9ae11be7585a0d48cdbfc67ada7e9066c3433b4f921ddf1362e103813f10bf838793ba64d562625903f4dcc7ac39c50d62e80d427a0783be5e466397c92a64 WHIRLPOOL b770c4fe031c78b631c58055185ca3189fa5d27e7ca97e639376e76544b7c10a2b219c3502e84f697a32f257e870f93c4ea0f0844e01964fc25a9552fa78bc80
+MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREKAAYFAk8r6IcACgkQgAnW8HDreRY+QgCggODWrYEIn0/8Yqk2yzhmln2e
-WWAAnjngXQv3uG9Qt/UdFpPBDeHPSZ9p
-=Rq+Z
+iQJ8BAEBCgBmBQJUr40rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirS9MQAIhC3Rn5HE440TXy9bV98BBo
+c4wA3DJ6uqn4qAnn4VYe5iuHgC+CLxkAaKqFyJVmUTEMT1yaBe0TrRxUrCyZBYQl
+wxolcJlWw6tJzAI0DM81K4l1KBot4TkYJIb12VGFbHVer0okVVmBUD/34qeuIwzb
+IIB7ZCgAki9Iqry5YQtvtj0p4iuufOm9Oy2xkHSwaEF6zt2MeBZAReJGck8nwHiZ
+KECDLjfW1Lo1qqkftKbxmZxStSBnY/LNn1Je0RHlehR4ADmxYF+/IeEH4Hv+eBmd
+eMoxaQB0zhYv2wdVwcD1KCBfrH89BmPrSew314rYdiVLcYHDXLD0ZhnLTWnSg566
+EzBnMTO9XRDsEqKfJEFoMYajesjV7jZ7XPx4gGClfJJkL85LWQPcQ3TDmdcGwSuu
+O4jEhC8VW5qzDfJv3wq/CRHMNpuFkQTFfR4EUMOpNKITVJKKMTFvnjQhFLov6gJC
+OAUUV3AFDVnz9tVecuX6IhqKt9zcaU7zgEnmfIxrcNhyiRcJi7z5xla3ZApGGHai
+VqOJTT5twzemxmQnrbE+1UudwxBC6qln0vmDTSEfRubCUYA6mEaBaVV9A2GeSztF
+PfSj9tsw2CHwqKu8Xv2UFYV2YZ3741pvOVEx8hIJy2P/CWm/Bcbwsw8QMZp59uzK
+Uddun+A0LHPOX0nAkeKy
+=lDNV
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/solve-resolve-bin/metadata.xml b/sci-chemistry/solve-resolve-bin/metadata.xml
index 1837bbc07a6e0868306c1f67ce0cfb1c5384e7d7..ae9ec7c5f6a43bad708d3074b615c72877e554f2 100644 (file)
--- a/sci-chemistry/solve-resolve-bin/metadata.xml
+++ b/sci-chemistry/solve-resolve-bin/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>
-       <maintainer>
-               <email>jlec@gentoo.org</email>
-       </maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>

diff --git a/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild b/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild
index c1b75c3654d90db9f1d78341415652223b4c30cb..0e8493b8d18061777bfa8f75f07224e9069e14a5 100644 (file)
--- a/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild
+++ b/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild,v 1.4 2012/02/03 14:00:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild,v 1.5 2015/01/09 08:11:22 jlec Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit eutils
 
 DESCRIPTION="Automated crystallographic structure solution for MIR, SAD, and MAD"
 HOMEPAGE="http://www.solve.lanl.gov/index.html"
 SRC_URI="
-       x86? ( http://solve.lanl.gov/pub/solve/${PV}/solve-${PV}-linux.tar.gz )
-       amd64? ( http://solve.lanl.gov/pub/solve/${PV}/solve-${PV}-linux-64.tar.gz )"
+       x86? ( https://solve.lanl.gov/pub/solve/${PV}/solve-${PV}-linux.tar.gz )
+       amd64? ( https://solve.lanl.gov/pub/solve/${PV}/solve-${PV}-linux-64.tar.gz )"
 
 SLOT="0"
 LICENSE="solve"
@@ -21,29 +21,32 @@ RDEPEND="sci-libs/ccp4-libs"
 DEPEND=""
 
 RESTRICT="mirror"
+
 S="${WORKDIR}"/solve-${PV}
 
-QA_FLAGS_IGNORED="${EROOT#/}opt/solve-resolve/bin/.*"
-QA_EXECSTACK="*"
-QA_TEXTRELS="*"
+QA_PREBUILT="opt/solve-resolve/bin/*"
 
 src_install(){
        local IN_PATH="/opt/solve-resolve/"
 
        exeinto ${IN_PATH}bin/
-       doexe bin/* || die
+       doexe bin/*
 
        insinto ${IN_PATH}lib/
-       doins -r lib/{*sym,sym*,hist*,*dat,segments,patterns} || die
+       doins -r lib/{*sym,sym*,hist*,*dat,segments,patterns}
+
+       docinto html
+       dodoc -r lib/html/*
 
-       dohtml -r lib/html/* || die
-       sed -i 's:/usr/local/lib/solve/:${EPREFIX}/opt/solve-resolve/lib/:' \
-                       lib/examples_solve/p9/solve*
+       sed \
+               -e 's:/usr/local/lib/solve/:${EPREFIX}/opt/solve-resolve/lib/:' \
+               -i lib/examples_solve/p9/solve* || die
        if use examples; then
-               sed -i 's:/usr/local/lib/resolve/:${EPREFIX}/opt/solve-resolve/lib/:' \
-                               lib/examples_resolve/{resolve.csh,prime_and_switch.csh}
+               sed \
+                       -e 's:/usr/local/lib/resolve/:${EPREFIX}/opt/solve-resolve/lib/:' \
+                       -i lib/examples_resolve/{resolve.csh,prime_and_switch.csh} || die
                insinto /usr/share/${PF}/
-               doins -r lib/examples_*solve || die
+               doins -r lib/examples_*solve
        fi
 
        cat >> "${T}"/20solve-resolve <<- EOF
@@ -54,7 +57,7 @@ src_install(){
        PATH="${EPREFIX}/${IN_PATH}bin"
        EOF
 
-       doenvd "${T}"/20solve-resolve || die
+       doenvd "${T}"/20solve-resolve
 }
 
 pkg_postinst(){