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 84595138334 for ; Fri, 14 Sep 2018 14:28:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BA38E0B00; Fri, 14 Sep 2018 14:28:50 +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 12E95E0B00 for ; Fri, 14 Sep 2018 14:28:49 +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 C236F335D00 for ; Fri, 14 Sep 2018 14:28:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0C603BF for ; Fri, 14 Sep 2018 14:28:44 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1536935306.1fef34d8c5572fc287d8f9b9e591247dd27905ab.alexxy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/xpra-2.2.6-r1.ebuild x11-wm/xpra/xpra-2.2.6.ebuild X-VCS-Directories: x11-wm/xpra/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 1fef34d8c5572fc287d8f9b9e591247dd27905ab X-VCS-Branch: master Date: Fri, 14 Sep 2018 14:28:44 +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: b468b414-aa0c-4f79-ab1a-042455437d78 X-Archives-Hash: 94533edfd8696e955a1e59390d8bdec6 commit: 1fef34d8c5572fc287d8f9b9e591247dd27905ab Author: Alexey Shvetsov gentoo org> AuthorDate: Fri Sep 14 14:28:26 2018 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Fri Sep 14 14:28:26 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fef34d8 x11-wm/xpra: Fix deps for x264 x265 encoders Package-Manager: Portage-2.3.49, Repoman-2.3.10 x11-wm/xpra/{xpra-2.2.6.ebuild => xpra-2.2.6-r1.ebuild} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/x11-wm/xpra/xpra-2.2.6.ebuild b/x11-wm/xpra/xpra-2.2.6-r1.ebuild similarity index 93% rename from x11-wm/xpra/xpra-2.2.6.ebuild rename to x11-wm/xpra/xpra-2.2.6-r1.ebuild index 5dcafddd7a5..12fe5f47278 100644 --- a/x11-wm/xpra/xpra-2.2.6.ebuild +++ b/x11-wm/xpra/xpra-2.2.6-r1.ebuild @@ -39,20 +39,20 @@ COMMON_DEPEND="${PYTHON_DEPS} libav? ( media-video/libav:0= ) ) dec_avcodec2? ( - !libav? ( >=media-video/ffmpeg-2:0= ) - libav? ( media-video/libav:0= ) + !libav? ( >=media-video/ffmpeg-2:0=[x264,x265] ) + libav? ( media-video/libav:0=[x264,x265] ) ) enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) enc_x264? ( media-libs/x264 - !libav? ( >=media-video/ffmpeg-1.0.4:0= ) - libav? ( media-video/libav:0= ) + !libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] ) + libav? ( media-video/libav:0=[x264] ) ) enc_x265? ( media-libs/x265 - !libav? ( >=media-video/ffmpeg-2:0= ) - libav? ( media-video/libav:0= ) ) + !libav? ( >=media-video/ffmpeg-2:0=[x264] ) + libav? ( media-video/libav:0=[x264] ) ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio )