[gentoo-commits] repo/gentoo:master commit in: dev-cpp/catch/

[David Seifert]

commit:     be1246e0efab3fc9527ee6b6dde9e8df74cf72d3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 16:22:01 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 18:41:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be1246e0

dev-cpp/catch: Sync catch-1.9999 live ebuild

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-cpp/catch/catch-1.9999.ebuild | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild
index a770fcddab5..f67c3c4193b 100644
--- a/dev-cpp/catch/catch-1.9999.ebuild
+++ b/dev-cpp/catch/catch-1.9999.ebuild
@@ -1,20 +1,32 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
-EGIT_BRANCH="Catch1.x"
-inherit cmake-utils git-r3
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+	EGIT_BRANCH="Catch1.x"
+else
+	MY_P=${PN^}-${PV}
+	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	S="${WORKDIR}/${PN^}2-${PV}"
+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=""
+SLOT="1"
 IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!<dev-cpp/catch-1.12.2:0"
 
 src_configure() {
 	local mycmakeargs=(