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 9169D1396D9 for ; Fri, 10 Nov 2017 12:38:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99D8DE0EAE; Fri, 10 Nov 2017 12:38:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 760C9E0EAE for ; Fri, 10 Nov 2017 12:38:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 381CE33BE2E for ; Fri, 10 Nov 2017 12:38:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC0779868 for ; Fri, 10 Nov 2017 12:38:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1510317478.7156e567691d13c04da466f5f9392a124d1618e5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/musicbrainz/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/musicbrainz/musicbrainz-3.0.3.ebuild media-libs/musicbrainz/musicbrainz-5.1.0.ebuild X-VCS-Directories: media-libs/musicbrainz/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7156e567691d13c04da466f5f9392a124d1618e5 X-VCS-Branch: master Date: Fri, 10 Nov 2017 12:38:10 +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: 89ae9279-92f5-40d3-b51a-afbf988089cc X-Archives-Hash: cb879c98ae2044a09ee2c07505f88eb4 commit: 7156e567691d13c04da466f5f9392a124d1618e5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 10 12:35:15 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 10 12:37:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7156e567 media-libs/musicbrainz: Disable unittests if USE=!test Closes: https://bugs.gentoo.org/603112 Package-Manager: Portage-2.3.8, Repoman-2.3.4 media-libs/musicbrainz/musicbrainz-3.0.3.ebuild | 10 +++++++++- media-libs/musicbrainz/musicbrainz-5.1.0.ebuild | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild b/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild index f30c547810f..4bb2649b464 100644 --- a/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild +++ b/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild @@ -1,5 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 + EAPI=5 inherit cmake-utils @@ -26,3 +27,10 @@ CMAKE_IN_SOURCE_BUILD=true DOCS="README.txt NEWS.txt AUTHORS.txt" PATCHES=( "${FILESDIR}/${PN}-3.0.2-gcc44.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package test CppUnit) + ) + cmake-utils_src_configure +} diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild index f8f09eb468e..420253156f0 100644 --- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild +++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild @@ -24,6 +24,11 @@ DEPEND="${RDEPEND} S="${WORKDIR}/lib${P}" +src_prepare() { + use test || cmake_comment_add_subdirectory tests + cmake-utils_src_prepare +} + src_install() { cmake-utils_src_install