public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: net-im/telepathy-text-ui/, net-im/ktp-common-internals/, ...
Date: Wed, 25 Jan 2012 14:02:00 +0000 (UTC)	[thread overview]
Message-ID: <635faa4671fb461bc60696e6bd155180d5ed5082.johu@gentoo> (raw)

commit:     635faa4671fb461bc60696e6bd155180d5ed5082
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 12:16:58 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 12:25:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=635faa46

[kde-telepathy] Move packages according upstream renaming. Remove 0.2.0. Rename set.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

---
 .../kde-telepathy-meta-9999.ebuild}                |   24 ++++++-----
 .../metadata.xml                                   |    0
 .../ktp-accounts-kcm-9999.ebuild}                  |   13 +++---
 .../metadata.xml                                   |    0
 .../ktp-approver-9999.ebuild}                      |    9 +---
 .../metadata.xml                                   |    0
 .../ktp-auth-handler-9999.ebuild}                  |    8 +--
 .../metadata.xml                                   |    0
 .../ktp-common-internals-9999.ebuild}              |    6 +--
 .../metadata.xml                                   |    0
 .../ktp-contact-applet-9999.ebuild}                |   10 ++---
 .../metadata.xml                                   |    0
 .../ktp-contact-list-9999.ebuild}                  |   10 ++---
 .../metadata.xml                                   |    0
 .../ktp-filetransfer-handler-9999.ebuild}          |    8 +--
 .../metadata.xml                                   |    0
 .../ktp-kded-module-9999.ebuild}                   |    8 +--
 .../metadata.xml                                   |    0
 .../ktp-presence-applet-9999.ebuild}               |    8 +---
 .../metadata.xml                                   |    0
 .../ktp-send-file-9999.ebuild}                     |   12 ++---
 .../metadata.xml                                   |    0
 .../ktp-text-ui-9999.ebuild}                       |    9 +---
 .../metadata.xml                                   |    0
 .../telepathy-accounts-kcm-9999.ebuild             |   37 ------------------
 .../telepathy-approver-9999.ebuild                 |   33 ----------------
 .../telepathy-auth-handler-9999.ebuild             |   32 ---------------
 .../telepathy-contact-applet-9999.ebuild           |   33 ----------------
 .../telepathy-contact-list-9999.ebuild             |   33 ----------------
 .../telepathy-filetransfer-handler-9999.ebuild     |   32 ---------------
 .../telepathy-kde-meta-9999.ebuild                 |   41 --------------------
 .../telepathy-kded-module-9999.ebuild              |   32 ---------------
 .../telepathy-presence-applet-0.2.0.ebuild         |   32 ---------------
 .../telepathy-presence-dataengine-0.2.0.ebuild     |   29 --------------
 .../telepathy-send-file-9999.ebuild                |   36 -----------------
 net-im/telepathy-text-ui/metadata.xml              |    5 --
 .../telepathy-text-ui-9999.ebuild                  |   33 ----------------
 profiles/updates/1Q-2012                           |   12 ++++++
 sets/kde-telepathy                                 |   12 ++++++
 sets/telepathy-kde                                 |   12 ------
 40 files changed, 74 insertions(+), 495 deletions(-)

diff --git a/net-im/telepathy-kde-meta/telepathy-kde-meta-0.2.0.ebuild b/net-im/kde-telepathy-meta/kde-telepathy-meta-9999.ebuild
similarity index 61%
rename from net-im/telepathy-kde-meta/telepathy-kde-meta-0.2.0.ebuild
rename to net-im/kde-telepathy-meta/kde-telepathy-meta-9999.ebuild
index d6496e6..042ddb3 100644
--- a/net-im/telepathy-kde-meta/telepathy-kde-meta-0.2.0.ebuild
+++ b/net-im/kde-telepathy-meta/kde-telepathy-meta-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-DESCRIPTION="KDE Telepathy client - merge this to pull in all net-im/telepathy*
+DESCRIPTION="KDE Telepathy client - merge this to pull in all net-im/ktp-*
 kde packages"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 
