summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-0.9.0.ebuild (renamed from net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild)3
-rw-r--r--kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-15.12.3.ebuild2
-rw-r--r--net-im/kde-telepathy-meta/metadata.xml8
-rw-r--r--profiles/updates/2Q-20161
4 files changed, 3 insertions, 11 deletions
diff --git a/net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-0.9.0.ebuild
index 270537c5c3ac..13fa87b37012 100644
--- a/net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-0.9.0.ebuild
@@ -4,8 +4,7 @@
EAPI=6
-DESCRIPTION="KDE Telepathy client - merge this to pull in all net-im/ktp-*
-kde packages"
+DESCRIPTION="Plasma Telepathy client"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
KEYWORDS="~amd64 ~x86"
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-15.12.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-15.12.3.ebuild
index 115038d32162..4c523f36dec1 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-15.12.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-15.12.3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
$(add_kdeapps_dep ktp-kded-module)
$(add_kdeapps_dep ktp-send-file)
$(add_kdeapps_dep ktp-text-ui)
- !net-im/kde-telepathy-meta
+ !kde-apps/plasma-telepathy-meta:4
nls? (
$(add_kdeapps_dep ktp-l10n '' ${L10N_MINIMAL})
)
diff --git a/net-im/kde-telepathy-meta/metadata.xml b/net-im/kde-telepathy-meta/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/net-im/kde-telepathy-meta/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
index 579d71257b55..75c7d8b819a3 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -16,3 +16,4 @@ move net-im/ktp-filetransfer-handler kde-apps/ktp-filetransfer-handler
move net-im/ktp-kded-module kde-apps/ktp-kded-module
move net-im/ktp-send-file kde-apps/ktp-send-file
move net-im/ktp-text-ui kde-apps/ktp-text-ui
+move net-im/kde-telepathy-meta -> kde-apps/plasma-telepathy-meta