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

[Johannes Huber]

commit:     90bfe16fdae06941adf2567e10ed991573267cc5
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 17:03:47 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 17:07:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=90bfe16f

kde-apps/bomber: Fix file collision

Block games-action/xbomber due to file collision.

Gentoo-bug: 602904
Gentoo-bug: 602902

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/bomber/bomber-16.12.49.9999.ebuild | 4 +++-
 kde-apps/bomber/bomber-9999.ebuild          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kde-apps/bomber/bomber-16.12.49.9999.ebuild 
b/kde-apps/bomber/bomber-16.12.49.9999.ebuild
index 7f2bfaf..6999546 100644
--- a/kde-apps/bomber/bomber-16.12.49.9999.ebuild
+++ b/kde-apps/bomber/bomber-16.12.49.9999.ebuild
@@ -25,4 +25,6 @@ DEPEND="
        $(add_qt_dep qtgui)
        $(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !games-action/xbomber
+"

diff --git a/kde-apps/bomber/bomber-9999.ebuild 
b/kde-apps/bomber/bomber-9999.ebuild
index 7f2bfaf..6999546 100644
--- a/kde-apps/bomber/bomber-9999.ebuild
+++ b/kde-apps/bomber/bomber-9999.ebuild
@@ -25,4 +25,6 @@ DEPEND="
        $(add_qt_dep qtgui)
        $(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !games-action/xbomber
+"