diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild index 29545780bb0a8..4ec98aafeaef6 100644 --- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild +++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild @@ -18,11 +18,11 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="debug google" DEPEND=" - $(add_kdebase_dep baloo '' 4.14.3) $(add_kdeapps_dep kdepimlibs 'akonadi(+)') app-crypt/gpgme dev-libs/grantlee:0 kde-apps/akonadi:4 + kde-frameworks/baloo:4 google? ( net-libs/libkgapi:4 ) " RDEPEND="${DEPEND} diff --git a/kde-base/baloo/Manifest b/kde-base/baloo/Manifest deleted file mode 100644 index 42fa3608104e6..0000000000000 --- a/kde-base/baloo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST baloo-4.14.3.tar.xz 145604 SHA256 9edcd2bf9fcb4f42959087c954e533bf3345d0971b7402f04c0703c1b2e66a5c SHA512 ce46abee6edfea333fe2b361418ee92e1e7e4b252c4cb9a48f302ff906b3dc49d78c4e55c69de09b0085e03fe87e978b90c2896f7492b940550fda9766679218 WHIRLPOOL a7e80983830419c796d18e72df64d08bb51aebda29c527bf6a65c61c233d80ca7ab6c784255949bd0697f67637cb37fe3bffc15fd5dd9253e185f6194221ebc9 diff --git a/kde-base/baloo/metadata.xml b/kde-base/baloo/metadata.xml deleted file mode 100644 index 2fdbf33d963db..0000000000000 --- a/kde-base/baloo/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest index fb6b1e8c7c3c4..65cd621cf4a4a 100644 --- a/kde-frameworks/baloo/Manifest +++ b/kde-frameworks/baloo/Manifest @@ -1,2 +1,3 @@ +DIST baloo-4.14.3.tar.xz 145604 SHA256 9edcd2bf9fcb4f42959087c954e533bf3345d0971b7402f04c0703c1b2e66a5c SHA512 ce46abee6edfea333fe2b361418ee92e1e7e4b252c4cb9a48f302ff906b3dc49d78c4e55c69de09b0085e03fe87e978b90c2896f7492b940550fda9766679218 WHIRLPOOL a7e80983830419c796d18e72df64d08bb51aebda29c527bf6a65c61c233d80ca7ab6c784255949bd0697f67637cb37fe3bffc15fd5dd9253e185f6194221ebc9 DIST baloo-5.26.0.tar.xz 187444 SHA256 dedd54b468e799cf0fc6e4f69e05659605907a026ec02895fc3bc250ab13f331 SHA512 bec8591648c0e3af7e96e2097725383195fd21fbb7d973738e2ff0caff9fd631b336bccca5ac9d3bc135fda00d2e2edcd9e0d26213f8a0cd1ea88588bc97d2d2 WHIRLPOOL f33b1d5ba9fc2250586f437bc613c3088a18058594f64f80d2b23665c83aa8c15e7167f5cd60dbf8405439e374e55b2a20f92bfb8567c0da17788d47ed75357a DIST baloo-5.27.0.tar.xz 199744 SHA256 8c89de0941fee468c5762526e3274e21b590410ffaf8fc0d04847cf1bb2e0a37 SHA512 ba0e8c0eed3e992b55ac9cc45c6d09e4eb4747c1237ff7e6514130624b1ca65cf343d49518bc0fd7306a956cd6755996445a59c076cb61d30e88fd390300c6a6 WHIRLPOOL 68e8faa90a0df3290415ecf1c18b0d0f74ae828d340da9e9bdcbe5edd1185dc243fcf286eb3953fb284636236f2cdac58271b0956766bed919810d21362dc997 diff --git a/kde-base/baloo/baloo-4.14.3.ebuild b/kde-frameworks/baloo/baloo-4.14.3.ebuild similarity index 85% rename from kde-base/baloo/baloo-4.14.3.ebuild rename to kde-frameworks/baloo/baloo-4.14.3.ebuild index d99525fd39f0f..bc0c96cc08a23 100644 --- a/kde-base/baloo/baloo-4.14.3.ebuild +++ b/kde-frameworks/baloo/baloo-4.14.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="Next generation of the Nepomuk project" +DESCRIPTION="Framework for searching and managing metadata" KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="debug minimal" diff --git a/kde-frameworks/baloo/baloo-5.26.0-r2.ebuild b/kde-frameworks/baloo/baloo-5.26.0-r2.ebuild index 85171e684cb82..393ab1434f70b 100644 --- a/kde-frameworks/baloo/baloo-5.26.0-r2.ebuild +++ b/kde-frameworks/baloo/baloo-5.26.0-r2.ebuild @@ -29,7 +29,7 @@ DEPEND=" >=dev-db/lmdb-0.9.17 " RDEPEND="${DEPEND} - !kde-base/baloo:4[-minimal(-)] + !kde-frameworks/baloo:4[-minimal(-)] " PATCHES=( diff --git a/kde-frameworks/baloo/baloo-5.27.0.ebuild b/kde-frameworks/baloo/baloo-5.27.0.ebuild index 82b6d1f7ba46b..7860788f59d9e 100644 --- a/kde-frameworks/baloo/baloo-5.27.0.ebuild +++ b/kde-frameworks/baloo/baloo-5.27.0.ebuild @@ -29,5 +29,5 @@ DEPEND=" >=dev-db/lmdb-0.9.17 " RDEPEND="${DEPEND} - !kde-base/baloo:4[-minimal(-)] + !kde-frameworks/baloo:4[-minimal(-)] " diff --git a/kde-misc/baloo-kcmadv/baloo-kcmadv-2014.04.27.ebuild b/kde-misc/baloo-kcmadv/baloo-kcmadv-2014.04.27.ebuild index 469e6dd041be6..d3a32ea6447de 100644 --- a/kde-misc/baloo-kcmadv/baloo-kcmadv-2014.04.27.ebuild +++ b/kde-misc/baloo-kcmadv/baloo-kcmadv-2014.04.27.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,9 +18,9 @@ SLOT="4" IUSE="" DEPEND=" - $(add_kdebase_dep baloo '-minimal(-)') dev-libs/qjson dev-libs/xapian + kde-frameworks/baloo:4[-minimal] kde-frameworks/kfilemetadata:4 " RDEPEND="${DEPEND}" diff --git a/kde-misc/zanshin/zanshin-0.3.1.ebuild b/kde-misc/zanshin/zanshin-0.3.1.ebuild index bb0dafbadcb87..ac9abf99e23c5 100644 --- a/kde-misc/zanshin/zanshin-0.3.1.ebuild +++ b/kde-misc/zanshin/zanshin-0.3.1.ebuild @@ -19,8 +19,8 @@ IUSE="debug" DEPEND=" $(add_kdeapps_dep kdepim-runtime '' 4.6.0) $(add_kdeapps_dep kdepimlibs) - $(add_kdebase_dep baloo) dev-libs/boost + kde-frameworks/baloo:4 " RDEPEND="${DEPEND}" diff --git a/kde-plasma/milou/milou-0.1.ebuild b/kde-plasma/milou/milou-0.1.ebuild index 1f2f6808278cd..129094731a0c0 100644 --- a/kde-plasma/milou/milou-0.1.ebuild +++ b/kde-plasma/milou/milou-0.1.ebuild @@ -19,8 +19,8 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" RDEPEND=" - $(add_kdebase_dep baloo) $(add_kdeapps_dep kdepimlibs) + kde-frameworks/baloo:4 " DEPEND="${RDEPEND} kde-frameworks/kfilemetadata:4 diff --git a/media-gfx/digikam/digikam-4.14.0-r1.ebuild b/media-gfx/digikam/digikam-4.14.0-r1.ebuild index 3f81aead6b35a..bf74f8a4ea860 100644 --- a/media-gfx/digikam/digikam-4.14.0-r1.ebuild +++ b/media-gfx/digikam/digikam-4.14.0-r1.ebuild @@ -49,7 +49,7 @@ CDEPEND=" addressbook? ( $(add_kdeapps_dep kdepimlibs) ) gphoto2? ( media-libs/libgphoto2:= ) mysql? ( virtual/mysql ) - semantic-desktop? ( $(add_kdebase_dep baloo '' 4.12.0) ) + semantic-desktop? ( kde-frameworks/baloo:4 ) " RDEPEND="${CDEPEND} $(add_kdeapps_dep kreadconfig) diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild index d8b0287b0ffd6..8a24ffc1d8fa2 100644 --- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild +++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild @@ -50,9 +50,7 @@ CDEPEND=" addressbook? ( $(add_kdeapps_dep kdepimlibs) ) gphoto2? ( media-libs/libgphoto2:= ) mysql? ( virtual/mysql ) - semantic-desktop? ( - $(add_kdebase_dep baloo) - ) + semantic-desktop? ( kde-frameworks/baloo:4 ) " RDEPEND="${CDEPEND} kde-apps/kreadconfig:4 diff --git a/net-libs/libkpeople/libkpeople-0.3.0.ebuild b/net-libs/libkpeople/libkpeople-0.3.0.ebuild index 321a220a21af2..fbd9eadd47079 100644 --- a/net-libs/libkpeople/libkpeople-0.3.0.ebuild +++ b/net-libs/libkpeople/libkpeople-0.3.0.ebuild @@ -24,7 +24,7 @@ IUSE="debug examples semantic-desktop test" RDEPEND=" $(add_kdeapps_dep kdepimlibs) - semantic-desktop? ( $(add_kdebase_dep baloo) ) + semantic-desktop? ( kde-frameworks/baloo:4 ) " DEPEND="${RDEPEND} sys-devel/gettext diff --git a/profiles/targets/desktop/kde/package.use b/profiles/targets/desktop/kde/package.use index 4f6486118a8a7..9dda4a56b89ba 100644 --- a/profiles/targets/desktop/kde/package.use +++ b/profiles/targets/desktop/kde/package.use @@ -3,7 +3,7 @@ # $Id$ # Resolve conflicts with slot 5 ebuilds -kde-base/baloo minimal +kde-frameworks/baloo minimal kde-apps/kde4-l10n minimal # Required by kde-frameworks/kauth diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index 696544b082cdb..74d504a0e3fa0 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -60,7 +60,7 @@ media-libs/phonon designer # Allow certain KDE 4 components to be coinstalled with Plasma 5