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 4098E138206 for ; Fri, 19 Jan 2018 13:04:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DD44E0825; Fri, 19 Jan 2018 13:04:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 368CFE0825 for ; Fri, 19 Jan 2018 13:04:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8E4E5335C3A for ; Fri, 19 Jan 2018 13:04:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4B271B5 for ; Fri, 19 Jan 2018 13:04:13 +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: <1516367041.9397ad9f85b5f881f85c9ffb022c3987ae075c71.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/catch/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/catch/catch-9999.ebuild X-VCS-Directories: dev-cpp/catch/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 9397ad9f85b5f881f85c9ffb022c3987ae075c71 X-VCS-Branch: master Date: Fri, 19 Jan 2018 13:04:13 +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-Archives-Salt: e6f3766f-e6a9-4cdc-a06f-36300d0672b2 X-Archives-Hash: 7926f91f3f94db94d16d335b7a867f5d commit: 9397ad9f85b5f881f85c9ffb022c3987ae075c71 Author: David Seifert gentoo org> AuthorDate: Fri Jan 19 13:02:04 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Jan 19 13:04:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9397ad9f dev-cpp/catch: Update live ebuild * Can now disable building with -Werror Bug: https://bugs.gentoo.org/644354 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-cpp/catch/catch-9999.ebuild | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild index da181287636..e24ac4a8a03 100644 --- a/dev-cpp/catch/catch-9999.ebuild +++ b/dev-cpp/catch/catch-9999.ebuild @@ -3,26 +3,29 @@ EAPI=6 -EGIT_REPO_URI="https://github.com/catchorg/Catch2.git" -inherit cmake-utils git-r3 +inherit cmake-utils + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/catchorg/Catch2.git" +else + SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="Modern C++ header-only framework for unit-tests" HOMEPAGE="https://github.com/catchorg/Catch2" -SRC_URI="" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="" IUSE="test" +RESTRICT="!test? ( test )" src_configure() { local mycmakeargs=( - -DNO_SELFTEST=$(usex !test) + -DCATCH_ENABLE_WERROR=OFF + -DBUILD_TESTING=$(usex test) + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" ) cmake-utils_src_configure } - -src_install() { - cmake-utils_src_install - dodoc -r docs/. -}