Pkg move net-im/ktp-common-internals -> kde-apps/ktp-common-internals

12 files changed, 9 insertions, 125 deletions

diff --git a/net-im/ktp-auth-handler/ktp-auth-handler-9999.ebuild b/net-im/ktp-auth-handler/ktp-auth-handler-9999.ebuild
index 1856310dc3..59ab81654b 100644
--- a/net-im/ktp-auth-handler/ktp-auth-handler-9999.ebuild
+++ b/net-im/ktp-auth-handler/ktp-auth-handler-9999.ebuild
@@ -20,13 +20,13 @@ DEPEND="
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep kaccounts-integration)
+	$(add_kdeapps_dep ktp-common-internals)
 	app-crypt/qca[qt5]
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	net-libs/accounts-qt
-	net-im/ktp-common-internals:5
 	net-libs/signond
 	net-libs/telepathy-qt[qt5]
 "
diff --git a/net-im/ktp-call-ui/ktp-call-ui-9999.ebuild b/net-im/ktp-call-ui/ktp-call-ui-9999.ebuild
index 9b326b2a61..b7736cca82 100644
--- a/net-im/ktp-call-ui/ktp-call-ui-9999.ebuild
+++ b/net-im/ktp-call-ui/ktp-call-ui-9999.ebuild
@@ -25,13 +25,13 @@ DEPEND="
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
 	dev-libs/boost
 	dev-libs/glib:2
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	media-libs/qt-gstreamer[qt5]
-	net-im/ktp-common-internals:5
 	net-libs/farstream:0.2
 	net-libs/telepathy-farstream
 	net-libs/telepathy-qt[farstream,qt5]
