gentoo resync : 05.12.2021

12 files changed, 140 insertions, 137 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index a77b35842068..f54d19a26e14 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index a34a62bbd914..40360de5ac6f 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,5 +1,8 @@
 AUX freecell-solver-5.22.1-no-docs.patch 1013 BLAKE2B d766bb4a12e546c7a2e6ccdaf00d234f2d1e9fc874c146e3d8755733915ab2cf58472551f46115347678b92ee6b4d14453f051960f5076932bbb15b8a0337794 SHA512 dbb78cb9f67e2d0d71516d765020c91a074a9984a26b3d5d5baf031a852c4c35efebfd1e331aaa009a2a066bd303c405e60b84be690a1bfe86a94ac832281f2e
 AUX freecell-solver-6.2.0-no-git-clone-kthxbye.patch 752 BLAKE2B 651fa79006d38c2d93404221547bfbeac2d500a4c8fca6a5607ea288177639f91be9fc2a71670a4c97c690b054c9aca73e0c745ceec44630a29f5b1bafc833ee SHA512 1c41cf9b09ab1569f714c1f73372532bf533c0ccf25c37f8ee593415a459e6ff06791f5cd6a086037361293e4c556ca8bf427dcf4906f6998a13c8d35c4ccdb4
+AUX freecell-solver-6.6.0-no-git-clone-kthxbye.patch 1383 BLAKE2B 7bb5b8ad8c67836391921ef0bf4af8917583743b2736e8b0057f8d082b853a83adda74160e0d8f042e89624329206287d77fd05e2e5359b70a1fd8cab170379e SHA512 bdc9dbb34af6553f8f92539219201fd69f792a3623e47aa202968a3a21b18379d50de6797cc0f1320c743d877855720462dd0ffd04c1aaee30773d89203efb8b
 DIST freecell-solver-6.2.0.tar.xz 426616 BLAKE2B f48d1b67c56a42f42e00e765a911944ae7d2eb97db81a8ebb58baa1603bd274c9ceb460bdf5c232c4f2b3f54d33acc0057e25c8c0bce897bb862eedc16613f05 SHA512 090f6b93c3f354b5c6bcb1ea67d9313639d23e81998cdc15316246a1cdac26450cf8fd04172bfd5539d875edf407dcdf7ce2c872221b7261f89dbbe309c27560
+DIST freecell-solver-6.6.0.tar.xz 432564 BLAKE2B 8bd4acc29eb2b934ae8666dd2877a428ed7b7f7f9eec87c8c7e395cd364dde91caac98895fa1abe61eeb7fd2ea84c4abf9924fc136879d53f9dd43ec5221b55a SHA512 55844426ca7e8c01916b94aca13ef579923b28ef88376bade6899a2b791a4a8198160a05169915fb484a12363c8c1b2f1bfaa7bd18afbc46c9ba86058cbba2bb
 EBUILD freecell-solver-6.2.0-r1.ebuild 1253 BLAKE2B ccbd3a685c931061704e53f75729a441ca62977bba9184ee1e111a5dfe5dd841a4d8961a9bd071508edb2f8ca2559754625059966c1c0f325145a91a7d8ac9cb SHA512 e1d7509e4fe0f29e5c340677b58dd53266235a0bee6442936931d8e5860ea210152fc62bc218559439d3ef4ba387c3d1eed772d6c857b628d2a464664b9ff8e2
+EBUILD freecell-solver-6.6.0.ebuild 1235 BLAKE2B 48f66bf618b6f30d1783d516c92f852bae88404dba8a55ae6d1aef372cd8718e8806c6ab856ef349e4252e2b1e86823612f4b9db57b29a08bd6847598e86d0c0 SHA512 987ba84517a56b9a744719222a0570a1198d117911d8cc04eff4fccc799559151179e24a5cb576d0422c8648af05438c5f13f189677237e88b176525071c1c09
 MISC metadata.xml 331 BLAKE2B 6e5ad98bc8e5ee7fef436b385efbc6f160eb41b5d8a246d7dd8d5f17449374fa301b10b723feb33ce9b5e33c4793c9b4a3e1dbd54f4f62f9063d76b85231124c SHA512 fc38c7c35294f50b8dd6dd17b866c83150af04af729dbcb9a9dc6e9ddd032bf7706c658c058655174a0c4e446e7bef6fa0c85c29dc2907f6b66e74a06deb475c