@@ -20,17 +20,19 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="
-	>=net-im/telepathy-accounts-kcm-${PV}
-	>=net-im/telepathy-approver-${PV}
-	>=net-im/telepathy-auth-handler-${PV}
+	>=net-im/ktp-accounts-kcm-${PV}
+	>=net-im/ktp-approver-${PV}
+	>=net-im/ktp-auth-handler-${PV}
+	>=net-im/ktp-common-internals-${PV}
+	>=net-im/ktp-contact-applet-${PV}
+	>=net-im/ktp-contact-list-${PV}
+	>=net-im/ktp-filetransfer-handler-${PV}
+	>=net-im/ktp-kded-module-${PV}
+	>=net-im/ktp-presence-applet-${PV}
+	>=net-im/ktp-send-file-${PV}
+	>=net-im/ktp-text-ui-${PV}
 	net-im/telepathy-connection-managers
-	>=net-im/telepathy-contact-applet-${PV}
-	>=net-im/telepathy-contact-list-${PV}
-	>=net-im/telepathy-filetransfer-handler-${PV}
-	>=net-im/telepathy-kded-module-${PV}
-	>=net-im/telepathy-presence-applet-${PV}
-	>=net-im/telepathy-send-file-${PV}
-	>=net-im/telepathy-text-ui-${PV}"
+"
 
 pkg_postinst() {
 	echo

diff --git a/net-im/telepathy-accounts-kcm/metadata.xml b/net-im/kde-telepathy-meta/metadata.xml
similarity index 100%
rename from net-im/telepathy-accounts-kcm/metadata.xml
rename to net-im/kde-telepathy-meta/metadata.xml

diff --git a/net-im/telepathy-accounts-kcm/telepathy-accounts-kcm-0.2.0.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
similarity index 69%
rename from net-im/telepathy-accounts-kcm/telepathy-accounts-kcm-0.2.0.ebuild
rename to net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
index 6981ba1..caaa7f0 100644
--- a/net-im/telepathy-accounts-kcm/telepathy-accounts-kcm-0.2.0.ebuild
+++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
@@ -4,16 +4,16 @@
 
 EAPI=4
 
+KDE_MINIMAL="4.7"
 KDE_LINGUAS="cs da de en_GB eo es et fi fr hu it ja km lt mai nds nl pl pt pt_BR
 ru sv tr ug uk zh_TW"
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy account management kcm"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	KEYWORDS=""
@@ -24,11 +24,10 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=net-im/telepathy-mission-control-5.7.9
-	>=net-libs/telepathy-glib-0.14
-	>=net-libs/telepathy-qt-0.7.3
+	>=net-im/ktp-common-internals-${PV}
+	net-im/telepathy-mission-control
+	net-libs/telepathy-glib
+	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}
 "
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-approver/metadata.xml b/net-im/ktp-accounts-kcm/metadata.xml
similarity index 100%
rename from net-im/telepathy-approver/metadata.xml
rename to net-im/ktp-accounts-kcm/metadata.xml

diff --git a/net-im/telepathy-approver/telepathy-approver-0.2.0.ebuild b/net-im/ktp-approver/ktp-approver-9999.ebuild
similarity index 70%
rename from net-im/telepathy-approver/telepathy-approver-0.2.0.ebuild
rename to net-im/ktp-approver/ktp-approver-9999.ebuild
index ad1d508..53939a7 100644
--- a/net-im/telepathy-approver/telepathy-approver-0.2.0.ebuild
+++ b/net-im/ktp-approver/ktp-approver-9999.ebuild
@@ -6,13 +6,12 @@ EAPI=4
 
 KDE_LINGUAS="cs da de hu it lt nds nl pt pt_BR sv uk"
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy notification handler"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	KEYWORDS=""
@@ -23,10 +22,8 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=net-libs/telepathy-qt-0.7.3
+	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
+	>=net-im/ktp-contact-list-${PV}
 "
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-auth-handler/metadata.xml b/net-im/ktp-approver/metadata.xml
similarity index 100%
rename from net-im/telepathy-auth-handler/metadata.xml
rename to net-im/ktp-approver/metadata.xml

