summaryrefslogtreecommitdiff
path: root/kde-misc/kdiff3
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
commitd934827bf44b7cfcf6711964418148fa60877668 (patch)
tree0625f358789b5e015e49db139cc1dbc9be00428f /kde-misc/kdiff3
parent2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
gentoo resync : 25.11.2020
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r--kde-misc/kdiff3/Manifest4
-rw-r--r--kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild41
-rw-r--r--kde-misc/kdiff3/kdiff3-1.8.4.ebuild5
3 files changed, 3 insertions, 47 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index e350d2fae1e0..d5ee3b56dbfd 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.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
DIST kdiff3-1.8.4.tar.xz 1040492 BLAKE2B 4598a5db318821af085c19983f17260969220bf7352fc961b8e49237c6818b5f723cebac8190ceb591f2cd3ad54b52b9f7bb91be91ce90c399ad959398e64f1e SHA512 100632f7656e53f567faec8efea1aba132916e7b6c9569b2bacb7da1081f1dd126e27825663fb860f3d40cb205cf3c1817dd28ea560b9e650b5002e3d89dd9d8
-EBUILD kdiff3-1.8.3-r1.ebuild 1078 BLAKE2B fefd53a09e26ab9c0c699ad7f939ba456d55e2497220159a6c3b06497d79f1c8e2de6f3c00e7aabf85fdc861af7bc1ff709b81d9ffa71ea84745b5bc7b3ed258 SHA512 59142b7b8b835121f61c7013f8f678bea635e03440041abdfe11da3d9fe6d62c6acee158f05197dc92c9ca45362035f4a5a504acfb664319d6060c994963da5e
-EBUILD kdiff3-1.8.4.ebuild 1087 BLAKE2B c861e9db380c87f51b688c9bb3d4b1b1bc485383d15c95f3f163c0c3f902af6d916ef593f91984a76ce2c04df8cc385a110eb8fb7474fade014902b366e99909 SHA512 94ebe581ee9e52a0b49f580665cecedffac4008fabb7d481ef8f0d9edd4091cc243de0f6b900918b08279851ebb71f06c0b1af37299123b1f9badcd72feee945
+EBUILD kdiff3-1.8.4.ebuild 1060 BLAKE2B 7821c38937bee4dbf00f78447eb6e5ab4cd2d3fe85f5d833b9e3bb7a5a9516ae97b843187e251f33caf6e47ba8f361d347b371bfe4d7f7cdef5e4bb522bccd5a SHA512 c922f4cffbbea168471530e6c43492a1d22ce55f1e5e05ce6874187f163113e6304cf45eda768318868a696d4385bbda235d55d383ac9b0425b4a12494ed6949
MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
deleted file mode 100644
index 678e2ab4e74a..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,41 +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://kde.org/applications/development/org.kde.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}/${P}-hidpi.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
index 7b3bf740d42b..7f4a90ae3b4f 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
@@ -9,13 +9,12 @@ QTMIN=5.12.3
inherit ecm kde.org
DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
-https://userbase.kde.org/KDiff3"
+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"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE=""
DEPEND="