From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QYzYg-0007wm-Cp for garchives@archives.gentoo.org; Tue, 21 Jun 2011 11:55:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B40D1C1F8; Tue, 21 Jun 2011 11:54:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EF7251C1F5 for ; Tue, 21 Jun 2011 11:54:19 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86AF02AC029 for ; Tue, 21 Jun 2011 11:54:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E56B78003D for ; Tue, 21 Jun 2011 11:54:18 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/staden/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/staden/ChangeLog sci-biology/staden/staden-2.0.0_beta8.ebuild sci-biology/staden/staden-9999.ebuild X-VCS-Directories: sci-biology/staden/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: bb79d45d1a14d26cdd95f9efecdad1b746c5af6a Date: Tue, 21 Jun 2011 11:54:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 751fd9dc7f19db62a624e1ae0f1d1134 commit: bb79d45d1a14d26cdd95f9efecdad1b746c5af6a Author: Justin Lecher gentoo org> AuthorDate: Tue Jun 21 11:31:44 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Jun 21 11:31:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dbb79d45d Added fortran-2.eclass support (Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --forc= e, 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 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/s= taden/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 @@ =20 EAPI=3D3 =20 -inherit eutils flag-o-matic base +inherit eutils fortran-2 flag-o-matic base multilib =20 -DESCRIPTION=3D"DNA sequence assembly (gap4, gap5), editing and analysis = tools (Spin)." +DESCRIPTION=3D"DNA sequence assembly (gap4, gap5), editing and analysis = tools (Spin)" HOMEPAGE=3D"http://sourceforge.net/projects/staden" -SRC_URI=3D"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=3D" + 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" =20 LICENSE=3D"staden" SLOT=3D"0" @@ -22,22 +23,23 @@ IUSE=3D"debug fortran X png curl tcl tk zlib" # # this is a glibc-2.9 issue, see https://sourceforge.net/tracker/index.p= hp?func=3Ddetail&aid=3D2629155&group_id=3D100316&atid=3D627058 # -#=20 # -DEPEND=3D">=3Ddev-lang/tk-8.4 - >=3Ddev-lang/tcl-8.4 - dev-tcltk/tklib - >=3Dsci-libs/io_lib-1.12.2 - >=3Dsys-libs/zlib-1.2 - >=3Dmedia-libs/libpng-1.2 - sci-biology/samtools - >=3Dapp-arch/xz-utils-4.999" +# +DEPEND=3D" + dev-lang/tk + dev-tcltk/tklib + >=3Dsci-libs/io_lib-1.12.2 + >=3Dsys-libs/zlib-1.2 + >=3Dmedia-libs/libpng-1.2 + sci-biology/samtools + >=3Dapp-arch/xz-utils-4.999" =20 # maybe we should depend on app-arch/lzma or app-arch/xz-utils? =20 -RDEPEND=3D"tcl? ( >=3Ddev-tcltk/itcl-3.2 ) - tk? ( >=3Ddev-tcltk/itk-3.2 ) - >=3Ddev-tcltk/iwidgets-4.0" +RDEPEND=3D"${DEPEND} + >=3Ddev-tcltk/iwidgets-4.0 + tcl? ( >=3Ddev-tcltk/itcl-3.2 ) + tk? ( >=3Ddev-tcltk/itk-3.2 )" =20 S=3D"${WORKDIR}"/staden-2.0.0b8-src =20 @@ -54,11 +56,7 @@ src_configure(){ myconf=3D" --with-tklib=3D/usr/lib/tklib0.5" # HACK use amd64 && myconf=3D"${myconf} --enable-64bit" use debug && append-cflags "-DCACHE_REF_DEBUG" - econf ${myconf} || die "configure failed" -} - -src_compile() { - emake || die "emake failed" + econf ${myconf} } =20 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/sta= den' # somehow for gap2caf, for example - echo 'LDPATH=3D/usr/lib/staden' > 99staden || die + echo 'LDPATH=3D/usr/$(get_libdir)/staden' > 99staden || die doenvd 99staden } diff --git a/sci-biology/staden/staden-9999.ebuild b/sci-biology/staden/s= taden-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: $ =20 EAPI=3D3 =20 -inherit eutils flag-o-matic base subversion # autotools +inherit eutils fortran-2 flag-o-matic base multilib subversion # autotoo= ls =20 -DESCRIPTION=3D"A fully developed set of DNA sequence assembly (Gap4), ed= iting and analysis tools (Spin)." +DESCRIPTION=3D"DNA sequence assembly (gap4, gap5), editing and analysis = tools (Spin)" HOMEPAGE=3D"http://sourceforge.net/projects/staden" # https://staden.svn.sourceforge.net/svnroot/staden staden if [ "$PV" =3D=3D "9999" ]; then @@ -28,23 +28,22 @@ IUSE=3D"debug fortran X png curl tcl tk zlib" # # this is a glibc-2.9 issue, see https://sourceforge.net/tracker/index.p= hp?func=3Ddetail&aid=3D2629155&group_id=3D100316&atid=3D627058 # -#=20 # -DEPEND=3D"dev-vcs/subversion - >=3Ddev-lang/tk-8.4 - >=3Ddev-lang/tcl-8.4 - dev-tcltk/tklib - >=3Dsci-libs/io_lib-1.12.2 - >=3Dsys-libs/zlib-1.2 - >=3Dmedia-libs/libpng-1.2 - sci-biology/samtools - >=3Dapp-arch/xz-utils-4.999" +DEPEND=3D" + dev-lang/tk + dev-tcltk/tklib + >=3Dsci-libs/io_lib-1.12.2 + >=3Dsys-libs/zlib-1.2 + >=3Dmedia-libs/libpng-1.2 + sci-biology/samtools + >=3Dapp-arch/xz-utils-4.999" =20 # maybe we should depend on app-arch/lzma or app-arch/xz-utils? =20 -RDEPEND=3D"tcl? ( >=3Ddev-tcltk/itcl-3.2 ) - tk? ( >=3Ddev-tcltk/itk-3.2 ) - >=3Ddev-tcltk/iwidgets-4.0" +RDEPEND=3D"${DEPEND} + >=3Ddev-tcltk/iwidgets-4.0 + tcl? ( >=3Ddev-tcltk/itcl-3.2 ) + tk? ( >=3Ddev-tcltk/itk-3.2 )" =20 src_unpack() { if [ "$PV" =3D=3D "9999" ]; then @@ -67,12 +66,7 @@ src_configure() { use amd64 && myconf=3D"${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} } =20 src_install() {