commit:     7ed1d531966db669ebc8a3bfdbfd36d1e5c42579
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 07:43:50 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 07:43:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed1d531

media-gfx/pqiv: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/pqiv/pqiv-2.11.ebuild | 11 ++++-------
 media-gfx/pqiv/pqiv-9999.ebuild | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/media-gfx/pqiv/pqiv-2.11.ebuild b/media-gfx/pqiv/pqiv-2.11.ebuild
index c094753f5a0..bb2e9b03aec 100644
--- a/media-gfx/pqiv/pqiv-2.11.ebuild
+++ b/media-gfx/pqiv/pqiv-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,17 +17,14 @@ HOMEPAGE="https://github.com/phillipberndt/pqiv 
http://www.pberndt.com/Programme
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="archive ffmpeg imagemagick kernel_linux libav pdf postscript webp"
+IUSE="archive ffmpeg imagemagick kernel_linux pdf postscript webp"
 
 RDEPEND="
        >=dev-libs/glib-2.32:2
        >=x11-libs/cairo-1.6
        x11-libs/gtk+:3
        archive? ( app-arch/libarchive:0= )
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:0= )
-               libav? ( media-video/libav:0= )
-       )
+       ffmpeg? ( media-video/ffmpeg:0= )
        imagemagick? ( media-gfx/imagemagick:0= )
        pdf? ( app-text/poppler:0= )
        postscript? ( app-text/libspectre:0= )
@@ -51,7 +48,7 @@ pkg_setup() {
 src_configure() {
        local backends="gdkpixbuf"
        use archive && backends+=",archive,archive_cbx"
-       use ffmpeg || use libav && backends+=",libav"
+       use ffmpeg && backends+=",libav"
        use imagemagick && backends+=",wand"
        use pdf && backends+=",poppler"
        use postscript && backends+=",spectre"

diff --git a/media-gfx/pqiv/pqiv-9999.ebuild b/media-gfx/pqiv/pqiv-9999.ebuild
index 499cd72f5f5..69023ebe556 100644
--- a/media-gfx/pqiv/pqiv-9999.ebuild
+++ b/media-gfx/pqiv/pqiv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,17 +17,14 @@ HOMEPAGE="https://github.com/phillipberndt/pqiv 
http://www.pberndt.com/Programme
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="archive ffmpeg imagemagick kernel_linux libav pdf postscript webp"
+IUSE="archive ffmpeg imagemagick kernel_linux pdf postscript webp"
 
 RDEPEND="
        >=dev-libs/glib-2.32:2
        >=x11-libs/cairo-1.6
        x11-libs/gtk+:3
        archive? ( app-arch/libarchive:0= )
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:0= )
-               libav? ( media-video/libav:0= )
-       )
+       ffmpeg? ( media-video/ffmpeg:0= )
        imagemagick? ( media-gfx/imagemagick:0= )
        pdf? ( app-text/poppler:0= )
        postscript? ( app-text/libspectre:0= )
@@ -51,7 +48,7 @@ pkg_setup() {
 src_configure() {
        local backends="gdkpixbuf"
        use archive && backends+=",archive,archive_cbx"
-       use ffmpeg || use libav && backends+=",libav"
+       use ffmpeg && backends+=",libav"
        use imagemagick && backends+=",wand"
        use pdf && backends+=",poppler"
        use postscript && backends+=",spectre"

Reply via email to