commit: 369cebcebc4d8676288ea2fc2f3edc1c48461acb Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Thu Mar 5 19:58:41 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Thu Mar 5 19:58:41 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=369cebce
Pkg move net-libs/kpeople -> kde-frameworks/kpeople .../ktp-common-internals-9999.ebuild | 3 +- kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild | 2 +- .../kpeople/kpeople-9999.ebuild | 17 +++------ {net-libs => kde-frameworks}/kpeople/metadata.xml | 0 net-libs/kpeople/kpeople-0.3.9999.ebuild | 41 ---------------------- 5 files changed, 8 insertions(+), 55 deletions(-) diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild index 648cef6..8d84845 100644 --- a/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild +++ b/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild @@ -15,7 +15,7 @@ LICENSE="LGPL-2.1" KEYWORDS="" IUSE="otr" -# todo: kpeople, kdepimlibs +# todo: kdepimlibs DEPEND=" $(add_frameworks_dep kcmutils) $(add_frameworks_dep kconfig) @@ -26,6 +26,7 @@ DEPEND=" $(add_frameworks_dep knotifications) $(add_frameworks_dep knotifyconfig) $(add_frameworks_dep kparts) + $(add_frameworks_dep kpeople) $(add_frameworks_dep kservice) $(add_frameworks_dep ktexteditor) $(add_frameworks_dep kwallet) diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild index 20f0690..9e9a31f 100644 --- a/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild +++ b/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild @@ -28,6 +28,7 @@ DEPEND=" $(add_frameworks_dep kitemviews) $(add_frameworks_dep knotifications) $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kpeople) $(add_frameworks_dep kservice) $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) @@ -40,7 +41,6 @@ DEPEND=" dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - net-libs/kpeople:5 net-libs/telepathy-qt[qt5] " RDEPEND="${DEPEND} diff --git a/net-libs/kpeople/kpeople-9999.ebuild b/kde-frameworks/kpeople/kpeople-9999.ebuild similarity index 66% rename from net-libs/kpeople/kpeople-9999.ebuild rename to kde-frameworks/kpeople/kpeople-9999.ebuild index 80fd6a9..c56bc71 100644 --- a/net-libs/kpeople/kpeople-9999.ebuild +++ b/kde-frameworks/kpeople/kpeople-9999.ebuild @@ -7,13 +7,13 @@ EAPI=5 inherit kde5 DESCRIPTION="KDE contact person abstraction library" -HOMEPAGE="https://projects.kde.org/projects/playground/network/kpeople" +HOMEPAGE="https://projects.kde.org/projects/frameworks/kpeople" LICENSE="LGPL-2.1" KEYWORDS="" IUSE="semantic-desktop" -RDEPEND=" +DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep ki18n) @@ -25,14 +25,7 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 - semantic-desktop? ( $(add_plasma_dep baloo) ) " -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package semantic-desktop KF5Baloo) - ) - - kde5_src_configure -} +RDEPEND="${DEPEND} + !net-libs/kpeople:5 +" diff --git a/net-libs/kpeople/metadata.xml b/kde-frameworks/kpeople/metadata.xml similarity index 100% rename from net-libs/kpeople/metadata.xml rename to kde-frameworks/kpeople/metadata.xml diff --git a/net-libs/kpeople/kpeople-0.3.9999.ebuild b/net-libs/kpeople/kpeople-0.3.9999.ebuild deleted file mode 100644 index 9f7a07c..0000000 --- a/net-libs/kpeople/kpeople-0.3.9999.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -VIRTUALX_REQUIRED="test" -KDE_LINGUAS="bs cs da de el fi fr hu ja lt nl pl pt pt_BR ro ru sk sl sv uk" -EGIT_BRANCH="libkpeople-0.3" -inherit kde4-base - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2" -else - KEYWORDS="" -fi - -DESCRIPTION="KDE contact person abstraction library" -HOMEPAGE="https://projects.kde.org/projects/playground/network/kpeople" - -LICENSE="LGPL-2.1" -SLOT="4/4" -IUSE="debug examples semantic-desktop test" - -RDEPEND=" - $(add_kdebase_dep kdepimlibs) - semantic-desktop? ( $(add_kdebase_dep baloo) ) -" -DEPEND="${RDEPEND} - sys-devel/gettext -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with examples) - $(cmake-utils_use_find_package semantic-desktop Baloo) - ) - - kde4-base_src_configure -}