Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/
Date: Fri, 14 May 2021 20:59:10
Message-Id: 1621025930.2cc375ee22608dff037229d7ece921cffc818202.asturm@gentoo
1 commit: 2cc375ee22608dff037229d7ece921cffc818202
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 14 20:58:40 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri May 14 20:58:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc375ee
7
8 kde-misc/kdiff3: Drop 1.9.0
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-misc/kdiff3/Manifest | 1 -
14 kde-misc/kdiff3/kdiff3-1.9.0.ebuild | 43 -------------------------------------
15 2 files changed, 44 deletions(-)
16
17 diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
18 index d0b2c8be4e1..754f54383c6 100644
19 --- a/kde-misc/kdiff3/Manifest
20 +++ b/kde-misc/kdiff3/Manifest
21 @@ -1,3 +1,2 @@
22 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
23 -DIST kdiff3-1.9.0.tar.xz 1052284 BLAKE2B 50362fe1949162dafa50ec5261d793bfb7eb836030459f575a114c127a84bcd6876f0292cea0d4173efbb1f4aa933dcfc08bb6b0147eb3db82c90ecf7b1f1f52 SHA512 5bf086816d0ab83cfacf71179996a7b934c799e356007e2f72b62bd69af3eacea748a2bcf48f98f30fade6c6d8cd1fca1d0c37e1ed1bed97150c64800d787df4
24 DIST kdiff3-1.9.1.tar.xz 1052912 BLAKE2B 844d0a5cf8fe054fb897bf41f0933cc83e2f9837d0c6a963600468b37984801935c3c7d1c866ed7120f2147ac469d20429aa252de75b0b5729360e459dbf224e SHA512 ce57083895f5ece2fffb9f4f1ad8b66df563a6f67eafc7758166bcde6cb5f822349d440d4d07a8b5076ea72f0a0f15979208cb5431524ba843814191a9c92969
25
26 diff --git a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
27 deleted file mode 100644
28 index adedf33c00c..00000000000
29 --- a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
30 +++ /dev/null
31 @@ -1,43 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -ECM_HANDBOOK="optional"
38 -KFMIN=5.74.0
39 -QTMIN=5.15.2
40 -inherit ecm kde.org
41 -
42 -DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
43 -HOMEPAGE="https://apps.kde.org/en/kdiff3 https://userbase.kde.org/KDiff3"
44 -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
45 -
46 -LICENSE="GPL-2"
47 -SLOT="5"
48 -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
49 -IUSE=""
50 -
51 -COMMON_DEPEND="
52 - >=dev-qt/qtgui-${QTMIN}:5
53 - >=dev-qt/qtprintsupport-${QTMIN}:5
54 - >=dev-qt/qtwidgets-${QTMIN}:5
55 - >=kde-frameworks/kconfig-${KFMIN}:5
56 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5
57 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
58 - >=kde-frameworks/kcrash-${KFMIN}:5
59 - >=kde-frameworks/ki18n-${KFMIN}:5
60 - >=kde-frameworks/kiconthemes-${KFMIN}:5
61 - >=kde-frameworks/kio-${KFMIN}:5
62 - >=kde-frameworks/kparts-${KFMIN}:5
63 - >=kde-frameworks/ktextwidgets-${KFMIN}:5
64 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
65 - >=kde-frameworks/kxmlgui-${KFMIN}:5
66 -"
67 -DEPEND="${COMMON_DEPEND}
68 - dev-libs/boost
69 -"
70 -RDEPEND="${COMMON_DEPEND}
71 - sys-apps/diffutils
72 -"
73 -
74 -PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 788058, git master