Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/
Date: Sat, 27 May 2017 16:10:28
Message-Id: 1495901395.c57db492243f9581208a63eceb367809a4e95f74.asturm@gentoo
1 commit: c57db492243f9581208a63eceb367809a4e95f74
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 27 15:56:16 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat May 27 16:09:55 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57db492
7
8 dev-vcs/subversion: Add kde-frameworks/kwallet alt. RDEPEND
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.1
11
12 dev-vcs/subversion/subversion-1.8.17.ebuild | 5 ++++-
13 dev-vcs/subversion/subversion-1.9.5.ebuild | 5 ++++-
14 2 files changed, 8 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-vcs/subversion/subversion-1.8.17.ebuild b/dev-vcs/subversion/subversion-1.8.17.ebuild
17 index 931a4029896..663a46742ac 100644
18 --- a/dev-vcs/subversion/subversion-1.8.17.ebuild
19 +++ b/dev-vcs/subversion/subversion-1.8.17.ebuild
20 @@ -41,7 +41,10 @@ COMMON_DEPEND="
21 RDEPEND="${COMMON_DEPEND}
22 apache2? ( www-servers/apache[apache2_modules_dav] )
23 java? ( >=virtual/jre-1.5 )
24 - kwallet? ( kde-apps/kwalletd:4 )
25 + kwallet? ( || (
26 + ( >=kde-frameworks/kwallet-5.34.0-r1 )
27 + ( kde-apps/kwalletd:4 )
28 + ) )
29 nls? ( virtual/libintl )
30 perl? ( dev-perl/URI )"
31 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
32
33 diff --git a/dev-vcs/subversion/subversion-1.9.5.ebuild b/dev-vcs/subversion/subversion-1.9.5.ebuild
34 index 7b0ad1c36f2..096932f6f69 100644
35 --- a/dev-vcs/subversion/subversion-1.9.5.ebuild
36 +++ b/dev-vcs/subversion/subversion-1.9.5.ebuild
37 @@ -41,7 +41,10 @@ COMMON_DEPEND="
38 RDEPEND="${COMMON_DEPEND}
39 apache2? ( www-servers/apache[apache2_modules_dav] )
40 java? ( >=virtual/jre-1.5 )
41 - kwallet? ( kde-apps/kwalletd:4 )
42 + kwallet? ( || (
43 + ( >=kde-frameworks/kwallet-5.34.0-r1 )
44 + ( kde-apps/kwalletd:4 )
45 + ) )
46 nls? ( virtual/libintl )
47 perl? ( dev-perl/URI )"
48 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once