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 F030B1382DE for ; Sat, 2 Jul 2016 21:19:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D759DE0925; Sat, 2 Jul 2016 21:19:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20E0AE0913 for ; Sat, 2 Jul 2016 21:19:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0D63340DD9 for ; Sat, 2 Jul 2016 21:19:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD0A42424 for ; Sat, 2 Jul 2016 21:19:35 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1467494358.31985d4938f7ab6990bc4fc2c2960e8923b4d900.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/catch/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/catch/catch-1.5.6.ebuild dev-cpp/catch/catch-9999.ebuild X-VCS-Directories: dev-cpp/catch/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 31985d4938f7ab6990bc4fc2c2960e8923b4d900 X-VCS-Branch: master Date: Sat, 2 Jul 2016 21:19:35 +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: 3c1da479-7812-4b69-a260-677b3e4ac501 X-Archives-Hash: 4fce4e19fc03508182f58f477aa64b7b commit: 31985d4938f7ab6990bc4fc2c2960e8923b4d900 Author: Michał Górny gentoo org> AuthorDate: Sat Jul 2 21:06:16 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jul 2 21:19:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31985d49 dev-cpp/catch: Avoid unnecessary IUSE=test dev-cpp/catch/catch-1.5.6.ebuild | 17 +++++++---------- dev-cpp/catch/catch-9999.ebuild | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dev-cpp/catch/catch-1.5.6.ebuild b/dev-cpp/catch/catch-1.5.6.ebuild index 7034812..15572fe 100644 --- a/dev-cpp/catch/catch-1.5.6.ebuild +++ b/dev-cpp/catch/catch-1.5.6.ebuild @@ -13,22 +13,19 @@ SRC_URI="https://github.com/philsquared/Catch/archive/v${PV}.tar.gz -> ${P^}.tar LICENSE="Boost-1.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="test" +IUSE="" S=${WORKDIR}/${P^} CMAKE_USE_DIR=${S}/projects/CMake -src_configure() { - # CMake is only used to build & run tests - use test && cmake-utils_src_configure -} - -src_compile() { - use test && cmake-utils_src_compile -} +# CMake is only used to build & run tests, so override phases +src_configure() { :; } +src_compile() { :; } src_test() { - use test && cmake-utils_src_test + cmake-utils_src_configure + cmake-utils_src_compile + cmake-utils_src_test } src_install() { diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild index ee8fefd..8fb27fb 100644 --- a/dev-cpp/catch/catch-9999.ebuild +++ b/dev-cpp/catch/catch-9999.ebuild @@ -14,21 +14,18 @@ SRC_URI="" LICENSE="Boost-1.0" SLOT="0" KEYWORDS="" -IUSE="test" +IUSE="" CMAKE_USE_DIR=${S}/projects/CMake -src_configure() { - # CMake is only used to build & run tests - use test && cmake-utils_src_configure -} - -src_compile() { - use test && cmake-utils_src_compile -} +# CMake is only used to build & run tests, so override phases +src_configure() { :; } +src_compile() { :; } src_test() { - use test && cmake-utils_src_test + cmake-utils_src_configure + cmake-utils_src_compile + cmake-utils_src_test } src_install() {