[telepathy] Removed telepathy-accounts-kcm-plugins, bug 385861

Switched to net-voip/telepathy-connection-managers for protocol dependencies

(Portage version: 2.2.0_alpha60_p70/git/Linux i686, signed Manifest commit with key DF018462)

6 files changed, 8 insertions, 55 deletions

diff --git a/net-im/telepathy-accounts-kcm-plugins/Manifest b/net-im/telepathy-accounts-kcm-plugins/Manifest
deleted file mode 100644
index f1c9f926969..00000000000
--- a/net-im/telepathy-accounts-kcm-plugins/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD telepathy-accounts-kcm-plugins-9999.ebuild 645 RMD160 8f3300ab5539cbd04e375ea0844fcffaa1c4c7a8 SHA1 dbce9ce2b55ccdf72cc6c888feec7489980a2f07 SHA256 fc0dc90300f5cbbe100ec20a96300dcc975591f88ff49e071cc64934906afce9
-MISC metadata.xml 414 RMD160 77a8510261d4d1fcb867a01b14dede52c24f7172 SHA1 2fff157e1b33862ff43133d4511c199f15bd78bb SHA256 4c068c02cfafa677fbb9174f1d44bc75b0916f6e53839d7492cf03ab9261e1ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk57AzgACgkQvRf93N8BhGJDIgD/X5nlP/XvSlqN0Cok0kLBEB0k
-n/NtnHyLxIyP6xyNE7cA/iE4oruWwAOjcbJrnaSpYIMv84Y83p38916qyiUqbuc9
-=eWZV
------END PGP SIGNATURE-----
diff --git a/net-im/telepathy-accounts-kcm-plugins/metadata.xml b/net-im/telepathy-accounts-kcm-plugins/metadata.xml
deleted file mode 100644
index b4cd0868b9c..00000000000
--- a/net-im/telepathy-accounts-kcm-plugins/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-	<use>
-		<flag name="irc">Enable Internet Relay Chat (IRC) support.</flag>
-		<flag name="purple">Enable libpurple supported protocols ICQ/Yahoo.</flag>
-		<flag name="zeroconf">Enable Link-Local Messaging via the zeroconf or Bonjour protocol.</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-im/telepathy-accounts-kcm-plugins/telepathy-accounts-kcm-plugins-9999.ebuild b/net-im/telepathy-accounts-kcm-plugins/telepathy-accounts-kcm-plugins-9999.ebuild
deleted file mode 100644
index 443b7e5716a..00000000000
--- a/net-im/telepathy-accounts-kcm-plugins/telepathy-accounts-kcm-plugins-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Telepathy protocols plugins for account management"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-KEYWORDS=""
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug irc purple jabber msn zeroconf"
-
-DEPEND="
-	net-im/telepathy-accounts-kcm
-	irc? ( net-irc/telepathy-idle )
-	jabber? ( net-voip/telepathy-gabble )
-	msn? ( net-voip/telepathy-butterfly )
-	purple? ( net-voip/telepathy-haze )
-	zeroconf? ( net-voip/telepathy-salut )
-"
-RDEPEND="${DEPEND}"
diff --git a/net-im/telepathy-kde-meta/Manifest b/net-im/telepathy-kde-meta/Manifest
index ba43d7a93e9..57207c378ea 100644
--- a/net-im/telepathy-kde-meta/Manifest
+++ b/net-im/telepathy-kde-meta/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD telepathy-kde-meta-9999.ebuild 812 RMD160 5dbd840679a728f12974915699eb02204bdf36fb SHA1 12c953a3368f0b8528ed2e268c0f7f80c5c032dc SHA256 4d4e180207edbca858227681c2528d99e3a865f9a86b3866f019acb3d30ab943
+EBUILD telepathy-kde-meta-9999.ebuild 805 RMD160 269f54994ce1e647ce0c3c8db27fb4f821da6c4b SHA1 c4787ec1f42b6a559d3737c7581e76d683802449 SHA256 374a529d26ac38007efac5747ad6afd1b6e950043be320ebd5e7560c6cd4bf4d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk56b08ACgkQvRf93N8BhGKnpQD6A77YGU+2PupIRrmZsoQxdxYP
-aIe3mUBPQdx6sAtBMikA/iKNrue9WHMuF5wEe4BsWG/srm5FrE3oE61zj8I/E7rA
-=0K3P
+iF4EAREIAAYFAk6OAK8ACgkQvRf93N8BhGIJ/QD+PH7EqRl4i53HsBq8aM38r4eI
+om2ChwKBf09AlyO1avUA/jK8o1bFZhQUKdO6jL1VVe2+Zj0OrBMS/HMXedij5AnX
+=EBMm
 -----END PGP SIGNATURE-----
diff --git a/net-im/telepathy-kde-meta/telepathy-kde-meta-9999.ebuild b/net-im/telepathy-kde-meta/telepathy-kde-meta-9999.ebuild
index 37bbf0bd42b..6692325f561 100644
--- a/net-im/telepathy-kde-meta/telepathy-kde-meta-9999.ebuild
+++ b/net-im/telepathy-kde-meta/telepathy-kde-meta-9999.ebuild
@@ -15,13 +15,13 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	>=net-im/telepathy-accounts-kcm-${PV}
-	>=net-im/telepathy-accounts-kcm-plugins-${PV}
 	>=net-im/telepathy-approver-${PV}
 	>=net-im/telepathy-contact-list-${PV}
 	>=net-im/telepathy-filetransfer-handler-${PV}
 	>=net-im/telepathy-presence-applet-${PV}
 	>=net-im/telepathy-send-file-${PV}
-	>=net-im/telepathy-text-ui-${PV}"
+	>=net-im/telepathy-text-ui-${PV}
+	net-voip/telepathy-connection-managers"
 
 pkg_postinst() {
 	echo
diff --git a/profiles/updates/4Q-2011 b/profiles/updates/4Q-2011
new file mode 100644
index 00000000000..66abe2eabf1
--- /dev/null
+++ b/profiles/updates/4Q-2011
@@ -0,0 +1 @@
+move net-im/telepathy-accounts-kcm-plugins net-voip/telepathy-connection-managers