QA, keyword ~amd64

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-gentoo-r4 x86_64

4 files changed, 30 insertions, 23 deletions

diff --git a/sci-biology/augustus/Manifest b/sci-biology/augustus/Manifest
index fda0152fa91b..c6ace6a710cb 100644
--- a/sci-biology/augustus/Manifest
+++ b/sci-biology/augustus/Manifest
@@ -1,6 +1,4 @@
-AUX augustus-2.0.3-cflags.patch 646 RMD160 a83852c8520ac12782dfe114fbd7618ce732bdc7 SHA1 1ee661682a11b99178ed77f1dec23b6241d2e8e7 SHA256 ef50cdbce090aa8404fd48ab98de2ab9bfe239bf352914bee3eceea3f466e87e
-AUX augustus-2.0.3-gcc4.3.patch 726 RMD160 1d6df43e6dd96c365bd3a0ca17136b13d38a789e SHA1 42bb3c4f1d9dcb4ebf5bd1c4fc6f2464cd62230c SHA256 c548b0ed5d63c9e81e6ebf8dd799bdbccb5096350b0d6253129d0529fb55defa
-DIST augustus.2.0.3.src.tar.gz 24488810 RMD160 6cb81134a6e554f3e9e436ebc8c9de0cc80e4d58 SHA1 c4039781493f2de6e507a6afb80b8393e60e8155 SHA256 b0964585247eae16752db17fc7d7b89667edb928dde53119ceb7dde265a696e5
-EBUILD augustus-2.0.3.ebuild 856 RMD160 2019e90f3c00c59bd1c1cdd3b5a9a1b77fb3ff3c SHA1 3955539ea873c2f0634df52a107452644acd6138 SHA256 1f1ea0588f762aef92e9fc29def0d8fe645a7e8a0d6d22b2c8906afd540e6e10
-MISC ChangeLog 441 RMD160 474ab0b70b8f7859a5262e87fe25d7ec16ef78aa SHA1 1e29b2b0878d44b31e6e8b49587b68c06ff5f013 SHA256 4c3c263b59dd6faf9f2c5592455d34709ff4b5670116321b494060e7f8a6e5f4
+DIST augustus.2.1.src.tar.gz 40596406 RMD160 c910eceda054c5e6bc908a263945b8fbbad99218 SHA1 fc0940c2567931f8b467fd196bf036d91cf21293 SHA256 c4f7d64391b9e279fd0c8f63c7c334b7abc6a4dfde86697670b18c5190433868
+EBUILD augustus-2.1.ebuild 809 RMD160 cb8518dc2702bf722fd1b3eb5bc5b6237b9fe169 SHA1 6327307d56e61b6560762b452132c7692a0ba4a9 SHA256 467a59f148f197660f93c2057eb7fe0466cee13fc554b5790589651f86825bac
+MISC ChangeLog 658 RMD160 0e4671b0b4a50a0a2eb28f5f6df6f14e2a51deb6 SHA1 e0baca495dec2bb8df27bdad48d64c8595306e82 SHA256 65449f8269977157911e7a05cff74e6af9155fef5b0be54d43df8c3b32776044
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
diff --git a/sci-biology/glimmerhmm/ChangeLog b/sci-biology/glimmerhmm/ChangeLog
index 2d5f928e70d3..4cef94853e51 100644
--- a/sci-biology/glimmerhmm/ChangeLog
+++ b/sci-biology/glimmerhmm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/glimmerhmm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmerhmm/ChangeLog,v 1.1 2008/09/07 13:11:13 weaver Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmerhmm/ChangeLog,v 1.2 2009/03/19 15:12:35 weaver Exp $
+
+  19 Mar 2009; Andrey Kislyuk <weaver@gentoo.org> ChangeLog:
+  QA, keyword ~amd64
 
 *glimmerhmm-3.0.1 (07 Sep 2008)
 
diff --git a/sci-biology/glimmerhmm/Manifest b/sci-biology/glimmerhmm/Manifest
index 5dd8157b1b05..bb63d7115879 100644
--- a/sci-biology/glimmerhmm/Manifest
+++ b/sci-biology/glimmerhmm/Manifest
@@ -1,4 +1,4 @@
 DIST GlimmerHMM-3.0.1.tar.gz 45475952 RMD160 273cb74458e3f444cd9f8ca9f6618335aea5465f SHA1 6caf10a3fb79660e48d88560869dee0394961f1a SHA256 c956838a398483003ff1af867c65aca082b82340d8b302b9ada77d1b246954e4
