gentoo resync : 20.03.2022

7 files changed, 4 insertions, 306 deletions

diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest
index f4b94dff10e8..e369fbf2c657 100644
--- a/dev-games/mygui/Manifest
+++ b/dev-games/mygui/Manifest
@@ -1,11 +1,5 @@
-AUX mygui-3.2.2-FHS.patch 1209 BLAKE2B 7bd14cfe0653ac74df4ab5ac6be69a9d95837795820baf5e0e6a11a03448f57cf761f240d3fa62e2f1ef121ac2e9b48b802edf74905fdf68f6744773f612cbe9 SHA512 21aba7d654a7197423bdeaa06fa79219d850c76248546227ece1f4916072289f0ebf68a9ad9a4569a1d5dfc15cf86762db3c0d4d58f4c233c1b4293ffb35e50e
-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.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.1.tar.gz 22433198 BLAKE2B 400f88a63df1bff5554236a0aeb58218fdb6100aa84f9eb1ac111adabfa45ae7eb1c3124bb04f3ef57587566e716d3242daa9cb5866d7ccc43a56c9605952411 SHA512 9d36272345b1a755db88848c8a0919feb6f8ae09d048efa3b8ed833bb5ddb9c65e1e7e0d26ad39eecd2a4de53fb654f4099c555e9ebd21ce9541a1a74580ef05
-EBUILD mygui-3.2.2.ebuild 3771 BLAKE2B 8adb10657584c8cf1b702ba9d0f0a440b4ff04e18fdf2279ac0eb12a8c91c9180a247e583edafd16357a46d497648ff287e0870d6ef820ab143df7efbd077281 SHA512 6b0c73741a810d27b3e804ffd32bc99d3d58ee2539b0fa4196d7d40d7af75755c5a1a45e2c94a64f0679c0d19d45359c211629fb797ba86839951088ab63cca7
-EBUILD mygui-3.4.1.ebuild 3640 BLAKE2B 5fc4ad05dc30911521924ce35ce864eb162f38a0c0ed7c63a253337270c1f9858b8790853eff4e8b06a4733f16c3fb56f960b0ff7bc0fa2d591441d0321e5e08 SHA512 46f13ae757d37a29c8be7d031000b22f39cfdbac6f5ed1c2d27feb0ca3c442c23db0de5841dbcc60169919b1ff4e2d8b1a355795a290130347cf8911a43b285f
+EBUILD mygui-3.4.1.ebuild 3638 BLAKE2B 8cc3248b6f44fc5cdd96fc09d456936ad5d805a7240c3f3a983688c28d2f1ef8cb45b91dd39efd27ef19b5727c40945fb8140d1a98fa9aedc093f20b2fc2990f SHA512 3cd260f39d8c30c7a231e9bbf64d38fdf8c1f352517713dbc026d1cea390922d487e0fdb67960edacfe9ee1fd12811d97b2458b159ab87c0b1022d12dbf7a55e
 MISC metadata.xml 2013 BLAKE2B a3c0a6ee33840e2c70951ec6ede217ef546cd584c241f79f98a0eb5396fa2e6011f01b23452907bec397395fdb3b6b5f3ed03c8738cf377ced9fa0aef930a859 SHA512 0906364e391e490e1be617f64e7b67dc08675f6106c21b46fff53f2ac94e3fc36658c2f8f926eae66689dfc5b6dc34b4931fd24548554df63629dd38b5560f5d
