net-im/ktp-accounts-kcm -> kde-apps/ktp-accounts-kcm

10 files changed, 7 insertions, 16 deletions

diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 1f2cce4cda92..91b64b41de7c 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1 +1,2 @@
+DIST ktp-accounts-kcm-0.9.0.tar.bz2 264892 SHA256 b9d7cf3b2a8f99e50ba60fec039b107f3049df41e44787683dbc346d08c37de7 SHA512 fadc424be1a462d3f84e1845e02467880214345a6f47b79036cce48ac60454abf3c449026e4b830628848d8e7744d628e61877817dfe7ac9f1f80b6913823bc8 WHIRLPOOL d6945ed15d9a0b4df5819a8de35f09cb650d70ce74622bbdcb774984e295e645128a2af0ccd2ce6dda077f198b748508f1f52d1781696878d54dbdc8795f4fc8
 DIST ktp-accounts-kcm-15.12.3.tar.xz 89012 SHA256 fab487ae001bd07cc8f4941e0aa1cea72e3472396c19aab91072dfc5ffcdd7ff SHA512 71acb011722f9cd793163acec2f52b174de26939c924d03c0e714865fe238877d35c26e0e3a1bd30efbc73e083e2a7d37e9bd137384d4c09d7f4fea0ee3ed460 WHIRLPOOL 7ab93e04bc8ef6c62b6c29052073117de8ab5332ae5590414b21736622e4989512660f436fb64a0b9e3b0d25c7fa847fc5d28d4dd5e7e8486eabf6c37fd429d3
diff --git a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.9.0.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-0.9.0.ebuild
index 26b277df2af9..26b277df2af9 100644
--- a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.9.0.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-0.9.0.ebuild
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.3.ebuild
index bc992095bf54..fc3abc960477 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.3.ebuild
@@ -41,7 +41,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kaccounts-providers)
 	net-im/telepathy-connection-managers
-	!net-im/ktp-accounts-kcm
+	!kde-apps/ktp-accounts-kcm:4
 "
 
 src_prepare() {
diff --git a/kde-apps/ktp-accounts-kcm/metadata.xml b/kde-apps/ktp-accounts-kcm/metadata.xml
index 98aa6aeeaf8e..0ab5e6876726 100644
--- a/kde-apps/ktp-accounts-kcm/metadata.xml
+++ b/kde-apps/ktp-accounts-kcm/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="experimental">Enables disabled telepathy services (currently only steam)</flag>
+		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild b/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
index b352ae982275..c7247dec7e6f 100644
--- a/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
+++ b/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
@@ -17,7 +17,7 @@ DEPEND="
 "
 RDEPEND="
 	!<kde-apps/kde-l10n-15.08.0-r1
-	!net-im/ktp-accounts-kcm
+	!kde-apps/ktp-accounts-kcm:4
 	!net-im/ktp-approver
 	!net-im/ktp-auth-handler
 	!kde-apps/ktp-common-internals:4
diff --git a/net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild b/net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild
index 437ae077189e..7783fc1f8c6e 100644
--- a/net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild
+++ b/net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="
-	>=net-im/ktp-accounts-kcm-${PV}:4
+	>=kde-apps/ktp-accounts-kcm-${PV}:4
 	>=net-im/ktp-approver-${PV}:4
 	>=net-im/ktp-auth-handler-${PV}:4
 	>=net-im/ktp-call-ui-${PV}:4
diff --git a/net-im/ktp-accounts-kcm/Manifest b/net-im/ktp-accounts-kcm/Manifest
deleted file mode 100644
index 2d22eca55913..000000000000
--- a/net-im/ktp-accounts-kcm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ktp-accounts-kcm-0.9.0.tar.bz2 264892 SHA256 b9d7cf3b2a8f99e50ba60fec039b107f3049df41e44787683dbc346d08c37de7 SHA512 fadc424be1a462d3f84e1845e02467880214345a6f47b79036cce48ac60454abf3c449026e4b830628848d8e7744d628e61877817dfe7ac9f1f80b6913823bc8 WHIRLPOOL d6945ed15d9a0b4df5819a8de35f09cb650d70ce74622bbdcb774984e295e645128a2af0ccd2ce6dda077f198b748508f1f52d1781696878d54dbdc8795f4fc8
diff --git a/net-im/ktp-accounts-kcm/metadata.xml b/net-im/ktp-accounts-kcm/metadata.xml
deleted file mode 100644
index 340f21dd9f00..000000000000
--- a/net-im/ktp-accounts-kcm/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<use>
-		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-im/ktp-contact-list/ktp-contact-list-0.9.0.ebuild b/net-im/ktp-contact-list/ktp-contact-list-0.9.0.ebuild
index 5d6d0c6c3d86..39f3b3924c41 100644
--- a/net-im/ktp-contact-list/ktp-contact-list-0.9.0.ebuild
+++ b/net-im/ktp-contact-list/ktp-contact-list-0.9.0.ebuild
@@ -19,7 +19,7 @@ SLOT="4"
 IUSE="debug semantic-desktop"
 
 DEPEND="
-	>=net-im/ktp-accounts-kcm-${PV}:4
+	>=kde-apps/ktp-accounts-kcm-${PV}:4
 	>=kde-apps/ktp-common-internals-${PV}:4[semantic-desktop?]
 	>=net-libs/telepathy-qt-0.9.5[qt4]
 	semantic-desktop? ( >=net-libs/libkpeople-0.3.0:= )
diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
index 45a86873fcbd..5d11a1470d1f 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -5,3 +5,4 @@ move dev-perl/set-scalar dev-perl/Set-Scalar
 move dev-perl/string-crc32 dev-perl/String-CRC32
 move app-admin/packagekit-qt4 app-admin/packagekit-qt
 move net-im/ktp-common-internals kde-apps/ktp-common-internals
+move net-im/ktp-accounts-kcm kde-apps/ktp-accounts-kcm