[gentoo-commits] proj/sci:fixing commit in: sci-biology/ssaha2-bin/

[gentoo-commits] proj/sci:fixing commit in: sci-biology/ssaha2-bin/

[Justin Lecher]

commit:     aaa0c7123809ee73cae45234e128621497860e31
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 19:49:47 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 19:49:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aaa0c712

sci-biology/ssaha2-bin: Version Bump; restrict license; add QA_PREBUILT for binaries

Package-Manager: portage-2.2.0_alpha180

---
 sci-biology/ssaha2-bin/ChangeLog                   |  6 ++++-
 sci-biology/ssaha2-bin/metadata.xml                | 10 ++++-----
 ...a2-bin-2.5.3.ebuild => ssaha2-bin-2.5.5.ebuild} | 26 +++++++++++++---------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/sci-biology/ssaha2-bin/ChangeLog b/sci-biology/ssaha2-bin/ChangeLog
index 914725e..8b3f2ff 100644
--- a/sci-biology/ssaha2-bin/ChangeLog
+++ b/sci-biology/ssaha2-bin/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-biology/ssaha2-bin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jun 2013; Justin Lecher <jlec@gentoo.org> -ssaha2-bin-2.5.3.ebuild,
+  +ssaha2-bin-2.5.5.ebuild, metadata.xml:
+  Version Bump; restrict license; add QA_PREBUILT for binaries
+
   25 Jun 2011; Justin Lecher <jlec@gentoo.org> ssaha2-bin-2.5.3.ebuild:
   Cleaned ebuild and fixed LICENSE
 

diff --git a/sci-biology/ssaha2-bin/metadata.xml b/sci-biology/ssaha2-bin/metadata.xml
index 07b5255..2bc8930 100644
--- a/sci-biology/ssaha2-bin/metadata.xml
+++ b/sci-biology/ssaha2-bin/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
-	<maintainer>
-		<email>mmokrejs@fold.natur.cuni.cz</email>
-		<name>Martin Mokrejs</name>
-	</maintainer>
+  <herd>sci-biology</herd>
+  <maintainer>
+    <email>mmokrejs@fold.natur.cuni.cz</email>
+    <name>Martin Mokrejs</name>
+  </maintainer>
 </pkgmetadata>

diff --git a/sci-biology/ssaha2-bin/ssaha2-bin-2.5.3.ebuild b/sci-biology/ssaha2-bin/ssaha2-bin-2.5.5.ebuild
similarity index 55%
rename from sci-biology/ssaha2-bin/ssaha2-bin-2.5.3.ebuild
rename to sci-biology/ssaha2-bin/ssaha2-bin-2.5.5.ebuild
index 34b63dd..96a183d 100644
--- a/sci-biology/ssaha2-bin/ssaha2-bin-2.5.3.ebuild
+++ b/sci-biology/ssaha2-bin/ssaha2-bin-2.5.5.ebuild
@@ -1,34 +1,40 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit toolchain-funcs
 
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}_v${PV}"
+
 DESCRIPTION="SSAHA2: Sequence Search and Alignment by Hashing Algorithm"
 HOMEPAGE="http://www.sanger.ac.uk/resources/software/ssaha2"
 SRC_URI="
-	x86? ( ftp://ftp.sanger.ac.uk/pub4/resources/software/ssaha2/ssaha2_i686.tgz )
-	amd64? ( ftp://ftp.sanger.ac.uk/pub4/resources/software/ssaha2/ssaha2_x86_64.tgz )
-	ia64? ( ftp://ftp.sanger.ac.uk/pub4/resources/software/ssaha2/ssaha2_ia64.tgz )
+	x86? ( ftp://ftp.sanger.ac.uk/pub4/resources/software/${MY_PN}/${MY_P}_i686.tgz )
+	amd64? ( ftp://ftp.sanger.ac.uk/pub4/resources/software/${MY_PN}/${MY_P}_x86_64.tgz )
 	ftp://ftp.sanger.ac.uk/pub4/resources/software/ssaha2/samflag.c
 	ftp://ftp.sanger.ac.uk/pub4/resources/software/ssaha2/ssaha2-manual.pdf"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-use x86 && S="${WORKDIR}"/ssaha2_v"${PV}"_i686
-use amd64 && S="${WORKDIR}"/ssaha2_v"${PV}"_x86_64
-use ia64 && S="${WORKDIR}"/ssaha2_v"${PV}"_ia64
+QA_PREBUILT="/opt/.*"
 
+pkg_setup() {
+	use x86 && export S="${WORKDIR}"/${MY_P}_i686
+	use amd64 && export S="${WORKDIR}"/${MY_P}_x86_64
+}
 src_compile() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o samflag "${DISTDIR}"/samflag.c || die "Failed to compile samflags"
 }
 
 src_install() {
-	dobin samflag ssaha2 ssaha2Build ssahaSNP
+	dobin samflag
+	exeinto /opt/bin
+	doexe ssaha2 ssaha2Build ssahaSNP
 	dodoc README "${DISTDIR}"/ssaha2-manual.pdf
 }