diff --git a/net-im/telepathy-auth-handler/telepathy-auth-handler-0.2.0.ebuild b/net-im/ktp-auth-handler/ktp-auth-handler-9999.ebuild
similarity index 74%
rename from net-im/telepathy-auth-handler/telepathy-auth-handler-0.2.0.ebuild
rename to net-im/ktp-auth-handler/ktp-auth-handler-9999.ebuild
index 8d03d5b..2d693ea 100644
--- a/net-im/telepathy-auth-handler/telepathy-auth-handler-0.2.0.ebuild
+++ b/net-im/ktp-auth-handler/ktp-auth-handler-9999.ebuild
@@ -6,13 +6,12 @@ EAPI=4
 
 KDE_LINGUAS="cs da de hu it lt nds nl pt pt_BR sv uk"
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy authentication handler"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	KEYWORDS=""
@@ -23,8 +22,7 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=net-libs/telepathy-qt-0.7.3
+	>=net-im/ktp-common-internals-${PV}
+	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-common-internals/metadata.xml b/net-im/ktp-auth-handler/metadata.xml
similarity index 100%
rename from net-im/telepathy-common-internals/metadata.xml
rename to net-im/ktp-auth-handler/metadata.xml

diff --git a/net-im/telepathy-common-internals/telepathy-common-internals-9999.ebuild b/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild
similarity index 70%
rename from net-im/telepathy-common-internals/telepathy-common-internals-9999.ebuild
rename to net-im/ktp-common-internals/ktp-common-internals-9999.ebuild
index a303bb0..250ae97 100644
--- a/net-im/telepathy-common-internals/telepathy-common-internals-9999.ebuild
+++ b/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild
@@ -5,16 +5,14 @@
 EAPI=4
 
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy common library"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
 	KEYWORDS=""
 fi
 
@@ -26,5 +24,3 @@ DEPEND="
 	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-contact-applet/metadata.xml b/net-im/ktp-common-internals/metadata.xml
similarity index 100%
rename from net-im/telepathy-contact-applet/metadata.xml
rename to net-im/ktp-common-internals/metadata.xml

diff --git a/net-im/telepathy-contact-applet/telepathy-contact-applet-0.2.0.ebuild b/net-im/ktp-contact-applet/ktp-contact-applet-9999.ebuild
similarity index 67%
rename from net-im/telepathy-contact-applet/telepathy-contact-applet-0.2.0.ebuild
rename to net-im/ktp-contact-applet/ktp-contact-applet-9999.ebuild
index e5d5b87..1eeddfa 100644
--- a/net-im/telepathy-contact-applet/telepathy-contact-applet-0.2.0.ebuild
+++ b/net-im/ktp-contact-applet/ktp-contact-applet-9999.ebuild
@@ -5,13 +5,12 @@
 EAPI=4
 
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy contact applet"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	KEYWORDS=""
@@ -22,10 +21,9 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=net-libs/telepathy-qt-0.7.3
+	>=net-im/ktp-common-internals-${PV}
+	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
+	>=net-im/ktp-contact-list-${PV}
 "
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-contact-list/metadata.xml b/net-im/ktp-contact-applet/metadata.xml
similarity index 100%
rename from net-im/telepathy-contact-list/metadata.xml
rename to net-im/ktp-contact-applet/metadata.xml

diff --git a/net-im/telepathy-contact-list/telepathy-contact-list-0.2.0.ebuild b/net-im/ktp-contact-list/ktp-contact-list-9999.ebuild
similarity index 70%
rename from net-im/telepathy-contact-list/telepathy-contact-list-0.2.0.ebuild
rename to net-im/ktp-contact-list/ktp-contact-list-9999.ebuild
index 8773539..8b756f4 100644
--- a/net-im/telepathy-contact-list/telepathy-contact-list-0.2.0.ebuild
+++ b/net-im/ktp-contact-list/ktp-contact-list-9999.ebuild
@@ -6,13 +6,12 @@ EAPI=4
 
 KDE_LINGUAS="cs da de et fr hu it ja km lt nds nl pl pt pt_BR sv ug uk"
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy contact list"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	KEYWORDS=""
@@ -23,9 +22,8 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=net-im/telepathy-accounts-kcm-${PV}
-	>=net-libs/telepathy-qt-0.7.3
+	>=net-im/ktp-accounts-kcm-${PV}
+	>=net-im/ktp-common-internals-${PV}
+	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-filetransfer-handler/metadata.xml b/net-im/ktp-contact-list/metadata.xml
similarity index 100%
rename from net-im/telepathy-filetransfer-handler/metadata.xml
rename to net-im/ktp-contact-list/metadata.xml

