[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, kde-frameworks/prison/, kde-apps/kdepimlibs/, ...

[Johannes Huber]

commit:     db77ba5c6e6286dec686ac0e43a20837836e04a7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 21:47:43 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 21:50:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db77ba5c

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

 kde-apps/akonadi-contacts/akonadi-contacts-16.08.3.ebuild    | 2 +-
 kde-apps/kaddressbook/kaddressbook-16.08.3.ebuild            | 2 +-
 kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.3.ebuild    | 2 +-
 kde-apps/kdepimlibs/kdepimlibs-4.14.10-r2.ebuild             | 2 +-
 kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild | 2 +-
 kde-base/klipper/klipper-4.11.22.ebuild                      | 4 ++--
 {media-libs => kde-frameworks}/prison/Manifest               | 0
 {media-libs => kde-frameworks}/prison/metadata.xml           | 0
 {media-libs => kde-frameworks}/prison/prison-1.1.1.ebuild    | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild    | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild    | 2 +-
 profiles/updates/4Q-2016                                     | 1 +
 13 files changed, 12 insertions(+), 11 deletions(-)

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 41aa18e..9497aea 100644
--- 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 a145d61..fe9b07e 100644
--- 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 afc004a..ef5927c 100644
--- 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 af0e2bd..7b9e2c2 100644
--- 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 3297526..f0657ec 100644
--- 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 9ef86ee..b550709 100644
--- 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 eb97e6b..736fd0c 100644
--- 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 856aac2..7728416 100644
--- 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 6c3ac7a..762e87d 100644
--- 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 491a9a4..9f13649 100644
--- 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 be56384..57c2d94 100644
--- 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