diff --git a/dev-games/freecell-solver/files/freecell-solver-6.6.0-no-git-clone-kthxbye.patch b/dev-games/freecell-solver/files/freecell-solver-6.6.0-no-git-clone-kthxbye.patch
new file mode 100644
index 000000000000..db2cc0bfb915
--- /dev/null
+++ b/dev-games/freecell-solver/files/freecell-solver-6.6.0-no-git-clone-kthxbye.patch
@@ -0,0 +1,39 @@
+From edbcda19be3720b164e9961226bfa74271f2b9b5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 11:35:28 +0100
+Subject: [PATCH] Make sure to disable futile external repo fetching
+
+---
+ CMakeLists.txt                 | 2 +-
+ cmake/rinutils_bootstrap.cmake | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c991dcb47..b0c13d4ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,7 +210,7 @@ ENDIF ()
+ # Clone the patsolve repository with the appropriate branch.
+ SET (pats_dir "patsolve")
+ 
+-IF (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${pats_dir}")
++IF (0)
+     EXECUTE_PROCESS(
+         COMMAND "git" "clone" "https://github.com/shlomif/patsolve.git" "${pats_dir}"
+         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+diff --git a/cmake/rinutils_bootstrap.cmake b/cmake/rinutils_bootstrap.cmake
+index 3879bce85..cf2ea168d 100644
+--- a/cmake/rinutils_bootstrap.cmake
++++ b/cmake/rinutils_bootstrap.cmake
+@@ -5,7 +5,7 @@ MACRO(RINUTILS_SET_UP_FLAGS)
+     SET (rinutils_inc_dir "${rinutils_dir_absolute}/rinutils/include")
+     SET (rinutils_git_tag "0.6.0")
+ 
+-    find_package(Rinutils QUIET)
++    find_package(Rinutils REQUIRED)
+     IF ("${Rinutils_FOUND}")
+         INCLUDE_DIRECTORIES(AFTER ${RINUTILS_INCLUDE_DIR} ${RINUTILS_INCLUDE_DIRS})
+     ELSE ()
+-- 
+2.34.1
+
diff --git a/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild b/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild
new file mode 100644
index 000000000000..29ec00776400
--- /dev/null
+++ b/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-single-r1
+
+DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
+HOMEPAGE="https://fc-solve.shlomifish.org/"
+SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="tcmalloc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/rinutils
+	$(python_gen_cond_dep '
+		dev-python/pysol_cards[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+	tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+	dev-perl/Moo
+	dev-perl/Path-Tiny
+	dev-perl/Template-Toolkit
+"
+
+DOCS=( README.html )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.22.1-no-docs.patch"
+	"${FILESDIR}/${P}-no-git-clone-kthxbye.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang board_gen
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBRARY=OFF
+		-DFCS_BUILD_DOCS=OFF
+		-DFCS_WITH_TEST_SUITE=OFF # requires unpackaged dependencies
+		-DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest
index 38020acef6fd..f1b5d543931c 100644
--- a/dev-games/mygui/Manifest
+++ b/dev-games/mygui/Manifest
@@ -2,10 +2,10 @@ AUX mygui-3.2.2-FHS.patch 1209 BLAKE2B 7bd14cfe0653ac74df4ab5ac6be69a9d958377958
 AUX mygui-3.2.2-build.patch 2801 BLAKE2B c414f7249f63c5addd0c616df3a0ac0979fc7c8565b9c12c8f81007f152c129d868ec9359641ce59abca4b9958bc3fa39bb906b221d66fef4e9df53135bf18da SHA512 954f95759967a1a4f4eb6952f6abbabbe3157703d5d0014299a8cd5060cd5fb0c7faa635ad10e5c23e0bc0c8d8089c29c14952058a7bdcc2643f06c226f5524d
 AUX mygui-3.2.2-c++17.patch 824 BLAKE2B d70fb25cffd51ac28aa0d443d0162ed76f11624e311fdbf71f1fd0321670203b9925fb9494586e9f289f9781faee3822073b06ac0ebd61a739350b7fdf38c401 SHA512 cf532e56e9324ac956745639a1a625cd54a494dafe1aa0bb086ce851428d758c71f13c77e415f2e0611b6772335902b225e128f15883c7adfd4d7c11a625c6ed
 AUX mygui-3.2.2-underlinking.patch 398 BLAKE2B 0e4ebdf58228ac6b6368202c40137feadf5f3adeb4f2e20020d2ed8db6db17a1ca0715e1018a5e851cc8a38163e4607e9f705f20f3190fa09de9de0eb7ab3099 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9
-AUX mygui-3.4.0-build.patch 2492 BLAKE2B 2819c235df3d479d42831fcf2a80a9a2e165b98acc87c7cd3105b5285b0bfa0d0e84ae2c8642d91260096cf2404e9a690812008e92cd5a5167e1dffc89f49809 SHA512 9dc685f71d14e369a8a3fff5e10572817a4d1a943471decb94e3d25133d53c5cc7401f8c360f0bcb1cc1188beb6e1a76521d51cdb88cb1f32eda1715c765da2e
-AUX mygui-3.4.0-underlinking.patch 491 BLAKE2B bc7d2facd04637f4d6b4ca2c2a353a66c16ce781050ecf6f59a461acedaa0dcb6293742bd83214c4e32bdbcda18ae461b9f60e90fd6f450832ba5ef002fb468f SHA512 0cdcd0906b52abc7843ae588d7afd8f1450bcf7162d41efb2af6a3744a64bb6e02ffdcdc6cd3346f72be7f5361a25bf35d937fac983814077deb339ed7b7dbfa
+AUX mygui-3.4.1-FHS.patch 684 BLAKE2B 393855309d895c2a30565ff05ec32ff8b78d47d1073038be9ad5110473be05ee9e93773f845f076b52e4aeda1b704d91f13218d58c0c4b723249ed395fb388f2 SHA512 1afabf04b4365e51a74d49d54b8a44b8f4d03e244bf04fd44de1b1d53cffc5ab2b31f9ef1eda6ee52446bde0ecd11b1174abe3d16b7e5ae8ef87a477f75cb255
+AUX mygui-3.4.1-build.patch 2056 BLAKE2B 7b7c304f3c5df023c1836df0d60d52b4d56a84134e2a8f4e4180317f54f6d3407f7c2fac7a138dfb70c4b7e6ad99a86047fd80316fcae9d8c8d821a648f5963f SHA512 a745eaf7f605c93d59781615cf1e0cbba0dbf2dd67de2ab04e25e96bc4fbd3a602c9460f9e0a73e9f7781cf355ebcc69e38f1530c7ec01d2ec630eff43c062e8
 DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4
-DIST mygui-3.4.0.tar.gz 22391483 BLAKE2B 5628cca98625285368b9363acd95e541e1ba7d86fd1d471f687c553d0f0abd9ccb2f47981cf0bb91f44a68489bb7ec3fbcb451734758e2435ab9ef320214465a SHA512 3f560fd9c7e5b514da40e41c7753dc20649f80b763f5ee20afc9627df3be14242ea833eff09eac16b9e88b1c9fbed7c09def0c5068c832e710c247191fb53487
+DIST mygui-3.4.1.tar.gz 22433198 BLAKE2B 400f88a63df1bff5554236a0aeb58218fdb6100aa84f9eb1ac111adabfa45ae7eb1c3124bb04f3ef57587566e716d3242daa9cb5866d7ccc43a56c9605952411 SHA512 9d36272345b1a755db88848c8a0919feb6f8ae09d048efa3b8ed833bb5ddb9c65e1e7e0d26ad39eecd2a4de53fb654f4099c555e9ebd21ce9541a1a74580ef05
 EBUILD mygui-3.2.2.ebuild 3764 BLAKE2B c049422721ae3108e005e733203482d1dbdb71b69199bac962a2389ee4446af68fc9449c456588ab08a46e6a3c5ccd08ac72050fa43d19a3d836fb1966a01c47 SHA512 362d03af0d91d919c099c3d32954b5039fa4b6fa211c026f0f7a71937d06ae51162308b3117cf57d33d1ea3c01c461b7c45c48dbee86028d7aa32b6271ea2e21
-EBUILD mygui-3.4.0.ebuild 3757 BLAKE2B b26ff57ef8140c3d81b37cde00aa4ca55256a343f49b6be8de2947e0c922d86f96670f5e28f79984ddeabd0cbd14439fe3a33b12e33e2c13445be03ca478a5db SHA512 e91dd037e258fd1dc445280a697295aa5e6b6580bdea5a8334936b3aad1a9de64b6b2e34f68d54165ad03d10bd625bc1938654050986f5039e6bb088a145de15
+EBUILD mygui-3.4.1.ebuild 3633 BLAKE2B d74e0452e81390c944197ccd7e80dac4bcdbac30237c5c725914d765ae8e3477581118bccbe2e72440426655ecbaec1ccf578fdcbf0fd5f87c69d4229bc072ea SHA512 50f083efd2e61a9bd998e6e02d8696320d42c4c28fe60a609de0ef25d95104bbf162a857317f3a3babd516d33b7517c47bc222433dfe3371417294e49953eb88
 MISC metadata.xml 2013 BLAKE2B a3c0a6ee33840e2c70951ec6ede217ef546cd584c241f79f98a0eb5396fa2e6011f01b23452907bec397395fdb3b6b5f3ed03c8738cf377ced9fa0aef930a859 SHA512 0906364e391e490e1be617f64e7b67dc08675f6106c21b46fff53f2ac94e3fc36658c2f8f926eae66689dfc5b6dc34b4931fd24548554df63629dd38b5560f5d
diff --git a/dev-games/mygui/files/mygui-3.4.0-underlinking.patch b/dev-games/mygui/files/mygui-3.4.0-underlinking.patch
deleted file mode 100644
index 1dcf2dbbbfda..000000000000
--- a/dev-games/mygui/files/mygui-3.4.0-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jun 15 10:42:42 UTC 2012
-Subject: build system
-
-fix underlinking
-
-diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt
---- a/MyGUIEngine/CMakeLists.txt
-+++ b/MyGUIEngine/CMakeLists.txt
-@@ -44,7 +44,10 @@ if (MYGUI_USE_FREETYPE)
- 	target_link_libraries(${PROJECTNAME}
- 		${FREETYPE_LIBRARIES}
- 		${ZLIB_LIBRARIES}
--	)
-+		dl)
-+else()
-+	target_link_libraries(${PROJECTNAME}
-+		dl)
- endif()
- 
- # platform specific dependencies
diff --git a/dev-games/mygui/files/mygui-3.4.1-FHS.patch b/dev-games/mygui/files/mygui-3.4.1-FHS.patch
new file mode 100644
index 000000000000..b6d7bbe8e327
--- /dev/null
+++ b/dev-games/mygui/files/mygui-3.4.1-FHS.patch
@@ -0,0 +1,27 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Oct 27 22:39:31 UTC 2012
+Subject: FHS
+
+paths hardcoded until upstream fixed the logic
+
+--- mygui-MyGUI3.2.2.orig/CMake/InstallResources.cmake
++++ mygui-MyGUI3.2.2/CMake/InstallResources.cmake
+@@ -24,7 +24,7 @@
+ 	else ()
+ 		install(FILES
+ 			${MYGUI_BINARY_DIR}/bin/${FILENAME}
+-			DESTINATION "bin"
++			DESTINATION "/etc/MYGUI"
+ 		)
+ 	endif ()
+ endfunction(install_file)
+@@ -53,7 +53,7 @@
+ 	if (WIN32)
+ 		set(MYGUI_MEDIA_DIR "../../Media")
+ 	elseif (UNIX)
+-		set(MYGUI_MEDIA_DIR "../share/MYGUI/Media")
++		set(MYGUI_MEDIA_DIR "${CMAKE_INSTALL_PREFIX}/share/MYGUI/Media")
+ 	else ()
+ 		set(MYGUI_MEDIA_DIR "../../Media")
+ 	endif ()
+ 
diff --git a/dev-games/mygui/files/mygui-3.4.0-build.patch b/dev-games/mygui/files/mygui-3.4.1-build.patch
index 71ed87d8bcb8..5729be5d4380 100644
--- a/dev-games/mygui/files/mygui-3.4.0-build.patch
+++ b/dev-games/mygui/files/mygui-3.4.1-build.patch
@@ -10,15 +10,6 @@ diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
  # should we build static libs?
  if (MYGUI_STATIC)
    set(MYGUI_LIB_TYPE STATIC)
-@@ -47,7 +49,7 @@ if (UNIX)
-   else ()
-     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
-   endif ()
--  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
-+  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
-   # configure additional packages
-   
 diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
 --- a/CMake/Utils/MyGUIConfigTargets.cmake
 +++ b/CMake/Utils/MyGUIConfigTargets.cmake
diff --git a/dev-games/mygui/mygui-3.4.0.ebuild b/dev-games/mygui/mygui-3.4.1.ebuild
index ab008898965f..4c022f900304 100644
--- a/dev-games/mygui/mygui-3.4.0.ebuild
+++ b/dev-games/mygui/mygui-3.4.1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-CMAKE_REMOVE_MODULES="yes"
 CMAKE_REMOVE_MODULES_LIST="FindFreetype"
-inherit cmake-utils flag-o-matic multilib
+inherit cmake flag-o-matic multilib
 
 MY_PN=MyGUI
 MY_P=${MY_PN}${PV}
@@ -41,9 +40,8 @@ S=${WORKDIR}/mygui-${MY_P}
 STATIC_BUILD=${WORKDIR}/${P}_build_static
 
 PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
 	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${PN}-3.2.2-FHS.patch
+	"${FILESDIR}"/${P}-FHS.patch
 )
 
 pkg_setup() {
@@ -64,15 +62,15 @@ src_configure() {
 			-DMYGUI_BUILD_DOCS=OFF
 			-DMYGUI_INSTALL_DOCS=OFF
 			-DMYGUI_USE_FREETYPE=ON
-			$(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
+			-DMYGUI_BUILD_PLUGINS=$(usex plugins)
 			-DMYGUI_BUILD_DEMOS=OFF
-			-DMYGUI_INSTALL_SAMPLES=OFF
+			-DMYGUI_INSTALL_DEMOS=OFF
 			-DMYGUI_BUILD_TOOLS=OFF
 			-DMYGUI_INSTALL_TOOLS=OFF
 			-DMYGUI_BUILD_WRAPPER=OFF
 			-DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") )
 
-		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_configure
+		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake_src_configure
 		unset mycmakeargs
 	fi
 
@@ -93,12 +91,12 @@ src_configure() {
 	if use ogre && use samples; then
 		mycmakeargs+=(
 			-DMYGUI_BUILD_DEMOS=ON
-			-DMYGUI_INSTALL_SAMPLES=ON
+			-DMYGUI_INSTALL_DEMOS=ON
 		)
 	else
 		mycmakeargs+=(
 			-DMYGUI_BUILD_DEMOS=OFF
-			-DMYGUI_INSTALL_SAMPLES=OFF
+			-DMYGUI_INSTALL_DEMOS=OFF
 		)
 
 	fi
@@ -109,23 +107,23 @@ src_configure() {
 		mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=OFF )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	# build system does not support building static and shared at once,
 	# run a double build
 	if use static-libs ; then
-		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_compile
+		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake_src_compile
 	fi
 
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	use doc && emake -C "${CMAKE_BUILD_DIR}"/Docs api-docs
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use static-libs ; then
 		find "${STATIC_BUILD}" -name "*.a" \! -name "libCommon.a" -exec dolib.a '{}' \;
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 01aaebb5edf6..4632ced9a826 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,6 +1,3 @@
-AUX tiled-1.4.3-python-38.patch 479 BLAKE2B ec7a36fbaddb9cd5b954285e25cd02e1c169e9fce4bb51dcdde528c60849086d4a0cf1bd706b909f2fd87be8174faf0f3488317fb05ed4c801dfffdda9af94f2 SHA512 6694d4bd8d79f5575e1b95fc5aa5b832e2193ff9475ea4e624db12f8305eac5b1a20cac4549ae1924e803ee6f5e9ab7835496c02a66c1e7f834671ada8549ebd
-DIST tiled-1.4.3.tar.gz 17806808 BLAKE2B 81b5a32cc1e6f5f3b4af5520752d34572f0e78aad90df435d075b53ac18b39961aa22d23cff614cd83f0883fd2fd2bca69026160cb8b1b727fddaeff5764babe SHA512 1e75e323733e05563bf542364778d95f2f22484ec0d85b4a9e7fac782c117934b37b049724979be5c83de86a3900c7ca2e9f3c5a660c530d2ecd0f023eb22c2e
 DIST tiled-1.7.2.tar.gz 16743422 BLAKE2B 0d8ae95b2fc68326d0a4989b26535cd72900ddf9674ad892c287f9d7df2f551fc46c9fa9c8991315f55ae90663a9a5b9c4239fd2ed61c240a36a60102b2710b3 SHA512 6d766adbfcb642279eb0ba27410858c54a29ed8e697445b6fb96ce210d0b1433b1ed4715e1d78af3aea8ec71a87b24eea52216bf6236159e0c8fdf87a2339a59
-EBUILD tiled-1.4.3-r1.ebuild 1449 BLAKE2B 017f74d6e359199357991d1c6077a9665dd3bdfcabce2a5a4c68a240aee3010059cd367ae64cfaa6c56f698182292a3725a1b6bb2a363af2e3ddf38b42dbe6ca SHA512 4c23db0081e14bae7e0b0bb6be5c949e46a4ecba6ea7a7f53f4920867ca9538b4201e31f342eae76e85182ca4da0fda2d88ef9a43ca9ef2cc92b39c3ef24b4f7
 EBUILD tiled-1.7.2.ebuild 1428 BLAKE2B d526566cb012670ad4afa0bcca268649007485903bded989a9724d9896a501ca8e5f9f8e1af305eee652941105d6283862393c5f5532da2850c643eee7741f05 SHA512 40e9d5d96c02e7ea4fcb84f31554ea4eb925af949d6d136af1a396a3102505044d4e6c75af3bd9b6efffe995ffd972db747327597c87923bfd1771dbe16176c2
 MISC metadata.xml 298 BLAKE2B b8e8a5e1a77555a31c9ed843b75be176be5bee398cf3c15ca991b6a016183927ead361a2bd460f2df3474b589e6ba569a9cd1ca44c5496a95f5276ee12d8d6da SHA512 762d37280c2078d639da4bc2020b88acff3372868d89302dce385252bd535ce86c6fc8f97b75fed879d6ee07d7de8636b2ea01fe796751d79ed632a5f824ff15
diff --git a/dev-games/tiled/files/tiled-1.4.3-python-38.patch b/dev-games/tiled/files/tiled-1.4.3-python-38.patch
deleted file mode 100644
index 5515fa8fff2f..000000000000
--- a/dev-games/tiled/files/tiled-1.4.3-python-38.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/plugins/python/find_python.pri
-+++ b/src/plugins/python/find_python.pri
-@@ -1,6 +1,10 @@
- !contains(DISABLE_PYTHON_PLUGIN, yes) {
-     unix {
--        packagesExist(python3) {
-+        packagesExist(python3-embed) {
-+            HAVE_PYTHON = yes
-+            CONFIG += link_pkgconfig
-+            PKGCONFIG += python3-embed
-+        } else:packagesExist(python3) {
-             HAVE_PYTHON = yes
-             CONFIG += link_pkgconfig
-             PKGCONFIG += python3
diff --git a/dev-games/tiled/tiled-1.4.3-r1.ebuild b/dev-games/tiled/tiled-1.4.3-r1.ebuild
deleted file mode 100644
index fb10433d8bf5..000000000000
--- a/dev-games/tiled/tiled-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit python-single-r1 qmake-utils xdg-utils
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-arch/zstd:=
-	>=dev-qt/qtcore-5.14:5
-	>=dev-qt/qtdeclarative-5.14:5
-	>=dev-qt/qtgui-5.14:5
-	>=dev-qt/qtnetwork-5.14:5
-	>=dev-qt/qtwidgets-5.14:5
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-PATCHES=( "${FILESDIR}/${P}-python-38.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	eqmake5 \
-		LIBDIR="/usr/$(get_libdir)" \
-		PREFIX="/usr" \
-		SYSTEM_ZSTD="yes" \
-		DISABLE_PYTHON_PLUGIN="$(usex !python)" \
-		USE_FHS_PLUGIN_PATH="true"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}