commit: 9f3476a6ca887309d12ca6ac33ac948aeae80904 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Wed Feb 25 20:55:14 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed Feb 25 22:10:01 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9f3476a6
Pkg move net-im/ktp-common-internals -> kde-apps/ktp-common-internals --- .../files/ktp-common-internals-tests-optional.patch | 0 .../ktp-common-internals-9999.ebuild | 20 +++++++------------- .../ktp-common-internals/metadata.xml | 0 net-im/ktp-auth-handler/ktp-auth-handler-9999.ebuild | 2 +- net-im/ktp-call-ui/ktp-call-ui-9999.ebuild | 2 +- net-im/ktp-contact-list/ktp-contact-list-9999.ebuild | 2 +- .../ktp-contact-runner-9999.ebuild | 2 +- .../ktp-desktop-applets-9999.ebuild | 2 +- .../ktp-filetransfer-handler-9999.ebuild | 2 +- net-im/ktp-kded-module/ktp-kded-module-9999.ebuild | 2 +- net-im/ktp-send-file/ktp-send-file-9999.ebuild | 2 +- net-im/ktp-text-ui/ktp-text-ui-9999.ebuild | 2 +- 12 files changed, 16 insertions(+), 22 deletions(-) diff --git a/net-im/ktp-common-internals/files/ktp-common-internals-9999-tests-optional.patch b/kde-apps/ktp-common-internals/files/ktp-common-internals-tests-optional.patch similarity index 100% rename from net-im/ktp-common-internals/files/ktp-common-internals-9999-tests-optional.patch rename to kde-apps/ktp-common-internals/files/ktp-common-internals-tests-optional.patch diff --git a/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild similarity index 83% rename from net-im/ktp-common-internals/ktp-common-internals-9999.ebuild rename to kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild index b790a2d..0e7d60d 100644 --- a/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild +++ b/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild @@ -4,21 +4,16 @@ EAPI=5 +KDE_DOXYGEN="true" 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" +KEYWORDS="" +IUSE="otr" # todo: kpeople, kdepimlibs DEPEND=" @@ -43,21 +38,20 @@ DEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - media-libs/qt-gstreamer + media-libs/qt-gstreamer[qt5] net-libs/accounts-qt - >=net-libs/telepathy-qt-0.9.5[qt5] net-libs/telepathy-logger-qt:5 - doc? ( app-doc/doxygen ) + >=net-libs/telepathy-qt-0.9.5[qt5] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) " RDEPEND="${DEPEND} - !net-im/ktp-common-internals:4 + !net-im/ktp-common-internals " -PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" ) +PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" ) src_configure() { local mycmakeargs=( diff --git a/net-im/ktp-common-internals/metadata.xml b/kde-apps/ktp-common-internals/metadata.xml similarity index 100% rename from net-im/ktp-common-internals/metadata.xml rename to kde-apps/ktp-common-internals/metadata.xml 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 1856310..59ab816 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 9b326b2..b7736cc 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-contact-list/ktp-contact-list-9999.ebuild b/net-im/ktp-contact-list/ktp-contact-list-9999.ebuild index 4869223..e54464e 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 b191bb9..05c93e1 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 a39d774..6b90947 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 7a417ff..1106883 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 9513a59..c24d73d 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 ba7b7c0..c183a42 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 a5e7995..9fd38ec 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] "
