summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-10-03 22:39:41 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-10-03 22:39:41 +0200
commiteed9956e8208611964ff7d3e1bc4a1f0c994f1f3 (patch)
treee96f35150953cad91e623fa19dcf1a4a914536c6 /kde-misc
parentkde-misc/tellico: Drop 3.3.5-r1 (diff)
downloadgentoo-eed9956e8208611964ff7d3e1bc4a1f0c994f1f3.tar.gz
gentoo-eed9956e8208611964ff7d3e1bc4a1f0c994f1f3.tar.bz2
gentoo-eed9956e8208611964ff7d3e1bc4a1f0c994f1f3.zip
kde-misc/kdiff3: Drop 1.9.2
Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/kdiff3/Manifest1
-rw-r--r--kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch24
-rw-r--r--kde-misc/kdiff3/kdiff3-1.9.2.ebuild43
3 files changed, 0 insertions, 68 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 0aa8008f32f9..a68ab0203c44 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511 SHA512 3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8
DIST kdiff3-1.9.3.tar.xz 1056920 BLAKE2B d32e60cbc8d41339dff9a91fe5a2c739a38dc856a0adc575fa0e777c921d40effb1f27b34d7a127a4aff95b10436ddafd7f3db63912c2def85307e1e46ea9964 SHA512 9d806efa5d92375bc0dd2014492e924a7f26c12fde0e89bb58f076a249dba83fd316253cfd53235eaaae26f29d37c730c5728de1c7de869532fc9c38190412d5
diff --git a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
deleted file mode 100644
index 581b487503ea..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0476b1daa73159aec411c7f10da6f313294f0e38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Tue, 4 May 2021 19:21:46 +0200
-Subject: [PATCH] Explicitly include <limits> for compatibility with gcc-11
-
----
- src/TypeUtils.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/TypeUtils.h b/src/TypeUtils.h
-index c072681..f0ab9c2 100644
---- a/src/TypeUtils.h
-+++ b/src/TypeUtils.h
-@@ -9,6 +9,7 @@
-
- #include <stdlib.h>
- #include <type_traits>
-+#include <limits>
-
- #include <QtGlobal>
-
---
-GitLab
-
diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
deleted file mode 100644
index 82515f73d04b..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-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="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.9.0-gcc11.patch" ) # bug 788058, git master