diff --git a/net-im/ktp-common-internals/files/ktp-common-internals-9999-tests-optional.patch b/net-im/ktp-common-internals/files/ktp-common-internals-9999-tests-optional.patch
deleted file mode 100644
index 43431732cc..0000000000
--- a/net-im/ktp-common-internals/files/ktp-common-internals-9999-tests-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/CMakeLists.txt	2015-01-20 21:49:46.354302243 +0100
-+++ b/CMakeLists.txt	2015-01-21 01:45:39.660978780 +0100
-@@ -10,10 +10,9 @@
- cmake_policy(SET CMP0002 OLD)
- 
- find_package (Qt5 REQUIRED CONFIG COMPONENTS
--              Qml
--              Test)
-+              Qml)
- 
--find_package (KF5 REQUIRED COMPONENTS 
-+find_package (KF5 REQUIRED COMPONENTS
-               CoreAddons
-               Notifications
-               KIO
-@@ -101,7 +100,11 @@
- add_subdirectory(KTp)
- add_subdirectory(tools)
- add_subdirectory(data)
--add_subdirectory(tests)
-+
-+if(BUILD_TESTING)
-+    find_package(Qt5Test REQUIRED CONFIG)
-+    add_subdirectory(tests)
-+endif()
- 
- if (OTR_LIBS_FOUND)
-     include_directories (${LIBOTR_INCLUDE_DIR}
diff --git a/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild b/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild
deleted file mode 100644
index b790a2de2b..0000000000
--- a/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-IUSE="doc otr"
-
-# todo: kpeople, kdepimlibs
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kaccounts-integration)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/qt-gstreamer
-	net-libs/accounts-qt
-	>=net-libs/telepathy-qt-0.9.5[qt5]
-	net-libs/telepathy-logger-qt:5
-	doc? ( app-doc/doxygen )
-	otr? (
-		dev-libs/libgcrypt:0=
-		>=net-libs/libotr-4.0.0
-	)
-"
-RDEPEND="${DEPEND}
-	!net-im/ktp-common-internals:4
-"
-
-PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use_find_package otr Libgcrypt)
-		$(cmake-utils_use_find_package otr LibOTR)
-	)
-
-	kde5_src_configure
-}
-
-src_compile() {
-	kde5_src_compile
-	use doc && kde5_src_compile apidox
-}
-
-src_install() {
-	kde5_src_install
-	use doc && dodoc "${BUILD_DIR}"/KTp/docs/html/*
-}
diff --git a/net-im/ktp-common-internals/metadata.xml b/net-im/ktp-common-internals/metadata.xml
deleted file mode 100644
index 0defe784bf..0000000000
--- a/net-im/ktp-common-internals/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>
-	<herd>kde</herd>
-	<use>
-		<flag name="otr">Enable support for encrypted conversations using Off-The-Records messaging</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-im/ktp-contact-list/ktp-contact-list-9999.ebuild b/net-im/ktp-contact-list/ktp-contact-list-9999.ebuild
index 4869223d49..e54464ea24 100644
--- a/net-im/ktp-contact-list/ktp-contact-list-9999.ebuild
+++ b/net-im/ktp-contact-list/ktp-contact-list-9999.ebuild
@@ -26,10 +26,10 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	=net-im/ktp-common-internals-9999:5
 	net-libs/telepathy-qt[qt5]
 "
 
diff --git a/net-im/ktp-contact-runner/ktp-contact-runner-9999.ebuild b/net-im/ktp-contact-runner/ktp-contact-runner-9999.ebuild
index b191bb9b60..05c93e1c29 100644
--- a/net-im/ktp-contact-runner/ktp-contact-runner-9999.ebuild
+++ b/net-im/ktp-contact-runner/ktp-contact-runner-9999.ebuild
@@ -17,10 +17,10 @@ DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep krunner)
+	$(add_kdeapps_dep ktp-common-internals)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	net-im/ktp-common-internals:5
 	net-libs/telepathy-qt[qt5]
 "
 
diff --git a/net-im/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild b/net-im/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild
index a39d774a53..6b90947f1a 100644
--- a/net-im/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild
+++ b/net-im/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild
@@ -24,8 +24,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_frameworks_dep kdeclarative)
+	$(add_kdeapps_dep ktp-common-internals)
 	dev-qt/qtdeclarative:5
 	dev-qt/qtquickcontrols:5
-	>=net-im/ktp-common-internals-${PV}
 	!net-im/ktp-desktop-applets:4
 "
diff --git a/net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild b/net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
index 7a417ff5a2..1106883a12 100644
--- a/net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
+++ b/net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
@@ -18,10 +18,10 @@ DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep ktp-common-internals)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	net-im/ktp-common-internals:5
 	net-libs/telepathy-qt[qt5]
 "
 RDEPEND="${DEPEND}
diff --git a/net-im/ktp-kded-module/ktp-kded-module-9999.ebuild b/net-im/ktp-kded-module/ktp-kded-module-9999.ebuild
index 9513a59c96..c24d73d75c 100644
--- a/net-im/ktp-kded-module/ktp-kded-module-9999.ebuild
+++ b/net-im/ktp-kded-module/ktp-kded-module-9999.ebuild
@@ -23,13 +23,13 @@ DEPEND="
 	$(add_frameworks_dep kidletime)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knotifications)
+	$(add_kdeapps_dep ktp-common-internals)
 	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
-	net-im/ktp-common-internals:5
 	net-libs/telepathy-qt[qt5]
 "
 RDEPEND="${DEPEND}
diff --git a/net-im/ktp-send-file/ktp-send-file-9999.ebuild b/net-im/ktp-send-file/ktp-send-file-9999.ebuild
index ba7b7c07f2..c183a427f7 100644
--- a/net-im/ktp-send-file/ktp-send-file-9999.ebuild
+++ b/net-im/ktp-send-file/ktp-send-file-9999.ebuild
@@ -19,10 +19,10 @@ DEPEND="
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep ktp-common-internals)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	net-im/ktp-common-internals:5
 	net-libs/telepathy-qt[qt5]
 "
 RDEPEND="${DEPEND}
diff --git a/net-im/ktp-text-ui/ktp-text-ui-9999.ebuild b/net-im/ktp-text-ui/ktp-text-ui-9999.ebuild
index a5e7995531..9fd38ec16e 100644
--- a/net-im/ktp-text-ui/ktp-text-ui-9999.ebuild
+++ b/net-im/ktp-text-ui/ktp-text-ui-9999.ebuild
@@ -34,12 +34,12 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep ktp-common-internals)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	net-im/ktp-common-internals:5
 	net-libs/kpeople:5
 	net-libs/telepathy-qt[qt5]
 "