From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7DA2B1382C5 for ; Mon, 1 Feb 2021 08:12:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F572E09BD; Mon, 1 Feb 2021 08:12:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6490EE09BD for ; Mon, 1 Feb 2021 08:12:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD73F340E0C for ; Mon, 1 Feb 2021 08:12:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 240724A1 for ; Mon, 1 Feb 2021 08:12:34 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1612167140.86dd71ff4e5aaf1d07e78b746045ec800fe2bafe.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/SOAPdenovo2/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/SOAPdenovo2/SOAPdenovo2-241.ebuild sci-biology/SOAPdenovo2/SOAPdenovo2-242.ebuild X-VCS-Directories: sci-biology/SOAPdenovo2/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 86dd71ff4e5aaf1d07e78b746045ec800fe2bafe X-VCS-Branch: master Date: Mon, 1 Feb 2021 08:12:34 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37997989-359c-46f7-ae18-92d07362c79c X-Archives-Hash: 3bb2bd53a0d3bb58ef360dd4daeb1daa commit: 86dd71ff4e5aaf1d07e78b746045ec800fe2bafe Author: Andrew Ammerlaan riseup net> AuthorDate: Mon Feb 1 08:12:20 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Mon Feb 1 08:12:20 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=86dd71ff sci-biology/SOAPdenovo2: version bump 242 no keywords yet, because it does not compile Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> ...APdenovo2-241.ebuild => SOAPdenovo2-242.ebuild} | 31 +++++++++------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sci-biology/SOAPdenovo2/SOAPdenovo2-241.ebuild b/sci-biology/SOAPdenovo2/SOAPdenovo2-242.ebuild similarity index 51% rename from sci-biology/SOAPdenovo2/SOAPdenovo2-241.ebuild rename to sci-biology/SOAPdenovo2/SOAPdenovo2-242.ebuild index e3679664d..8ae80d466 100644 --- a/sci-biology/SOAPdenovo2/SOAPdenovo2-241.ebuild +++ b/sci-biology/SOAPdenovo2/SOAPdenovo2-242.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit toolchain-funcs eutils +inherit toolchain-funcs DESCRIPTION="Whole genome shotgun assembler (sparse de Bruijn graph) (now MEGAHIT)" HOMEPAGE="https://github.com/aquaskyline/SOAPdenovo2 - http://gigascience.biomedcentral.com/articles/10.1186/2047-217X-1-18" -SRC_URI="https://github.com/aquaskyline/SOAPdenovo2/archive/r241.tar.gz -> ${P}.tar.gz" + https://gigascience.biomedcentral.com/articles/10.1186/2047-217X-1-18" +SRC_URI="https://github.com/aquaskyline/SOAPdenovo2/archive/r${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="" +KEYWORDS="" # fails to compile DEPEND="dev-libs/libaio sci-biology/samtools:0.1-legacy" @@ -22,7 +21,7 @@ RDEPEND="${DEPEND}" S="${WORKDIR}"/"${PN}"-r"${PV}" # version is 2.04-r241 src_prepare(){ - epatch "${FILESDIR}"/SOAPdenovo2-r241-Makefile.patch + #eapply "${FILESDIR}"/SOAPdenovo2-r241-Makefile.patch # this will be partly covered by # https://github.com/aquaskyline/SOAPdenovo2/pull/44 # @@ -33,15 +32,11 @@ src_prepare(){ sparsePregraph/inc/sam.h sparsePregraph/inc/bam.h sparsePregraph/inc/bgzf.h standardPregraph/inc/zlib.h \ standardPregraph/inc/zconf.h sparsePregraph/inc/zlib.h sparsePregraph/inc/zconf.h standardPregraph/inc/*.so \ sparsePregraph/*.a || die + find -type f -name "*.h" -exec sed -i -e 's/#include "sam.h"/#include "bam-0.1-legacy\/sam.h"/g' {} + || die + find -type f -name "*.h" -exec sed -i -e 's/#include "bgzf.h"/#include "bam-0.1-legacy\/bgzf.h"/g' {} + || die + find -type f -name "*.h" -exec sed -i -e 's/#include "sam.h"/#include "bam-0.1-legacy\/sam.h"/g' {} + || die + find -type f -name "*.c*" -exec sed -i -e 's/#include "bam.h"/#include "bam-0.1-legacy\/bam.h"/g' {} + || die + find -type f -name "*.c*" -exec sed -i -e 's/#include "bgzf.h"/#include "bam-0.1-legacy\/bgzf.h"/g' {} + || die + find -type f -name "*.c*" -exec sed -i -e 's/#include "sam.h"/#include "bam-0.1-legacy\/sam.h"/g' {} + || die default } - -src_compile(){ - cd standardPregraph && emake -j1 63mer=1 - cd ../standardPregraph && emake -j1 127mer=1 - cd ../sparsePregraph && emake -j1 -} - -src_install(){ - doman "${FILESDIR}"/SOAPdenovo2.1 -}