gentoo resync : 25.11.2020

3 files changed, 10 insertions, 57 deletions

diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index e41998a2d107..e9306e542188 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,3 @@
-DIST rocs-20.04.3.tar.xz 1505280 BLAKE2B 5ee98b3250db48f41a6a63db82633fc5fed2d3348314deb2db29b77ebb54d032c4162914556ac6c25e8c7c7ebd08aacfb6f241f28b4934af363f354c3415fd2a SHA512 b561e8864a700c832d36ce8fb645d29c09c4c9dcf34a01649ad6448b9d00a25945134821753ebeef56a607c3c66424a59d8a2372ae5561185fd37691709bfd5d
-DIST rocs-20.08.1.tar.xz 1497428 BLAKE2B ce3e9088bf1394c5876652a1a269d48e58bba35a5b6d0505a3fd54e52cc3cceec591c452d1604d7f39b35b93a26369887c880ca6a5463057b208a8069e0b0aed SHA512 f9bc679812caff5f1e1b299ab527cca6cab7f22ea57669bb17f58fe1c6ecb6275c7bb3444af82628ec5aae2ab43a426f51d3b5ca470e6440bd9b270755563e67
-EBUILD rocs-20.04.3.ebuild 1289 BLAKE2B 903bf90f0c38e790a5db6d9105f442221b332af8e2f77c59f77d271d5a62e291f78225616f6e8ced8ca1210fe96b5926dec60ee57481466ae6028b4e3f32b8d8 SHA512 7cb675b87a73e2f9f0b9d44f6c5f5a76c00c073976db7d645de18db6177733974962672fedd74296eb317fb64401c2885e0c40093d728dfd57a62fb2668c8f51
-EBUILD rocs-20.08.1.ebuild 1292 BLAKE2B 34216ab26ddde59eba63dbfa6b6f38c508dca65d480cef6a78a614838b3b447c9cdedc5968051d71fdcc291efdbb25b594ec7082473227853dbb51b089188f6c SHA512 5b88f487ad90bf3c732214b62d2f82903d7c061602d5568d4524d163e3550fee93329eccd6a88edc91ee585afc419f30f8c3dcab7e25694d640c6a88720be9fd
+DIST rocs-20.08.3.tar.xz 1498184 BLAKE2B 0488a62dd830e92cbe525379e53e0eb8a32334256ca30453549adad681df4e28d6bb05eed852e751e124003ede2833d5b78d4a3aab5e550334674811d6ca1804 SHA512 9eb5df64bad994f03348c86139bb156da856411ce4692a8d095c5a6410a9253a3e4a458ae7d3d3c18e6a56877728866e3c563d58c60a90658f9c0ea52ecdd15e
+EBUILD rocs-20.08.3.ebuild 1343 BLAKE2B 05bbefb36d9a2c7c20eb42184bb5ce0602e7703df7b6522b8cbd0e6fe079805ccf94a9519ffab560b4963cb051d6c19398c7aaa8b0ddd218501168400cdee86e SHA512 e0cde3c1e58e716e3ebe8c6c2690b7d93e9c54051d5a61c75393daf966b52686d951f8a2419e9377e96a013dcc64c3e0903a012639e3066873f61a06bc9bda0f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-20.08.1.ebuild b/kde-apps/rocs/rocs-20.08.1.ebuild
deleted file mode 100644
index 531091266033..000000000000
--- a/kde-apps/rocs/rocs-20.08.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Interface to work with Graph Theory"
-HOMEPAGE="https://kde.org/applications/education/org.kde.rocs"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.49
-"
-
-RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/rocs/rocs-20.04.3.ebuild b/kde-apps/rocs/rocs-20.08.3.ebuild
index da94ba46d89c..d46552b5183d 100644
--- a/kde-apps/rocs/rocs-20.04.3.ebuild
+++ b/kde-apps/rocs/rocs-20.08.3.ebuild
@@ -5,19 +5,19 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Interface to work with Graph Theory"
-HOMEPAGE="https://kde.org/applications/education/org.kde.rocs"
+HOMEPAGE="https://apps.kde.org/en/rocs"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/grantlee:5
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
@@ -41,8 +41,11 @@ RDEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.49
 "
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+"
 
 RESTRICT+=" test"	# 1/10 tests currently fails