gentoo resync : 30.05.2020

4 files changed, 139 insertions, 32 deletions

diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index d4220476e22d..6dcb2c2999c0 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -1,4 +1,6 @@
 AUX cegui-0.8.7-icu-59.patch 444 BLAKE2B 7ba31c1a856638be317c0d3166159bea14be9f3ccc79e8b361907e9ba1bf7c07a77ba5cf76a49f33d7ceca8d6aedf659f7bdd2826cc1eec3b72352a8a0ed6d7e SHA512 6a8838e8a6ddfb5b73bb765470185530a81ffeaec9d090e1038d317aca800a987b08d3a82744c0b77266d2f351ae2668bada741b26ac303be052071f9daf3408
+AUX cegui-0.8.7-musl.patch 2017 BLAKE2B a7735ce19c17505be2ba1da5c0aa8fde00ed6cca9926a1586a426a6b56d0fa9bb402a54a8c99b79f58a8adde3edfb79856a2766ca28f8ac92930d4e4004b4dc1 SHA512 c9bece96a6f7600cc59b94391b774acc016e2f33fb608d33aa25ef603b5782f47d338cad6ad244224c861fa00a8ebc0f80f7aa1df4800a7c8347029f2b5e996d
+AUX cegui-0.8.7-python3.patch 1045 BLAKE2B 702c30e85d08e117888d56adaf2c131f9c6410916f08b03ac66efd69230e14b53ee05975e04489f3526fba964a372b340b86acf5a31dda36ddbab40d7f65d944 SHA512 9870e996697775938ca9ba6708dc93d5e59e8a640dd2542c1e8cc8b903ebd1738b11e733f2e9d012f932558a6f77ee8014f0d98133252e2cee2025e664a38e61
 DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56
-EBUILD cegui-0.8.7-r1.ebuild 3257 BLAKE2B 08680f7b90847ad17a4fbdf3d326e219bcb0f5b35ba102e86e6420657d7bacdc1ce793793dcf94ecbf8f9f672aa5d346fb497ff8a391ff565c5f49ab1e8b89f9 SHA512 8a1ad48c6c02d9055c425e325fae1b26a8dc358e8a29ab97e95a362ec8cc13901e0d592d15ad378511f50df4c7c90ca7e9c89db0c4ec558e2a8d1a1a7f60e205
+EBUILD cegui-0.8.7-r1.ebuild 3218 BLAKE2B dd05fabf6a65d69c1752077df3cab2e951db311931324e88b0437992c1e3b20b96779d6b4eff9c44eff4888a587931a697f975d12186918cc8d8165678e753ff SHA512 bf51d3acdbb65d3f96154bb4b0ec0b958a2d3c4a02b825729506e9e7d649685a7b8daf8d9cdc0ec255baea8e081a82c76ffae985867bcf8c10a631fd5365df8a
 MISC metadata.xml 803 BLAKE2B da9534a051925be6cd6d285ce3335c65ba799481840f95aadedb2f81f7a06e05253e8949bf77e7626635437bc5ad5b91af11d6aa452f3524669efdd6216b3bd6 SHA512 47d0eeed54ab5b192051b976a5e1a9790c9e0321753cdc8da73fda4131ac30e40fb57f418418ea7b2bbb30041f76def1a79803d699962488ea4dc1dad50c4996
diff --git a/dev-games/cegui/cegui-0.8.7-r1.ebuild b/dev-games/cegui/cegui-0.8.7-r1.ebuild
index d89518d63680..6e34ca1b15de 100644
--- a/dev-games/cegui/cegui-0.8.7-r1.ebuild
+++ b/dev-games/cegui/cegui-0.8.7-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # TODO: multiple ABI?
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_8 )
+inherit flag-o-matic cmake python-single-r1
 
 DESCRIPTION="Crazy Eddie's GUI System"
 HOMEPAGE="http://www.cegui.org.uk/"
@@ -13,10 +13,10 @@ SRC_URI="mirror://sourceforge/crayzedsgui/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip"
 REQUIRED_USE="|| ( expat tinyxml xerces-c xml )
-	${PYTHON_REQUIRED_USE}" # bug 362223
+	python? ( ${PYTHON_REQUIRED_USE} )" # bug 362223
 
 # gles broken
 #	gles? ( media-libs/mesa[gles1] )
@@ -50,15 +50,27 @@ RDEPEND="
 	tinyxml? ( dev-libs/tinyxml )
 	truetype? ( media-libs/freetype:2 )
 	xerces-c? ( dev-libs/xerces-c )
