aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-12-17 18:03:47 +0100
committerJohannes Huber <johu@gentoo.org>2016-12-17 18:07:35 +0100
commit90bfe16fdae06941adf2567e10ed991573267cc5 (patch)
treefbf77bde24145e696ce37c39fc3e78f84bc26822
parentkde-apps/kdegraphics-mobipocket: SLOTs 4 and 5 collide (diff)
downloadkde-90bfe16fdae06941adf2567e10ed991573267cc5.tar.gz
kde-90bfe16fdae06941adf2567e10ed991573267cc5.tar.bz2
kde-90bfe16fdae06941adf2567e10ed991573267cc5.zip
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
-rw-r--r--kde-apps/bomber/bomber-16.12.49.9999.ebuild4
-rw-r--r--kde-apps/bomber/bomber-9999.ebuild4
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 7f2bfaf814..6999546b1a 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 7f2bfaf814..6999546b1a 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
+"