[gentoo-commits] proj/kde:master commit in: profiles/updates/, kde-plasma/systemsettings/, kde-misc/kdeconnect/, ...

[Andreas Sturmlechner]

commit:     8dce70dd20e120c07bba7d6e75700dcdec2f260b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 22 11:13:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 20:26:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8dce70dd

dev-libs/kirigami: pkgmove to kde-frameworks/kirigami, slotmove 2 -> 5

See also:
https://mail.kde.org/pipermail/kde-frameworks-devel/2017-June/045892.html

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/kalgebra/kalgebra-17.07.90.ebuild                |  2 +-
 kde-apps/kalgebra/kalgebra-17.08.49.9999.ebuild           |  2 +-
 kde-apps/kalgebra/kalgebra-9999.ebuild                    |  2 +-
 kde-apps/okular/okular-17.07.90.ebuild                    |  2 +-
 kde-apps/okular/okular-17.08.49.9999.ebuild               |  2 +-
 kde-apps/okular/okular-9999.ebuild                        |  2 +-
 .../kirigami/kirigami-9999.ebuild                         | 15 +++------------
 {dev-libs => kde-frameworks}/kirigami/metadata.xml        |  0
 kde-misc/kdeconnect/kdeconnect-9999.ebuild                |  2 +-
 kde-plasma/plasma-sdk/plasma-sdk-5.10.49.9999.ebuild      |  2 +-
 kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild              |  2 +-
 kde-plasma/systemsettings/systemsettings-9999.ebuild      |  2 +-
 media-video/kamoso/kamoso-9999.ebuild                     |  2 +-
 profiles/updates/3Q-2017                                  |  2 ++
 14 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/kde-apps/kalgebra/kalgebra-17.07.90.ebuild b/kde-apps/kalgebra/kalgebra-17.07.90.ebuild
index d3826ebac2..d476ae4d5a 100644
--- a/kde-apps/kalgebra/kalgebra-17.07.90.ebuild
+++ b/kde-apps/kalgebra/kalgebra-17.07.90.ebuild
@@ -29,8 +29,8 @@ DEPEND="
 	readline? ( sys-libs/readline:0= )
 "
 RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami '' 2.2.0)
 	$(add_qt_dep qtquickcontrols)
-	dev-libs/kirigami:2
 	!kde-apps/analitza:4
 "
 

diff --git a/kde-apps/kalgebra/kalgebra-17.08.49.9999.ebuild b/kde-apps/kalgebra/kalgebra-17.08.49.9999.ebuild
index 90b6bc3289..41d233a312 100644
--- a/kde-apps/kalgebra/kalgebra-17.08.49.9999.ebuild
+++ b/kde-apps/kalgebra/kalgebra-17.08.49.9999.ebuild
@@ -29,8 +29,8 @@ DEPEND="
 	readline? ( sys-libs/readline:0= )
 "
 RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami '' 2.2.0)
 	$(add_qt_dep qtquickcontrols)
-	dev-libs/kirigami:2
 	!kde-apps/analitza:4
 "
 

diff --git a/kde-apps/kalgebra/kalgebra-9999.ebuild b/kde-apps/kalgebra/kalgebra-9999.ebuild
index 90b6bc3289..41d233a312 100644
--- a/kde-apps/kalgebra/kalgebra-9999.ebuild
+++ b/kde-apps/kalgebra/kalgebra-9999.ebuild
@@ -29,8 +29,8 @@ DEPEND="
 	readline? ( sys-libs/readline:0= )
 "
 RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami '' 2.2.0)
 	$(add_qt_dep qtquickcontrols)
-	dev-libs/kirigami:2
 	!kde-apps/analitza:4
 "
 

diff --git a/kde-apps/okular/okular-17.07.90.ebuild b/kde-apps/okular/okular-17.07.90.ebuild
index 3416aa377a..dbf20bd090 100644
--- a/kde-apps/okular/okular-17.07.90.ebuild
+++ b/kde-apps/okular/okular-17.07.90.ebuild
@@ -57,7 +57,7 @@ RDEPEND="${DEPEND}
 	image-backend? ( $(add_frameworks_dep kimageformats) )
 	mobile? (
 		$(add_qt_dep qtquickcontrols)
-		dev-libs/kirigami:2
+		$(add_frameworks_dep kirigami '' 2.2.0)
 	)
 "
 