-	xml? ( dev-libs/libxml2 )
+	xml? ( dev-libs/libxml2:2 )
 	zip? ( sys-libs/zlib[minizip] )"
+
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	opengl? ( media-libs/glm )"
+
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	opengl? ( media-libs/glm )"
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-icu-59.patch
+	"${FILESDIR}"/${P}-python3.patch
+	"${FILESDIR}"/${P}-musl.patch
+)
 
-PATCHES=( "${FILESDIR}"/${P}-icu-59.patch )
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
 
 src_configure() {
 	# http://www.cegui.org.uk/mantis/view.php?id=991
@@ -66,46 +78,46 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF
-		$(cmake-utils_use devil CEGUI_BUILD_IMAGECODEC_DEVIL)
-		$(cmake-utils_use freeimage CEGUI_BUILD_IMAGECODEC_FREEIMAGE)
+		-DCEGUI_BUILD_IMAGECODEC_DEVIL=$(usex devil)
+		-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=$(usex freeimage)
 		-DCEGUI_BUILD_IMAGECODEC_PVR=OFF
 		-DCEGUI_BUILD_IMAGECODEC_SILLY=OFF
 		-DCEGUI_BUILD_IMAGECODEC_STB=ON
 		-DCEGUI_BUILD_IMAGECODEC_TGA=ON
-		$(cmake-utils_use lua CEGUI_BUILD_LUA_GENERATOR)
-		$(cmake-utils_use lua CEGUI_BUILD_LUA_MODULE)
-		$(cmake-utils_use python CEGUI_BUILD_PYTHON_MODULES)
+		-DCEGUI_BUILD_LUA_GENERATOR=$(usex lua)
+		-DCEGUI_BUILD_LUA_MODULE=$(usex lua)
+		-DCEGUI_BUILD_PYTHON_MODULES=$(usex python)
 		-DCEGUI_BUILD_RENDERER_DIRECTFB=OFF
-		$(cmake-utils_use irrlicht CEGUI_BUILD_RENDERER_IRRLICHT)
+		-DCEGUI_BUILD_RENDERER_IRRLICHT=$(usex irrlicht)
 		-DCEGUI_BUILD_RENDERER_NULL=ON
-		$(cmake-utils_use ogre CEGUI_BUILD_RENDERER_OGRE)
-		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL)
-		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL3)
+		-DCEGUI_BUILD_RENDERER_OGRE=$(usex ogre)
+		-DCEGUI_BUILD_RENDERER_OPENGL=$(usex opengl)
+		-DCEGUI_BUILD_RENDERER_OPENGL3=$(usex opengl)
 		-DCEGUI_BUILD_RENDERER_OPENGLES=OFF
-		$(cmake-utils_use static-libs CEGUI_BUILD_STATIC_CONFIGURATION)
+		-DCEGUI_BUILD_STATIC_CONFIGURATION=$(usex static-libs)
 		-DCEGUI_BUILD_TESTS=OFF
-		$(cmake-utils_use expat CEGUI_BUILD_XMLPARSER_EXPAT)
-		$(cmake-utils_use xml CEGUI_BUILD_XMLPARSER_LIBXML2)
+		-DCEGUI_BUILD_XMLPARSER_EXPAT=$(usex expat)
+		-DCEGUI_BUILD_XMLPARSER_LIBXML2=$(usex xml)
 		-DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
-		$(cmake-utils_use tinyxml CEGUI_BUILD_XMLPARSER_TINYXML)
-		$(cmake-utils_use xerces-c CEGUI_BUILD_XMLPARSER_XERCES)
-		$(cmake-utils_use truetype CEGUI_HAS_FREETYPE)
-		$(cmake-utils_use zip CEGUI_HAS_MINIZIP_RESOURCE_PROVIDER)
-		$(cmake-utils_use pcre CEGUI_HAS_PCRE_REGEX)
+		-DCEGUI_BUILD_XMLPARSER_TINYXML=$(usex tinyxml)
+		-DCEGUI_BUILD_XMLPARSER_XERCES=$(usex xerces-c)
+		-DCEGUI_HAS_FREETYPE=$(usex truetype)
+		-DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=$(usex zip)
+		-DCEGUI_HAS_PCRE_REGEX=$(usex pcre)
 		-DCEGUI_SAMPLES_ENABLED=OFF
-		$(cmake-utils_use bidi CEGUI_USE_FRIBIDI)
+		-DCEGUI_USE_FRIBIDI=$(usex bidi)
 		-DCEGUI_USE_MINIBIDI=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && emake -C "${BUILD_DIR}" html
