5 files changed, 42 insertions, 67 deletions
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index a31db67d6434..6e37ad1c0270 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,9 +1,7 @@
 DIST Catch-1.11.0.tar.gz 376132 BLAKE2B 23a1a6292dd91ec1c71923b4902b42b59ff6be5227b666f68ef0dc33756a58a63edd70a9b139dda0b1860c2b7a0cfec7ab9262e6447eff3184cfe28ea9b0aa77 SHA512 33085c2671f78c7562eace909564b2730eabcaf4490cd463402e66ab4ac2be1fe4fe360916c11aa589ba4a010622444126ee2ae747783b5869b5d7276361f132
-DIST Catch2-2.0.1.tar.gz 397154 BLAKE2B e41cb3afb706ebed5742b2639cbba9a3468b6325788c6928f8c4e307cd0b11a5fda6aa91def709536ec56412010c0865589999f1cb270630372ba3275bd36fbf SHA512 df6dc480aa208c6c39c8b36d06295883345f925b7ec579e9f0f7a68c816b90dbc3c2ece32926a6458646f7412027212f1b4c3cb28f217f411d3a56580f6edc32
-DIST Catch2-2.1.0.tar.gz 475638 BLAKE2B 66c48b7fe551f066e43870465e0fb58b966243d00cfe78c22389af45cf1cf97d6b3c192cdbf6aec4046ff3744a03e0125ca3b66f7c2a47d17f5a6ce538ad8959 SHA512 1fa0d1cb607fcb8dec37437fa788868324b0ded8e929138f4167d57bafa567b64955546142699a3e3bd2aeb7d36b7c2c7c426aaf3d68b94bddd43b2f78026fc8
+DIST Catch2-2.1.1.tar.gz 481236 BLAKE2B 8a8110611aaf4ea913462884d8293bcae7d0abf3075253a26385a56b2cb5bf50b769e2117430c9712e4644f430cc16461fabfef921c5fbfceb82effb0da74e93 SHA512 64947672e614301a45efd812eb3eef98d871c9719005a441b6f6bb1dc26820bd9643ba285bcc0eaef9b212c5ab6ada4a875433c47a020ce436bcc411cdc8ad72
 EBUILD catch-1.11.0.ebuild 725 BLAKE2B 49c5034310812a931d9155d0aa3d791c30ab1f381c14bf102a26e23cd7c24ca97c4d4b7b11c8c859e665fdbd7beea44416e193ec06ad1d8e883f7459023ce3d6 SHA512 e7fa7e70cb02ab499606e656650d4ddb0c11c4990c720457dc0e21ebcee4a44e67356dfc89d3bdd0caf5e943fb5b59b5fa4ff9f2bd1963b6db20f362c1725560
 EBUILD catch-1.9999.ebuild 558 BLAKE2B bafe5cb18017202bd684d631b8839caab6bb128d8fc42d7772dd74aa91dcd99b139393fa22463536924da114fc508a92d5b49639590933397a57cab9f2159ac0 SHA512 1952c96b2fa49e674a32466f2ec709b2f92c8e2502eecb1f25c24d81d11c73e8c28cfbb1da5b7e322bbebd28d6ade06f6b157e07f47f1a06ad258c30efc118f0
-EBUILD catch-2.0.1.ebuild 600 BLAKE2B 57c2684c149adea28cf80122023e3a8140ef92e82e9523726c4377f13992f8d0c4ef812687ac2727496c8062269d1299dd12f3d3111295eb0acd551e04c2a8dc SHA512 dfad28f7a5d5379253e50ea2b7db60e9e560ace137fd28c188570b9e61d669706f6f97a0218d7ffeb6c8fe01baf52bc79855ff19fdc83f528fe437390f1bdcdb
-EBUILD catch-2.1.0.ebuild 600 BLAKE2B 57c2684c149adea28cf80122023e3a8140ef92e82e9523726c4377f13992f8d0c4ef812687ac2727496c8062269d1299dd12f3d3111295eb0acd551e04c2a8dc SHA512 dfad28f7a5d5379253e50ea2b7db60e9e560ace137fd28c188570b9e61d669706f6f97a0218d7ffeb6c8fe01baf52bc79855ff19fdc83f528fe437390f1bdcdb
-EBUILD catch-9999.ebuild 709 BLAKE2B 11ec1e0c1ada1bac5716b706d6eeec4dc14af052c275ea7fa51a5e11e5d030e77e27663cd572d620039d324aeb46d121d9c322425944cdad6665696e66a2809c SHA512 db3a518f4fc19be0ffda3cf37de7c34a785049a63b52030b7e915affa74f5995a59cc01abe90a3e2b583ceba59e0d108e775faa46bb9b642061074b7f12002a8
+EBUILD catch-2.1.1.ebuild 789 BLAKE2B 1eefb971644a62d137bd3af77bd3155fe82382f1520e5da503ad80bb4ace697ce461f5d3c6311ac0b241224f6df603b87ec00f5c9225d8d6bb6c7a6ecf9bb303 SHA512 930839ea809a06dcb8f66ade29cf3e5b109327ceaef66da33c55fc958974b2489bfb003238b560189868bc08246ca4ddb7b5f239ff0b804973c6fab50ab4b4b0
+EBUILD catch-9999.ebuild 789 BLAKE2B 1eefb971644a62d137bd3af77bd3155fe82382f1520e5da503ad80bb4ace697ce461f5d3c6311ac0b241224f6df603b87ec00f5c9225d8d6bb6c7a6ecf9bb303 SHA512 930839ea809a06dcb8f66ade29cf3e5b109327ceaef66da33c55fc958974b2489bfb003238b560189868bc08246ca4ddb7b5f239ff0b804973c6fab50ab4b4b0
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.0.1.ebuild b/dev-cpp/catch/catch-2.0.1.ebuild
deleted file mode 100644
index ac2dfcb10a67..000000000000
--- a/dev-cpp/catch/catch-2.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P=${PN^}2-${PV}
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_SELFTEST=$(usex !test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r docs/.
-}
diff --git a/dev-cpp/catch/catch-2.1.0.ebuild b/dev-cpp/catch/catch-2.1.0.ebuild
deleted file mode 100644
index ac2dfcb10a67..000000000000
--- a/dev-cpp/catch/catch-2.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P=${PN^}2-${PV}
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2"
-SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_SELFTEST=$(usex !test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r docs/.
-}
diff --git a/dev-cpp/catch/catch-2.1.1.ebuild b/dev-cpp/catch/catch-2.1.1.ebuild
new file mode 100644
index 000000000000..d7763c4ccaa9
--- /dev/null
+++ b/dev-cpp/catch/catch-2.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+else
+	MY_P=${PN^}2-${PV}
+	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCATCH_ENABLE_WERROR=OFF
+		-DBUILD_TESTING=$(usex test)
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index e24ac4a8a034..d7763c4ccaa9 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -3,14 +3,18 @@
 
 EAPI=6
 
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
 else
+	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+
+	S=${WORKDIR}/${MY_P}
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"