[gentoo-commits] repo/gentoo:master commit in: net-im/ktp-kded-module/, kde-apps/ktp-kded-module/, net-im/kde-telepathy-meta/, ...

[gentoo-commits] repo/gentoo:master commit in: net-im/ktp-kded-module/, kde-apps/ktp-kded-module/, net-im/kde-telepathy-meta/, ...

[Johannes Huber]

commit:     b1b0d95303ac2209de5ac926047cc245385f4c34
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 11:33:15 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 12:35:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b0d953

net-im/ktp-kded-module -> kde-apps/ktp-kded-module

 kde-apps/ktp-kded-module/Manifest                                 | 1 +
 {net-im => kde-apps}/ktp-kded-module/ktp-kded-module-0.9.0.ebuild | 0
 kde-apps/ktp-kded-module/ktp-kded-module-15.12.3.ebuild           | 2 +-
 kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild                         | 2 +-
 net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild         | 2 +-
 net-im/ktp-kded-module/Manifest                                   | 1 -
 net-im/ktp-kded-module/metadata.xml                               | 8 --------
 profiles/updates/2Q-2016                                          | 1 +
 8 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 5bff455..c11d297 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1 +1,2 @@
+DIST ktp-kded-integration-module-0.9.0.tar.bz2 79387 SHA256 e7fb9cd8770b9c2560f8325ed17c334726c082b932fb17820cc881d49b11419d SHA512 eb597de2691ea4df29e85f720d4ead4d8ec03c86570eca19953b9410b9fc45a578ce87bbc1ae52f5d4c0601ca66dc5ca2cad65beb648dd9c93297b70f227cebe WHIRLPOOL c56aec68cb59883fd6841b1574c086d4c212a5acbda3127e1aa5fa312dcfc285881b85870882ed3d8038142d22fce8654ad8109f3429acf5a9eb25cb1a5789a5
 DIST ktp-kded-module-15.12.3.tar.xz 38772 SHA256 083bb9e8b720d2df27509546406eb4cc760d168d0311aa22579e781ee5638274 SHA512 52cc87b3d86a0084b9a52b5138d9b5c8efd2f269dbeafab87b3289b0f1fde32bba38bf0bb9948a593041c51b08804d7a0c28616a1b3474c4c88e0b20f861d25d WHIRLPOOL 1a26750831ab89f38bf9256c67573fec11a275c167c1553b738c2762b8b544df18abdc9188fdea363681cc143590aa67e19b7bb5675d4c6ab70bf542782d3a5d

diff --git a/net-im/ktp-kded-module/ktp-kded-module-0.9.0.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-0.9.0.ebuild
similarity index 100%
rename from net-im/ktp-kded-module/ktp-kded-module-0.9.0.ebuild
rename to kde-apps/ktp-kded-module/ktp-kded-module-0.9.0.ebuild

diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-15.12.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-15.12.3.ebuild
index a201e89..675e12c 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-15.12.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-15.12.3.ebuild
@@ -37,5 +37,5 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep signon-kwallet-extension)
-	!net-im/ktp-kded-module
+	!kde-apps/ktp-kded-module:4
 "

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 93936ef..eb2f20d 100644
--- a/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
+++ b/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	!kde-apps/ktp-common-internals:4
 	!kde-apps/ktp-contact-list:4
 	!kde-apps/ktp-filetransfer-handler:4
-	!net-im/ktp-kded-module
+	!kde-apps/ktp-kded-module:4
 	!net-im/ktp-send-file
 	!net-im/ktp-text-ui
 "

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 1421c02..b4da95e 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
@@ -24,7 +24,7 @@ RDEPEND="
 	>=kde-apps/ktp-contact-runner-${PV}:4
 	>=kde-apps/ktp-desktop-applets-${PV}:4
 	>=kde-apps/ktp-filetransfer-handler-${PV}:4
-	>=net-im/ktp-kded-module-${PV}:4
+	>=kde-apps/ktp-kded-module-${PV}:4
 	>=net-im/ktp-send-file-${PV}:4
 	>=net-im/ktp-text-ui-${PV}:4
 	net-im/telepathy-connection-managers

diff --git a/net-im/ktp-kded-module/Manifest b/net-im/ktp-kded-module/Manifest
deleted file mode 100644
index fb7ced3..0000000
--- a/net-im/ktp-kded-module/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ktp-kded-integration-module-0.9.0.tar.bz2 79387 SHA256 e7fb9cd8770b9c2560f8325ed17c334726c082b932fb17820cc881d49b11419d SHA512 eb597de2691ea4df29e85f720d4ead4d8ec03c86570eca19953b9410b9fc45a578ce87bbc1ae52f5d4c0601ca66dc5ca2cad65beb648dd9c93297b70f227cebe WHIRLPOOL c56aec68cb59883fd6841b1574c086d4c212a5acbda3127e1aa5fa312dcfc285881b85870882ed3d8038142d22fce8654ad8109f3429acf5a9eb25cb1a5789a5

diff --git a/net-im/ktp-kded-module/metadata.xml b/net-im/ktp-kded-module/metadata.xml
deleted file mode 100644
index 0cf5922..0000000
--- a/net-im/ktp-kded-module/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 0c584db..c171166 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -13,3 +13,4 @@ move net-im/ktp-contact-list kde-apps/ktp-contact-list
 move net-im/ktp-contact-runner kde-apps/ktp-contact-runner
 move net-im/ktp-desktop-applets kde-apps/ktp-desktop-applets
 move net-im/ktp-filetransfer-handler kde-apps/ktp-filetransfer-handler
+move net-im/ktp-kded-module kde-apps/ktp-kded-module