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 1588F139694 for ; Sat, 22 Apr 2017 16:10:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6513E21C07C; Sat, 22 Apr 2017 16:09:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C45F21C07C for ; Sat, 22 Apr 2017 16:09:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2B9B333FE7D for ; Sat, 22 Apr 2017 16:09:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9509A73F3 for ; Sat, 22 Apr 2017 16:09:55 +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: <1492877391.6b672731c97e773142cbc7ee9a5a09cf2c4c5d60.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/velvet/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/velvet/velvet-1.2.10.ebuild X-VCS-Directories: sci-biology/velvet/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 6b672731c97e773142cbc7ee9a5a09cf2c4c5d60 X-VCS-Branch: master Date: Sat, 22 Apr 2017 16:09:55 +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: c537e98b-a970-4b2d-9e3f-0e50f5643a58 X-Archives-Hash: 2202be84f242ee88b770c11b5d6a7ece commit: 6b672731c97e773142cbc7ee9a5a09cf2c4c5d60 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Fri Apr 14 07:42:19 2017 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Apr 22 16:09:51 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b672731 sci-biology/velvet: expose additional variables as described in manual and needed at compile time Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4421 Signed-off-by: Justin Lecher gentoo.org> sci-biology/velvet/velvet-1.2.10.ebuild | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sci-biology/velvet/velvet-1.2.10.ebuild b/sci-biology/velvet/velvet-1.2.10.ebuild index c6c841be3e4..53f5dd644f9 100644 --- a/sci-biology/velvet/velvet-1.2.10.ebuild +++ b/sci-biology/velvet/velvet-1.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -28,9 +28,11 @@ src_prepare() { fi elog "Upstream recommendes using -O3 in CFLAGS" echo - elog "To adjust the MAXKMERLENGTH or CATEGORIES parameters as described in the manual," - elog "please set the variables VELVET_MAXKMERLENGTH or VELVET_CATEGORIES in your" - elog "environment or /etc/make.conf, then re-emerge the package. For example:" + elog "To adjust the MAXKMERLENGTH, CATEGORIES, BIGASSEMBLY, LONGSEQUENCES parameters" + elog "as described in the PDF manual, please set the variables by prepending VELVET_ in" + elog "front of it. For example VELVET_MAXKMERLENGTH, VELVET_CATEGORIES, ..." + elog "Set them either in your environment or in /etc/portage/make.conf, then re-emerge" + elog "the package. For example:" elog " VELVET_MAXKMERLENGTH=NN emerge [options] velvet" MAKEOPTS+=" -j1" @@ -51,8 +53,11 @@ src_prepare() { CFLAGS="${CFLAGS}" OPT="${CFLAGS}" ) + if use openmp; then MAKE_XOPTS+=( OPENMP=1 ); fi if [[ ${VELVET_MAXKMERLENGTH} != "" ]]; then MAKE_XOPTS+=( MAXKMERLENGTH=${VELVET_MAXKMERLENGTH} ); fi if [[ ${VELVET_CATEGORIES} != "" ]]; then MAKE_XOPTS+=( CATEGORIES=${VELVET_CATEGORIES} ); fi + if [[ ${VELVET_BIGASSEMBLY} != "" ]]; then MAKE_XOPTS+=( BIGASSEMBLY=${VELVET_BIGASSEMBLY} ); fi + if [[ ${VELVET_LONGSEQUENCES} != "" ]]; then MAKE_XOPTS+=( LONGSEQUENCES=${VELVET_LONGSEQUENCES} ); fi } src_compile() {