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 91011139694 for ; Sat, 22 Apr 2017 16:09:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB26F21C054; Sat, 22 Apr 2017 16:09:57 +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 CCF1521C054 for ; Sat, 22 Apr 2017 16:09:57 +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 DEE5E33BF43 for ; Sat, 22 Apr 2017 16:09:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A868F743A 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.3cc49dd6ca6d216bfc03f0d4629d806670530d7b.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: 3cc49dd6ca6d216bfc03f0d4629d806670530d7b 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: 5f7d3096-38d1-4051-9e39-cc96aa46216b X-Archives-Hash: d0a25213e92ece5a352e6cb5e6d442c9 commit: 3cc49dd6ca6d216bfc03f0d4629d806670530d7b Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Fri Apr 14 09:52:36 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=3cc49dd6 sci-biology/velvet: simplify tests in ebuild 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sci-biology/velvet/velvet-1.2.10.ebuild b/sci-biology/velvet/velvet-1.2.10.ebuild index 53f5dd644f9..31560aee188 100644 --- a/sci-biology/velvet/velvet-1.2.10.ebuild +++ b/sci-biology/velvet/velvet-1.2.10.ebuild @@ -26,7 +26,7 @@ src_prepare() { if ! use doc; then sed -i -e '/default :/ s/doc//' "${S}"/Makefile || die fi - elog "Upstream recommendes using -O3 in CFLAGS" + elog "Upstream recommends using -O3 in CFLAGS" echo elog "To adjust the MAXKMERLENGTH, CATEGORIES, BIGASSEMBLY, LONGSEQUENCES parameters" elog "as described in the PDF manual, please set the variables by prepending VELVET_ in" @@ -53,11 +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 + use openmp && MAKE_XOPTS+=( OPENMP=1 ) + test "${VELVET_MAXKMERLENGTH}" != "" && MAKE_XOPTS+=( MAXKMERLENGTH=${VELVET_MAXKMERLENGTH} ) + test "${VELVET_CATEGORIES}" != "" && MAKE_XOPTS+=( CATEGORIES=${VELVET_CATEGORIES} ) + test "${VELVET_BIGASSEMBLY}" != "" && MAKE_XOPTS+=( BIGASSEMBLY=${VELVET_BIGASSEMBLY} ) + test "${VELVET_LONGSEQUENCES}" != "" && MAKE_XOPTS+=( LONGSEQUENCES=${VELVET_LONGSEQUENCES} ) } src_compile() {