[gentoo-commits] proj/kde:master commit in: kde-apps/kwave/

[Andreas Sturmlechner]

commit:     b9c96c7b6b1ecc9c0ab07904791884963df1075b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 23:48:23 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 23:53:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9c96c7b

kde-apps/kwave: Cleanup obsolete blocker

No longer required after pkgmove.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kwave/kwave-17.04.49.9999.ebuild | 9 +++------
 kde-apps/kwave/kwave-9999.ebuild          | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/kde-apps/kwave/kwave-17.04.49.9999.ebuild 
b/kde-apps/kwave/kwave-17.04.49.9999.ebuild
index 3cf5a5fa6e..9ac8bc153a 100644
--- a/kde-apps/kwave/kwave-17.04.49.9999.ebuild
+++ b/kde-apps/kwave/kwave-17.04.49.9999.ebuild
@@ -14,9 +14,9 @@ LICENSE="
        opus? ( BSD-2 )
 "
 KEYWORDS=""
-IUSE="alsa flac mp3 +qtmedia opus oss pulseaudio vorbis"
+IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
-COMMON_DEPEND="
+RDEPEND="
        $(add_frameworks_dep kcompletion)
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kconfigwidgets)
@@ -52,15 +52,12 @@ COMMON_DEPEND="
                media-libs/libvorbis
        )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
        $(add_kdeapps_dep poxml)
        $(add_qt_dep qtconcurrent)
        sys-devel/gettext
        virtual/imagemagick-tools[png,svg]
 "
-RDEPEND="${COMMON_DEPEND}
-       !media-sound/kwave:4
-"
 
 DOCS=( AUTHORS CHANGES LICENSES README TODO )
 

diff --git a/kde-apps/kwave/kwave-9999.ebuild b/kde-apps/kwave/kwave-9999.ebuild
index 3cf5a5fa6e..9ac8bc153a 100644
--- a/kde-apps/kwave/kwave-9999.ebuild
+++ b/kde-apps/kwave/kwave-9999.ebuild
@@ -14,9 +14,9 @@ LICENSE="
        opus? ( BSD-2 )
 "
 KEYWORDS=""
-IUSE="alsa flac mp3 +qtmedia opus oss pulseaudio vorbis"
+IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
-COMMON_DEPEND="
+RDEPEND="
        $(add_frameworks_dep kcompletion)
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kconfigwidgets)
@@ -52,15 +52,12 @@ COMMON_DEPEND="
                media-libs/libvorbis
        )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
        $(add_kdeapps_dep poxml)
        $(add_qt_dep qtconcurrent)
        sys-devel/gettext
        virtual/imagemagick-tools[png,svg]
 "
-RDEPEND="${COMMON_DEPEND}
-       !media-sound/kwave:4
-"
 
 DOCS=( AUTHORS CHANGES LICENSES README TODO )