[gentoo-commits] proj/sci:master commit in: sci-chemistry/nmrview/

[Justin Lecher]

commit:     95446c5561fd05bfed6f9e270e0587acf9cc45bb
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  1 09:09:12 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun  1 09:09:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=95446c55

sci-chemistry/nmrview: Move to EAPI=4, specify QA_PREBUILT

(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/nmrview/ChangeLog               |    6 +++-
 sci-chemistry/nmrview/metadata.xml            |    1 -
 sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild |   37 ++++++++++++++-----------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/sci-chemistry/nmrview/ChangeLog b/sci-chemistry/nmrview/ChangeLog
index 5cdf469..c84d1a8 100644
--- a/sci-chemistry/nmrview/ChangeLog
+++ b/sci-chemistry/nmrview/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-chemistry/nmrview
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Jun 2012; Justin Lecher <jlec@g.o> nmrview-5.2.2-r3.ebuild,
+  metadata.xml:
+  Move to EAPI=4, specify QA_PREBUILT
+
 *nmrview-5.2.2-r3 (14 Aug 2009)
 
   14 Aug 2009; Justin Lecher (jlec) <jlec@×××××××××.net>

diff --git a/sci-chemistry/nmrview/metadata.xml b/sci-chemistry/nmrview/metadata.xml
index 9897693..95180e1 100644
--- a/sci-chemistry/nmrview/metadata.xml
+++ b/sci-chemistry/nmrview/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Justin Lecher</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild b/sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild
index 2d59b1e..e302f97 100644
--- a/sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild
+++ b/sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild
@@ -1,31 +1,38 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=4
+
 DESCRIPTION="Visualisation and analysis of processed NMR data"
-LICENSE="as-is"
 HOMEPAGE="http://www.onemoonscientific.com/nmrview/"
-SRC_URI="${PN}${PV}.lib.tar.gz
+SRC_URI="
+	${PN}${PV}.lib.tar.gz
 	${PN}${PV//./_}_01_linux.gz"
-RESTRICT="fetch"
 
 SLOT="0"
+LICENSE="as-is"
 IUSE=""
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="x11-libs/libX11"
+DEPEND=""
+
+RESTRICT="fetch"
 
 S="${WORKDIR}"
 
 INSTDIR="/opt/nmrview"
 
+QA_PREBUILT="/opt/nmrview/nmrview5_2_2_01_linux"
+
 pkg_nofetch() {
 	einfo "Please visit:"
 	einfo "\t${HOMEPAGE}"
-	einfo
+	echo
 	einfo "Complete the registration process, then download the following files:"
 	einfo "\t${A}"
-	einfo
+	echo
 	einfo "Place the downloaded files in your distfiles directory:"
 	einfo "\t${DISTDIR}"
 	echo
@@ -44,17 +51,15 @@ src_install() {
 		-e "s:/opt:${EPREFIX}/opt:g" \
 		"${FILESDIR}"/${PN}.sh-r1 \
 		> "${T}"/${PN}
-	dobin "${T}"/${PN} || die "Failed to install wrapper script"
+	dobin "${T}"/${PN}
 	exeinto ${INSTDIR}
-	doexe ${PN}${PV//./_}_01_linux || die "Failed to install binary."
+	doexe ${PN}${PV//./_}_01_linux
 
 	DIRS="help html images nvtcl nvtclC nvtclExt reslib star tcl8.4 tk8.4 tools"
-	doins -r ${DIRS} || die "Failed to install shared files."
-
-	dodoc "${FILESDIR}"/README.Gentoo || die "Failed to install Gentoo README."
-	doins README || die "Failed to install README."
-	dosym ${INSTDIR}/html /usr/share/doc/${PF}/html || die \
-		"Failed to link HTML documentation."
-	dosym ${INSTDIR}/README /usr/share/doc/${PF}/README || die \
-		"Failed to link README."
+	doins -r ${DIRS}
+
+	dodoc "${FILESDIR}"/README.Gentoo
+	doins README
+	dosym ${INSTDIR}/html /usr/share/doc/${PF}/html
+	dosym ${INSTDIR}/README /usr/share/doc/${PF}/README
 }