| 1 |
commit: 1ddffdabb7d34f0a8711fe4788ebf5a078e89832 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jul 31 19:59:27 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 31 21:10:55 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ddffdab |
| 7 |
|
| 8 |
[kde-apps] Remove conflicting KDE4-based RDEPENDs from meta |
| 9 |
|
| 10 |
kgpg - depends on kde-base/kdepimlibs:4 |
| 11 |
kopete - depends on kde-base/kdepimlibs:4 |
| 12 |
kuser - depends on kde-base/kdepimlibs:4 |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.20 |
| 15 |
|
| 16 |
kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild | 3 ++- |
| 17 |
kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild | 3 ++- |
| 18 |
kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild | 3 ++- |
| 19 |
kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild | 3 ++- |
| 20 |
kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild | 3 ++- |
| 21 |
kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild | 3 ++- |
| 22 |
6 files changed, 12 insertions(+), 6 deletions(-) |
| 23 |
|
| 24 |
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild |
| 25 |
index a0fd2d0..dd4cff0 100644 |
| 26 |
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild |
| 27 |
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild |
| 28 |
@@ -10,8 +10,9 @@ DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-deriv |
| 29 |
KEYWORDS="~amd64 ~x86" |
| 30 |
IUSE="+cron" |
| 31 |
|
| 32 |
+# FIXME: Add back when ported |
| 33 |
+# $(add_kdeapps_dep kuser) |
| 34 |
RDEPEND=" |
| 35 |
$(add_kdeapps_dep ksystemlog) |
| 36 |
- $(add_kdeapps_dep kuser) |
| 37 |
cron? ( $(add_kdeapps_dep kcron) ) |
| 38 |
" |
| 39 |
|
| 40 |
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild |
| 41 |
index 084822c..938a219 100644 |
| 42 |
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild |
| 43 |
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild |
| 44 |
@@ -10,8 +10,9 @@ DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-deriv |
| 45 |
KEYWORDS="" |
| 46 |
IUSE="+cron" |
| 47 |
|
| 48 |
+# FIXME: Add back when ported |
| 49 |
+# $(add_kdeapps_dep kuser) |
| 50 |
RDEPEND=" |
| 51 |
$(add_kdeapps_dep ksystemlog) |
| 52 |
- $(add_kdeapps_dep kuser) |
| 53 |
cron? ( $(add_kdeapps_dep kcron) ) |
| 54 |
" |
| 55 |
|
| 56 |
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild |
| 57 |
index 9de8b42..605ee14 100644 |
| 58 |
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild |
| 59 |
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild |
| 60 |
@@ -10,10 +10,11 @@ DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages" |
| 61 |
KEYWORDS="~amd64 ~x86" |
| 62 |
IUSE="ppp" |
| 63 |
|
| 64 |
+# FIXME: Add back when ported |
| 65 |
+# $(add_kdeapps_dep kopete) |
| 66 |
RDEPEND=" |
| 67 |
$(add_kdeapps_dep kdenetwork-filesharing) |
| 68 |
$(add_kdeapps_dep kget) |
| 69 |
- $(add_kdeapps_dep kopete) |
| 70 |
$(add_kdeapps_dep krdc) |
| 71 |
$(add_kdeapps_dep krfb) |
| 72 |
$(add_kdeapps_dep plasma-telepathy-meta) |
| 73 |
|
| 74 |
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild |
| 75 |
index 27b87a1..ba20d38 100644 |
| 76 |
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild |
| 77 |
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild |
| 78 |
@@ -10,10 +10,11 @@ DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages" |
| 79 |
KEYWORDS="" |
| 80 |
IUSE="ppp" |
| 81 |
|
| 82 |
+# FIXME: Add back when ported |
| 83 |
+# $(add_kdeapps_dep kopete) |
| 84 |
RDEPEND=" |
| 85 |
$(add_kdeapps_dep kdenetwork-filesharing) |
| 86 |
$(add_kdeapps_dep kget) |
| 87 |
- $(add_kdeapps_dep kopete) |
| 88 |
$(add_kdeapps_dep krdc) |
| 89 |
$(add_kdeapps_dep krfb) |
| 90 |
$(add_kdeapps_dep plasma-telepathy-meta) |
| 91 |
|
| 92 |
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild |
| 93 |
index 8c5fe0a..2ef4d47 100644 |
| 94 |
--- a/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild |
| 95 |
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild |
| 96 |
@@ -11,13 +11,14 @@ HOMEPAGE="http://www.kde.org/applications/utilities http://utils.kde.org" |
| 97 |
KEYWORDS="~amd64 ~x86" |
| 98 |
IUSE="cups floppy lirc" |
| 99 |
|
| 100 |
+# FIXME: Add back when ported |
| 101 |
+# $(add_kdeapps_dep kgpg) |
| 102 |
RDEPEND=" |
| 103 |
$(add_kdeapps_dep ark) |
| 104 |
$(add_kdeapps_dep filelight) |
| 105 |
$(add_kdeapps_dep kcalc) |
| 106 |
$(add_kdeapps_dep kcharselect) |
| 107 |
$(add_kdeapps_dep kdf) |
| 108 |
- $(add_kdeapps_dep kgpg) |
| 109 |
$(add_kdeapps_dep ktimer) |
| 110 |
$(add_kdeapps_dep kwalletmanager) |
| 111 |
$(add_kdeapps_dep superkaramba) |
| 112 |
|
| 113 |
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild |
| 114 |
index 2124052..aafae4f 100644 |
| 115 |
--- a/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild |
| 116 |
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild |
| 117 |
@@ -11,13 +11,14 @@ HOMEPAGE="http://www.kde.org/applications/utilities http://utils.kde.org" |
| 118 |
KEYWORDS="" |
| 119 |
IUSE="cups floppy lirc" |
| 120 |
|
| 121 |
+# FIXME: Add back when ported |
| 122 |
+# $(add_kdeapps_dep kgpg) |
| 123 |
RDEPEND=" |
| 124 |
$(add_kdeapps_dep ark) |
| 125 |
$(add_kdeapps_dep filelight) |
| 126 |
$(add_kdeapps_dep kcalc) |
| 127 |
$(add_kdeapps_dep kcharselect) |
| 128 |
$(add_kdeapps_dep kdf) |
| 129 |
- $(add_kdeapps_dep kgpg) |
| 130 |
$(add_kdeapps_dep ktimer) |
| 131 |
$(add_kdeapps_dep kwalletmanager) |
| 132 |
$(add_kdeapps_dep superkaramba) |
Archives