[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, media-gfx/kphotoalbum/, kde-apps/libkface/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, media-gfx/kphotoalbum/, kde-apps/libkface/, ...

[Michael Palimaka]

commit:     0d913a707beaabe25045151874721dd4e36a52c4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 12:03:31 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 12:03:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d913a70

media-libs/libkface: move to kde-apps/libkface

 {media-libs => kde-apps}/libkface/Manifest               | 0
 {media-libs => kde-apps}/libkface/libkface-4.12.0.ebuild | 0
 {media-libs => kde-apps}/libkface/libkface-4.4.0.ebuild  | 0
 {media-libs => kde-apps}/libkface/metadata.xml           | 0
 media-gfx/digikam/digikam-4.10.0.ebuild                  | 2 +-
 media-gfx/digikam/digikam-4.4.0-r1.ebuild                | 2 +-
 media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild           | 2 +-
 profiles/updates/4Q-2015                                 | 1 +
 8 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-libs/libkface/Manifest b/kde-apps/libkface/Manifest
similarity index 100%
rename from media-libs/libkface/Manifest
rename to kde-apps/libkface/Manifest

diff --git a/media-libs/libkface/libkface-4.12.0.ebuild b/kde-apps/libkface/libkface-4.12.0.ebuild
similarity index 100%
rename from media-libs/libkface/libkface-4.12.0.ebuild
rename to kde-apps/libkface/libkface-4.12.0.ebuild

diff --git a/media-libs/libkface/libkface-4.4.0.ebuild b/kde-apps/libkface/libkface-4.4.0.ebuild
similarity index 100%
rename from media-libs/libkface/libkface-4.4.0.ebuild
rename to kde-apps/libkface/libkface-4.4.0.ebuild

diff --git a/media-libs/libkface/metadata.xml b/kde-apps/libkface/metadata.xml
similarity index 100%
rename from media-libs/libkface/metadata.xml
rename to kde-apps/libkface/metadata.xml

diff --git a/media-gfx/digikam/digikam-4.10.0.ebuild b/media-gfx/digikam/digikam-4.10.0.ebuild
index ea51c0e..f10dd1a 100644
--- a/media-gfx/digikam/digikam-4.10.0.ebuild
+++ b/media-gfx/digikam/digikam-4.10.0.ebuild
@@ -32,6 +32,7 @@ CDEPEND="
 	kde-apps/kdebase-kioslaves:4
 	kde-apps/libkdcraw:4=
 	kde-apps/libkexiv2:4=
+	>=kde-apps/libkface-4.6.0:4
 	kde-apps/libkipi:4
 	kde-apps/marble:4=[plasma]
 	kde-apps/kcmshell:4
@@ -39,7 +40,6 @@ CDEPEND="
 	media-libs/jasper
 	media-libs/lcms:2
 	>=media-libs/lensfun-0.2.6
-	|| ( >=kde-apps/libkface-14.12.0:4 >=media-libs/libkface-4.6.0 )
 	>=media-libs/libkgeomap-4.6.0:=
 	media-libs/liblqr
 	>=media-libs/libpgf-6.12.27

diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
index f36ebe1..89d72ad 100644
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -33,12 +33,12 @@ CDEPEND="
 	kde-apps/kdebase-kioslaves:4
 	kde-apps/libkdcraw:4=
 	kde-apps/libkexiv2:4=
+	<=kde-apps/libkface-4.4.0
 	kde-apps/libkipi:4
 	kde-apps/marble:4=[plasma]
 	media-libs/jasper
 	media-libs/lcms:2
 	media-libs/lensfun
-	|| ( kde-apps/libkface:4 <=media-libs/libkface-4.4.0 )
 	media-libs/libkgeomap
 	media-libs/liblqr
 	>=media-libs/libpgf-6.12.27

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
index d152deb..e6148bd 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	media-libs/phonon[qt4]
 	virtual/jpeg:0
 	exif? ( >=media-gfx/exiv2-0.17 )
-	face? ( >=media-libs/libkface-4.7.0 )
+	face? ( >=kde-apps/libkface-4.7.0 )
 	geolocation? ( $(add_kdeapps_dep marble) )
 	kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
 	map? ( >=media-libs/libkgeomap-4.7.0 )

diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
index 9cf9e9d..395ebdf 100644
--- a/profiles/updates/4Q-2015
+++ b/profiles/updates/4Q-2015
@@ -3,3 +3,4 @@ move sys-apps/cv sys-apps/progress
 slotmove =dev-ruby/recog-2.0.6 2 2.0.6
 slotmove =dev-ruby/recog-2.0.12 2 2.0.12
 slotmove =dev-ruby/recog-2.0.14 2 2.0.14
+move media-libs/libkface kde-apps/libkface