-EBUILD glimmerhmm-3.0.1.ebuild 1366 RMD160 84493ee3c15f3ae7e830fda59a57693940a02f26 SHA1 e519451ea038ffe03ac550e2001cdb55e5d52aca SHA256 d73957db05bff8279096cedda2d71156c9716813ffe6153740bcc1e5971fdb7d
-MISC ChangeLog 366 RMD160 acc6863d2b2522da20a144488b270f592b2cdb23 SHA1 af3851cefcf3f43712e79ce0f4db524754b1504e SHA256 af60f08738f87dbf4d1aa84336be9ae049be7c22bcb8845db5abebb5bd0613bf
+EBUILD glimmerhmm-3.0.1.ebuild 1527 RMD160 7215cff42b8e6ffc23e5b50a4b338822146c517d SHA1 9b3cfff0411ebefd6abc731fdb926d645442f61e SHA256 4b5d80b720fd6329137b85bc74c9745cb1b1f0ba9af0207a7adaaaac4e1fb515
+MISC ChangeLog 449 RMD160 d250e7d498ad74feabdba324a8c840714c2b8a41 SHA1 7eadc4ecd4d49b97e3af14c0628a4f58077067e0 SHA256 fcbb4044daa27f225cf2e4cab14e8e2e805d63497e06875ba8c308597a996a6f
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
diff --git a/sci-biology/glimmerhmm/glimmerhmm-3.0.1.ebuild b/sci-biology/glimmerhmm/glimmerhmm-3.0.1.ebuild
index 5ed407386afa..a0a78a26e487 100644
--- a/sci-biology/glimmerhmm/glimmerhmm-3.0.1.ebuild
+++ b/sci-biology/glimmerhmm/glimmerhmm-3.0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmerhmm/glimmerhmm-3.0.1.ebuild,v 1.2 2008/09/07 14:37:31 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmerhmm/glimmerhmm-3.0.1.ebuild,v 1.3 2009/03/19 15:12:35 weaver Exp $
+
+inherit toolchain-funcs
 
 MY_P=GlimmerHMM
 
@@ -11,35 +13,39 @@ SRC_URI="ftp://ftp.cbcb.umd.edu/pub/software/glimmerhmm/${MY_P}-${PV}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 	sed -i -e 's|\(my $scriptdir=\)$FindBin::Bin|\1"/usr/share/'${PN}'/training_utils"|' \
-		-e 's|\(use lib\) $FindBin::Bin|\1 "/usr/share/'${PN}'/lib"|' train/trainGlimmerHMM || die "sed failed"
-	sed -i 's/^CFLAGS[ ]*=.*//' */makefile
+		-e 's|\(use lib\) $FindBin::Bin|\1 "/usr/share/'${PN}'/lib"|' "${S}/train/trainGlimmerHMM" || die
+	sed -i -e 's/^CFLAGS[ ]*=.*//' \
+		-e 's/C *=.*/C='$(tc-getCC)'/' \
+		-e 's/CC *=.*/CC='$(tc-getCXX)'/' \
+		"${S}"/*/makefile || die
+}
 
-	cd sources
-	emake || die "emake failed in sources"
-	cd "${S}/train" || die "failed to cd"
-	emake || die "emake failed in train"
+src_compile() {
+	emake -C "${S}/sources" || die "emake failed in sources"
+	emake -C "${S}/train" || die "emake failed in train"
 }
 
 src_install() {
-	dobin sources/glimmerhmm train/trainGlimmerHMM
+	dobin sources/glimmerhmm train/trainGlimmerHMM || die
 
 	dodir /usr/share/${PN}/{lib,models,training_utils}
 	insinto /usr/share/${PN}/lib
-	doins train/*.pm
+	doins train/*.pm || die
 	insinto /usr/share/${PN}/models
-	doins -r trained_dir/*
+	doins -r trained_dir/* || die
 	insinto /usr/share/${PN}/training_utils
 	insopts -m755
-	doins train/{build{1,2,-icm,-icm-noframe},erfapp,falsecomp,findsites,karlin,score,score{2,ATG,ATG2,STOP,STOP2},splicescore}
+	doins train/{build{1,2,-icm,-icm-noframe},erfapp,falsecomp,findsites,karlin,score,score{2,ATG,ATG2,STOP,STOP2},splicescore} || die
 
 	dodoc README.first train/readme.train
 }