From 51536d2fe4697ba9114d611178bb9e20d3d5b729 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Dec 2017 20:48:53 +0000 Subject: gentoo resync : 23.12.2017 --- sci-biology/Manifest.gz | Bin 25119 -> 25121 bytes sci-biology/bamtools/Manifest | 6 +-- sci-biology/bamtools/bamtools-2.4.2.ebuild | 35 --------------- sci-biology/bamtools/bamtools-2.5.1.ebuild | 69 +++++++++++++++++++++++++++++ sci-biology/bamtools/bamtools-9999.ebuild | 38 +++++++++++++++- 5 files changed, 108 insertions(+), 40 deletions(-) delete mode 100644 sci-biology/bamtools/bamtools-2.4.2.ebuild create mode 100644 sci-biology/bamtools/bamtools-2.5.1.ebuild (limited to 'sci-biology') diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz index e595e9c37fca..6530d34211fd 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 d62831eeff5c..d466fb993d15 100644 --- a/sci-biology/bamtools/Manifest +++ b/sci-biology/bamtools/Manifest @@ -1,4 +1,4 @@ -DIST bamtools-2.4.2.tar.gz 548095 BLAKE2B 19f302eb5de9c8e3f0dc53cb9cbb359b1186b44318f7cb82e83ea995920bb30331d0873c9ad9c68601306772eab1283ead2b0eb4a8cb17cb1eade600c9cdbfac SHA512 244a63609c0b10a85bba7cac210a27ea9abafba136e9c91fc789c7aa21a6cdaa7622afebc50ec8d30d4446872d5206dbd3d679ca03e95ac90771c87359cb69a0 -EBUILD bamtools-2.4.2.ebuild 818 BLAKE2B dd6d86de8ac663a5b08de3eb16e024ca355974d6265d4cbc94e293acb80dc6b704a576b4646e8f0d84a45d4195cbf5d0d9a2b13ba1e8552c5e27e0614cab3efc SHA512 9073703d58572f8e517b5ccdf5059d7643aee3c0090eb30d5debe75ff091d1abb2b7f29585554bc81d5e18822f5867efc2fd5c20aef6c4d707253f2b80a0bcbe -EBUILD bamtools-9999.ebuild 818 BLAKE2B dd6d86de8ac663a5b08de3eb16e024ca355974d6265d4cbc94e293acb80dc6b704a576b4646e8f0d84a45d4195cbf5d0d9a2b13ba1e8552c5e27e0614cab3efc SHA512 9073703d58572f8e517b5ccdf5059d7643aee3c0090eb30d5debe75ff091d1abb2b7f29585554bc81d5e18822f5867efc2fd5c20aef6c4d707253f2b80a0bcbe +DIST bamtools-2.5.1.tar.gz 549750 BLAKE2B c00b42b10e074e2c6b06f8bc9277a57080b9e99cd10080b1ad9052d59a3db353b33ecf6c30642d1651897396ea65e1e19cb15db0d58a89d4375fe34a8ec38e55 SHA512 f2c761c5bf923cf2f3db3dc54e40b4781307106b9177784f930aab619bd11fae3b343f3cfd232524580d39f0526a2a2f18efcf820fe4d9c951406bdb6b953afb +EBUILD bamtools-2.5.1.ebuild 1404 BLAKE2B 599274264f072f35c267fac453fe474630e98d8f9c56ddbd4ec59357bf92b822b31a6a1dcba50260a31bed02a38aca50866a6fe7d4ce5b8bdbe2852edfca2dbd SHA512 b3013eb6b0b0b870a8c2ac8f441b6437424edc4162456193c749f3c807858fb6718fa799cd7fbcc7c5706b8be6bdd4533a111a6839772bc7c57f5a2f2254059b +EBUILD bamtools-9999.ebuild 1404 BLAKE2B 599274264f072f35c267fac453fe474630e98d8f9c56ddbd4ec59357bf92b822b31a6a1dcba50260a31bed02a38aca50866a6fe7d4ce5b8bdbe2852edfca2dbd SHA512 b3013eb6b0b0b870a8c2ac8f441b6437424edc4162456193c749f3c807858fb6718fa799cd7fbcc7c5706b8be6bdd4533a111a6839772bc7c57f5a2f2254059b MISC metadata.xml 881 BLAKE2B e7feabf909d8dbccc784cd2e94d07882d700433e773ac51928b796f4bfd22a7e8de7a4d99268dd8ea0f8d36683f5bbe9f3c4fcba37fc85c284f49b9ad7d413e0 SHA512 4922e3edaa65c7981b8656245287e4c4d613f8ba6d6b63131fe9e5183f8119eab5501e354ad80d37d8f61f56d86513af2aedd2b086e5da3d1ab48b3aef57a18c diff --git a/sci-biology/bamtools/bamtools-2.4.2.ebuild b/sci-biology/bamtools/bamtools-2.4.2.ebuild deleted file mode 100644 index bd0157db0d12..000000000000 --- a/sci-biology/bamtools/bamtools-2.4.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files" -HOMEPAGE="https://github.com/pezmaster31/bamtools" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/pezmaster31/bamtools.git" -else - SRC_URI="https://github.com/pezmaster31/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0/${PV}" # no stable ABI yet - -RDEPEND=" - >=dev-libs/jsoncpp-1.8.0:= - sys-libs/zlib:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -mycmakeargs=( -DBUILD_SHARED_LIBS=ON ) - -src_prepare() { - # delete bundled libs, just to be safe - rm -r src/third_party/{gtest-1.6.0,jsoncpp} || die - - cmake-utils_src_prepare -} diff --git a/sci-biology/bamtools/bamtools-2.5.1.ebuild b/sci-biology/bamtools/bamtools-2.5.1.ebuild new file mode 100644 index 000000000000..ba21654b97fb --- /dev/null +++ b/sci-biology/bamtools/bamtools-2.5.1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils multibuild + +DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files" +HOMEPAGE="https://github.com/pezmaster31/bamtools" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pezmaster31/bamtools.git" +else + SRC_URI="https://github.com/pezmaster31/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0/${PV}" # no stable ABI yet +IUSE="static-libs" + +RDEPEND=" + >=dev-libs/jsoncpp-1.8.0:= + sys-libs/zlib:=" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && + MULTIBUILD_VARIANTS=( + $(usev static-libs) + shared + ) +} + +src_prepare() { + # delete bundled libs, just to be safe + rm -r src/third_party/{gtest-1.6.0,jsoncpp} || die + + cmake-utils_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 + + cmake-utils_src_configure + } + multibuild_foreach_variant my_configure +} + +src_compile() { + multibuild_foreach_variant cmake-utils_src_compile +} + +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} diff --git a/sci-biology/bamtools/bamtools-9999.ebuild b/sci-biology/bamtools/bamtools-9999.ebuild index bd0157db0d12..ba21654b97fb 100644 --- a/sci-biology/bamtools/bamtools-9999.ebuild +++ b/sci-biology/bamtools/bamtools-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit cmake-utils +inherit cmake-utils multibuild DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files" HOMEPAGE="https://github.com/pezmaster31/bamtools" @@ -18,6 +18,7 @@ fi LICENSE="MIT" SLOT="0/${PV}" # no stable ABI yet +IUSE="static-libs" RDEPEND=" >=dev-libs/jsoncpp-1.8.0:= @@ -25,7 +26,13 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig" -mycmakeargs=( -DBUILD_SHARED_LIBS=ON ) +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && + MULTIBUILD_VARIANTS=( + $(usev static-libs) + shared + ) +} src_prepare() { # delete bundled libs, just to be safe @@ -33,3 +40,30 @@ src_prepare() { cmake-utils_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 + + cmake-utils_src_configure + } + multibuild_foreach_variant my_configure +} + +src_compile() { + multibuild_foreach_variant cmake-utils_src_compile +} + +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} -- cgit v1.2.3