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

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
index 112e883a106d38862cd7d6069dae20ab8157007d..a8dc2a284ccc41f9bb63d0133e2458f5aae44baf 100644 (file)
--- 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 663a46742acfcb33bf9f4997de7ab48b91d81c38..11446afe5dcf43df6f19dd1450b3aaca962e80f6 100644 (file)
--- 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 0d83b616b845f0a82f9939b3bd4d1232dbb29daa..f3c2697e04c9bfccb1172c13930172f744e845f1 100644 (file)
--- 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