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 1Ra6Rx-0005H6-8W for garchives@archives.gentoo.org; Mon, 12 Dec 2011 14:01:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35D5221C105; Mon, 12 Dec 2011 14:01:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 002CC21C105 for ; Mon, 12 Dec 2011 14:01:40 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E82B1B4028 for ; Mon, 12 Dec 2011 14:01:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 883B08004A for ; Mon, 12 Dec 2011 14:01:39 +0000 (UTC) From: "Martin Mokrejs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" 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-9999.ebuild X-VCS-Directories: sci-biology/staden/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: af67cc9273a5089c2c01aba5dc8cf8eed7d5aa3b Date: Mon, 12 Dec 2011 14:01:39 +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: 8d63266f-d0eb-49ba-a33a-92726ffc5486 X-Archives-Hash: 1f93726dc0174c1e74e096d346cced66 commit: af67cc9273a5089c2c01aba5dc8cf8eed7d5aa3b Author: Martin Mokrejs fold natur cuni cz> AuthorDate: Mon Dec 12 14:01:34 2011 +0000 Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Mon Dec 12 14:01:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Daf67cc92 fix determination of svn-based checkout number required for building (Portage version: 2.1.10.38/git/Linux i686, unsigned Manifest commit) --- sci-biology/staden/ChangeLog | 4 ++++ sci-biology/staden/staden-9999.ebuild | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sci-biology/staden/ChangeLog b/sci-biology/staden/ChangeLog index 243d4e7..e98e9ca 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 + 12 Dec 2011; Martin Mokrejs staden-9999.= ebuild: + fix determination of svn-based checkout number required for building + staden-9999.ebuild + 08 Jul 2011; Martin Mokrejs staden-2.0.0_beta8.ebuild, staden-9999.ebuild: Documented that we have to install somehow diff --git a/sci-biology/staden/staden-9999.ebuild b/sci-biology/staden/s= taden-9999.ebuild index 8fc8b94..175b343 100644 --- a/sci-biology/staden/staden-9999.ebuild +++ b/sci-biology/staden/staden-9999.ebuild @@ -6,6 +6,10 @@ EAPI=3D3 =20 inherit base eutils flag-o-matic fortran-2 multilib subversion =20 +if [ "$PV" =3D=3D "9999" ]; then + inherit autotools +fi + 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 @@ -17,7 +21,7 @@ fi =20 LICENSE=3D"staden" SLOT=3D"0" -KEYWORDS=3D"" +KEYWORDS=3D"~amd64" IUSE=3D"curl debug fortran png tcl tk X zlib" =20 # either g77 or gfortran must be available @@ -63,11 +67,14 @@ src_configure() { use debug && append-cflags "-DCACHE_REF_DEBUG" use debug && append-cxxflags "-DCACHE_REF_DEBUG" econf ${myconf} + # edit system.mk to place there proper version number of the svn-contro= lled checkout + SVNVERSION=3D`svnversion ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_= URI##*/}` + sed -e "s/^SVNVERS.*/SVNVERS =3D "${SVNVERSION}"/" -i system.mk } =20 src_install() { # TODO: dodoc /usr/share/doc/staden/manual/gap4.index ? - emake install DESTDIR=3D"${D}" || die "make install failed" + emake install DESTDIR=3D"${D}" SVN_VERSION=3D"${SVNVERSION}" || die "ma= ke install failed" =20 cat >> "${S}"/99staden <<- EOF STADENROOT=3D"${EPREFIX}"/usr/share/staden