From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 20 Mar 2022 00:40:44 +0000
Subject: gentoo resync : 20.03.2022

---
 dev-vcs/kdesvn/Manifest               |  3 +-
 dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild | 74 +++++++++++++++++++++++++++++++++++
 dev-vcs/kdesvn/kdesvn-2.1.0.ebuild    | 65 ------------------------------
 3 files changed, 76 insertions(+), 66 deletions(-)
 create mode 100644 dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild
 delete mode 100644 dev-vcs/kdesvn/kdesvn-2.1.0.ebuild

(limited to 'dev-vcs/kdesvn')

diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index 805b2ff8f84a..7a9c683a8c31 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,3 +1,4 @@
+DIST kdesvn-2.1.0-patchset-1.tar.xz 7368 BLAKE2B 6da62bdad00a4846a4046535f26559d5c7738fd5a799bbbb4c7d4e3e03f0fa0afba763bfee067cb5bc745df56ef51dcafd4187784a69bce743fe6ac3d90372d1 SHA512 046b335ab2e68ff46849a6f7a3331de7f0f3da653a9971a2fe20cc12fe4af0e1aa192340c77fbadac81e58eeb238f3ec269a99032f87b0bed55bcbb5fc90d920
 DIST kdesvn-2.1.0.tar.xz 2096108 BLAKE2B b2807e6222d5743858a9592fe568c851e466f1349bb97869c3acab892b6ef9ce730d6ec1875b720b2ebb5e2099f6d4287bf76995d7b95800f0814499736b97c7 SHA512 ec1ad8422fd698a9c07d43c3051aabff615ea774c0e988ae07843f1935a2a5c3390cf175db5c10acfe3d94abcd7a2b9b41680047598c4e7b53162cdb4e74768d
-EBUILD kdesvn-2.1.0.ebuild 1653 BLAKE2B 40faa0ab4652d7f773abc4ae802f07068fabe5d29275bab5cf4fd146047638e7430798694ee6f2f692a47bded7077359de499dac9a3866288c32aabb0a710381 SHA512 6bf1ede2ec2757171b0dad6a83cdee27cdf37ed95ec9987694ba822c291a5fea36ae312eaf5a04eea61bf0f42a24e48be89b78b35173f62f65e06ecbd5e9b663
+EBUILD kdesvn-2.1.0-r1.ebuild 2074 BLAKE2B 883766056af60e9f2bf3ba8078840ca4b992c1da9f88542678c7acb46d10f12eace87a9bc185092d3f708246da02ca8569d5aeda660ccb249519134ecab11427 SHA512 ea651d1d318d8ad11804c25450d62f35e9ac7cfdf7f8ac3b67ee0524fdfd0ae16a74909cce58aac1cdc1ab9423c7778f67a5e398e7a9942cb39e6a9bd1a71c00
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..448e7d758395
--- /dev/null
+++ b/dev-vcs/kdesvn/kdesvn-2.1.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to the subversion vcs"
+HOMEPAGE="https://apps.kde.org/kdesvn/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="+man"
+
+DEPEND="
+	dev-libs/apr:1
+	dev-libs/apr-util:1
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-vcs/subversion
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${KFMIN}:5 )
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-remove-help-button.patch # KDE-bug 410566
+	"${WORKDIR}"/${P}-fix-openwith-context-menu.patch # KDE-bug 410585
+	"${WORKDIR}"/${P}-fix-dupl-cli-options.patch
+	"${WORKDIR}"/${P}-crashfix-w-o-local-checkout-path.patch # KDE-bug 419906
+	"${WORKDIR}"/${P}-crashfix-closing-repo.patch # KDE-bug 437948
+	"${WORKDIR}"/${P}-hidpi-{1,2}.patch
+	"${WORKDIR}"/${P}-fix-deprecated.patch
+)
+
+src_prepare(){
+	ecm_src_prepare
+
+	if ! use man ; then
+		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+	fi
+}
diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild
deleted file mode 100644
index e246998c71fc..000000000000
--- a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 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="A frontend to the subversion vcs"
-HOMEPAGE="https://apps.kde.org/kdesvn/"
-
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="+man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${KFMIN}:5 )
-"
-DEPEND="
-	dev-libs/apr:1
-	dev-libs/apr-util:1
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-vcs/subversion
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdesdk-kioslaves:4[subversion(-)]
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use man ; then
-		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
-	fi
-}
-- 
cgit v1.2.3