From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/
Date: Mon, 31 Mar 2025 15:41:28 +0000 (UTC) [thread overview]
Message-ID: <1743435682.019fba5d103e942a010378adfc543a65564e17aa.asturm@gentoo> (raw)
commit: 019fba5d103e942a010378adfc543a65564e17aa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 31 15:39:39 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 31 15:41:22 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019fba5d
kde-misc/kdiff3: drop 1.12.0, 1.12.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kdiff3/Manifest | 2 -
.../kdiff3/files/kdiff3-1.12.0-bogus-dep.patch | 27 --------------
kde-misc/kdiff3/kdiff3-1.12.0.ebuild | 43 ----------------------
kde-misc/kdiff3/kdiff3-1.12.1.ebuild | 41 ---------------------
4 files changed, 113 deletions(-)
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index bc55b4b49eb5..ff916702aa47 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1 @@
-DIST kdiff3-1.12.0.tar.xz 1204256 BLAKE2B c320acc411fa6dd470657cec63d1c04611a78bcab3bd1501339cde11798098b0d5369eb10e8357677547ce27ded5fe4171b741c7413c4f53b6c5e9cd9301bd46 SHA512 d409f3be076ee2a4a736c201fe7b509304b29a843490b6e60b5f2e221dc34c5d78ba717e08c4ce053f9af28c6750c600658a84853e0ed5591161320e3bcef631
-DIST kdiff3-1.12.1.tar.xz 1204916 BLAKE2B 57af81a79e448e827aa9b44175bc26e73f944e31b50ab9e7970fecc19791432b94d277ca2575da9155c7eabc3854ea0416094496d5597e1d2d8a8bc9ac30e308 SHA512 873d1b2aa4511ac0a3c520f7c333c606f77bb8941b781559e69d3a07690d2433b9c320cf5e6bb1b6eef9e526f10c9585bf501e031a91aea58b4c7965f680a2a5
DIST kdiff3-1.12.2.tar.xz 1203080 BLAKE2B 3f23fb68d0e815720d50882095fca8e36bf8fe7fd88056631cf27044a354a1e581c938fd83ed309cb931b3b0881fe21a30d81e3cb87db5d2eae7d2bc9cafed71 SHA512 82133c7ba4635adfb923ee5bb46c0ec991f9d9e297062f02c30bf2834b341fdea6eb6c210cae9143a3b195c51f7ba1aad48f6a320f7c9841f89f914fb78065a8
diff --git a/kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch b/kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch
deleted file mode 100644
index 982a0677a48a..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b187d9235e466d5fc876dc513da2ed16c8bd7611 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 12 Dec 2024 01:46:44 +0100
-Subject: [PATCH] Drop unused Qt6Core5Compat
-
-Amends https://invent.kde.org/sdk/kdiff3/-/commit/342924de5000a2821736f2c4cd58f92c6ad9c159
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 56f68e1a..4e61a6cb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,7 +77,6 @@ find_package(
- Gui
- Widgets
- PrintSupport
-- Core5Compat
- )
-
- find_package(
---
-GitLab
-
diff --git a/kde-misc/kdiff3/kdiff3-1.12.0.ebuild b/kde-misc/kdiff3/kdiff3-1.12.0.ebuild
deleted file mode 100644
index f5a047c87ccd..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.6.0
-QTMIN=6.7.2
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-libs/icu-70.0:=
- >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kcrash-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/ktextwidgets-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.82
-"
-RDEPEND="${COMMON_DEPEND}
- !${CATEGORY}/${PN}:5
- sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${P}-bogus-dep.patch" )
-
-# TODO: -DENABLE_GDBINDEX?
diff --git a/kde-misc/kdiff3/kdiff3-1.12.1.ebuild b/kde-misc/kdiff3/kdiff3-1.12.1.ebuild
deleted file mode 100644
index 17e935d5c772..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.12.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.6.0
-QTMIN=6.7.2
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-libs/icu-70.0:=
- >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kcrash-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/ktextwidgets-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.82
-"
-RDEPEND="${COMMON_DEPEND}
- !${CATEGORY}/${PN}:5
- sys-apps/diffutils
-"
-
-# TODO: -DENABLE_GDBINDEX?
next reply other threads:[~2025-03-31 15:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-31 15:41 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-11 6:54 [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/ Andreas Sturmlechner
2024-08-10 7:57 Andreas Sturmlechner
2020-08-01 7:36 Andreas Sturmlechner
2020-05-01 20:32 Andreas Sturmlechner
2019-05-19 22:01 Andreas Sturmlechner
2019-03-20 14:02 Andreas Sturmlechner
2017-09-03 9:27 Andreas Sturmlechner
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=1743435682.019fba5d103e942a010378adfc543a65564e17aa.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