gentoo resync : 18.11.2019

3 files changed, 37 insertions, 32 deletions

diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 005c4fb85f44..52f62405898c 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-19.04.3.tar.xz 313252 BLAKE2B ce7fd10b7ef86ee94cef2663f893c81caacd09ad9262a4c7502a6920d647921c87dec8d836265d048cdf661a02a8fb656dfa04514c8862fb4a64282defcb6638 SHA512 3dc5cf9dbe93198558449941c6b973cc288fe7c4b4cb4b34134176afe417232934eb35588a538aa55224b982f69413837164564682411ffbb6908c7b53ac3811
-DIST kubrick-19.08.2.tar.xz 312928 BLAKE2B b5485be05f283d645cc64b5790eea6fecae7b187e5cc2488b43e2c1161bf76667246d86926d6a3923bc39d44f18e0504c89d86c4e51c4db3c5e412ffeb6e6226 SHA512 52163d9cfb04033309f5a16c68d92d13be61ecb97f12c2377a3274d4d8ca439b68cae13ee92a45dc2b0b9117e8d450a414e5eb0cecf3ae825c7fe2886af38a5d
+DIST kubrick-19.08.3.tar.xz 313384 BLAKE2B b1f76f57b5301b924c2b20878708fe15dcaa0babcc21467de0a1f8ec09e5b9b128eeaf32f2cadbcd1f9bbc8d54d69a07bd87842358f15e57c5f31ee1ece2077c SHA512 158347fd0f5bd20b098b57ca490bc298ad9e5d78beeac36e60539131c7079a6f9cbcb3bd1bea94663e6aeee63bfa8f1ce90c3e12d7217eece2e85c9e5f171d17
 EBUILD kubrick-19.04.3.ebuild 725 BLAKE2B b8d167244b68689f5b67b377218bd32c9d7498c34e0f3ce71ff93dd008178f918e4a28fd2291cfa66f8f022b76b8cdd53238484ecfec9792f7c3b37c3dabf8a6 SHA512 39a187d314ffc42a3d2738bae9d60557cf595024092dd76da062c3eee9fb01e1f9128c1351166ca210099ca57e17bd02635dce1875776aca93c1741b0ba0f2de
-EBUILD kubrick-19.08.2.ebuild 728 BLAKE2B a424fd6af542a549ca76bdefcef60026eee4c12d8637a2552edc4cfe0a33488e3c7d9c77dafaeff8a6376ef4d9140ee2c14deb0bcf42422d9231656d040f7e80 SHA512 2d7f30d5ef7d8ccab8bc3e82c6afeb88925cc8b2a24de2e7a2c82116605197ef14ac084938206fe0ff36766a9cc1926bfe3cf824eaf24478106966dd3427efcb
+EBUILD kubrick-19.08.3.ebuild 890 BLAKE2B ec341e2534423f8b9e8a525cfcc5e69c15c5244c6f57b2b359f44bb65d2b893dd13e652e066cd9a3397def56a11d2afda58ac741f95d7c57854717ea806aa9a1 SHA512 ae91423497b0f83e0e982ffd9b77cb9fd665b05ee5437fefd01585372e93b40833f4746b995de3ece4964f06dfcc36af047ca4e5fc8a4c704f2697ca84522168
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-19.08.2.ebuild b/kde-apps/kubrick/kubrick-19.08.2.ebuild
deleted file mode 100644
index 58c7ac189c8f..000000000000
--- a/kde-apps/kubrick/kubrick-19.08.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
-HOMEPAGE="https://kde.org/applications/games/kubrick/"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	virtual/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kubrick/kubrick-19.08.3.ebuild b/kde-apps/kubrick/kubrick-19.08.3.ebuild
new file mode 100644
index 000000000000..37721e3751b4
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-19.08.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
+HOMEPAGE="https://kde.org/applications/games/kubrick/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtopengl-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	virtual/glu
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"