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

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

[Johannes Huber]

commit:     24847ce9babc750e5cf4403669f27b6f62ce0af5
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 17:06:23 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 17:06:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24847ce9

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.08.3.ebuild | 4 +++-
 kde-apps/bomber/bomber-16.12.0.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kde-apps/bomber/bomber-16.08.3.ebuild b/kde-apps/bomber/bomber-16.08.3.ebuild
index e549897..723cc81 100644
--- a/kde-apps/bomber/bomber-16.08.3.ebuild
+++ b/kde-apps/bomber/bomber-16.08.3.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-16.12.0.ebuild b/kde-apps/bomber/bomber-16.12.0.ebuild
index e549897..723cc81 100644
--- a/kde-apps/bomber/bomber-16.12.0.ebuild
+++ b/kde-apps/bomber/bomber-16.12.0.ebuild
@@ -25,4 +25,6 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!games-action/xbomber
+"