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

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 30 insertions, 23 deletions

diff --git a/sci-chemistry/solve-resolve-bin/ChangeLog b/sci-chemistry/solve-resolve-bin/ChangeLog
index 4070ac6ef404..073bed0576ab 100644
--- 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/metadata.xml b/sci-chemistry/solve-resolve-bin/metadata.xml
index 1837bbc07a6e..ae9ec7c5f6a4 100644
--- 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 c1b75c3654d9..0e8493b8d180 100644
--- 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(){