| 1 |
commit: 42dce4c2766d3fb54ca4e17f2f62a11685726eaa |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 1 15:44:10 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 1 15:44:19 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=42dce4c2 |
| 7 |
|
| 8 |
kde-apps/kio-extras: remove kde-apps/kdebase-kioslaves blocker. |
| 9 |
|
| 10 |
The colliding files have been renamed since 5.3.0. |
| 11 |
|
| 12 |
Upstream-commit: a370c30dd903cf62082a33b293ca770b3a90bbf8 |
| 13 |
Upstream-commit: 11665afdb174585e324b9888135e93763b4ad390 |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.20.1 |
| 16 |
|
| 17 |
kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild | 2 -- |
| 18 |
kde-apps/kio-extras/kio-extras-9999.ebuild | 2 -- |
| 19 |
2 files changed, 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild |
| 22 |
index 008e606..a4b6878 100644 |
| 23 |
--- a/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild |
| 24 |
+++ b/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild |
| 25 |
@@ -50,9 +50,7 @@ COMMON_DEPEND=" |
| 26 |
" |
| 27 |
RDEPEND="${COMMON_DEPEND} |
| 28 |
$(add_frameworks_dep kded) |
| 29 |
- !kde-apps/kdebase-kioslaves:4[-minimal(-)] |
| 30 |
!kde-apps/kcontrol:4 |
| 31 |
- !kde-base/kdebase-kioslaves:4[-minimal(-)] |
| 32 |
!kde-base/kio-extras |
| 33 |
!kde-plasma/kio-extras |
| 34 |
" |
| 35 |
|
| 36 |
diff --git a/kde-apps/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild |
| 37 |
index 008e606..a4b6878 100644 |
| 38 |
--- a/kde-apps/kio-extras/kio-extras-9999.ebuild |
| 39 |
+++ b/kde-apps/kio-extras/kio-extras-9999.ebuild |
| 40 |
@@ -50,9 +50,7 @@ COMMON_DEPEND=" |
| 41 |
" |
| 42 |
RDEPEND="${COMMON_DEPEND} |
| 43 |
$(add_frameworks_dep kded) |
| 44 |
- !kde-apps/kdebase-kioslaves:4[-minimal(-)] |
| 45 |
!kde-apps/kcontrol:4 |
| 46 |
- !kde-base/kdebase-kioslaves:4[-minimal(-)] |
| 47 |
!kde-base/kio-extras |
| 48 |
!kde-plasma/kio-extras |
| 49 |
" |
Archives