gentoo resync : 25.08.2020

3 files changed, 17 insertions, 25 deletions

diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index c0689181c119..24cf11e28793 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
-DIST kajongg-19.12.3.tar.xz 4464436 BLAKE2B 7ba749f4c1ef538200f5a818762487b4857670a284989f84820130f3a93e758f327e082d98291647675f60ff6efa6c7a1028f66688bc396f984c5d83ae8fc02a SHA512 2529ef77aaa4eee8c3245caecbb48316b797dc517e3a27dfbf2582ca3833c54d3e9b65f89b6bebd6d0565956ef87c130fc5dde338e03e2ed978913841cb981c3
-DIST kajongg-20.04.2.tar.xz 4468304 BLAKE2B b3af945a73098aa0dda9f14460c1d41edba34f5837c60a7f6e4534bc350f97bed1bc3156f446abdcc231700c880c78df1f54045bcb2bde387b962ac1d49b3323 SHA512 6fc575554c374a5fb33bf47ad43d96a67ce6c721ee6451f228a8e8a34265039287822143b1923eabe3d6680bf79b6f37350f38a92c81a0caa82eb845520de4c6
-EBUILD kajongg-19.12.3.ebuild 1316 BLAKE2B 5e6df1cf92978a56b6f9953af86623572ffae9be49c73a91f22172f2425669a15833b83b394f203450e7bf33a0909e80b27791ded8882f8d3aebb8edfd017b80 SHA512 5cc6f00d66ba3e383dbd56f16281dd237b3d4dd7e111bacb4c34337b22cbe0e785a5180ce9fc04e41cf71e848439bd6ecef1219b4eaa58058196a1df26958300
-EBUILD kajongg-20.04.2.ebuild 1043 BLAKE2B 49a00dceccbe3f30d280b70d448115314308d1e137bcc3cc45771b4f2dcc0333769e9472f02023c57cbc7b9c147285a19b60e039b3d34d6f71a8ca79058e3539 SHA512 b87cdc1b904c58938a39d29ac62a499e904d3e58abcd1088ce2e7133462633de33d4fccf532704d254fb60da87c9d409a240848b54484f72dd0a602b879f9502
+DIST kajongg-20.04.3.tar.xz 4467924 BLAKE2B 80bc1717586c93b530973c937c7ca7f5952a701d70ed297b4c5f19d32eea9f037bc4eab32662b2c7042fb4e2ed763c1cb4ebef8e1ad2e82bea995463f9eb38bc SHA512 8621d8f98de76b3debb3593f6f5deed63605023f38dfb682186cd829f355423b84813a47698d4316556eefe65bb2bc8b85225e28d231a5bfec98925ad34ec0cd
+DIST kajongg-20.08.0.tar.xz 4475292 BLAKE2B d28a963f745b1a5b7217b9383608f8988586a67327d1e5945697661d276e53f55bbce0c7b538317f021566b1c56c218e88d50e506e463bbed43f6b2d9e501647 SHA512 340adea2734fabe774caa4975c845f84bff1cea96a3796791365b9aa361d5561fd49e764dacb47697ec4a2bbcd83e39f2b3f6d78762cda1e954858c9db1a1749
+EBUILD kajongg-20.04.3.ebuild 1040 BLAKE2B f6677ef9da453a2a44cbdf38ccfe9e2482106f781536acf6037ac9442c43824b224d0325a8966ce4c2b802c77cb801464e34224b6a9e22af2d9d80fdc028e83d SHA512 161f2107975d901d542258a69f6331c0071dce2fcffa9d772134ad766641878ebeef68726359459ad2bdb124337fe3e2fb898e7154cb4f7ba3caff1683411088
+EBUILD kajongg-20.08.0.ebuild 1043 BLAKE2B b5035f354c975c5504a342a024622f1554893d08216c66b7f8be4c863a1b3280345add6f696e0d45cc9df28c8480006020db8e5e7fac8e862291a3f202aaf958 SHA512 202e837fb743a9f3dfeb82decafe77c97d70a9506692325804d90d1dbef6127b08887a97dc56f276510cc79610f896b4d2683e769f2b2b9ecd3aefbb1f94ad7e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-19.12.3.ebuild b/kde-apps/kajongg/kajongg-20.04.3.ebuild
index aeb414dfc4c5..20974b312ab0 100644
--- a/kde-apps/kajongg/kajongg-19.12.3.ebuild
+++ b/kde-apps/kajongg/kajongg-20.04.3.ebuild
@@ -4,10 +4,10 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8} )
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 inherit python-single-r1 ecm kde.org
 
 DESCRIPTION="Classical Mah Jongg for four players"
@@ -21,13 +21,13 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
+	dev-db/sqlite:3
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-db/sqlite:3
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
 	$(python_gen_cond_dep '
 		dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
 		>=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
@@ -45,12 +45,4 @@ pkg_setup() {
 src_prepare() {
 	python_fix_shebang src
 	ecm_src_prepare
-	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
-}
-
-src_install() {
-	ecm_src_install
-	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
-	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
-	fperms a+x /usr/share/kajongg/kajongg{,server}.py
 }
diff --git a/kde-apps/kajongg/kajongg-20.04.2.ebuild b/kde-apps/kajongg/kajongg-20.08.0.ebuild
index dabea269a548..d49b3cf13b01 100644
--- a/kde-apps/kajongg/kajongg-20.04.2.ebuild
+++ b/kde-apps/kajongg/kajongg-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 PYTHON_COMPAT=( python3_{7,8} )
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit python-single-r1 ecm kde.org
 
 DESCRIPTION="Classical Mah Jongg for four players"
@@ -21,13 +21,13 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
+	dev-db/sqlite:3
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-db/sqlite:3
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
 	$(python_gen_cond_dep '
 		dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
 		>=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]