kde-plasma/baloo: move to kde-frameworks.

diff --git a/kde-plasma/baloo/Manifest b/kde-plasma/baloo/Manifest
deleted file mode 100644 (file)
index 8de231c..0000000
--- a/kde-plasma/baloo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST baloo-5.9.2.tar.xz 144124 SHA256 1ca97763c136d3b7762cdc04f6e76fb9d314ba38db8ad48778647590626e19e6 SHA512 fad46714ba03349f6b12599fff2b304aab957d183601b252c0a44423b7cd626d552511ee4432190e09b10437af023152fd6538523bfcd570d0f126ce02d10e11 WHIRLPOOL 24ed3281faafd5a890293359667769cebd61f56c87dc400ee07249719d26deaef842676170787c40c73e26a65a03f72ba5ba27465b8023758a68af2eb879f5bc

diff --git a/kde-plasma/baloo/baloo-5.9.2.ebuild b/kde-plasma/baloo/baloo-5.9.2.ebuild
deleted file mode 100644 (file)
index 7ec298f..0000000
--- a/kde-plasma/baloo/baloo-5.9.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-# version scheme fail by upstream
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-       PLASMA_VERSION=5.3.2
-       SRC_URI="mirror://kde/stable/plasma/${PLASMA_VERSION}/${PN}-${PV}.tar.xz"
-fi
-
-DESCRIPTION="Framework for searching and managing metadata"
-KEYWORDS=" ~amd64"
-IUSE=""
-
-DEPEND="
-       $(add_frameworks_dep kauth)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdelibs4support)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kidletime)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep solid)
-       $(add_plasma_dep kfilemetadata)
-       =dev-libs/xapian-1.2*[chert]
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtsql:5
-       dev-qt/qtwidgets:5
-       sys-apps/attr
-       !<kde-base/nepomuk-4.12.50
-"
-RDEPEND="${DEPEND}
-       !kde-base/baloo:4[-minimal(-)]
-       !kde-base/baloo:5
-"

diff --git a/kde-plasma/baloo/metadata.xml b/kde-plasma/baloo/metadata.xml
deleted file mode 100644 (file)
index a23f444..0000000
--- a/kde-plasma/baloo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <herd>kde</herd>
-</pkgmetadata>

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild
index 2c522c5766f41a73d0078e9e731580ce536ae022..c312485f635043aba7760169afb376c005d165e9 100644 (file)
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild
@@ -13,10 +13,10 @@ KEYWORDS="~amd64"
 IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb"
 
 COMMON_DEPEND="
-       || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) )
        $(add_plasma_dep kwin)
        $(add_plasma_dep plasma-workspace)
        $(add_frameworks_dep attica)
+       $(add_frameworks_dep baloo)
        $(add_frameworks_dep kactivities)
        $(add_frameworks_dep karchive)
        $(add_frameworks_dep kauth)

diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild
index 282658af96ce002de1b2b4854b4f09230ad809d5..e57a87e5793eec50ffa31cf30ff7373b95fdc087 100644 (file)
--- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild
@@ -25,7 +25,7 @@ DEPEND="
        dev-qt/qtxml:5
        media-libs/taglib
        semantic-desktop? (
-               || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) )
+               $(add_frameworks_dep baloo)
                || ( $(add_plasma_dep kfilemetadata) $(add_frameworks_dep kfilemetadata) )
        )
 "

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild
index d107c3025440d36f1a9b1c301c8ae5e3e377c550..ccf6b59f65cd28175ec93c8ea161a15189e4ac8a 100644 (file)
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild
@@ -15,11 +15,11 @@ KEYWORDS="~amd64"
 IUSE="dbus +drkonqi gps prison qalculate +systemmonitor"
 
 COMMON_DEPEND="
-       || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) )
        $(add_plasma_dep kwayland)
        $(add_plasma_dep kwin)
        $(add_plasma_dep libkscreen)
        $(add_plasma_dep libksysguard)
+       $(add_frameworks_dep baloo)
        $(add_frameworks_dep kactivities)
        $(add_frameworks_dep kauth)
        $(add_frameworks_dep kbookmarks)

diff --git a/profiles/updates/3Q-2015 b/profiles/updates/3Q-2015
index bf82fc1a3aa89da574c7857bff83ca3abc54f600..e429241bc5c548d3ff8cd84ccc874acc11807444 100644 (file)
--- a/profiles/updates/3Q-2015
+++ b/profiles/updates/3Q-2015
@@ -5,3 +5,4 @@ slotmove dev-util/kdevelop-qmake 0 4
 move dev-java/biojava sci-biology/biojava
 move x11-plugins/bitlbee-steam net-im/bitlbee-steam
 move media-video/kdenlive kde-apps/kdenlive
+move kde-plasma/baloo kde-frameworks/baloo