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 8F515139083 for ; Mon, 18 Dec 2017 19:25:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D93DCE107D; Mon, 18 Dec 2017 19:25:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B13B9E107D for ; Mon, 18 Dec 2017 19:25:05 +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 EC7D033BE18 for ; Mon, 18 Dec 2017 19:25:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85436ADCA for ; Mon, 18 Dec 2017 19:25:02 +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: <1513625085.d2ef19be60fd2d18def5d6aa51dd5d185783179e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/clementine/clementine-1.3.1_p20171113.ebuild X-VCS-Directories: media-sound/clementine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d2ef19be60fd2d18def5d6aa51dd5d185783179e X-VCS-Branch: master Date: Mon, 18 Dec 2017 19:25:02 +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: f338d39c-d5cf-4b02-990b-0b0baedb5297 X-Archives-Hash: 6ccaff5f58f3329dc201fa5a3a1503a0 commit: d2ef19be60fd2d18def5d6aa51dd5d185783179e Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 18 19:24:16 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 18 19:24:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ef19be media-sound/clementine: Fix DEPENDs, LINGUAS Disable tests dir if USE=!test. Bug: https://bugs.gentoo.org/641586 Closes: https://bugs.gentoo.org/641524 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-sound/clementine/clementine-1.3.1_p20171113.ebuild | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild index 8522d19cb62..5208d152f2c 100644 --- a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild +++ b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild @@ -74,8 +74,7 @@ DEPEND="${COMMON_DEPEND} >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) - dev-libs/boost:= - dev-qt/qttest:4 + dev-libs/boost sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) @@ -84,8 +83,12 @@ DEPEND="${COMMON_DEPEND} pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) - test? ( gnome-base/gsettings-desktop-schemas ) + test? ( + dev-qt/qttest:4 + gnome-base/gsettings-desktop-schemas + ) " + DOCS=( Changelog README.md ) PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) @@ -98,6 +101,9 @@ src_prepare() { sed -i \ -e '/add_test_file(translations_test.cpp/d' \ tests/CMakeLists.txt || die + + use test || cmake_comment_add_subdirectory tests + rm -r 3rdparty/{gmock,google-breakpad,libprojectm,taglib} || die } src_configure() { @@ -114,10 +120,9 @@ src_configure() { -DENABLE_GIO=ON -DENABLE_SPOTIFY_BLOB=OFF -DUSE_BUILTIN_TAGLIB=OFF - -DUSE_SYSTEM_GMOCK=ON -DUSE_SYSTEM_PROJECTM=ON -DBUNDLE_PROJECTM_PRESETS=OFF - -DLINGUAS=$(l10n_get_locales) + -DLINGUAS="$(l10n_get_locales)" -DENABLE_BOX="$(usex box)" -DENABLE_AUDIOCD="$(usex cdda)" -DENABLE_DBUS="$(usex dbus)" @@ -136,6 +141,7 @@ src_configure() { ) use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT + use test && mycmakeargs+=( -DUSE_SYSTEM_GMOCK=ON ) cmake-utils_src_configure }