[gentoo-commits] proj/sci:master commit in: sci-biology/staden/

["Justin Lecher" <jlec@gentoo.org>]

commit:     0a1e03d17371b6e44f2b7816e6db2ea86ec76ecb
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 09:22:43 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 09:22:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0a1e03d1

Streamlined fortran-2 eclass usage

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-biology/staden/ChangeLog                 |    4 ++++
 sci-biology/staden/staden-2.0.0_beta8.ebuild |   20 +++++++++-----------
 sci-biology/staden/staden-9999.ebuild        |   23 +++++++++++------------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/sci-biology/staden/ChangeLog b/sci-biology/staden/ChangeLog
index 6064fae..fa96390 100644
--- a/sci-biology/staden/ChangeLog
+++ b/sci-biology/staden/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Jun 2011; Justin Lecher <jlec@gentoo.org> staden-2.0.0_beta8.ebuild,
+  staden-9999.ebuild:
+  Streamlined fortran-2 eclass usage
+
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> staden-2.0.0_beta8.ebuild,
   staden-9999.ebuild:
   Added fortran-2.eclass support

diff --git a/sci-biology/staden/staden-2.0.0_beta8.ebuild b/sci-biology/staden/staden-2.0.0_beta8.ebuild
index a5d9990..993be4c 100644
--- a/sci-biology/staden/staden-2.0.0_beta8.ebuild
+++ b/sci-biology/staden/staden-2.0.0_beta8.ebuild
@@ -4,10 +4,10 @@
 
 EAPI=3
 
-inherit eutils fortran-2 flag-o-matic base multilib
+inherit base eutils flag-o-matic fortran-2 multilib
 
 DESCRIPTION="DNA sequence assembly (gap4, gap5), editing and analysis tools (Spin)"
-HOMEPAGE="http://sourceforge.net/projects/staden"
+HOMEPAGE="http://sourceforge.net/projects/staden/"
 SRC_URI="
 	http://downloads.sourceforge.net/staden/staden-2.0.0b8.tar.gz
 	http://sourceforge.net/projects/staden/files/staden/2.0.0b8/staden_doc-2.0.0b8-src.tar.gz"
@@ -15,27 +15,23 @@ SRC_URI="
 LICENSE="staden"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug fortran X png curl tcl tk zlib"
+IUSE="curl debug fortran png tcl tk X zlib"
 
 # either g77 or gfortran must be available
 # edit src/mk/linux.mk accordingly
-
 #
 # this is a glibc-2.9 issue, see https://sourceforge.net/tracker/index.php?func=detail&aid=2629155&group_id=100316&atid=627058
 #
 #
 #
 DEPEND="
+	app-arch/xz-utils
 	dev-lang/tk
 	dev-tcltk/tklib
-	>=sci-libs/io_lib-1.12.2
-	>=sys-libs/zlib-1.2
 	>=media-libs/libpng-1.2
 	sci-biology/samtools
-	>=app-arch/xz-utils-4.999"
-
-# maybe we should depend on app-arch/lzma or app-arch/xz-utils?
-
+	>=sci-libs/io_lib-1.12.2
+	>=sys-libs/zlib-1.2"
 RDEPEND="${DEPEND}
 	>=dev-tcltk/iwidgets-4.0
 	tcl? ( >=dev-tcltk/itcl-3.2 )
@@ -68,6 +64,8 @@ src_install() {
 	# subsequently, apps linked against /usr/lib/staden can be run because
 	# loader can find the library (I failed to use '-Wl,-rpath,/usr/lib/staden'
 	# somehow for gap2caf, for example
-	echo 'LDPATH=/usr/$(get_libdir)/staden' > 99staden || die
+	cat >> "${T}"/99staden <<- EOF
+	LDPATH=/usr/$(get_libdir)/staden
+	EOF
 	doenvd 99staden
 }

diff --git a/sci-biology/staden/staden-9999.ebuild b/sci-biology/staden/staden-9999.ebuild
index 3f78adb..3add863 100644
--- a/sci-biology/staden/staden-9999.ebuild
+++ b/sci-biology/staden/staden-9999.ebuild
@@ -4,23 +4,21 @@
 
 EAPI=3
 
-inherit eutils fortran-2 flag-o-matic base multilib subversion # autotools
+inherit base eutils flag-o-matic fortran-2 multilib subversion
 
 DESCRIPTION="DNA sequence assembly (gap4, gap5), editing and analysis tools (Spin)"
-HOMEPAGE="http://sourceforge.net/projects/staden"
+HOMEPAGE="http://sourceforge.net/projects/staden/"
 # https://staden.svn.sourceforge.net/svnroot/staden staden
 if [ "$PV" == "9999" ]; then
 	ESVN_REPO_URI="https://staden.svn.sourceforge.net/svnroot/staden/staden/trunk"
-	#KEYWORDS="~amd64 ~x86"
 else
 	SRC_URI="http://downloads.sourceforge.net/staden/staden-2.0.0b7-src.tar.gz"
-	#KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="staden"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug fortran X png curl tcl tk zlib"
+IUSE="curl debug fortran png tcl tk X zlib"
 
 # either g77 or gfortran must be available
 # edit src/mk/linux.mk accordingly
@@ -30,16 +28,13 @@ IUSE="debug fortran X png curl tcl tk zlib"
 #
 #
 DEPEND="
+	app-arch/xz-utils
 	dev-lang/tk
 	dev-tcltk/tklib
-	>=sci-libs/io_lib-1.12.2
-	>=sys-libs/zlib-1.2
 	>=media-libs/libpng-1.2
 	sci-biology/samtools
-	>=app-arch/xz-utils-4.999"
-
-# maybe we should depend on app-arch/lzma or app-arch/xz-utils?
-
+	>=sci-libs/io_lib-1.12.2
+	>=sys-libs/zlib-1.2"
 RDEPEND="${DEPEND}
 	>=dev-tcltk/iwidgets-4.0
 	tcl? ( >=dev-tcltk/itcl-3.2 )
@@ -71,6 +66,10 @@ src_configure() {
 
 src_install() {
 	emake install DESTDIR="${D}" || die "make install failed"
-	echo "STADENROOT="${EPREFIX}"/usr/share/staden" > "${S}"/99staden
+
+	cat >> "${S}"/99staden <<- EOF
+	STADENROOT="${EPREFIX}"/usr/share/staden
+	EOF
+
 	doenvd "${S}"/99staden || die
 }