12 files changed, 8 insertions, 7 deletions
diff --git a/media-libs/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index f4e8528bc1a8..f4e8528bc1a8 100644
--- a/media-libs/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
diff --git a/media-libs/libkgeomap/libkgeomap-4.12.0.ebuild b/kde-apps/libkgeomap/libkgeomap-4.12.0.ebuild
index 7b6294b37340..7b6294b37340 100644
--- a/media-libs/libkgeomap/libkgeomap-4.12.0.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-4.12.0.ebuild
diff --git a/media-libs/libkgeomap/libkgeomap-4.4.0.ebuild b/kde-apps/libkgeomap/libkgeomap-4.4.0.ebuild
index 20e47047c25e..20e47047c25e 100644
--- a/media-libs/libkgeomap/libkgeomap-4.4.0.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-4.4.0.ebuild
diff --git a/media-libs/libkgeomap/metadata.xml b/kde-apps/libkgeomap/metadata.xml
index a23f444b67d6..a23f444b67d6 100644
--- a/media-libs/libkgeomap/metadata.xml
+++ b/kde-apps/libkgeomap/metadata.xml
diff --git a/media-gfx/digikam/digikam-4.10.0.ebuild b/media-gfx/digikam/digikam-4.10.0.ebuild
index f10dd1adf0dd..adee0112b9fc 100644
--- a/media-gfx/digikam/digikam-4.10.0.ebuild
+++ b/media-gfx/digikam/digikam-4.10.0.ebuild
@@ -33,6 +33,7 @@ CDEPEND="
 	kde-apps/libkdcraw:4=
 	kde-apps/libkexiv2:4=
 	>=kde-apps/libkface-4.6.0:4
+	>=kde-apps/libkgeomap-4.6.0:4=
 	kde-apps/libkipi:4
 	kde-apps/marble:4=[plasma]
 	kde-apps/kcmshell:4
@@ -40,7 +41,6 @@ CDEPEND="
 	media-libs/jasper
 	media-libs/lcms:2
 	>=media-libs/lensfun-0.2.6
-	>=media-libs/libkgeomap-4.6.0:=
 	media-libs/liblqr
 	>=media-libs/libpgf-6.12.27
 	media-libs/libpng:0=
diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
index 89d72ad23fb6..57376c3737a4 100644
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -34,12 +34,12 @@ CDEPEND="
 	kde-apps/libkdcraw:4=
 	kde-apps/libkexiv2:4=
 	<=kde-apps/libkface-4.4.0
+	kde-apps/libkgeomap:4
 	kde-apps/libkipi:4
 	kde-apps/marble:4=[plasma]
 	media-libs/jasper
 	media-libs/lcms:2
 	media-libs/lensfun
-	media-libs/libkgeomap
 	media-libs/liblqr
 	>=media-libs/libpgf-6.12.27
 	media-libs/libpng:0=
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
index e6148bd08507..d83e74cce2bf 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 	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 )
+	map? ( >=kde-apps/libkgeomap-4.7.0:4 )
 	raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index 9c48c8d664a7..01cc8559c25e 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -6,6 +6,6 @@
 		<flag name="face">Enable face detection and recognition using <pkg>media-libs/libkface</pkg></flag>
 		<flag name="geolocation">Add support for <pkg>kde-apps/marble</pkg></flag>
 		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
-		<flag name="map">Enable map display support using <pkg>media-libs/libkgeomap</pkg></flag>
+		<flag name="map">Enable map display support using <pkg>kde-apps/libkgeomap</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
index c079988810ae..59987474cbe7 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
@@ -40,7 +40,7 @@ COMMONDEPEND="
 	dev-libs/libxslt
 	dev-libs/qjson
 	dev-qt/qtxmlpatterns:4
-	gpssync? ( || ( >=kde-apps/libkgeomap-14.12.0:4 >=media-libs/libkgeomap-4.12.0 ) )
+	gpssync? ( >=kde-apps/libkgeomap-4.12.0:4 )
 	media-libs/libpng:0=
 	media-libs/tiff:0
 	virtual/jpeg:0
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
index 31b15328ded0..77e84ed8b679 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
@@ -39,7 +39,7 @@ COMMONDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/qjson
-	gpssync?	( >=media-libs/libkgeomap-4.2.0 )
+	gpssync?	( >=kde-apps/libkgeomap-4.2.0:4 )
 	media-libs/libpng:0=
 	media-libs/tiff
 	virtual/jpeg
diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index 74966c6ad0d9..3f9650842856 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
-		<flag name="gpssync">Build the gpssync plugin, which requires media-lib/libkgeomap and thereby marble</flag>
+		<flag name="gpssync">Build the gpssync plugin, which requires kde-apps/libkgeomap and thereby marble</flag>
 		<flag name="mediawiki">Build the mediawiki export plugin</flag>
 		<flag name="panorama">Pull in dependencies needed by panorama plugin</flag>
 		<flag name="redeyes">Add redeyes removal support</flag>
diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
index 395ebdf14985..4e483b53e25a 100644
--- a/profiles/updates/4Q-2015
+++ b/profiles/updates/4Q-2015
@@ -4,3 +4,4 @@ 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
+move media-libs/libkgeomap kde-apps/libkgeomap