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 1QZgGD-0002Yb-HT for garchives@archives.gentoo.org; Thu, 23 Jun 2011 09:31:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7A691C130; Thu, 23 Jun 2011 09:31:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5C5011C11E for ; Thu, 23 Jun 2011 09:31:21 +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 A8B6A1B4025 for ; Thu, 23 Jun 2011 09:31:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C26038004B for ; Thu, 23 Jun 2011 09:31:19 +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: <0a1e03d17371b6e44f2b7816e6db2ea86ec76ecb.jlec@gentoo> 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: 0a1e03d17371b6e44f2b7816e6db2ea86ec76ecb Date: Thu, 23 Jun 2011 09:31:19 +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: 8f9124a2f21c11560e1fd2edfd11d100 commit: 0a1e03d17371b6e44f2b7816e6db2ea86ec76ecb Author: Justin Lecher gentoo org> AuthorDate: Thu Jun 23 09:22:43 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Jun 23 09:22:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D0a1e03d1 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: $ =20 + 23 Jun 2011; Justin Lecher staden-2.0.0_beta8.ebuild= , + staden-9999.ebuild: + Streamlined fortran-2 eclass usage + 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 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 @@ =20 EAPI=3D3 =20 -inherit eutils fortran-2 flag-o-matic base multilib +inherit base eutils flag-o-matic fortran-2 multilib =20 DESCRIPTION=3D"DNA sequence assembly (gap4, gap5), editing and analysis = tools (Spin)" -HOMEPAGE=3D"http://sourceforge.net/projects/staden" +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" @@ -15,27 +15,23 @@ SRC_URI=3D" LICENSE=3D"staden" SLOT=3D"0" KEYWORDS=3D"~x86 ~amd64" -IUSE=3D"debug fortran X png curl tcl tk zlib" +IUSE=3D"curl debug fortran png tcl tk X zlib" =20 # 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.p= hp?func=3Ddetail&aid=3D2629155&group_id=3D100316&atid=3D627058 # # # DEPEND=3D" + app-arch/xz-utils 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" - -# maybe we should depend on app-arch/lzma or app-arch/xz-utils? - + >=3Dsci-libs/io_lib-1.12.2 + >=3Dsys-libs/zlib-1.2" RDEPEND=3D"${DEPEND} >=3Ddev-tcltk/iwidgets-4.0 tcl? ( >=3Ddev-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/sta= den' # somehow for gap2caf, for example - echo 'LDPATH=3D/usr/$(get_libdir)/staden' > 99staden || die + cat >> "${T}"/99staden <<- EOF + LDPATH=3D/usr/$(get_libdir)/staden + EOF doenvd 99staden } diff --git a/sci-biology/staden/staden-9999.ebuild b/sci-biology/staden/s= taden-9999.ebuild index 3f78adb..3add863 100644 --- a/sci-biology/staden/staden-9999.ebuild +++ b/sci-biology/staden/staden-9999.ebuild @@ -4,23 +4,21 @@ =20 EAPI=3D3 =20 -inherit eutils fortran-2 flag-o-matic base multilib subversion # autotoo= ls +inherit base eutils flag-o-matic fortran-2 multilib subversion =20 DESCRIPTION=3D"DNA sequence assembly (gap4, gap5), editing and analysis = tools (Spin)" -HOMEPAGE=3D"http://sourceforge.net/projects/staden" +HOMEPAGE=3D"http://sourceforge.net/projects/staden/" # https://staden.svn.sourceforge.net/svnroot/staden staden if [ "$PV" =3D=3D "9999" ]; then ESVN_REPO_URI=3D"https://staden.svn.sourceforge.net/svnroot/staden/stad= en/trunk" - #KEYWORDS=3D"~amd64 ~x86" else SRC_URI=3D"http://downloads.sourceforge.net/staden/staden-2.0.0b7-src.t= ar.gz" - #KEYWORDS=3D"~amd64 ~x86" fi =20 LICENSE=3D"staden" SLOT=3D"0" KEYWORDS=3D"" -IUSE=3D"debug fortran X png curl tcl tk zlib" +IUSE=3D"curl debug fortran png tcl tk X zlib" =20 # either g77 or gfortran must be available # edit src/mk/linux.mk accordingly @@ -30,16 +28,13 @@ IUSE=3D"debug fortran X png curl tcl tk zlib" # # DEPEND=3D" + app-arch/xz-utils 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" - -# maybe we should depend on app-arch/lzma or app-arch/xz-utils? - + >=3Dsci-libs/io_lib-1.12.2 + >=3Dsys-libs/zlib-1.2" RDEPEND=3D"${DEPEND} >=3Ddev-tcltk/iwidgets-4.0 tcl? ( >=3Ddev-tcltk/itcl-3.2 ) @@ -71,6 +66,10 @@ src_configure() { =20 src_install() { emake install DESTDIR=3D"${D}" || die "make install failed" - echo "STADENROOT=3D"${EPREFIX}"/usr/share/staden" > "${S}"/99staden + + cat >> "${S}"/99staden <<- EOF + STADENROOT=3D"${EPREFIX}"/usr/share/staden + EOF + doenvd "${S}"/99staden || die }