[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     29755fb5500218b36ac06c0f020bc5c9dcf1dbe1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 20:55:21 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 14 20:58:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29755fb5

kde-misc/kdiff3: 1.9.1 version bump

Closes: https://bugs.gentoo.org/789330
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-misc/kdiff3/Manifest            |  1 +
 kde-misc/kdiff3/kdiff3-1.9.1.ebuild | 42 +++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 53b8015b5a9..d0b2c8be4e1 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
 DIST kdiff3-1.9.0.tar.xz 1052284 BLAKE2B 50362fe1949162dafa50ec5261d793bfb7eb836030459f575a114c127a84bcd6876f0292cea0d4173efbb1f4aa933dcfc08bb6b0147eb3db82c90ecf7b1f1f52 SHA512 5bf086816d0ab83cfacf71179996a7b934c799e356007e2f72b62bd69af3eacea748a2bcf48f98f30fade6c6d8cd1fca1d0c37e1ed1bed97150c64800d787df4
+DIST kdiff3-1.9.1.tar.xz 1052912 BLAKE2B 844d0a5cf8fe054fb897bf41f0933cc83e2f9837d0c6a963600468b37984801935c3c7d1c866ed7120f2147ac469d20429aa252de75b0b5729360e459dbf224e SHA512 ce57083895f5ece2fffb9f4f1ad8b66df563a6f67eafc7758166bcde6cb5f822349d440d4d07a8b5076ea72f0a0f15979208cb5431524ba843814191a9c92969

diff --git a/kde-misc/kdiff3/kdiff3-1.9.1.ebuild b/kde-misc/kdiff3/kdiff3-1.9.1.ebuild
new file mode 100644
index 00000000000..a05eeb463c6
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.9.1.ebuild
@@ -0,0 +1,42 @@
+# 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
+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