gentoo resync : 15.12.2019

4 files changed, 44 insertions, 38 deletions

diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 7787864b8e17..527f37a8148d 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
-DIST kmahjongg-19.04.3.tar.xz 4064396 BLAKE2B 2c23292a53e8bd5cfff9b1dec164082484bd385f7a709c07166552bf134582c3af704b6f2a91d2dddd550d82855e516adc5c57599bc0fb87c5c408d91c326a4e SHA512 7fb13e7d8381f352e23e3723340b9e80a73219b291105ad8226b8b891433bc7ffabc27dff2adb3854314d62fc5de9b82a0afb98a050ee2749c63e97b68d8a484
 DIST kmahjongg-19.08.3.tar.xz 3379632 BLAKE2B dab79ace503b83032214621d4227bb63eb805cf7df28bd5f4ce63217a67d2fc8626185a500520618e67d3383a7a65f2e50779d5baef8daee7346ffc0a3288c50 SHA512 73a82a08f3ae89a96438f3bb4dc8df2a73efb08bd2a3583d3847ae2a7273838171c255e9275eab4a85661a4d1a4678696969a2f8372aef16d4f5618c497b7702
-EBUILD kmahjongg-19.04.3.ebuild 914 BLAKE2B 4b62559a6f82f29687e05b3ffc2cf64917b1bc673425320c79248308e836178cbda1249ab165f38586bfc9c1d83c0350a23fd36dcd995182525e5dafdd4d21ea SHA512 e12ea3ed9373239b1ca021058fe8f84cb680615f54e8479718d45710753f8495b8f03b282b8e273f5e638d2e04506427edbe37fb60168793ff3c28acaf34baac
-EBUILD kmahjongg-19.08.3.ebuild 1100 BLAKE2B 71eb607593e65cd4da0297d9a9f88f49abc4832df2f65bce935cc8562d41e8a110e585f5bca733f1cb0f55aa321113da93b115d66181a393250b5cf3a716e341 SHA512 884b1386d17b7abc826cdd17a428d0de17af1e7227befd13fbbcd80e5d57dd4efd6e54eaddfd9270514dbf15d9ec5525560f0515be79569b1d41b03980332868
+DIST kmahjongg-19.12.0.tar.xz 3424940 BLAKE2B ad248eeee57af3c5d4e82e5008e7ac160a8b5c5450f117efbf13eb3d76ecc3dbe9b4eff6ef3dbb78a646a17ebd6f1245aa1b0421d216c8b0dddb20f7151dcecb SHA512 8340e711c27048a5d308079e2c0a70d048c88aa5d7af660d8c24a5ee47252557babc4f1321f15f72c6c3cee17675887468c239aee936ad4f583cc91e92182896
+EBUILD kmahjongg-19.08.3.ebuild 1097 BLAKE2B b7b0210adce3cdd50838dcf81680f4d9e6a4a18a1f6c1781a6cd10b0bd1669875128e6c57b20f756fbb02f0d5ed832d6300f70492fd99a8a1029e05ad795845b SHA512 07a53f71a749a2652c2ad1b10bc21a639b2bb251004aca7784b763ba99f49c66d580e4337653af7bf558330dd971baf1f83788e6843f9226eae91fea63fae106
+EBUILD kmahjongg-19.12.0.ebuild 1108 BLAKE2B ef6c1fcccf9d3bdf36f4faf1c84d0f1ba88f5632762260d0e87c0a7c5518c223159fd7812897645a6af75f067bcc2ba9820ce36ec35280d7b1a64e1753682729 SHA512 735d7eb7029fbe234d7796830117d67873fae94b61a1602b8cf90d3a5639472d10126458818589ff9c5efadf4bc0d386b8ab9a8f2033e9550add45eafee91102
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-19.04.3.ebuild b/kde-apps/kmahjongg/kmahjongg-19.04.3.ebuild
deleted file mode 100644
index ed7b8455f1d7..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A tile matching game for one or two players"
-HOMEPAGE="https://kde.org/applications/games/kmahjongg/
-https://games.kde.org/game.php?game=kmahjongg"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmahjongg/kmahjongg-19.08.3.ebuild b/kde-apps/kmahjongg/kmahjongg-19.08.3.ebuild
index 6da8ecfbf5d2..391fc26922be 100644
--- a/kde-apps/kmahjongg/kmahjongg-19.08.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/games/kmahjongg/
 https://games.kde.org/game.php?game=kmahjongg"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-19.12.0.ebuild b/kde-apps/kmahjongg/kmahjongg-19.12.0.ebuild
new file mode 100644
index 000000000000..fdc0e5a808db
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="A tile matching game for one or two players"
+HOMEPAGE="https://kde.org/applications/games/org.kde.kmahjongg
+https://games.kde.org/game.php?game=kmahjongg"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=kde-apps/libkmahjongg-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"