[gentoo-commits] repo/gentoo:master commit in: sci-biology/velvet/

["Justin Lecher" <jlec@gentoo.org>]

commit:     3cc49dd6ca6d216bfc03f0d4629d806670530d7b
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Fri Apr 14 09:52:36 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec <AT> 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() {