commit: 60d8b54213b9061e4ecb9bd58b5a496f47bb4d52
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 17:46:54 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 17:46:54 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=60d8b542
*/*: Drop media-video/libav
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../ffmpegthumbs/ffmpegthumbs-20.04.49.9999.ebuild | 9 ++++-----
kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild | 9 ++++-----
kde-apps/k3b/k3b-20.04.49.9999.ebuild | 19 ++++++++-----------
kde-apps/k3b/k3b-9999.ebuild | 19 ++++++++-----------
.../kfilemetadata/kfilemetadata-9999.ebuild | 9 +++------
media-gfx/digikam/digikam-7.0.0_beta3.ebuild | 5 ++---
media-gfx/digikam/digikam-9999.ebuild | 5 ++---
media-sound/amarok/amarok-9999.ebuild | 5 ++---
.../subtitlecomposer/subtitlecomposer-9999.ebuild | 5 ++---
9 files changed, 35 insertions(+), 50 deletions(-)
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.04.49.9999.ebuild
b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.04.49.9999.ebuild
index d2b9550fdf..eac54fbcc1 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.04.49.9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.04.49.9999.ebuild
@@ -12,18 +12,17 @@ DESCRIPTION="FFmpeg based thumbnail generator for video
files"
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE="libav"
+IUSE=""
BDEPEND="
virtual/pkgconfig
"
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
+ media-video/ffmpeg:0=
"
RDEPEND="${DEPEND}"
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
index a71f90f144..74644782ae 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
@@ -12,18 +12,17 @@ DESCRIPTION="FFmpeg based thumbnail generator for video
files"
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE="libav"
+IUSE=""
BDEPEND="
virtual/pkgconfig
"
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
+ media-video/ffmpeg:0=
"
RDEPEND="${DEPEND}"
diff --git a/kde-apps/k3b/k3b-20.04.49.9999.ebuild
b/kde-apps/k3b/k3b-20.04.49.9999.ebuild
index 502f77ab07..862b547a3d 100644
--- a/kde-apps/k3b/k3b-20.04.49.9999.ebuild
+++ b/kde-apps/k3b/k3b-20.04.49.9999.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/K3b";
LICENSE="GPL-2 FDL-1.2"
SLOT="5"
KEYWORDS=""
-IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd
vorbis webkit"
+IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis
webkit"
REQUIRED_USE="
flac? ( taglib )
@@ -26,6 +26,12 @@ REQUIRED_USE="
"
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/libkcddb-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -45,18 +51,9 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
- >=kde-apps/libkcddb-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
media-libs/libsamplerate
dvd? ( media-libs/libdvdread:= )
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
+ ffmpeg? ( media-video/ffmpeg:0= )
flac? ( >=media-libs/flac-1.2[cxx] )
mp3? ( media-sound/lame )
mad? ( media-libs/libmad )
diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild
index a6d172ca70..d9532d1bd7 100644
--- a/kde-apps/k3b/k3b-9999.ebuild
+++ b/kde-apps/k3b/k3b-9999.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/K3b";
LICENSE="GPL-2 FDL-1.2"
SLOT="5"
KEYWORDS=""
-IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd
vorbis webkit"
+IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis
webkit"
REQUIRED_USE="
flac? ( taglib )
@@ -26,6 +26,12 @@ REQUIRED_USE="
"
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/libkcddb-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -45,18 +51,9 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
- >=kde-apps/libkcddb-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
media-libs/libsamplerate
dvd? ( media-libs/libdvdread:= )
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
+ ffmpeg? ( media-video/ffmpeg:0= )
flac? ( >=media-libs/flac-1.2[cxx] )
mp3? ( media-sound/lame )
mad? ( media-libs/libmad )
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
index fde26ad6f7..ac7f61bfc4 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
@@ -11,21 +11,18 @@ inherit ecm kde.org python-any-r1
DESCRIPTION="Library for extracting file metadata"
LICENSE="LGPL-2+"
KEYWORDS=""
-IUSE="epub exif ffmpeg kernel_linux libav office pdf taglib"
+IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
BDEPEND="
test? ( ${PYTHON_DEPS} )
"
RDEPEND="
+ >=dev-qt/qtxml-${QTMIN}:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
- >=dev-qt/qtxml-${QTMIN}:5
epub? ( app-text/ebook-tools )
exif? ( media-gfx/exiv2:= )
- ffmpeg? (
- libav? ( >=media-video/libav-12.2:= )
- !libav? ( media-video/ffmpeg:0= )
- )
+ ffmpeg? ( media-video/ffmpeg:0= )
office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
pdf? ( app-text/poppler[qt5] )
taglib? ( media-libs/taglib )
diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
index d6909e113c..b9dd335861 100644
--- a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
+++ b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.digikam.org/";
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
BDEPEND="
>=dev-util/cmake-3.14.3
@@ -82,8 +82,7 @@ COMMON_DEPEND="
)
mediaplayer? (
media-libs/qtav[opengl]
- !libav? ( media-video/ffmpeg:= )
- libav? ( media-video/libav:= )
+ media-video/ffmpeg:=
)
opengl? (
>=dev-qt/qtopengl-${QTMIN}:5
diff --git a/media-gfx/digikam/digikam-9999.ebuild
b/media-gfx/digikam/digikam-9999.ebuild
index b689a1d756..9ffd0bb932 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.digikam.org/";
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
BDEPEND="
>=dev-util/cmake-3.14.3
@@ -82,8 +82,7 @@ COMMON_DEPEND="
)
mediaplayer? (
media-libs/qtav[opengl]
- !libav? ( media-video/ffmpeg:= )
- libav? ( media-video/libav:= )
+ media-video/ffmpeg:=
)
opengl? (
>=dev-qt/qtopengl-${QTMIN}:5
diff --git a/media-sound/amarok/amarok-9999.ebuild
b/media-sound/amarok/amarok-9999.ebuild
index c4524f479c..75e86c5091 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://amarok.kde.org/";
LICENSE="GPL-2"
SLOT="5"
-IUSE="ipod lastfm libav mtp ofa podcast wikipedia"
+IUSE="ipod lastfm mtp ofa podcast wikipedia"
# ipod requires gdk enabled and also gtk compiled in libgpod
BDEPEND="virtual/pkgconfig"
@@ -70,8 +70,7 @@ DEPEND="
)
ofa? (
media-libs/libofa
- !libav? ( media-video/ffmpeg:= )
- libav? ( media-video/libav:= )
+ media-video/ffmpeg:=
)
lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
mtp? ( media-libs/libmtp )
diff --git a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
index 83ebfc87e5..b669b2b3dd 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/maxrd2/subtitlecomposer";
LICENSE="GPL-2"
SLOT="5"
KEYWORDS=""
-IUSE="libav unicode"
+IUSE="unicode"
BDEPEND="
sys-devel/gettext
@@ -37,8 +37,7 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
media-libs/qtav:=
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
+ media-video/ffmpeg:0=
unicode? ( dev-libs/icu:= )
"
RDEPEND="${DEPEND}"
