[gentoo-commits] repo/gentoo:master commit in: dev-games/mygui/, dev-games/mygui/files/

["Sam James" <sam@gentoo.org>]

commit:     7d97869582c5d3310410c146f3cc5f793987438a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 05:03:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 05:03:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d978695

dev-games/mygui: drop 3.2.2

Closes: https://bugs.gentoo.org/823994
Closes: https://bugs.gentoo.org/665804
Closes: https://bugs.gentoo.org/625362
Closes: https://bugs.gentoo.org/828736
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-games/mygui/Manifest                           |   1 -
 dev-games/mygui/files/mygui-3.2.2-FHS.patch        |  44 -------
 dev-games/mygui/files/mygui-3.2.2-build.patch      |  61 ---------
 dev-games/mygui/files/mygui-3.2.2-c++17.patch      |  27 ----
 .../mygui/files/mygui-3.2.2-underlinking.patch     |  20 ---
 dev-games/mygui/mygui-3.2.2.ebuild                 | 144 ---------------------
 6 files changed, 297 deletions(-)

diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest
index 907e4d1b27ed..eaf910c62584 100644
--- a/dev-games/mygui/Manifest
+++ b/dev-games/mygui/Manifest
@@ -1,2 +1 @@
-DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4
 DIST mygui-3.4.1.tar.gz 22433198 BLAKE2B 400f88a63df1bff5554236a0aeb58218fdb6100aa84f9eb1ac111adabfa45ae7eb1c3124bb04f3ef57587566e716d3242daa9cb5866d7ccc43a56c9605952411 SHA512 9d36272345b1a755db88848c8a0919feb6f8ae09d048efa3b8ed833bb5ddb9c65e1e7e0d26ad39eecd2a4de53fb654f4099c555e9ebd21ce9541a1a74580ef05

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 827a5384a718..000000000000
--- a/dev-games/mygui/mygui-3.2.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 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
-}