public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ffmpegthumbs/
Date: Wed, 21 Aug 2024 21:47:30 +0000 (UTC)	[thread overview]
Message-ID: <1724273629.fc0517348e734a55be397d5b3bc393f752103c67.asturm@gentoo> (raw)

commit:     fc0517348e734a55be397d5b3bc393f752103c67
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 23:16:29 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 20:53:49 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc051734

kde-apps/ffmpegthumbs: RDEPEND on kde-apps/ffmpegthumbs-common

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/ffmpegthumbs/ffmpegthumbs-24.07.90.ebuild      | 10 +++++++++-
 kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.0.ebuild       | 10 +++++++++-
 kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.49.9999.ebuild | 10 +++++++++-
 kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild          | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.07.90.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.07.90.ebuild
index 823ace40b3..e8faeeb499 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.07.90.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.07.90.ebuild
@@ -20,8 +20,16 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:6
 	media-video/ffmpeg:0=
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/${PN}-common-${PV}
+"
 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-24.08.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.0.ebuild
index 823ace40b3..e8faeeb499 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.0.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.0.ebuild
@@ -20,8 +20,16 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:6
 	media-video/ffmpeg:0=
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/${PN}-common-${PV}
+"
 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-24.08.49.9999.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.49.9999.ebuild
index 8990ae3b10..8c36f98c17 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.49.9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.49.9999.ebuild
@@ -20,8 +20,16 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:6
 	media-video/ffmpeg:0=
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/${PN}-common-${PV}
+"
 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 8990ae3b10..8c36f98c17 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
@@ -20,8 +20,16 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:6
 	media-video/ffmpeg:0=
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/${PN}-common-${PV}
+"
 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
+)


             reply	other threads:[~2024-08-21 21:47 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-21 21:47 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-02 10:28 [gentoo-commits] proj/kde:master commit in: kde-apps/ffmpegthumbs/ Andreas Sturmlechner
2024-08-14 23:17 Andreas Sturmlechner
2024-01-07 13:26 Andreas Sturmlechner
2023-09-14 19:43 Andreas Sturmlechner
2022-11-12  9:02 Andreas Sturmlechner
2020-12-17 10:17 Andreas Sturmlechner
2018-08-16 20:26 Andreas Sturmlechner
2016-08-25 20:03 Michael Palimaka
2016-05-12 12:38 Michael Palimaka
2016-03-01 15:10 Michael Palimaka
2016-02-18 11:48 Michael Palimaka
2016-01-20 16:41 Michael Palimaka
2015-11-08 12:33 Manuel Rüger
2015-11-08 12:26 Manuel Rüger
2015-11-08 12:24 Manuel Rüger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1724273629.fc0517348e734a55be397d5b3bc393f752103c67.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox