[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/

[Andreas Sturmlechner]

commit:     c57db492243f9581208a63eceb367809a4e95f74
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 15:56:16 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 27 16:09:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57db492

dev-vcs/subversion: Add kde-frameworks/kwallet alt. RDEPEND

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-vcs/subversion/subversion-1.8.17.ebuild | 5 ++++-
 dev-vcs/subversion/subversion-1.9.5.ebuild  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/subversion/subversion-1.8.17.ebuild 
b/dev-vcs/subversion/subversion-1.8.17.ebuild
index 931a4029896..663a46742ac 100644
--- a/dev-vcs/subversion/subversion-1.8.17.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.17.ebuild
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
        apache2? ( www-servers/apache[apache2_modules_dav] )
        java? ( >=virtual/jre-1.5 )
-       kwallet? ( kde-apps/kwalletd:4 )
+       kwallet? ( || (
+               ( >=kde-frameworks/kwallet-5.34.0-r1 )
+               ( kde-apps/kwalletd:4 )
+       ) )
        nls? ( virtual/libintl )
        perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once

diff --git a/dev-vcs/subversion/subversion-1.9.5.ebuild 
b/dev-vcs/subversion/subversion-1.9.5.ebuild
index 7b0ad1c36f2..096932f6f69 100644
--- a/dev-vcs/subversion/subversion-1.9.5.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.5.ebuild
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
        apache2? ( www-servers/apache[apache2_modules_dav] )
        java? ( >=virtual/jre-1.5 )
-       kwallet? ( kde-apps/kwalletd:4 )
+       kwallet? ( || (
+               ( >=kde-frameworks/kwallet-5.34.0-r1 )
+               ( kde-apps/kwalletd:4 )
+       ) )
        nls? ( virtual/libintl )
        perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once