[gentoo-commits] gentoo-x86 commit in sci-biology/glimmer: ChangeLog glimmer-3.02-r1.ebuild

[Andrey Kislyuk (weaver)]

weaver      09/12/28 19:14:27

  Modified:             ChangeLog glimmer-3.02-r1.ebuild
  Log:
  QA fixes, including bug 298223
  (Portage version: 2.2_rc30/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  sci-biology/glimmer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-biology/glimmer/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	4 Jan 2009 01:24:22 -0000	1.3
+++ ChangeLog	28 Dec 2009 19:14:26 -0000	1.4
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/glimmer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmer/ChangeLog,v 1.3 2009/01/04 01:24:22 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmer/ChangeLog,v 1.4 2009/12/28 19:14:26 weaver Exp $
+
+  28 Dec 2009; Andrey Kislyuk <weaver@g.o>
+  +files/glimmer-3.02-glibc210.patch, glimmer-3.02-r1.ebuild:
+  QA fixes, including bug 298223
 
 *glimmer-3.02-r1 (04 Jan 2009)
 



1.2                  sci-biology/glimmer/glimmer-3.02-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/glimmer-3.02-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/glimmer-3.02-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/glimmer-3.02-r1.ebuild?r1=1.1&r2=1.2

Index: glimmer-3.02-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-biology/glimmer/glimmer-3.02-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glimmer-3.02-r1.ebuild	4 Jan 2009 01:24:22 -0000	1.1
+++ glimmer-3.02-r1.ebuild	28 Dec 2009 19:14:26 -0000	1.2
@@ -1,10 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmer/glimmer-3.02-r1.ebuild,v 1.1 2009/01/04 01:24:22 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmer/glimmer-3.02-r1.ebuild,v 1.2 2009/12/28 19:14:26 weaver Exp $
 
-inherit versionator
+EAPI="2"
 
-MY_PV=$(delete_all_version_separators)
+inherit eutils
+
+MY_PV=${PV//./}
 
 DESCRIPTION="An HMM-based microbial gene finding system from TIGR"
 HOMEPAGE="http://www.cbcb.umd.edu/software/glimmer/"
@@ -16,26 +18,33 @@
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
-RDEPEND="!app-crypt/pkcrack
+RDEPEND="app-shells/tcsh
+	!app-crypt/pkcrack
 	!media-libs/libextractor"
 
 S="${WORKDIR}/${PN}${PV}"
 
-src_compile() {
+src_prepare() {
 	sed -i -e 's|\(set awkpath =\).*|\1 /usr/share/'${PN}'/scripts|' \
 		-e 's|\(set glimmerpath =\).*|\1 /usr/bin|' scripts/* || die "failed to rewrite paths"
-	sed -i 's/include  <string>/include  <string.h>/' src/Common/delcher.hh
-	cd src
-	emake || die "emake failed"
+	# Fix Makefile to die on failure
+	sed -i 's/$(MAKE) $(TGT)/$(MAKE) $(TGT) || exit 1/' src/c_make.gen || die
+	# GCC 4.3 include fix
+	sed -i 's/include  <string>/include  <string.h>/' src/Common/delcher.hh || die
+	epatch "${FILESDIR}/${PN}-${PV}-glibc210.patch"
+}
+
+src_compile() {
+	emake -C src || die
 }
 
 src_install() {
 	rm bin/test
-	dobin bin/*
+	dobin bin/* || die
 
 	dodir /usr/share/${PN}/scripts
 	insinto /usr/share/${PN}/scripts
-	doins scripts/*
+	doins scripts/* || die
 
 	dodoc glim302notes.pdf
 }