[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/frameworkintegration/, kde-frameworks/kdeclarative/, ...

[Andreas Sturmlechner]

commit:     d4e2b952c7451abe3e073ea1b4df4dd496ba0126
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 11:24:44 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 11:35:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e2b952

kde-frameworks: Try to help remaining users over Qt 5.15.1 upgrade

Qt <5.15 versions are gone from Gentoo ebuild repo so we can do this.

- New baseline QTMIN=5.15.1, bumping packages w/ slot op (+ KF5ItemViews):
  kde-frameworks/frameworkintegration
  kde-frameworks/kdeclarative
  kde-frameworks/kio
  kde-frameworks/kitemviews
  kde-frameworks/kxmlgui
  kde-frameworks/qqc2-desktop-style
- Cleanup obsolete slot ops where possible

Bug: https://bugs.gentoo.org/749777
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...tegration-5.74.0.ebuild => frameworkintegration-5.74.0-r1.ebuild} | 5 ++---
 .../{kdeclarative-5.74.0-r1.ebuild => kdeclarative-5.74.0-r2.ebuild} | 5 ++---
 kde-frameworks/kio/{kio-5.74.1-r1.ebuild => kio-5.74.1-r2.ebuild}    | 5 ++---
 .../{kitemviews-5.74.0.ebuild => kitemviews-5.74.0-r1.ebuild}        | 2 +-
 .../kxmlgui/{kxmlgui-5.74.0-r1.ebuild => kxmlgui-5.74.0-r2.ebuild}   | 2 +-
 ...op-style-5.74.0-r1.ebuild => qqc2-desktop-style-5.74.0-r2.ebuild} | 2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.74.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.74.0-r1.ebuild
similarity index 90%
rename from kde-frameworks/frameworkintegration/frameworkintegration-5.74.0.ebuild
rename to kde-frameworks/frameworkintegration/frameworkintegration-5.74.0-r1.ebuild
index ec2f3923758..f62503a630d 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.74.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.74.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_QTHELP="false"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,10 +15,9 @@ LICENSE="LGPL-2+"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.15.0
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	=kde-frameworks/kconfig-${PVCUT}*:5
 	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
 	=kde-frameworks/ki18n-${PVCUT}*:5

diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r2.ebuild
similarity index 90%
rename from kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
rename to kde-frameworks/kdeclarative/kdeclarative-5.74.0-r2.ebuild
index d4bb82bf2ae..f0a7eefaff7 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="false"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
@@ -13,10 +13,9 @@ LICENSE="LGPL-2+"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
-# drop qtgui subslot operator when QT_MINIMAL >= 5.15.0
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	=kde-frameworks/kconfig-${PVCUT}*:5

diff --git a/kde-frameworks/kio/kio-5.74.1-r1.ebuild b/kde-frameworks/kio/kio-5.74.1-r2.ebuild
similarity index 95%
rename from kde-frameworks/kio/kio-5.74.1-r1.ebuild
rename to kde-frameworks/kio/kio-5.74.1-r2.ebuild
index 567730714e5..e332fd74357 100644
--- a/kde-frameworks/kio/kio-5.74.1-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.74.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org xdg-utils
 
@@ -15,14 +15,13 @@ LICENSE="LGPL-2+"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
-# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5=[ssl]
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	=kde-frameworks/kauth-${PVCUT}*:5

diff --git a/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.74.0-r1.ebuild
similarity index 97%
rename from kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
rename to kde-frameworks/kitemviews/kitemviews-5.74.0-r1.ebuild
index 7ec7f179341..574da604a33 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.74.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_DESIGNERPLUGIN="true"
-QTMIN=5.14.2
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 

diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r2.ebuild
similarity index 99%
rename from kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
rename to kde-frameworks/kxmlgui/kxmlgui-5.74.0-r2.ebuild
index 2c06e087a0e..405c52cf9ed 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_DESIGNERPLUGIN="true"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 

diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r2.ebuild
similarity index 98%
rename from kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
rename to kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r2.ebuild
index ca7de8049c8..f3f9d7d8827 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_QTHELP="false"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"