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

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

diff --git a/media-libs/libkgeomap/libkgeomap-4.12.0.ebuild b/kde-apps/libkgeomap/libkgeomap-4.12.0.ebuild
similarity index 100%
rename from media-libs/libkgeomap/libkgeomap-4.12.0.ebuild
rename to 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
similarity index 100%
rename from media-libs/libkgeomap/libkgeomap-4.4.0.ebuild
rename to kde-apps/libkgeomap/libkgeomap-4.4.0.ebuild

diff --git a/media-libs/libkgeomap/metadata.xml b/kde-apps/libkgeomap/metadata.xml
similarity index 100%
rename from media-libs/libkgeomap/metadata.xml
rename to 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 f10dd1adf0ddfed40623a1a3b79d6c8b328a203c..adee0112b9fc3a13c78de5746c20cee31b9a2cd7 100644 (file)
--- 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 89d72ad23fb67ee785a2319a85bb3a26f3a5653f..57376c3737a4d8e0a2a8bb77dffc7b2084a6de9a 100644 (file)
--- 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 e6148bd08507ff0c2c117260f02112c418a30fdf..d83e74cce2bf4e2cdf9afbc44cc5adbdfbab322c 100644 (file)
--- 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 9c48c8d664a7d7a490582208bcdde2d7c3aa0e8b..01cc8559c25ec8835c162eaab4116b8a2c45ef75 100644 (file)
--- 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 c079988810ae3b03f49408c210181c69e02cca74..59987474cbe795d84a32d170da24d9940f9e521d 100644 (file)
--- 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 31b15328ded0ba4d6a681702ee7edef359c7c3ca..77e84ed8b679880ce50d17fcaa77c49434865dd2 100644 (file)
--- 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 74966c6ad0d90037f7c9385523e0c4cc65dcc882..3f9650842856546a454a7eeb314d614cd9e57b38 100644 (file)
--- 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 395ebdf14985e28f2da619cf8ecc8d1cff10cec7..4e483b53e25a05f096e94764024a2da3fa588ad4 100644 (file)
--- 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