+	cmake_src_compile all $(usex doc html "")
 }
 
 src_install() {
-	cmake-utils_src_install
-	use doc && dohtml "${BUILD_DIR}"/doc/doxygen/html/*
+	cmake_src_install
+	docinto html
+	use doc && dodoc -r "${BUILD_DIR}"/doc/doxygen/html/*
 }
diff --git a/dev-games/cegui/files/cegui-0.8.7-musl.patch b/dev-games/cegui/files/cegui-0.8.7-musl.patch
new file mode 100644
index 000000000000..6eb62018dcfc
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.8.7-musl.patch
@@ -0,0 +1,72 @@
+From e7611d3ef0b9ab2e00f485030234dea3a58c7aa4 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 16 May 2020 20:07:02 +0100
+Subject: [PATCH] Fix debug build and rework Exceptions includes logic
+
+Commit 3ddf92058392 broke the debug build. HAVE_EXECINFO_H is never
+defined by the build system so this header is never included, even
+when it is needed by the debug code.
+
+The right way to fix this is only to include these headers when debug
+is actually enabled. This does mean that the debug build is still
+broken under musl but fixing that would require using libunwind
+instead.
+---
+ cegui/src/Exceptions.cpp | 16 ++++------------
+ 1 file changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/cegui/src/Exceptions.cpp b/cegui/src/Exceptions.cpp
+index 138081a..934989e 100644
+--- a/cegui/src/Exceptions.cpp
++++ b/cegui/src/Exceptions.cpp
+@@ -33,12 +33,13 @@
+ 
+ #if defined( __WIN32__ ) || defined( _WIN32)
+ #   include <windows.h>
++#elif defined(__ANDROID__)
++#   include <android/log.h>
+ #endif
+ 
++#if defined(_DEBUG) || defined(DEBUG)
+ #if defined(_MSC_VER)
+ #   include <dbghelp.h>
+-#elif defined(__ANDROID__)
+-#   include <android/log.h>
+ #elif     (defined(__linux__) && !defined(__ANDROID__)) \
+       ||  defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) \
+       ||  defined(__HAIKU__)
+@@ -47,6 +48,7 @@
+ #   include <cxxabi.h>
+ #   include <cstdlib>
+ #endif
++#endif
+ 
+ // Start of CEGUI namespace section
+ namespace CEGUI
+@@ -57,14 +59,6 @@ bool Exception::d_stdErrEnabled(true);
+ //----------------------------------------------------------------------------//
+ static void dumpBacktrace(size_t frames)
+ {
+-
+-#if defined(__ANDROID__)
+-
+-    // Not implemented yet.
+-    CEGUI_UNUSED(frames);
+-
+-#else
+-
+ #if defined(_DEBUG) || defined(DEBUG)
+ #if defined(_MSC_VER)
+     SymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_INCLUDE_32BIT_MODULES);
+@@ -187,8 +181,6 @@ static void dumpBacktrace(size_t frames)
+ 
+     CEGUI_UNUSED(frames);
+ 
+-#endif
+-
+ #endif
+ }
+ 
+-- 
+2.26.2
+
diff --git a/dev-games/cegui/files/cegui-0.8.7-python3.patch b/dev-games/cegui/files/cegui-0.8.7-python3.patch
new file mode 100644
index 000000000000..354f8cc65c8c
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.8.7-python3.patch
@@ -0,0 +1,21 @@
+From b53f162767bd18aa7dfebe322a7af65593c753f5 Mon Sep 17 00:00:00 2001
+From: ATAGOYAMA Tanuki <s172262@yahoo.co.jp>
+Date: Tue, 21 Nov 2017 20:51:36 +0900
+Subject: [PATCH] cegui/src/ScriptModules/Python/binding/CMakeLists.txt: fix
+ cmake error
+
+---
+ cegui/src/ScriptModules/Python/bindings/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cegui/src/ScriptModules/Python/bindings/CMakeLists.txt b/cegui/src/ScriptModules/Python/bindings/CMakeLists.txt
+index 758788c67..5cc9d5620 100644
+--- a/cegui/src/ScriptModules/Python/bindings/CMakeLists.txt
++++ b/cegui/src/ScriptModules/Python/bindings/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ execute_process(
+-    COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(plat_specific=True, prefix=\"\")"
++    COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; print (distutils.sysconfig.get_python_lib(plat_specific=True, prefix=\"\"))"
+     OUTPUT_VARIABLE CEGUI_PYTHON_INSTALL_DIR
+     OUTPUT_STRIP_TRAILING_WHITESPACE
+ )