| 1 |
commit: 31985d4938f7ab6990bc4fc2c2960e8923b4d900 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 2 21:06:16 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 2 21:19:18 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31985d49 |
| 7 |
|
| 8 |
dev-cpp/catch: Avoid unnecessary IUSE=test |
| 9 |
|
| 10 |
dev-cpp/catch/catch-1.5.6.ebuild | 17 +++++++---------- |
| 11 |
dev-cpp/catch/catch-9999.ebuild | 17 +++++++---------- |
| 12 |
2 files changed, 14 insertions(+), 20 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-cpp/catch/catch-1.5.6.ebuild b/dev-cpp/catch/catch-1.5.6.ebuild |
| 15 |
index 7034812..15572fe 100644 |
| 16 |
--- a/dev-cpp/catch/catch-1.5.6.ebuild |
| 17 |
+++ b/dev-cpp/catch/catch-1.5.6.ebuild |
| 18 |
@@ -13,22 +13,19 @@ SRC_URI="https://github.com/philsquared/Catch/archive/v${PV}.tar.gz -> ${P^}.tar |
| 19 |
LICENSE="Boost-1.0" |
| 20 |
SLOT="0" |
| 21 |
KEYWORDS="~amd64 ~x86" |
| 22 |
-IUSE="test" |
| 23 |
+IUSE="" |
| 24 |
|
| 25 |
S=${WORKDIR}/${P^} |
| 26 |
CMAKE_USE_DIR=${S}/projects/CMake |
| 27 |
|
| 28 |
-src_configure() { |
| 29 |
- # CMake is only used to build & run tests |
| 30 |
- use test && cmake-utils_src_configure |
| 31 |
-} |
| 32 |
- |
| 33 |
-src_compile() { |
| 34 |
- use test && cmake-utils_src_compile |
| 35 |
-} |
| 36 |
+# CMake is only used to build & run tests, so override phases |
| 37 |
+src_configure() { :; } |
| 38 |
+src_compile() { :; } |
| 39 |
|
| 40 |
src_test() { |
| 41 |
- use test && cmake-utils_src_test |
| 42 |
+ cmake-utils_src_configure |
| 43 |
+ cmake-utils_src_compile |
| 44 |
+ cmake-utils_src_test |
| 45 |
} |
| 46 |
|
| 47 |
src_install() { |
| 48 |
|
| 49 |
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild |
| 50 |
index ee8fefd..8fb27fb 100644 |
| 51 |
--- a/dev-cpp/catch/catch-9999.ebuild |
| 52 |
+++ b/dev-cpp/catch/catch-9999.ebuild |
| 53 |
@@ -14,21 +14,18 @@ SRC_URI="" |
| 54 |
LICENSE="Boost-1.0" |
| 55 |
SLOT="0" |
| 56 |
KEYWORDS="" |
| 57 |
-IUSE="test" |
| 58 |
+IUSE="" |
| 59 |
|
| 60 |
CMAKE_USE_DIR=${S}/projects/CMake |
| 61 |
|
| 62 |
-src_configure() { |
| 63 |
- # CMake is only used to build & run tests |
| 64 |
- use test && cmake-utils_src_configure |
| 65 |
-} |
| 66 |
- |
| 67 |
-src_compile() { |
| 68 |
- use test && cmake-utils_src_compile |
| 69 |
-} |
| 70 |
+# CMake is only used to build & run tests, so override phases |
| 71 |
+src_configure() { :; } |
| 72 |
+src_compile() { :; } |
| 73 |
|
| 74 |
src_test() { |
| 75 |
- use test && cmake-utils_src_test |
| 76 |
+ cmake-utils_src_configure |
| 77 |
+ cmake-utils_src_compile |
| 78 |
+ cmake-utils_src_test |
| 79 |
} |
| 80 |
|
| 81 |
src_install() { |
Archives