From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- sci-biology/Manifest.gz | Bin 25283 -> 25286 bytes sci-biology/bamtools/Manifest | 4 ++-- sci-biology/bamtools/bamtools-2.5.1.ebuild | 22 ++++++---------------- sci-biology/bamtools/bamtools-9999.ebuild | 22 ++++++---------------- 4 files changed, 14 insertions(+), 34 deletions(-) (limited to 'sci-biology') diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz index 7aa57a68ff6a..cdb2c8cbf42f 100644 Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ diff --git a/sci-biology/bamtools/Manifest b/sci-biology/bamtools/Manifest index abded6ee22ae..54d81206f725 100644 --- a/sci-biology/bamtools/Manifest +++ b/sci-biology/bamtools/Manifest @@ -1,4 +1,4 @@ DIST bamtools-2.5.1.tar.gz 549750 BLAKE2B c00b42b10e074e2c6b06f8bc9277a57080b9e99cd10080b1ad9052d59a3db353b33ecf6c30642d1651897396ea65e1e19cb15db0d58a89d4375fe34a8ec38e55 SHA512 f2c761c5bf923cf2f3db3dc54e40b4781307106b9177784f930aab619bd11fae3b343f3cfd232524580d39f0526a2a2f18efcf820fe4d9c951406bdb6b953afb -EBUILD bamtools-2.5.1.ebuild 1441 BLAKE2B f3800dc456e1f63bb14cb65f82dce68c9208fba16db27f979be045f4b96f74def142c315dd7b7cb7c55e833810be8daeb9eea587dc2b57f142ea33f7c74e1ca8 SHA512 0e1c557787359ee8f91546c3cab93029b4ab0a37d2b248fcd7007218ca29150a4a8cb13664b237ce4d19c08dce3c06ab04d3feb0324cd239c5732579f3857280 -EBUILD bamtools-9999.ebuild 1441 BLAKE2B f3800dc456e1f63bb14cb65f82dce68c9208fba16db27f979be045f4b96f74def142c315dd7b7cb7c55e833810be8daeb9eea587dc2b57f142ea33f7c74e1ca8 SHA512 0e1c557787359ee8f91546c3cab93029b4ab0a37d2b248fcd7007218ca29150a4a8cb13664b237ce4d19c08dce3c06ab04d3feb0324cd239c5732579f3857280 +EBUILD bamtools-2.5.1.ebuild 1273 BLAKE2B 9ff546267edeb8dfb4ebd0abd9664768dbeec6d5b03465dba3d17b5906da4895de354800a078ae76e53940a2f36754e560fd3f734956af4ad670f33400b36630 SHA512 66086024be16d409775722903ab5729a21f24914c0e8e52cde30604f15cd65a6292f35b7193f57b449dcf53b2494ea37a47edf8b1b14aca345a5df6f8fde53cf +EBUILD bamtools-9999.ebuild 1273 BLAKE2B 9ff546267edeb8dfb4ebd0abd9664768dbeec6d5b03465dba3d17b5906da4895de354800a078ae76e53940a2f36754e560fd3f734956af4ad670f33400b36630 SHA512 66086024be16d409775722903ab5729a21f24914c0e8e52cde30604f15cd65a6292f35b7193f57b449dcf53b2494ea37a47edf8b1b14aca345a5df6f8fde53cf MISC metadata.xml 881 BLAKE2B e7feabf909d8dbccc784cd2e94d07882d700433e773ac51928b796f4bfd22a7e8de7a4d99268dd8ea0f8d36683f5bbe9f3c4fcba37fc85c284f49b9ad7d413e0 SHA512 4922e3edaa65c7981b8656245287e4c4d613f8ba6d6b63131fe9e5183f8119eab5501e354ad80d37d8f61f56d86513af2aedd2b086e5da3d1ab48b3aef57a18c 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