[gentoo-commits] repo/gentoo:master commit in: kde-apps/ktp-call-ui/, net-im/ktp-desktop-applets/, profiles/updates/, ...

[gentoo-commits] repo/gentoo:master commit in: kde-apps/ktp-call-ui/, net-im/ktp-desktop-applets/, profiles/updates/, ...

[Johannes Huber]

commit:     a41a7849bc525c1f5356aae5481ed9d7fad94639
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 11:17:46 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=a41a7849

net-im/ktp-desktop-applets -> kde-apps/ktp-desktop-applets

 kde-apps/ktp-call-ui/ktp-call-ui-0.9.0.ebuild                     | 2 +-
 kde-apps/ktp-desktop-applets/Manifest                             | 1 +
 .../ktp-desktop-applets/ktp-desktop-applets-0.9.0.ebuild          | 0
 kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.3.ebuild   | 2 +-
 net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild         | 2 +-
 net-im/ktp-desktop-applets/Manifest                               | 1 -
 net-im/ktp-desktop-applets/metadata.xml                           | 8 --------
 profiles/updates/2Q-2016                                          | 1 +
 8 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-0.9.0.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-0.9.0.ebuild
index 9f8a16c..b81fb51 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-0.9.0.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-0.9.0.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	|| (
 		>=kde-apps/ktp-contact-list-${PV}:4
-		>=net-im/ktp-desktop-applets-${PV}:4
+		>=kde-apps/ktp-desktop-applets-${PV}:4
 		>=net-im/ktp-text-ui-${PV}:4
 	)
 	v4l? ( media-plugins/gst-plugins-v4l2:0.10 )

diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index c91c0d2..b6c9cdf 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1 +1,2 @@
+DIST ktp-desktop-applets-0.9.0.tar.bz2 64913 SHA256 fe6254b5c2178b22e2d53ced5dc72a3cb96e667294b4a34936d37b434c8dc88d SHA512 45e8e61b975bc64187352a4133e66c7c0b061873619017c4faf96dc05da8362748fb1f8193e495d998a0ffa03631f91887d4ddd0e2d50b57a3971b6cc8a8fc7b WHIRLPOOL 1fd574e480fbb1eb29de8d7c674331fd480263b4336830f6ec002c83aac3bb364bc7216947706eded60b95e2d06cc5d5d945f56cd37d435537d7a634aaabdf30
 DIST ktp-desktop-applets-15.12.3.tar.xz 26228 SHA256 f86745c420f36da93b3bfcbb1c34ee50896a2b8fbb067092e5a5c0770eb39e5d SHA512 ff776b6d9ef7728144d361a38b5883d10d0ac5c3f5cf96c6d5507cad1ba60207daf969c65f8043e1fa3d0f2a4a90bd1bd9ad89aaeca55ae16b606d8a888927bb WHIRLPOOL fb696b651f68b9771ad99afd8ea02ead42812197c9b4924b8b132f63e2369459e3b3dc8037546e9fa993b14ea87922bb8ddcea182f8c0ef4f2871a8e3c92841a

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

diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.3.ebuild
index 6624746..1e5e797 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.3.ebuild
@@ -20,5 +20,5 @@ DEPEND="
 	$(add_qt_dep qtdeclarative)
 "
 RDEPEND="${DEPEND}
-	!net-im/ktp-desktop-applets
+	!kde-apps/ktp-desktop-applets: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 424bb2a..5e0eb03 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
@@ -22,7 +22,7 @@ RDEPEND="
 	>=kde-apps/ktp-common-internals-${PV}:4
 	>=kde-apps/ktp-contact-list-${PV}:4
 	>=kde-apps/ktp-contact-runner-${PV}:4
-	>=net-im/ktp-desktop-applets-${PV}:4
+	>=kde-apps/ktp-desktop-applets-${PV}:4
 	>=net-im/ktp-filetransfer-handler-${PV}:4
 	>=net-im/ktp-kded-module-${PV}:4
 	>=net-im/ktp-send-file-${PV}:4

diff --git a/net-im/ktp-desktop-applets/Manifest b/net-im/ktp-desktop-applets/Manifest
deleted file mode 100644
index 7c17c15..0000000
--- a/net-im/ktp-desktop-applets/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ktp-desktop-applets-0.9.0.tar.bz2 64913 SHA256 fe6254b5c2178b22e2d53ced5dc72a3cb96e667294b4a34936d37b434c8dc88d SHA512 45e8e61b975bc64187352a4133e66c7c0b061873619017c4faf96dc05da8362748fb1f8193e495d998a0ffa03631f91887d4ddd0e2d50b57a3971b6cc8a8fc7b WHIRLPOOL 1fd574e480fbb1eb29de8d7c674331fd480263b4336830f6ec002c83aac3bb364bc7216947706eded60b95e2d06cc5d5d945f56cd37d435537d7a634aaabdf30

diff --git a/net-im/ktp-desktop-applets/metadata.xml b/net-im/ktp-desktop-applets/metadata.xml
deleted file mode 100644
index 0cf5922..0000000
--- a/net-im/ktp-desktop-applets/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 665fdcd..337593e 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -11,3 +11,4 @@ move net-im/ktp-auth-handler kde-apps/ktp-auth-handler
 move net-im/ktp-call-ui kde-apps/ktp-call-ui
 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