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 729861382C5 for ; Sat, 6 Jan 2018 02:14:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7358E08DA; Sat, 6 Jan 2018 02:14:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 B5A6FE08DA for ; Sat, 6 Jan 2018 02:14:34 +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 415CC335C3C for ; Sat, 6 Jan 2018 02:14:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDBBD1A7 for ; Sat, 6 Jan 2018 02:14:30 +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: <1515204827.d4a1bfdfbe03733d8bd0922605773028d5307c77.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/obs-studio/obs-studio-9999.ebuild X-VCS-Directories: media-video/obs-studio/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d4a1bfdfbe03733d8bd0922605773028d5307c77 X-VCS-Branch: master Date: Sat, 6 Jan 2018 02:14:30 +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: 4e22aa1a-f9a4-42f2-9fd8-5fa025973f34 X-Archives-Hash: 22a08819f59671444831768d8b73f1e0 commit: d4a1bfdfbe03733d8bd0922605773028d5307c77 Author: Lucian Poston gmail com> AuthorDate: Mon Dec 25 10:13:22 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 6 02:13:47 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a1bfdf media-video/obs-studio: Prefer imagemagick-7 Closes: https://bugs.gentoo.org/641608 Package-Manager: Portage-2.3.13, Repoman-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/6628 media-video/obs-studio/obs-studio-9999.ebuild | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 06c66b0e0b2..e790219d687 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -3,6 +3,8 @@ EAPI=6 +CMAKE_MIN_VERSION=3.9.6 + inherit cmake-utils gnome2-utils if [[ ${PV} == *9999 ]]; then @@ -49,17 +51,7 @@ COMMON_DEPEND=" ) v4l? ( media-libs/libv4l ) " -DEPEND="${COMMON_DEPEND} - imagemagick? ( - || ( - =media-gfx/imagemagick-7 - >=dev-util/cmake-3.9 - ) - ) - ) -" +DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" CMAKE_REMOVE_MODULES_LIST=( FindFreetype )