From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 3 Mar 2021 10:28:17 +0000
Subject: gentoo resync : 03.03.2021

---
 kde-misc/kdiff3/Manifest            |  4 +---
 kde-misc/kdiff3/kdiff3-1.8.4.ebuild | 40 -------------------------------------
 kde-misc/kdiff3/kdiff3-1.8.5.ebuild |  2 +-
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 kde-misc/kdiff3/kdiff3-1.8.4.ebuild

(limited to 'kde-misc/kdiff3')

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index ed987fc84d76..3738093a279a 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,6 +1,4 @@
 AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
-DIST kdiff3-1.8.4.tar.xz 1040492 BLAKE2B 4598a5db318821af085c19983f17260969220bf7352fc961b8e49237c6818b5f723cebac8190ceb591f2cd3ad54b52b9f7bb91be91ce90c399ad959398e64f1e SHA512 100632f7656e53f567faec8efea1aba132916e7b6c9569b2bacb7da1081f1dd126e27825663fb860f3d40cb205cf3c1817dd28ea560b9e650b5002e3d89dd9d8
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
-EBUILD kdiff3-1.8.4.ebuild 1060 BLAKE2B 7821c38937bee4dbf00f78447eb6e5ab4cd2d3fe85f5d833b9e3bb7a5a9516ae97b843187e251f33caf6e47ba8f361d347b371bfe4d7f7cdef5e4bb522bccd5a SHA512 c922f4cffbbea168471530e6c43492a1d22ce55f1e5e05ce6874187f163113e6304cf45eda768318868a696d4385bbda235d55d383ac9b0425b4a12494ed6949
-EBUILD kdiff3-1.8.5.ebuild 1062 BLAKE2B d86491bd12bdaf47a7e9af73edb168ac609579f4526f66690e68b8778c9a08cc64b808e75dda00fb7179ff74dcd1a600b47a8246b47426e13d74b99fd40e0dc2 SHA512 5cde71163b04f4b1d976ed27cfecdb35c460d31602a49d052a1c097aa377acc5bdbf85bf844171bd5f3e9f4879ca5baaee1d996db24c49b245377e07a06a7fad
+EBUILD kdiff3-1.8.5.ebuild 1060 BLAKE2B 90af39a2d93a2b80970e8375688b367bcfe4f1e7b9f01c8f1dd7fcc2c65f8d45a874d87bf8d5149536c2f59d50b74a123736ee47173b18d8d9e7bd01b86be3bf SHA512 c4e4f500c6016a456e89a3b2656267d56b6839ace4e4804d68af26cce6ca3a01ef88775ed1f23c7805e9fdd70414ef0afe9c7777376ac220122e757181af5c84
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
deleted file mode 100644
index 7f4a90ae3b4f..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/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=""
-
-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/kiconthemes-${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
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.3-hidpi.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
index ec84fcba2ce1..c9625b834e80 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
-- 
cgit v1.2.3