From e47f0847b07adb2e6d9bb0f3b1bd491c6f3535fa Mon Sep 17 00:00:00 2001 From: David Seifert Date: Thu, 13 Dec 2018 15:07:52 +0100 Subject: sci-biology/bamtools: Bump to EAPI 7 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: David Seifert --- sci-biology/bamtools/bamtools-2.5.1.ebuild | 22 ++++++---------------- sci-biology/bamtools/bamtools-9999.ebuild | 22 ++++++---------------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/sci-biology/bamtools/bamtools-2.5.1.ebuild b/sci-biology/bamtools/bamtools-2.5.1.ebuild index 038ed14beb08..84c9dc837233 100644 --- a/sci-biology/bamtools/bamtools-2.5.1.ebuild +++ b/sci-biology/bamtools/bamtools-2.5.1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} inherit cmake-utils multibuild DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files" @@ -24,8 +23,8 @@ IUSE="static-libs" RDEPEND=" >=dev-libs/jsoncpp-1.8.0:= sys-libs/zlib:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && @@ -44,17 +43,8 @@ src_prepare() { src_configure() { my_configure() { - case "${MULTIBUILD_ID}" in - static*) - local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) - ;; - shared) - local mycmakeargs=( -DBUILD_SHARED_LIBS=ON ) - ;; - *) - die "${MULTIBUILD_ID} is not recognized" - ;; - esac + [[ ${MULTIBUILD_ID} == static-libs* ]] && + local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) cmake-utils_src_configure } diff --git a/sci-biology/bamtools/bamtools-9999.ebuild b/sci-biology/bamtools/bamtools-9999.ebuild index 038ed14beb08..84c9dc837233 100644 --- a/sci-biology/bamtools/bamtools-9999.ebuild +++ b/sci-biology/bamtools/bamtools-9999.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} inherit cmake-utils multibuild DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files" @@ -24,8 +23,8 @@ IUSE="static-libs" RDEPEND=" >=dev-libs/jsoncpp-1.8.0:= sys-libs/zlib:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && @@ -44,17 +43,8 @@ src_prepare() { src_configure() { my_configure() { - case "${MULTIBUILD_ID}" in - static*) - local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) - ;; - shared) - local mycmakeargs=( -DBUILD_SHARED_LIBS=ON ) - ;; - *) - die "${MULTIBUILD_ID} is not recognized" - ;; - esac + [[ ${MULTIBUILD_ID} == static-libs* ]] && + local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) cmake-utils_src_configure } -- cgit v1.2.3-65-gdbad