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

[Andreas Sturmlechner]

commit:     2b12edf9f652c42fadb6a1872a002cb42bd6debf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 12:20:58 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 12:27:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b12edf9

dev-vcs/subversion: Drop references to last-rited package

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-vcs/subversion/metadata.xml             | 2 +-
 dev-vcs/subversion/subversion-1.8.18.ebuild | 5 +----
 dev-vcs/subversion/subversion-1.9.7.ebuild  | 5 +----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
index 112e883a106..a8dc2a284cc 100644
--- a/dev-vcs/subversion/metadata.xml
+++ b/dev-vcs/subversion/metadata.xml
@@ -10,6 +10,6 @@
                <flag name="dso">Enable runtime module search</flag>
                <flag name="extras">Install extra scripts (examples, tools, 
hooks)</flag>
                <flag name="http">Enable http support using 
<pkg>net-libs/serf</pkg></flag>
-               <flag name="kwallet">Enable encrypted storage of passwords with 
<pkg>kde-apps/kwalletd</pkg></flag>
+               <flag name="kwallet">Enable encrypted storage of passwords with 
<pkg>kde-frameworks/kwallet</pkg></flag>
        </use>
 </pkgmetadata>

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