diff --git a/kde-apps/okular/okular-17.08.49.9999.ebuild b/kde-apps/okular/okular-17.08.49.9999.ebuild
index 4cb6dbb5f4..b2e9978343 100644
--- a/kde-apps/okular/okular-17.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-17.08.49.9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="${DEPEND}
 	image-backend? ( $(add_frameworks_dep kimageformats) )
 	mobile? (
 		$(add_qt_dep qtquickcontrols)
-		dev-libs/kirigami:2
+		$(add_frameworks_dep kirigami '' 2.2.0)
 	)
 "
 

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 4cb6dbb5f4..b2e9978343 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="${DEPEND}
 	image-backend? ( $(add_frameworks_dep kimageformats) )
 	mobile? (
 		$(add_qt_dep qtquickcontrols)
-		dev-libs/kirigami:2
+		$(add_frameworks_dep kirigami '' 2.2.0)
 	)
 "
 

diff --git a/dev-libs/kirigami/kirigami-9999.ebuild b/kde-frameworks/kirigami/kirigami-9999.ebuild
similarity index 71%
rename from dev-libs/kirigami/kirigami-9999.ebuild
rename to kde-frameworks/kirigami/kirigami-9999.ebuild
index 54cb34674d..52ce723f89 100644
--- a/dev-libs/kirigami/kirigami-9999.ebuild
+++ b/kde-frameworks/kirigami/kirigami-9999.ebuild
@@ -3,24 +3,15 @@
 
 EAPI=6
 
+KDE_EXAMPLES="true"
 KDE_TEST="forceoptional"
-QT_MINIMAL="5.7.1"
 inherit kde5
 
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	MY_PN="${PN}2"
-	SRC_BRANCH=stable
-	[[ ${PV} = *.[8-9]?.* ]] && SRC_BRANCH=unstable
-	SRC_URI="mirror://kde/${SRC_BRANCH}/${PN}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
 DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
 HOMEPAGE="https://techbase.kde.org/Kirigami"
+
 LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="examples plasma"
+IUSE="plasma"
 
 RDEPEND="
 	$(add_qt_dep qtdeclarative)

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

diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
index a2536690ca..1fb5881fa4 100644
--- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
@@ -42,7 +42,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep plasma-workspace)
-	app? ( dev-libs/kirigami:2 )
+	app? ( $(add_frameworks_dep kirigami '' 2.2.0) )
 	wayland? ( $(add_plasma_dep kwin) )
 	!kde-misc/kdeconnect:4
 "

diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.10.49.9999.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.10.49.9999.ebuild
index 2c786097fc..815acd1316 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.10.49.9999.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.10.49.9999.ebuild
@@ -32,8 +32,8 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	dev-libs/kirigami:2
 "
 RDEPEND="${DEPEND}
 	!dev-util/plasmate
+	$(add_frameworks_dep kirigami '' 2.2.0)
 "

diff --git a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
index 2c786097fc..0c03aad18b 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
@@ -32,8 +32,8 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	dev-libs/kirigami:2
 "
 RDEPEND="${DEPEND}
 	!dev-util/plasmate
+	$(add_frameworks_dep kirigami )
 "

diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild
index 2232683690..921f88f813 100644
--- a/kde-plasma/systemsettings/systemsettings-9999.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-plasma/systemsettings:4
-	dev-libs/kirigami:2
+	$(add_frameworks_dep kirigami)
 	gtk? ( $(add_plasma_dep kde-gtk-config) )
 "
 

diff --git a/media-video/kamoso/kamoso-9999.ebuild b/media-video/kamoso/kamoso-9999.ebuild
index d102ce3249..784bd6d218 100644
--- a/media-video/kamoso/kamoso-9999.ebuild
+++ b/media-video/kamoso/kamoso-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	virtual/libudev:=
 "
 RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami '' 2.2.0)
 	$(add_qt_dep qtquickcontrols2)
-	dev-libs/kirigami:2
 	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
 "

diff --git a/profiles/updates/3Q-2017 b/profiles/updates/3Q-2017
index 14d163aaf4..e525c6d434 100644
--- a/profiles/updates/3Q-2017
+++ b/profiles/updates/3Q-2017
@@ -1 +1,3 @@
 move media-libs/libkdeaccessibilityclient media-libs/libqaccessibilityclient
+move dev-libs/kirigami kde-frameworks/kirigami
+slotmove kde-frameworks/kirigami 2 5