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

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

commit:     bb79d45d1a14d26cdd95f9efecdad1b746c5af6a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:31:44 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:31:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bb79d45d

Added fortran-2.eclass support

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

---
 sci-biology/staden/ChangeLog                 |    8 +++++
 sci-biology/staden/staden-2.0.0_beta8.ebuild |   42 ++++++++++++-------------
 sci-biology/staden/staden-9999.ebuild        |   38 ++++++++++-------------
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/sci-biology/staden/ChangeLog b/sci-biology/staden/ChangeLog
new file mode 100644
index 0000000..6064fae
--- /dev/null
+++ b/sci-biology/staden/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for sci-biology/staden
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  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 a4e1e47..a5d9990 100644
--- a/sci-biology/staden/staden-2.0.0_beta8.ebuild
+++ b/sci-biology/staden/staden-2.0.0_beta8.ebuild
@@ -4,12 +4,13 @@
 
 EAPI=3
 
-inherit eutils flag-o-matic base
+inherit eutils fortran-2 flag-o-matic base multilib
 
-DESCRIPTION="DNA sequence assembly (gap4, gap5), editing and analysis tools (Spin)."
+DESCRIPTION="DNA sequence assembly (gap4, gap5), editing and analysis tools (Spin)"
 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"
+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"
 
 LICENSE="staden"
 SLOT="0"
@@ -22,22 +23,23 @@ IUSE="debug fortran X png curl tcl tk zlib"
 #
 # this is a glibc-2.9 issue, see https://sourceforge.net/tracker/index.php?func=detail&aid=2629155&group_id=100316&atid=627058
 #
-# 
 #
-DEPEND=">=dev-lang/tk-8.4
-		>=dev-lang/tcl-8.4
-		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"
+#
+DEPEND="
+	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?
 
-RDEPEND="tcl? ( >=dev-tcltk/itcl-3.2 )
-		tk? ( >=dev-tcltk/itk-3.2 )
-		>=dev-tcltk/iwidgets-4.0"
+RDEPEND="${DEPEND}
+	>=dev-tcltk/iwidgets-4.0
+	tcl? ( >=dev-tcltk/itcl-3.2 )
+	tk? ( >=dev-tcltk/itk-3.2 )"
 
 S="${WORKDIR}"/staden-2.0.0b8-src
 
@@ -54,11 +56,7 @@ src_configure(){
 	myconf=" --with-tklib=/usr/lib/tklib0.5" # HACK
 	use amd64 && myconf="${myconf} --enable-64bit"
 	use debug && append-cflags "-DCACHE_REF_DEBUG"
-	econf ${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
+	econf ${myconf}
 }
 
 src_install() {
@@ -70,6 +68,6 @@ 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/lib/staden' > 99staden || die
+	echo 'LDPATH=/usr/$(get_libdir)/staden' > 99staden || die
 	doenvd 99staden
 }

diff --git a/sci-biology/staden/staden-9999.ebuild b/sci-biology/staden/staden-9999.ebuild
index fa67b6f..3f78adb 100644
--- a/sci-biology/staden/staden-9999.ebuild
+++ b/sci-biology/staden/staden-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=3
 
-inherit eutils flag-o-matic base subversion # autotools
+inherit eutils fortran-2 flag-o-matic base multilib subversion # autotools
 
-DESCRIPTION="A fully developed set of DNA sequence assembly (Gap4), editing and analysis tools (Spin)."
+DESCRIPTION="DNA sequence assembly (gap4, gap5), editing and analysis tools (Spin)"
 HOMEPAGE="http://sourceforge.net/projects/staden"
 # https://staden.svn.sourceforge.net/svnroot/staden staden
 if [ "$PV" == "9999" ]; then
@@ -28,23 +28,22 @@ IUSE="debug fortran X png curl tcl tk zlib"
 #
 # this is a glibc-2.9 issue, see https://sourceforge.net/tracker/index.php?func=detail&aid=2629155&group_id=100316&atid=627058
 #
-# 
 #
-DEPEND="dev-vcs/subversion
-		>=dev-lang/tk-8.4
-		>=dev-lang/tcl-8.4
-		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"
+DEPEND="
+	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?
 
-RDEPEND="tcl? ( >=dev-tcltk/itcl-3.2 )
-		tk? ( >=dev-tcltk/itk-3.2 )
-		>=dev-tcltk/iwidgets-4.0"
+RDEPEND="${DEPEND}
+	>=dev-tcltk/iwidgets-4.0
+	tcl? ( >=dev-tcltk/itcl-3.2 )
+	tk? ( >=dev-tcltk/itk-3.2 )"
 
 src_unpack() {
 	if [ "$PV" == "9999" ]; then
@@ -67,12 +66,7 @@ src_configure() {
 	use amd64 && myconf="${myconf} --enable-64bit"
 	use debug && append-cflags "-DCACHE_REF_DEBUG"
 	use debug && append-cxxflags "-DCACHE_REF_DEBUG"
-	econf ${myconf} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
+	econf ${myconf}
 }
 
 src_install() {