commit: ccba725e9f63a45872cf7356e56592ac2e30db82
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 2 09:34:36 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 2 09:54:54 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ccba725e
kde-apps/ffmpegthumbs: Re-integrate ${PN}-common
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.49.9999.ebuild | 11 +++--------
kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild | 11 +++--------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.49.9999.ebuild
b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.49.9999.ebuild
index ef63c24f25..ead43a9fe4 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.49.9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.49.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,15 +21,10 @@ DEPEND="
media-video/ffmpeg:0=
"
RDEPEND="${DEPEND}
- >=kde-apps/${PN}-common-${PV}
+ !<kde-apps/ffmpegthumbs-23.08.5-r1:5
+ !kde-apps/ffmpegthumbs-common
"
BDEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:6
virtual/pkgconfig
"
-
-# Shipped by kde-apps/ffmpegthumbs-common package for shared use w/ SLOT 5
-ECM_REMOVE_FROM_INSTALL=(
- /usr/share/config.kcfg/ffmpegthumbnailersettings5.kcfg
- /usr/share/metainfo/org.kde.ffmpegthumbs.metainfo.xml
-)
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
index 0f0d39347d..c4d3d51bf8 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,15 +21,10 @@ DEPEND="
media-video/ffmpeg:0=
"
RDEPEND="${DEPEND}
- >=kde-apps/${PN}-common-${PV}
+ !<kde-apps/ffmpegthumbs-23.08.5-r1:5
+ !kde-apps/ffmpegthumbs-common
"
BDEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:6
virtual/pkgconfig
"
-
-# Shipped by kde-apps/ffmpegthumbs-common package for shared use w/ SLOT 5
-ECM_REMOVE_FROM_INSTALL=(
- /usr/share/config.kcfg/ffmpegthumbnailersettings5.kcfg
- /usr/share/metainfo/org.kde.ffmpegthumbs.metainfo.xml
-)