diff --git a/dev-games/mygui/files/mygui-3.2.2-FHS.patch b/dev-games/mygui/files/mygui-3.2.2-FHS.patch
deleted file mode 100644
index 14d21626ff7b..000000000000
--- a/dev-games/mygui/files/mygui-3.2.2-FHS.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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 ()
---- mygui-MyGUI3.2.2.orig/Common/Base/Ogre/BaseManager.cpp
-+++ mygui-MyGUI3.2.2/Common/Base/Ogre/BaseManager.cpp
-@@ -49,13 +49,13 @@
- 		mWindow(nullptr),
- 		mExit(false),
- 		mPluginCfgName("plugins.cfg"),
--		mResourceXMLName("resources.xml"),
-+		mResourceXMLName("/etc/MYGUI/resources.xml"),
- 		mResourceFileName("MyGUI_Core.xml")
- 	{
- 		#if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
- 			mResourcePath = macBundlePath() + "/Contents/Resources/";
- 		#else
--			mResourcePath = "";
-+			mResourcePath = "/etc/MYGUI/";
- 		#endif
- 	}
- 
diff --git a/dev-games/mygui/files/mygui-3.2.2-build.patch b/dev-games/mygui/files/mygui-3.2.2-build.patch
deleted file mode 100644
index a16b27c285b7..000000000000
--- a/dev-games/mygui/files/mygui-3.2.2-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ru mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake mygui-MyGUI3.2.2/CMake/ConfigureBuild.cmake
---- mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake	2015-01-26 10:32:35.000000000 -0500
-+++ mygui-MyGUI3.2.2/CMake/ConfigureBuild.cmake	2015-03-14 01:09:40.743621643 -0400
-@@ -4,6 +4,8 @@
- # also prepare package files for pkg-config and CMake.
- #######################################################################
- 
-+include(GNUInstallDirs)
-+
- # should we build static libs?
- if (MYGUI_STATIC)
-   set(MYGUI_LIB_TYPE STATIC)
-@@ -47,7 +49,7 @@
-   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 -ru mygui-MyGUI3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake mygui-MyGUI3.2.2/CMake/Utils/MyGUIConfigTargets.cmake
---- mygui-MyGUI3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake	2015-01-26 10:32:35.000000000 -0500
-+++ mygui-MyGUI3.2.2/CMake/Utils/MyGUIConfigTargets.cmake	2015-03-14 01:08:44.905791784 -0400
-@@ -1,6 +1,8 @@
- # Configure settings and install targets
- # FIXME: Copypasted from Ogre and need lots of changes
- 
-+include(GNUInstallDirs)
-+
- if (WIN32)
- 	set(MYGUI_RELEASE_PATH "/Release")
- 	set(MYGUI_RELWDBG_PATH "/RelWithDebInfo")
-@@ -60,6 +62,12 @@
- # install targets according to current build type
- function(mygui_install_target TARGETNAME SUFFIX)
- 	install(TARGETS ${TARGETNAME}
-+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" CONFIGURATIONS Gentoo ""
-+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo ""
-+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo ""
-+		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Gentoo ""
-+	)
-+	install(TARGETS ${TARGETNAME}
- 		RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
- 		LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- 		ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-@@ -171,7 +179,13 @@
- 		endif ()
- 		add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
- 	endif ()
--	set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
-+
-+	# rename demo target^M
-+	if (${SOLUTIONFOLDER} STREQUAL "Demos")
-+		set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER} OUTPUT_NAME MYGUI-${PROJECTNAME})
-+	else()
-+		set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
-+	endif()
- 	
- 	add_dependencies(${PROJECTNAME} MyGUIEngine Common)
- 
diff --git a/dev-games/mygui/files/mygui-3.2.2-c++17.patch b/dev-games/mygui/files/mygui-3.2.2-c++17.patch
deleted file mode 100644
index 1cdf7babeb12..000000000000
--- a/dev-games/mygui/files/mygui-3.2.2-c++17.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/MyGUI/mygui/commit/ced30dac10082ff9593a2c971d26b3aebce6b2be.patch
-https://bugs.gentoo.org/732778
-
-Part of:
-
-From ced30dac10082ff9593a2c971d26b3aebce6b2be Mon Sep 17 00:00:00 2001
-From: George Evmenov <george.evmenov@geocv.com>
-Date: Fri, 26 Jun 2015 12:25:26 +0300
-Subject: [PATCH] do not use nullptr define
-
---- a/MyGUIEngine/include/MyGUI_Prerequest.h
-+++ b/MyGUIEngine/include/MyGUI_Prerequest.h
-@@ -19,13 +19,7 @@
- #define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch)
- 
- #ifndef MYGUI_DONT_REPLACE_NULLPTR
--#	if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
--#		ifndef _MANAGED
--#			ifndef _NATIVE_NULLPTR_SUPPORTED
--#				define nullptr 0
--#			endif
--#		endif
--#	else
-+#	if __cplusplus < 201103L && !defined(_NATIVE_NULLPTR_SUPPORTED)
- #		define nullptr 0
- #	endif
- #endif
diff --git a/dev-games/mygui/files/mygui-3.2.2-underlinking.patch b/dev-games/mygui/files/mygui-3.2.2-underlinking.patch
deleted file mode 100644
index 2d1026856f03..000000000000
--- a/dev-games/mygui/files/mygui-3.2.2-underlinking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jun 15 10:42:42 UTC 2012
-Subject: build system
-
-fix underlinking
-
---- MyGUIEngine/CMakeLists.txt
-+++ MyGUIEngine/CMakeLists.txt
-@@ -48,7 +48,10 @@
- if (MYGUI_USE_FREETYPE)
- 	target_link_libraries(${PROJECTNAME}
- 		${FREETYPE_LIBRARIES}
--	)
-+		dl)
-+else()
-+	target_link_libraries(${PROJECTNAME}
-+		dl)
- endif()
- 
- # platform specific dependencies
diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild
deleted file mode 100644
index 55a3ccd96db5..000000000000
--- a/dev-games/mygui/mygui-3.2.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindFreetype"
-inherit eutils cmake-utils flag-o-matic multilib
-
-MY_PN=MyGUI
-MY_P=${MY_PN}${PV}
-
-DESCRIPTION="A library for creating GUIs for games"
-HOMEPAGE="http://mygui.info/"
-SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug doc +ogre opengl plugins samples static-libs test tools l10n_ru"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="ogre? ( !opengl )
-	opengl? ( !ogre )"
-
-RDEPEND="
-	media-libs/freetype:2
-	ogre? (
-		dev-games/ogre:=[freeimage,opengl]
-		samples? ( dev-games/ois )
-	)
-	opengl? ( virtual/opengl
-		media-libs/glew )
-	tools? ( dev-games/ois )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/mygui-${MY_P}
-STATIC_BUILD=${WORKDIR}/${P}_build_static
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-FHS.patch
-	"${FILESDIR}"/${P}-c++17.patch
-)
-
-pkg_setup() {
-	if use samples && use !ogre ; then
-		ewarn "Samples disabled, because they only work with ogre!"
-		ewarn "Enable ogre USE flag if you want to use samples."
-	fi
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG
-
-	local mycmakeargs=()
-
-	# static configuration
-	if use static-libs ; then
-		mycmakeargs=( -DMYGUI_STATIC=ON
-			-DMYGUI_BUILD_DOCS=OFF
-			-DMYGUI_INSTALL_DOCS=OFF
-			-DMYGUI_USE_FREETYPE=ON
-			$(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
-			-DMYGUI_BUILD_DEMOS=OFF
-			-DMYGUI_INSTALL_SAMPLES=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
-		unset mycmakeargs
-	fi
-
-	# main configuration
-	mycmakeargs=( -DMYGUI_STATIC=OFF
-		$(cmake-utils_use doc MYGUI_BUILD_DOCS)
-		$(cmake-utils_use doc MYGUI_INSTALL_DOCS)
-		-DMYGUI_USE_FREETYPE=ON
-		$(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
-		$(usex ogre "$(cmake-utils_use samples MYGUI_BUILD_DEMOS)" "-DMYGUI_BUILD_DEMOS=OFF")
-		$(usex ogre "$(cmake-utils_use samples MYGUI_INSTALL_SAMPLES)" "-DMYGUI_INSTALL_SAMPLES=OFF")
-		$(cmake-utils_use tools MYGUI_BUILD_TOOLS)
-		$(cmake-utils_use tools MYGUI_INSTALL_TOOLS)
-		$(cmake-utils_use opengl MYGUI_USE_SYSTEM_GLEW)
-		-DMYGUI_BUILD_WRAPPER=OFF
-		-DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") )
-
-	if use tools || (use samples && use ogre) ; then
-		mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=ON )
-	else
-		mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=OFF )
-	fi
-
-	cmake-utils_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
-	fi
-
-	cmake-utils_src_compile
-
-	use doc && emake -C "${CMAKE_BUILD_DIR}"/Docs api-docs
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use static-libs ; then
-		find "${STATIC_BUILD}" -name "*.a" \! -name "libCommon.a" -exec dolib.a '{}' \;
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins "${STATIC_BUILD}"/pkgconfig/MYGUIStatic.pc
-	fi
-
-	if use doc ; then
-		dohtml -r "${CMAKE_BUILD_DIR}"/Docs/html/*
-
-		if use l10n_ru ; then
-			docompress -x /usr/share/doc/${PF}/Papers
-			dodoc -r Docs/Papers
-		fi
-	fi
-
-	keepdir /etc/MYGUI
-	fperms o+w /etc/MYGUI
-
-	# test media not needed at runtime
-	rm -rf "${ED%/}"/usr/share/MYGUI/Media/UnitTests || die
-	# wrapper not available for linux, remove related media
-	rm -rf "${ED%/}"/usr/share/MYGUI/Media/Wrapper || die
-}
-
-pkg_postinst() {
-	elog
-	elog "ogre.cfg and Ogre.log are created as"
-	elog "${EROOT%/}/etc/MYGUI/mygui-ogre.cfg and /etc/MYGUI/mygui-Ogre.log"
-	elog
-}
diff --git a/dev-games/mygui/mygui-3.4.1.ebuild b/dev-games/mygui/mygui-3.4.1.ebuild
index 6bedba772b6d..182b5dbdf3cd 100644
--- a/dev-games/mygui/mygui-3.4.1.ebuild
+++ b/dev-games/mygui/mygui-3.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST="FindFreetype"
-inherit cmake flag-o-matic multilib
+inherit cmake flag-o-matic
 
 MY_PN=MyGUI
 MY_P=${MY_PN}${PV}
@@ -24,7 +24,7 @@ REQUIRED_USE="ogre? ( !opengl )
 RDEPEND="media-libs/freetype:2
 	sys-libs/zlib
 	ogre? (
-		dev-games/ogre:0=[freeimage,opengl]
+		>=dev-games/ogre-1.12:0=[freeimage,opengl]
 		samples? ( dev-games/ois )
 	)
 	opengl? (