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 64DFD13997D for ; Wed, 13 Nov 2019 18:16:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A096DE0880; Wed, 13 Nov 2019 18:16:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73380E0880 for ; Wed, 13 Nov 2019 18:16:23 +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 2A99C34CDA8 for ; Wed, 13 Nov 2019 18:16:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25861773 for ; Wed, 13 Nov 2019 18:16:20 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1573668962.a217ed25f690d9d4ed7b492df1d0d4205830fa3f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/bamtools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/bamtools/bamtools-2.5.1.ebuild sci-biology/bamtools/bamtools-9999.ebuild X-VCS-Directories: sci-biology/bamtools/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: a217ed25f690d9d4ed7b492df1d0d4205830fa3f X-VCS-Branch: master Date: Wed, 13 Nov 2019 18:16:20 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 264b075c-07b9-4dec-9515-2b0d54af238f X-Archives-Hash: a88fc11950d2e4da01898ed7f467c094 commit: a217ed25f690d9d4ed7b492df1d0d4205830fa3f Author: David Seifert gentoo org> AuthorDate: Wed Nov 13 18:16:02 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Nov 13 18:16:02 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a217ed25 sci-biology/bamtools: Remove USE="static-libs" Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> sci-biology/bamtools/bamtools-2.5.1.ebuild | 33 +++--------------------------- sci-biology/bamtools/bamtools-9999.ebuild | 33 +++--------------------------- 2 files changed, 6 insertions(+), 60 deletions(-) diff --git a/sci-biology/bamtools/bamtools-2.5.1.ebuild b/sci-biology/bamtools/bamtools-2.5.1.ebuild index 84c9dc83723..b5affe9f0fa 100644 --- a/sci-biology/bamtools/bamtools-2.5.1.ebuild +++ b/sci-biology/bamtools/bamtools-2.5.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils multibuild +inherit cmake-utils DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files" HOMEPAGE="https://github.com/pezmaster31/bamtools" @@ -18,7 +18,6 @@ fi LICENSE="MIT" SLOT="0/${PV}" # no stable ABI yet -IUSE="static-libs" RDEPEND=" >=dev-libs/jsoncpp-1.8.0:= @@ -26,35 +25,9 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="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 + rm -rf src/third_party/{gtest-1.6.0,jsoncpp} || die cmake-utils_src_prepare } - -src_configure() { - my_configure() { - [[ ${MULTIBUILD_ID} == static-libs* ]] && - local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) - - 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 84c9dc83723..b5affe9f0fa 100644 --- a/sci-biology/bamtools/bamtools-9999.ebuild +++ b/sci-biology/bamtools/bamtools-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils multibuild +inherit cmake-utils DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files" HOMEPAGE="https://github.com/pezmaster31/bamtools" @@ -18,7 +18,6 @@ fi LICENSE="MIT" SLOT="0/${PV}" # no stable ABI yet -IUSE="static-libs" RDEPEND=" >=dev-libs/jsoncpp-1.8.0:= @@ -26,35 +25,9 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="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 + rm -rf src/third_party/{gtest-1.6.0,jsoncpp} || die cmake-utils_src_prepare } - -src_configure() { - my_configure() { - [[ ${MULTIBUILD_ID} == static-libs* ]] && - local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) - - 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 -}