diff --git a/net-im/telepathy-filetransfer-handler/telepathy-filetransfer-handler-0.2.0.ebuild b/net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
similarity index 74%
rename from net-im/telepathy-filetransfer-handler/telepathy-filetransfer-handler-0.2.0.ebuild
rename to net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
index 1083163..17c3bae 100644
--- a/net-im/telepathy-filetransfer-handler/telepathy-filetransfer-handler-0.2.0.ebuild
+++ b/net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
@@ -6,13 +6,12 @@ EAPI=4
 
 KDE_LINGUAS="cs da de et fr hu it ja lt nds nl pl pt pt_BR sv uk"
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy file transfer handler"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	KEYWORDS=""
@@ -23,8 +22,7 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=net-libs/telepathy-qt-0.7.3
+	>=net-im/ktp-common-internals-${PV}
+	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-kde-meta/metadata.xml b/net-im/ktp-filetransfer-handler/metadata.xml
similarity index 100%
rename from net-im/telepathy-kde-meta/metadata.xml
rename to net-im/ktp-filetransfer-handler/metadata.xml

diff --git a/net-im/telepathy-kded-module/telepathy-kded-module-0.2.0.ebuild b/net-im/ktp-kded-module/ktp-kded-module-9999.ebuild
similarity index 72%
rename from net-im/telepathy-kded-module/telepathy-kded-module-0.2.0.ebuild
rename to net-im/ktp-kded-module/ktp-kded-module-9999.ebuild
index 03dad7e..ee106be 100644
--- a/net-im/telepathy-kded-module/telepathy-kded-module-0.2.0.ebuild
+++ b/net-im/ktp-kded-module/ktp-kded-module-9999.ebuild
@@ -6,13 +6,12 @@ EAPI=4
 
 KDE_LINGUAS="cs da de hu it lt nds nl pt pt_BR sv uk"
 KDE_SCM="git"
-MY_P="${PN/telepathy-kded/telepathy-kde-integration}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy workspace integration"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	KEYWORDS=""
@@ -23,8 +22,7 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=net-libs/telepathy-qt-0.7.3
+	>=net-im/ktp-common-internals-${PV}
+	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-kded-module/metadata.xml b/net-im/ktp-kded-module/metadata.xml
similarity index 100%
rename from net-im/telepathy-kded-module/metadata.xml
rename to net-im/ktp-kded-module/metadata.xml

diff --git a/net-im/telepathy-presence-applet/telepathy-presence-applet-9999.ebuild b/net-im/ktp-presence-applet/ktp-presence-applet-9999.ebuild
similarity index 66%
rename from net-im/telepathy-presence-applet/telepathy-presence-applet-9999.ebuild
rename to net-im/ktp-presence-applet/ktp-presence-applet-9999.ebuild
index 5a8fc42..85c3bae 100644
--- a/net-im/telepathy-presence-applet/telepathy-presence-applet-9999.ebuild
+++ b/net-im/ktp-presence-applet/ktp-presence-applet-9999.ebuild
@@ -5,16 +5,14 @@
 EAPI=4
 
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy presence applet"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
 	KEYWORDS=""
 fi
 
@@ -26,7 +24,5 @@ DEPEND="
 	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
+	>=net-im/ktp-contact-list-${PV}
 "
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-presence-applet/metadata.xml b/net-im/ktp-presence-applet/metadata.xml
similarity index 100%
rename from net-im/telepathy-presence-applet/metadata.xml
rename to net-im/ktp-presence-applet/metadata.xml

diff --git a/net-im/telepathy-send-file/telepathy-send-file-0.2.0.ebuild b/net-im/ktp-send-file/ktp-send-file-9999.ebuild
similarity index 67%
rename from net-im/telepathy-send-file/telepathy-send-file-0.2.0.ebuild
rename to net-im/ktp-send-file/ktp-send-file-9999.ebuild
index fd106dc..ed8c56f 100644
--- a/net-im/telepathy-send-file/telepathy-send-file-0.2.0.ebuild
+++ b/net-im/ktp-send-file/ktp-send-file-9999.ebuild
@@ -7,13 +7,12 @@ EAPI=4
 KDE_MINIMAL="4.7"
 KDE_LINGUAS="cs da de hu it lt nds nl pt pt_BR sv uk"
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	KEYWORDS=""
@@ -24,11 +23,10 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=net-libs/telepathy-qt-0.7.3
+	>=net-im/ktp-common-internals-${PV}
+	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
-	>=net-im/telepathy-filetransfer-handler-${PV}
+	>=net-im/ktp-contact-list-${PV}
+	>=net-im/ktp-filetransfer-handler-${PV}
 "
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-presence-dataengine/metadata.xml b/net-im/ktp-send-file/metadata.xml
similarity index 100%
rename from net-im/telepathy-presence-dataengine/metadata.xml
rename to net-im/ktp-send-file/metadata.xml

