| 1 |
commit: eaca2e98dca6d73a63baf7e152ea9173686b620e |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 29 07:45:53 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 29 07:45:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=eaca2e98 |
| 7 |
|
| 8 |
kde-apps/kdeedu-data: Fix file collision |
| 9 |
|
| 10 |
Gentoo-bug: 578344 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild | 4 +++- |
| 15 |
kde-apps/kdeedu-data/kdeedu-data-9999.ebuild | 4 +++- |
| 16 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild b/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild |
| 19 |
index 3df4a9a..5b66dfb 100644 |
| 20 |
--- a/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild |
| 21 |
+++ b/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild |
| 22 |
@@ -15,4 +15,6 @@ DEPEND=" |
| 23 |
$(add_frameworks_dep extra-cmake-modules) |
| 24 |
$(add_qt_dep qtcore) |
| 25 |
" |
| 26 |
-RDEPEND="" |
| 27 |
+RDEPEND=" |
| 28 |
+ !kde-apps/libkdeedu:4 |
| 29 |
+" |
| 30 |
|
| 31 |
diff --git a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild b/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild |
| 32 |
index 3df4a9a..5b66dfb 100644 |
| 33 |
--- a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild |
| 34 |
+++ b/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild |
| 35 |
@@ -15,4 +15,6 @@ DEPEND=" |
| 36 |
$(add_frameworks_dep extra-cmake-modules) |
| 37 |
$(add_qt_dep qtcore) |
| 38 |
" |
| 39 |
-RDEPEND="" |
| 40 |
+RDEPEND=" |
| 41 |
+ !kde-apps/libkdeedu:4 |
| 42 |
+" |
Archives