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

Package-Manager: portage-2.2.0_alpha180

4 files changed, 30 insertions, 21 deletions

diff --git a/sci-biology/ssaha2-bin/ChangeLog b/sci-biology/ssaha2-bin/ChangeLog
index 914725e6e..8b3f2ffef 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/Manifest b/sci-biology/ssaha2-bin/Manifest
index 3cd3275a6..f1a6a5db5 100644
--- a/sci-biology/ssaha2-bin/Manifest
+++ b/sci-biology/ssaha2-bin/Manifest
@@ -1,5 +1,4 @@
-DIST samflag.c 2424 SHA256 945958214ef1adc40029a6b3c323c37338e095e9e2bcbff5e5ec05aadbdb67d0
-DIST ssaha2-manual.pdf 163188 SHA256 1a0529168b71ac55e13b34264a854daa6a5dac9468f81ccb5b63bd5e1baafdbf
-DIST ssaha2_i686.tgz 288481 SHA256 7d173d763d9f685ef3d0075124bf8b763c6d2d3ed1a1f823bc66d6b6b029abed
-DIST ssaha2_ia64.tgz 458507 SHA256 3eb2a31559911f3ee87e11f3b977962da31b60c25ea0c9a064edfd1165b6b5dd
-DIST ssaha2_x86_64.tgz 287790 SHA256 0135ab2e285a898d450744b7c9d643efbeb6048783169a6647f310ce2e7b8138
+DIST samflag.c 2424 SHA256 945958214ef1adc40029a6b3c323c37338e095e9e2bcbff5e5ec05aadbdb67d0 SHA512 50ef4d134e5fab4f1399fd2eb35de0c8ce901c23e360a52ee5cdca117c124c77f432a50a666d655dc0f04089db84d873f9251e68ff6f6f4ac327e23362657aa7 WHIRLPOOL c89abd1bac315aaadfc4456c4ec4252a6ccdd1f42db604b60568d3ee7e367f8ec99ff7915aeaac7dafa594bd29bb11affb3f62ed9d6dd577dd407c2c4c93e7c5
+DIST ssaha2-manual.pdf 163188 SHA256 1a0529168b71ac55e13b34264a854daa6a5dac9468f81ccb5b63bd5e1baafdbf SHA512 2a43d038684519d3a4e1fca54b75ac731961dc1e9e1034914eff481b303e5b49d11f4d9149e56a6e06292107f5be3ee6357bb9ec508cdb4de1fac677fade5d0e WHIRLPOOL 25040635acf63d874c453d5e2c2bb93dd2f44537c79ce5d3109bd59a345cbf41e4106b05039a8d3e0b00a8e1bd7a66d923161b8f0fe2544f10c37f5a4bfbbaf9
+DIST ssaha2_v2.5.5_i686.tgz 1045230 SHA256 b66ddbf1374cbcf583ff5413cb7c17dd0e63c2372d227c26526fa79597cb39c8 SHA512 e5611a2b382348e84b7cc40496b42d78ca1b5a5d641acfdb1371bff79dbe055f8c22db10b3a428d7943a6824246141e28e71146722a613585d82034187d81e32 WHIRLPOOL 169d316e548a4cc223755534b235163f0356129b6aab44540cbe5eb6083ea46f47ee689097301ecc86974da8a7b21f5887db8e88b772668c3049de31120581de
+DIST ssaha2_v2.5.5_x86_64.tgz 1167987 SHA256 478bdbda9d5fe36278748e571299f5eaf39d5172758cf0d0a85fa750f84667d4 SHA512 483dc726e1ac52020481a5721e0ac870fccdec22d9f7e74bddc76cbb76bd10ceccba57ecab9e2787045cde0e6cb74186bd3769e5c7222eb15e9c445ba7ac2592 WHIRLPOOL dbde27ca5e2eeba1c44fc59cd66f1ac6c6fa52647174c184521cf88b9ae8b05633f2fc1bc93b3be6e07e499832ec0938c4fab1017e53706b51c78060f6590b01
diff --git a/sci-biology/ssaha2-bin/metadata.xml b/sci-biology/ssaha2-bin/metadata.xml
index 07b525505..2bc893037 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
index 34b63dd43..96a183dc7 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
 }