diff --git a/net-im/telepathy-text-ui/telepathy-text-ui-0.2.0.ebuild b/net-im/ktp-text-ui/ktp-text-ui-9999.ebuild
similarity index 70%
rename from net-im/telepathy-text-ui/telepathy-text-ui-0.2.0.ebuild
rename to net-im/ktp-text-ui/ktp-text-ui-9999.ebuild
index f091e39..2a9bee2 100644
--- a/net-im/telepathy-text-ui/telepathy-text-ui-0.2.0.ebuild
+++ b/net-im/ktp-text-ui/ktp-text-ui-9999.ebuild
@@ -6,13 +6,12 @@ EAPI=4
 
 KDE_LINGUAS="cs da de et fr hu it ja km lt nds nl pl pt pt_BR sv ug uk"
 KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
 inherit kde4-base
 
 DESCRIPTION="KDE Telepathy text chat window"
 HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
+	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	KEYWORDS=""
@@ -23,10 +22,8 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=net-libs/telepathy-qt-0.7.3
+	>=net-libs/telepathy-qt-0.9.0
 "
 RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
+	>=net-im/ktp-contact-list-${PV}
 "
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-send-file/metadata.xml b/net-im/ktp-text-ui/metadata.xml
similarity index 100%
rename from net-im/telepathy-send-file/metadata.xml
rename to net-im/ktp-text-ui/metadata.xml

