From 8cdc799ba9ec10f5d6d0a5288f4a53418b49850a Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sat, 25 Apr 2020 21:50:55 +0300 Subject: [PATCH] media-libs/libopenshot: migrate frim libav Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada --- media-libs/libopenshot/libopenshot-0.2.2.ebuild | 5 ++--- media-libs/libopenshot/libopenshot-0.2.4.ebuild | 5 ++--- media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/media-libs/libopenshot/libopenshot-0.2.2.ebuild b/media-libs/libopenshot/libopenshot-0.2.2.ebuild index f011d7adca61..36281237c364 100644 --- a/media-libs/libopenshot/libopenshot-0.2.2.ebuild +++ b/media-libs/libopenshot/libopenshot-0.2.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="+imagemagick libav +python test" +IUSE="+imagemagick +python test" # https://github.com/OpenShot/libopenshot/issues/43 RESTRICT="test" @@ -26,8 +26,7 @@ RDEPEND=" dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.1.4 imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) - libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) - !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) + media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] python? ( ${PYTHON_DEPS} ) " DEPEND=" diff --git a/media-libs/libopenshot/libopenshot-0.2.4.ebuild b/media-libs/libopenshot/libopenshot-0.2.4.ebuild index 39d166e92c80..a8da723ee468 100644 --- a/media-libs/libopenshot/libopenshot-0.2.4.ebuild +++ b/media-libs/libopenshot/libopenshot-0.2.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0/18" KEYWORDS="~amd64 ~x86" -IUSE="doc examples +imagemagick libav +python test" +IUSE="doc examples +imagemagick +python test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -28,8 +28,7 @@ RDEPEND=" net-libs/cppzmq net-libs/zeromq imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) - !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) - libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] ) + media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] python? ( ${PYTHON_DEPS} ) " DEPEND="${RDEPEND}" diff --git a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild index 0905430c03b8..32de4448a664 100644 --- a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild +++ b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar. LICENSE="GPL-3+" SLOT="0/17" KEYWORDS="amd64 x86" -IUSE="doc examples +imagemagick libav +python test" +IUSE="doc examples +imagemagick +python test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -28,8 +28,7 @@ RDEPEND=" dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.1.9_pre20190502:0= imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) - libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] ) - !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) + media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] python? ( ${PYTHON_DEPS} ) " DEPEND="${RDEPEND}" -- 2.26.2