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 4FC90138335 for ; Mon, 17 Sep 2018 21:09:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A211E0C32; Mon, 17 Sep 2018 21:09:26 +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 34204E0C30 for ; Mon, 17 Sep 2018 21:09:26 +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 E1D83335CFC for ; Mon, 17 Sep 2018 21:09:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73EE93D9 for ; Mon, 17 Sep 2018 21:09:23 +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: <1537218267.36e892fa5b71c17ecb4f6db69c735165f3bc43fe.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-video/subtitlecomposer/ X-VCS-Repository: proj/kde X-VCS-Files: media-video/subtitlecomposer/subtitlecomposer-9999.ebuild X-VCS-Directories: media-video/subtitlecomposer/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 36e892fa5b71c17ecb4f6db69c735165f3bc43fe X-VCS-Branch: master Date: Mon, 17 Sep 2018 21:09:23 +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: 2e0bec93-8523-43fb-9a4a-719028ae5ca9 X-Archives-Hash: 9767a1551c9e300e425febf6b5d855fd commit: 36e892fa5b71c17ecb4f6db69c735165f3bc43fe Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 15 23:51:59 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 17 21:04:27 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=36e892fa media-video/subtitlecomposer: Sync with 0.6.6 changes Package-Manager: Portage-2.3.49, Repoman-2.3.10 .../subtitlecomposer/subtitlecomposer-9999.ebuild | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild index 16f0452e51..1bc839caa7 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild +++ b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild @@ -13,9 +13,9 @@ EGIT_REPO_URI="https://github.com/maxrd2/${PN}" LICENSE="GPL-2" KEYWORDS="" -IUSE="mpv unicode xine" +IUSE="gstreamer libav mpv unicode xine" -CDEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep kcodecs) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -30,31 +30,38 @@ CDEPEND=" $(add_frameworks_dep sonnet) $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 media-libs/phonon[qt5(+)] + gstreamer? ( + dev-libs/glib:2 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:0= ) mpv? ( media-video/mpv ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib + x11-libs/libX11 x11-libs/libxcb ) " -RDEPEND="${CDPEEND} +RDEPEND="${COMMON_DEPEND} !media-video/subtitlecomposer:4 " -DEPEND="${CDEPEND} +DEPEND="${COMMON_DEPEND} sys-devel/gettext + virtual/pkgconfig " src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706 + $(cmake-utils_use_find_package gstreamer GStreamer) $(cmake-utils_use_find_package mpv MPV) $(cmake-utils_use_find_package unicode ICU) $(cmake-utils_use_find_package xine Xine) - $(cmake-utils_use_find_package xine XCB) + $(cmake-utils_use_find_package xine X11) ) kde5_src_configure @@ -63,8 +70,6 @@ src_configure() { pkg_postinst() { kde5_pkg_postinst - echo - elog "Some example scripts provided by ${PV} require dev-lang/ruby" + elog "Some example scripts provided by ${PN} require dev-lang/ruby" elog "or dev-lang/python to be installed." - echo }