diff --git a/net-im/telepathy-accounts-kcm/telepathy-accounts-kcm-9999.ebuild b/net-im/telepathy-accounts-kcm/telepathy-accounts-kcm-9999.ebuild
deleted file mode 100644
index cd49956..0000000
--- a/net-im/telepathy-accounts-kcm/telepathy-accounts-kcm-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_MINIMAL="4.7"
-KDE_LINGUAS="cs da de en_GB eo es et fi fr hu it ja km lt mai nds nl pl pt pt_BR
-ru sv tr ug uk zh_TW"
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy account management kcm"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
-	KEYWORDS=""
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-im/telepathy-common-internals-${PV}
-	>=net-im/telepathy-mission-control-5.7.9
-	>=net-libs/telepathy-glib-0.14
-	>=net-libs/telepathy-qt-0.9.0
-"
-RDEPEND="${DEPEND}
-"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-approver/telepathy-approver-9999.ebuild b/net-im/telepathy-approver/telepathy-approver-9999.ebuild
deleted file mode 100644
index 9f4f135..0000000
--- a/net-im/telepathy-approver/telepathy-approver-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_LINGUAS="cs da de hu it lt nds nl pt pt_BR sv uk"
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy notification handler"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
-	KEYWORDS=""
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-libs/telepathy-qt-0.9.0
-"
-RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
-"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-auth-handler/telepathy-auth-handler-9999.ebuild b/net-im/telepathy-auth-handler/telepathy-auth-handler-9999.ebuild
deleted file mode 100644
index 5311497..0000000
--- a/net-im/telepathy-auth-handler/telepathy-auth-handler-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_LINGUAS="cs da de hu it lt nds nl pt pt_BR sv uk"
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy authentication handler"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
-	KEYWORDS=""
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-im/telepathy-common-internals-${PV}
-	>=net-libs/telepathy-qt-0.9.0
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-contact-applet/telepathy-contact-applet-9999.ebuild b/net-im/telepathy-contact-applet/telepathy-contact-applet-9999.ebuild
deleted file mode 100644
index 594dbd1..0000000
--- a/net-im/telepathy-contact-applet/telepathy-contact-applet-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy contact applet"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-im/telepathy-common-internals-${PV}
-	>=net-libs/telepathy-qt-0.9.0
-"
-RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
-"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-contact-list/telepathy-contact-list-9999.ebuild b/net-im/telepathy-contact-list/telepathy-contact-list-9999.ebuild
deleted file mode 100644
index 8654677..0000000
--- a/net-im/telepathy-contact-list/telepathy-contact-list-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_LINGUAS="cs da de et fr hu it ja km lt nds nl pl pt pt_BR sv ug uk"
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy contact list"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-im/telepathy-accounts-kcm-${PV}
-	>=net-im/telepathy-common-internals-${PV}
-	>=net-libs/telepathy-qt-0.9.0
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-filetransfer-handler/telepathy-filetransfer-handler-9999.ebuild b/net-im/telepathy-filetransfer-handler/telepathy-filetransfer-handler-9999.ebuild
deleted file mode 100644
index 98818d1..0000000
--- a/net-im/telepathy-filetransfer-handler/telepathy-filetransfer-handler-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_LINGUAS="cs da de et fr hu it ja lt nds nl pl pt pt_BR sv uk"
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy file transfer handler"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-im/telepathy-common-internals-${PV}
-	>=net-libs/telepathy-qt-0.9.0
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-kde-meta/telepathy-kde-meta-9999.ebuild b/net-im/telepathy-kde-meta/telepathy-kde-meta-9999.ebuild
deleted file mode 100644
index ba87fd3..0000000
--- a/net-im/telepathy-kde-meta/telepathy-kde-meta-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="KDE Telepathy client - merge this to pull in all net-im/telepathy*
-kde packages"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
-SLOT="4"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=net-im/telepathy-accounts-kcm-${PV}
-	>=net-im/telepathy-approver-${PV}
-	>=net-im/telepathy-auth-handler-${PV}
-	>=net-im/telepathy-common-internals-${PV}
-	net-im/telepathy-connection-managers
-	>=net-im/telepathy-contact-applet-${PV}
-	>=net-im/telepathy-contact-list-${PV}
-	>=net-im/telepathy-filetransfer-handler-${PV}
-	>=net-im/telepathy-kded-module-${PV}
-	>=net-im/telepathy-presence-applet-${PV}
-	>=net-im/telepathy-send-file-${PV}
-	>=net-im/telepathy-text-ui-${PV}"
-
-pkg_postinst() {
-	echo
-	elog "You can configure the accounts in the KDE System Settings"
-	elog "and then add the Instant Messaging plasma applet to access the contact list."
-	echo
-}

diff --git a/net-im/telepathy-kded-module/telepathy-kded-module-9999.ebuild b/net-im/telepathy-kded-module/telepathy-kded-module-9999.ebuild
deleted file mode 100644
index 0d41521..0000000
--- a/net-im/telepathy-kded-module/telepathy-kded-module-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_LINGUAS="cs da de hu it lt nds nl pt pt_BR sv uk"
-KDE_SCM="git"
-MY_P="${PN/telepathy-kded/telepathy-kde-integration}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy workspace integration"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
-	KEYWORDS=""
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-im/telepathy-common-internals-${PV}
-	>=net-libs/telepathy-qt-0.9.0
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-presence-applet/telepathy-presence-applet-0.2.0.ebuild b/net-im/telepathy-presence-applet/telepathy-presence-applet-0.2.0.ebuild
deleted file mode 100644
index 06472d9..0000000
--- a/net-im/telepathy-presence-applet/telepathy-presence-applet-0.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy presence applet"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-libs/telepathy-qt-0.7.3
-"
-RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
-	>=net-im/telepathy-presence-dataengine-${PV}
-"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-presence-dataengine/telepathy-presence-dataengine-0.2.0.ebuild b/net-im/telepathy-presence-dataengine/telepathy-presence-dataengine-0.2.0.ebuild
deleted file mode 100644
index 712ef33..0000000
--- a/net-im/telepathy-presence-dataengine/telepathy-presence-dataengine-0.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy presence dataengine"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-libs/telepathy-qt-0.7.3
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-send-file/telepathy-send-file-9999.ebuild b/net-im/telepathy-send-file/telepathy-send-file-9999.ebuild
deleted file mode 100644
index ad33510..0000000
--- a/net-im/telepathy-send-file/telepathy-send-file-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_MINIMAL="4.7"
-KDE_LINGUAS="cs da de hu it lt nds nl pt pt_BR sv uk"
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
-	KEYWORDS=""
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-im/telepathy-common-internals-${PV}
-	>=net-libs/telepathy-qt-0.9.0
-"
-RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
-	>=net-im/telepathy-filetransfer-handler-${PV}
-"
-
-S=${WORKDIR}/${MY_P}

