commit: 7f087ea2706e10ef970cb75fd65df8c37b4d5aae
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct 26 13:51:46 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 10:55:01 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f087ea2
kde-apps/kdenetwork-meta: Drop USE=telepathy and kopete
Dropping kopete from deps in anticipation of KDE PIM unmask.
Package-Manager: portage-2.3.0
kde-apps/kdenetwork-meta/kdenetwork-meta-16.08.49.9999.ebuild | 7 ++++---
kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild | 7 ++++---
kde-apps/kdenetwork-meta/metadata.xml | 1 -
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-16.08.49.9999.ebuild
b/kde-apps/kdenetwork-meta/kdenetwork-meta-16.08.49.9999.ebuild
index 3a12e98..363db85 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-16.08.49.9999.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-16.08.49.9999.ebuild
@@ -8,21 +8,22 @@ inherit kde5-meta-pkg
DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived
packages"
KEYWORDS=""
-IUSE="nls ppp +telepathy"
+IUSE="nls ppp"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+# FIXME: Add back whenever it gets ported
+# $(add_kdeapps_dep kopete)
RDEPEND="
$(add_kdeapps_dep kdenetwork-filesharing)
$(add_kdeapps_dep kget)
$(add_kdeapps_dep krdc)
$(add_kdeapps_dep krfb)
+ $(add_kdeapps_dep plasma-telepathy-meta)
$(add_kdeapps_dep zeroconf-ioslave)
nls? (
$(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
$(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL})
)
ppp? ( $(add_kdeapps_dep kppp) )
- telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
- !telepathy? ( $(add_kdeapps_dep kopete) )
"
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
index 3a12e98..363db85 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
@@ -8,21 +8,22 @@ inherit kde5-meta-pkg
DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived
packages"
KEYWORDS=""
-IUSE="nls ppp +telepathy"
+IUSE="nls ppp"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+# FIXME: Add back whenever it gets ported
+# $(add_kdeapps_dep kopete)
RDEPEND="
$(add_kdeapps_dep kdenetwork-filesharing)
$(add_kdeapps_dep kget)
$(add_kdeapps_dep krdc)
$(add_kdeapps_dep krfb)
+ $(add_kdeapps_dep plasma-telepathy-meta)
$(add_kdeapps_dep zeroconf-ioslave)
nls? (
$(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
$(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL})
)
ppp? ( $(add_kdeapps_dep kppp) )
- telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
- !telepathy? ( $(add_kdeapps_dep kopete) )
"
diff --git a/kde-apps/kdenetwork-meta/metadata.xml
b/kde-apps/kdenetwork-meta/metadata.xml
index e9ae825..b6d27d5 100644
--- a/kde-apps/kdenetwork-meta/metadata.xml
+++ b/kde-apps/kdenetwork-meta/metadata.xml
@@ -7,6 +7,5 @@
</maintainer>
<use>
<flag name="ppp">Enable support for
<pkg>net-dialup/ppp</pkg>.</flag>
- <flag name="telepathy">Enable build of
<pkg>kde-apps/plasma-telepathy-meta</pkg>, otherwise
<pkg>kde-apps/kopete</pkg>.</flag>
</use>
</pkgmetadata>
