media-libs/prison -> kde-frameworks/prison

diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-16.08.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-16.08.3.ebuild
index 41aa18e4fc946c40a2ea543558e61fd2188c6921..9497aea71161fbbd11aa2eb2b4d3ffc230af696c 100644 (file)
--- a/kde-apps/akonadi-contacts/akonadi-contacts-16.08.3.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-16.08.3.ebuild
@@ -40,7 +40,7 @@ DEPEND="
        $(add_qt_dep qtwebengine 'widgets')
        $(add_qt_dep qtwidgets)
        >=dev-libs/grantlee-5.1.0:5
-       prison? ( media-libs/prison:5 )
+       prison? ( $(add_frameworks_dep prison) )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/kaddressbook/kaddressbook-16.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-16.08.3.ebuild
index a145d61d7a61b260f576e418888f43e79318fad8..fe9b07e0060bb07dc89eeabc43eeefa0d3890351 100644 (file)
--- a/kde-apps/kaddressbook/kaddressbook-16.08.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-16.08.3.ebuild
@@ -52,7 +52,7 @@ COMMON_DEPEND="
        $(add_qt_dep qtprintsupport)
        $(add_qt_dep qtwidgets)
        dev-libs/grantlee:5
-       prison? ( media-libs/prison:5 )
+       prison? ( $(add_frameworks_dep prison) )
 "
 DEPEND="${COMMON_DEPEND}
        test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )

diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.3.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.3.ebuild
index afc004aba6e27318cdfcb25782fe998622ac05b0..ef5927cd9709304fba14ff9e095eea1833513bea 100644 (file)
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.3.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.3.ebuild
@@ -32,7 +32,7 @@ DEPEND="
        $(add_qt_dep qtgui)
        $(add_qt_dep qtwidgets)
        >=dev-libs/grantlee-5.1.0:5
-       prison? ( media-libs/prison:5 )
+       prison? ( $(add_frameworks_dep prison) )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r2.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r2.ebuild
index af0e2bdb2eeba51a92ba79e779e87dff1c4aa60f..7b9e2c283ee09d8676967f97e345ccba18ab86ce 100644 (file)
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r2.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r2.ebuild
@@ -27,7 +27,7 @@ DEPEND="
        kde-apps/akonadi:4
        media-libs/phonon[qt4]
        x11-misc/shared-mime-info
-       prison? ( media-libs/prison:4 )
+       prison? ( kde-frameworks/prison:4 )
        ldap? ( net-nds/openldap )
 "
 # boost is not linked to, but headers which include it are installed

diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild
index 3297526a6a597c42212cb619d6aa04822da2bbe0..f0657ec3155c93d870795d02298b2cfb98541120 100644 (file)
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild
@@ -31,7 +31,7 @@ DEPEND="
        kde-apps/akonadi:4
        media-libs/phonon[qt4]
        x11-misc/shared-mime-info
-       prison? ( media-libs/prison:4 )
+       prison? ( kde-frameworks/prison:4 )
        ldap? ( net-nds/openldap )
 "
 # boost is not linked to, but headers which include it are installed

diff --git a/kde-base/klipper/klipper-4.11.22.ebuild b/kde-base/klipper/klipper-4.11.22.ebuild
index 9ef86ee327cabd357652a51216f05d8cfcd37b54..b550709adc2cc973b1d04dd60d151d1e4549bf9a 100644 (file)
--- a/kde-base/klipper/klipper-4.11.22.ebuild
+++ b/kde-base/klipper/klipper-4.11.22.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,7 +18,7 @@ DEPEND="
        kde-plasma/libtaskmanager:4
        sys-libs/zlib
        x11-libs/libX11
-       prison? ( media-libs/prison:4 )
+       prison? ( kde-frameworks/prison:4 )
 "
 RDEPEND="${DEPEND}"
 

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

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

diff --git a/media-libs/prison/prison-1.1.1.ebuild b/kde-frameworks/prison/prison-1.1.1.ebuild
similarity index 91%
rename from media-libs/prison/prison-1.1.1.ebuild
rename to kde-frameworks/prison/prison-1.1.1.ebuild
index eb97e6b4bd9094573531e2b96c24eaf6ad92a8df..736fd0cbd10c84ddf26e13d73f665b5efbbaffca 100644 (file)
--- a/media-libs/prison/prison-1.1.1.ebuild
+++ b/kde-frameworks/prison/prison-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
index 856aac27efa03f00b62caa1c4ed8d185bf0dc885..77284162e301b67ca591945b8af894ad17874602 100644 (file)
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
@@ -84,7 +84,7 @@ COMMON_DEPEND="
        calendar? ( $(add_kdeapps_dep kholidays) )
        geolocation? ( $(add_frameworks_dep networkmanager-qt) )
        gps? ( sci-geosciences/gpsd )
-       prison? ( media-libs/prison:5 )
+       prison? ( $(add_frameworks_dep prison) )
        qalculate? ( sci-libs/libqalculate )
 "
 RDEPEND="${COMMON_DEPEND}

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
index 6c3ac7a9c326463e41b3655c080f373e320c2c41..762e87d2f7abafe50f32b244bc18a68ca33dc182 100644 (file)
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
@@ -83,7 +83,7 @@ COMMON_DEPEND="
        calendar? ( $(add_kdeapps_dep kholidays) )
        geolocation? ( $(add_frameworks_dep networkmanager-qt) )
        gps? ( sci-geosciences/gpsd )
-       prison? ( media-libs/prison:5 )
+       prison? ( $(add_frameworks_dep prison) )
        qalculate? ( sci-libs/libqalculate )
        semantic-desktop? ( $(add_frameworks_dep baloo) )
 "

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
index 491a9a4209b88816f8e128fbdc7ebcd6cf8567be..9f13649771f8b6ef5133e08cd89a7761319d7cee 100644 (file)
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
@@ -82,7 +82,7 @@ COMMON_DEPEND="
        calendar? ( $(add_kdeapps_dep kholidays) )
        geolocation? ( $(add_frameworks_dep networkmanager-qt) )
        gps? ( sci-geosciences/gpsd )
-       prison? ( media-libs/prison:5 )
+       prison? ( $(add_frameworks_dep prison) )
        qalculate? ( sci-libs/libqalculate )
        semantic-desktop? ( $(add_frameworks_dep baloo) )
 "

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index be563846aae68b6ebe7f37c10d558b450cb7198e..57c2d9437263a8b55cce262293cc8cf70bf3b8ef 100644 (file)
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -44,3 +44,4 @@ move kde-base/libkworkspace kde-plasma/libkworkspace
 move kde-base/libplasmagenericshell kde-plasma/libplasmagenericshell
 move kde-base/libplasmaclock kde-plasma/libplasmaclock
 move kde-base/libtaskmanager kde-plasma/libtaskmanager
+move media-libs/prison kde-frameworks/prison