From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CABA71381F3 for ; Sun, 16 Jun 2013 20:20:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59C1CE09BF; Sun, 16 Jun 2013 20:19:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4382E09BF for ; Sun, 16 Jun 2013 20:19:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D6BD33E3BC for ; Sun, 16 Jun 2013 20:19:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 28BDBE5465 for ; Sun, 16 Jun 2013 20:19:03 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1371413913.c2ac84939cff29d46ec7657f1f55f9c37c31abfc.jlec@gentoo> Subject: [gentoo-commits] proj/sci:fixing commit in: sci-biology/twinscan/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/twinscan/ChangeLog sci-biology/twinscan/metadata.xml sci-biology/twinscan/twinscan-4.1.2.ebuild X-VCS-Directories: sci-biology/twinscan/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: c2ac84939cff29d46ec7657f1f55f9c37c31abfc X-VCS-Branch: fixing Date: Sun, 16 Jun 2013 20:19:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 893cdd8f-3cca-46f5-a2c4-53ed4d6dca0e X-Archives-Hash: ce35c180c84c4e5dae8ec90841669fba commit: c2ac84939cff29d46ec7657f1f55f9c37c31abfc Author: Justin Lecher gentoo org> AuthorDate: Sun Jun 16 20:18:33 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Jun 16 20:18:33 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c2ac8493 sci-biology/twinscan: Bump to EAPI=5 and fix license Package-Manager: portage-2.2.0_alpha180 --- sci-biology/twinscan/ChangeLog | 6 +++++- sci-biology/twinscan/metadata.xml | 10 +++++----- sci-biology/twinscan/twinscan-4.1.2.ebuild | 30 ++++++++++++++++++++---------- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/sci-biology/twinscan/ChangeLog b/sci-biology/twinscan/ChangeLog index 3914a60..fedf86e 100644 --- a/sci-biology/twinscan/ChangeLog +++ b/sci-biology/twinscan/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-biology/twinscan -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Jun 2013; Justin Lecher twinscan-4.1.2.ebuild, + metadata.xml: + Bump to EAPI=5 and fix license + 07 Mar 2011; Justin Lecher twinscan-4.1.2.ebuild: Correct Slots for gtk 3 introduction to tree diff --git a/sci-biology/twinscan/metadata.xml b/sci-biology/twinscan/metadata.xml index 3302123..fc7c769 100644 --- a/sci-biology/twinscan/metadata.xml +++ b/sci-biology/twinscan/metadata.xml @@ -1,9 +1,9 @@ - - weaver@gentoo.org - Andrey Kislyuk - - sci-biology + + weaver@gentoo.org + Andrey Kislyuk + + sci-biology diff --git a/sci-biology/twinscan/twinscan-4.1.2.ebuild b/sci-biology/twinscan/twinscan-4.1.2.ebuild index 96b1a04..516aec8 100644 --- a/sci-biology/twinscan/twinscan-4.1.2.ebuild +++ b/sci-biology/twinscan/twinscan-4.1.2.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=2 +EAPI=5 + +inherit toolchain-funcs DESCRIPTION="TwinScan, N-SCAN, and Pairagon: A gene structure prediction pipeline" HOMEPAGE="http://mblab.wustl.edu/software/twinscan" -SRC_URI="http://mblab.wustl.edu/software/download/iscan-${PV}.tar_.gz" +SRC_URI="http://mblab.wustl.edu/software/download/iscan-${PV}.tar_.gz -> ${P}.tar.gz" -LICENSE="as-is" +LICENSE="all-rights-reserved" SLOT="0" IUSE="" KEYWORDS="~amd64 ~x86" @@ -18,14 +20,21 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/N-SCAN" -src_unpack() { - unpack ${A} - tar -C "${WORKDIR}" -xf iscan-${PV}.tar_ -} - src_prepare() { sed -i "1 a use lib '/usr/share/${PN}/lib/perl5';" "${S}"/bin/*.pl || die - sed -i '/my $blast_param/ s/#//' "${S}/bin/runTwinscan2.pl" + sed -i '/my $blast_param/ s/#//' "${S}/bin/runTwinscan2.pl" || die + tc-export CC AR RANLIB + + sed \ + -e 's:ar :$(AR) :g' \ + -e 's:ranlib :$(RANLIB) :g' \ + -e 's: -o : $(LDFLAGS) -o :g' \ + -i Makefile || die + + sed \ + -e "/^GLIB_CFLAGS/s:=.*:=$($(tc-getPKG_CONFIG) --cflags glib-2.0) -DHAS_GLIB:g" \ + -e "/^GLIB_LFLAGS/s:=.*:=$($(tc-getPKG_CONFIG) --libs glib-2.0)-DHAS_GLIB:g" \ + -i Makefile.include || die } src_install() { @@ -35,5 +44,6 @@ src_install() { doins -r "${S}/lib" || die echo "TWINSCAN=/usr" > "${S}"/99${PN} doenvd "${S}"/99${PN} || die + rm -rf examples/tmp dodoc examples/* README* }