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

[Michał Górny]

commit:     084e045c4ba8a1f3ecc9f480cf4a93fef3b28451
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  5 08:53:42 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov  5 12:19:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084e045c

dev-cpp/catch: Install using CMake

 dev-cpp/catch/catch-1.9999.ebuild | 17 ++++++-----------
 dev-cpp/catch/catch-9999.ebuild   | 17 ++++++-----------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/dev-cpp/catch/catch-1.9999.ebuild 
b/dev-cpp/catch/catch-1.9999.ebuild
index b6b3d982a71..4cad4e13c4b 100644
--- a/dev-cpp/catch/catch-1.9999.ebuild
+++ b/dev-cpp/catch/catch-1.9999.ebuild
@@ -14,21 +14,16 @@ SRC_URI=""
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="test"
 
-# CMake is only used to build & run tests, so override phases
-src_configure() { :; }
-src_compile() { :; }
-
-src_test() {
+src_configure() {
+       local mycmakeargs=(
+               -DNO_SELFTEST=$(usex !test)
+       )
        cmake-utils_src_configure
-       cmake-utils_src_compile
-       cmake-utils_src_test
 }
 
 src_install() {
-       # same location as used in fedora
-       insinto /usr/include/catch
-       doins -r include/.
+       cmake-utils_src_install
        dodoc -r docs/.
 }

diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 41195675fe3..5a244d42728 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -13,21 +13,16 @@ SRC_URI=""
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="test"
 
-# CMake is only used to build & run tests, so override phases
-src_configure() { :; }
-src_compile() { :; }
-
-src_test() {
+src_configure() {
+       local mycmakeargs=(
+               -DNO_SELFTEST=$(usex !test)
+       )
        cmake-utils_src_configure
-       cmake-utils_src_compile
-       cmake-utils_src_test
 }
 
 src_install() {
-       # same location as used in fedora
-       insinto /usr/include/catch
-       doins -r include/.
+       cmake-utils_src_install
        dodoc -r docs/.
 }