diff --git a/net-im/telepathy-text-ui/metadata.xml b/net-im/telepathy-text-ui/metadata.xml
deleted file mode 100644
index 8d1e86a..0000000
--- a/net-im/telepathy-text-ui/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-</pkgmetadata>

diff --git a/net-im/telepathy-text-ui/telepathy-text-ui-9999.ebuild b/net-im/telepathy-text-ui/telepathy-text-ui-9999.ebuild
deleted file mode 100644
index 375555e..0000000
--- a/net-im/telepathy-text-ui/telepathy-text-ui-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_LINGUAS="cs da de et fr hu it ja km lt nds nl pl pt pt_BR sv ug uk"
-KDE_SCM="git"
-MY_P="${PN/telepathy/telepathy-kde}-${PV}"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy text chat window"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/telepathy-kde/${PV}/src/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${PN/telepathy/ktp}"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	>=net-libs/telepathy-qt-0.9.0
-"
-RDEPEND="${DEPEND}
-	>=net-im/telepathy-contact-list-${PV}
-"
-
-S=${WORKDIR}/${MY_P}

diff --git a/profiles/updates/1Q-2012 b/profiles/updates/1Q-2012
index e5cdd70..9205325 100644
--- a/profiles/updates/1Q-2012
+++ b/profiles/updates/1Q-2012
@@ -1,3 +1,15 @@
 move kde-base/mobipocket kde-base/kdegraphics-mobipocket
 slotmove kde-misc/miniplayer 0 4
 move net-libs/telepathy-qt4 net-libs/telepathy-qt
+move net-im/telepathy-kde-meta net-im/kde-telepathy-meta
+move net-im/telepathy-accounts-kcm net-im/ktp-accounts-kcm
+move net-im/telepathy-approver net-im/ktp-approver
+move net-im/telepathy-auth-handler net-im/ktp-auth-handler
+move net-im/telepathy-common-internals net-im/ktp-common-internals
+move net-im/telepathy-contact-applet net-im/ktp-contact-applet
+move net-im/telepathy-contact-list net-im/ktp-contact-list
+move net-im/telepathy-filetransfer-handler net-im/ktp-filetransfer-handler
+move net-im/telepathy-kded-module net-im/ktp-kded-module
+move net-im/telepathy-presence-applet net-im/ktp-presence-applet
+move net-im/telepathy-send-file net-im/ktp-send-file
+move net-im/telepathy-text-ui net-im/ktp-text-ui

diff --git a/sets/kde-telepathy b/sets/kde-telepathy
new file mode 100644
index 0000000..392f050
--- /dev/null
+++ b/sets/kde-telepathy
@@ -0,0 +1,12 @@
+net-im/ktp-accounts-kcm
+net-im/ktp-approver
+net-im/ktp-auth-handler
+net-im/ktp-common-internals
+net-im/ktp-contact-applet
+net-im/ktp-contact-list
+net-im/ktp-filetransfer-handler
+net-im/ktp-kded-module
+net-im/ktp-presence-applet
+net-im/ktp-send-file
+net-im/ktp-text-ui
+net-im/kde-telepathy-meta

diff --git a/sets/telepathy-kde b/sets/telepathy-kde
deleted file mode 100644
index 8852057..0000000
--- a/sets/telepathy-kde
+++ /dev/null
@@ -1,12 +0,0 @@
-net-im/telepathy-accounts-kcm
-net-im/telepathy-approver
-net-im/telepathy-auth-handler
-net-im/telepathy-common-internals
-net-im/telepathy-contact-applet
-net-im/telepathy-contact-list
-net-im/telepathy-filetransfer-handler
-net-im/telepathy-kded-module
-net-im/telepathy-kde-meta
-net-im/telepathy-presence-applet
-net-im/telepathy-send-file
-net-im/telepathy-text-ui



                 reply	other threads:[~2012-01-25 14:02 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=635faa4671fb461bc60696e6bd155180d5ed5082.johu@gentoo \
    --to=johu@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox