gentoo resync : 05.12.2021

5 files changed, 42 insertions, 47 deletions

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 '{}' \;