From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1505733-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 447AE15801B
	for <garchives@archives.gentoo.org>; Sat,  8 Apr 2023 17:23:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 861B0E087F;
	Sat,  8 Apr 2023 17:23:23 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 5CB0AE087F
	for <gentoo-commits@lists.gentoo.org>; Sat,  8 Apr 2023 17:23:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 908C834106B
	for <gentoo-commits@lists.gentoo.org>; Sat,  8 Apr 2023 17:23:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 06ED2A30
	for <gentoo-commits@lists.gentoo.org>; Sat,  8 Apr 2023 17:23:21 +0000 (UTC)
From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" <dilfridge@gentoo.org>
Message-ID: <1680974589.02c6b97ab60f971b82f456be7186160fd2d93ebb.dilfridge@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-vcs/subversion/subversion-1.14.2-r1.ebuild
X-VCS-Directories: dev-vcs/subversion/
X-VCS-Committer: dilfridge
X-VCS-Committer-Name: Andreas K. Hüttel
X-VCS-Revision: 02c6b97ab60f971b82f456be7186160fd2d93ebb
X-VCS-Branch: master
Date: Sat,  8 Apr 2023 17:23:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 73464679-447b-4b83-a269-a3f377d511de
X-Archives-Hash: 480cdbc3d30aa9057be70855c036aa1e

commit:     02c6b97ab60f971b82f456be7186160fd2d93ebb
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 17:21:38 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 17:23:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c6b97a

dev-vcs/subversion: Hardwire kf5 paths, drop kdelibs4support dep

No patches needed, configure arguments work

Closes: https://bugs.gentoo.org/759793
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-vcs/subversion/subversion-1.14.2-r1.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
index 863ce516964b..b5d43cf56b8c 100644
--- a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
 	virtual/pkgconfig
 	!!<sys-apps/sandbox-1.6
 	doc? ( app-doc/doxygen )
-	kwallet? ( kde-frameworks/kdelibs4support:5 )
 	nls? ( sys-devel/gettext )
 	perl? ( dev-lang/swig )
 	ruby? ( dev-lang/swig )
@@ -185,7 +184,6 @@ src_configure() {
 		$(use_with gnome-keyring)
 		$(use_enable java javahl)
 		$(use_with java jdk "${JAVA_HOME}")
-		$(use_with kwallet)
 		$(use_enable nls)
 		$(use_enable plaintext-password-storage)
 		$(use_with sasl)
@@ -199,6 +197,12 @@ src_configure() {
 		--enable-svnxx
 	)
 
+	if use kwallet ; then
+		myconf+=( "--with-kwallet=/usr/include/:/usr/$(get_libdir)/" )
+	else
+		myconf+=( --without-kwallet )
+	fi
+
 	if use perl || use ruby; then
 		myconf+=( --with-swig )
 	else