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

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

[Johannes Huber]

commit:     3d4b2ac8df03e1dc60b0fe03a790d8728b6e1c22
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 10:47:07 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=3d4b2ac8

net-im/ktp-approver -> kde-apps/ktp-approver

 kde-apps/ktp-approver/Manifest                              | 1 +
 {net-im => kde-apps}/ktp-approver/ktp-approver-0.9.0.ebuild | 0
 kde-apps/ktp-approver/ktp-approver-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-approver/Manifest                                | 1 -
 net-im/ktp-approver/metadata.xml                            | 8 --------
 profiles/updates/2Q-2016                                    | 1 +
 8 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index d6cdaa4..8261fe6 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1 +1,2 @@
+DIST ktp-approver-0.9.0.tar.bz2 36866 SHA256 3ac663cdfa51f564bb7f9898974acb630ab9112a5d76a73657d10f53c42b82e7 SHA512 9b00d9ad2d962190f9c2e234976abccd275256356faea4c37768aeb1682694bc299cc057e25fd523f32a592611280f51003ec0e6a5a795a197cd9d8df2b6c58f WHIRLPOOL 9b7d07c336db3b120a877a0b3c6d3b6c0d88f5fd9c45ef08b3788592480a90a433163b174d7840a3c561ee121501002c1a3a6d55298ee0f1ef7d6a664f2eaff2
 DIST ktp-approver-15.12.3.tar.xz 20956 SHA256 fc5eed606a62bf58b2ac72b30fbb0b2e4dada6f959c3ed09f6082a7762b5f706 SHA512 265c842c4dc022ee47a69d0e1daad1007f4dc8ec5e6940e35270265d8cde984907093ff3f28416d44936196e3e5ce0b3e5a4322d6a8ba2b10b4c80eb097b31e4 WHIRLPOOL d2a345f2c83cca90a33ff7712dc42a273a40faf3289188551fe85e721f22fec0e643b4b6f37abcc32b63f91d9aa60f0c6699ee08d551ee1c72bf4d6d2b9e1211

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

diff --git a/kde-apps/ktp-approver/ktp-approver-15.12.3.ebuild b/kde-apps/ktp-approver/ktp-approver-15.12.3.ebuild
index d5ba883..b95e898 100644
--- a/kde-apps/ktp-approver/ktp-approver-15.12.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-15.12.3.ebuild
@@ -27,5 +27,5 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep ktp-contact-list)
-	!net-im/ktp-approver
+	!kde-apps/ktp-approver: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 c7247de..6d1acc2 100644
--- a/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
+++ b/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 RDEPEND="
 	!<kde-apps/kde-l10n-15.08.0-r1
 	!kde-apps/ktp-accounts-kcm:4
-	!net-im/ktp-approver
+	!kde-apps/ktp-approver:4
 	!net-im/ktp-auth-handler
 	!kde-apps/ktp-common-internals:4
 	!net-im/ktp-contact-list

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 7783fc1..d029714 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
@@ -16,7 +16,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	>=kde-apps/ktp-accounts-kcm-${PV}:4
-	>=net-im/ktp-approver-${PV}:4
+	>=kde-apps/ktp-approver-${PV}:4
 	>=net-im/ktp-auth-handler-${PV}:4
 	>=net-im/ktp-call-ui-${PV}:4
 	>=kde-apps/ktp-common-internals-${PV}:4

diff --git a/net-im/ktp-approver/Manifest b/net-im/ktp-approver/Manifest
deleted file mode 100644
index 7ea9e04..0000000
--- a/net-im/ktp-approver/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ktp-approver-0.9.0.tar.bz2 36866 SHA256 3ac663cdfa51f564bb7f9898974acb630ab9112a5d76a73657d10f53c42b82e7 SHA512 9b00d9ad2d962190f9c2e234976abccd275256356faea4c37768aeb1682694bc299cc057e25fd523f32a592611280f51003ec0e6a5a795a197cd9d8df2b6c58f WHIRLPOOL 9b7d07c336db3b120a877a0b3c6d3b6c0d88f5fd9c45ef08b3788592480a90a433163b174d7840a3c561ee121501002c1a3a6d55298ee0f1ef7d6a664f2eaff2

diff --git a/net-im/ktp-approver/metadata.xml b/net-im/ktp-approver/metadata.xml
deleted file mode 100644
index 0cf5922..0000000
--- a/net-im/ktp-approver/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 5d11a14..35bdba0 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -6,3 +6,4 @@ 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
+move net-im/ktp-approver kde-apps/ktp-approver