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

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

[Johannes Huber]

commit:     cadaf172fff4df48577c2d2cd5560e05e025b43e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 11:38:08 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=cadaf172

net-im/ktp-send-file -> kde-apps/ktp-send-file

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

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

diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index 6967b7c..442ae87 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1 +1,2 @@
+DIST ktp-send-file-0.9.0.tar.bz2 29739 SHA256 a453ae5ca8d18242c9050d961be4fa5d7e8f230f0397fd0206f84a3635106864 SHA512 ff6cad1831a4851c00f11a27e1302bf051d2cc72f6e8bc90bd838329a681202e213fb4f3f9accb56522601f9623c061b29e14bb380d66764237d15eef3eece04 WHIRLPOOL eeed7cbb8afc26a6a5396eef3f57578245c752cbbc594d61a4cc5655cf3636743587e06ef5df4638f72de32c17c72191975888313ff089b17bab294cead7fcf9
 DIST ktp-send-file-15.12.3.tar.xz 14684 SHA256 31473406b4187e1adea6ca67fc7b27c3ea3877c1f0f7d4a9b74ff6c59706a32f SHA512 54eb9aedbea692cd6fec5e8de9f7fd5483e4416d30114b01414294602265f892533ace65b5eb0249f0d48955a28eb8241cba4111cf6c4f9a98bd9c6832c72721 WHIRLPOOL ef485997fe544650ef04d7a1d634a213d12b6792a4246d92b91f973505bba548878904ebd88d2c67417ff04a8acc4b900b3b3fbc6d13b8a92467a26404d37c19

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

diff --git a/kde-apps/ktp-send-file/ktp-send-file-15.12.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-15.12.3.ebuild
index 454b7ae..3d717ed 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-15.12.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-15.12.3.ebuild
@@ -31,5 +31,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep ktp-contact-list)
 	$(add_kdeapps_dep ktp-filetransfer-handler)
-	!net-im/ktp-send-file
+	!kde-apps/ktp-send-file: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 b4da95e..ca409f1 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
@@ -25,7 +25,7 @@ RDEPEND="
 	>=kde-apps/ktp-desktop-applets-${PV}:4
 	>=kde-apps/ktp-filetransfer-handler-${PV}:4
 	>=kde-apps/ktp-kded-module-${PV}:4
-	>=net-im/ktp-send-file-${PV}:4
+	>=kde-apps/ktp-send-file-${PV}:4
 	>=net-im/ktp-text-ui-${PV}:4
 	net-im/telepathy-connection-managers
 "

diff --git a/net-im/ktp-send-file/Manifest b/net-im/ktp-send-file/Manifest
deleted file mode 100644
index 84774bc..0000000
--- a/net-im/ktp-send-file/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ktp-send-file-0.9.0.tar.bz2 29739 SHA256 a453ae5ca8d18242c9050d961be4fa5d7e8f230f0397fd0206f84a3635106864 SHA512 ff6cad1831a4851c00f11a27e1302bf051d2cc72f6e8bc90bd838329a681202e213fb4f3f9accb56522601f9623c061b29e14bb380d66764237d15eef3eece04 WHIRLPOOL eeed7cbb8afc26a6a5396eef3f57578245c752cbbc594d61a4cc5655cf3636743587e06ef5df4638f72de32c17c72191975888313ff089b17bab294cead7fcf9

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