gentoo resync : 15.01.2020

3 files changed, 44 insertions, 10 deletions

diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
index afc325d031c8..c6f1f7668e1f 100644
--- a/games-strategy/ufoai/Manifest
+++ b/games-strategy/ufoai/Manifest
@@ -1,6 +1,7 @@
 AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5adf981e5062eb75bffaac51c127fe056e00da59238d91a0b1916d6325ea7e643a87e0945ac3ef20d8f2b958cc88904d96ed9c3 SHA512 b8a61ca5be370bc7fec5d97317e950b2654e6ffe4ffef4473b64f1a37af5dfbfa9152ef4e5bb11e2217bdadae04e7499ef19b67bfdfb32c5ab4a200ac5798ffc
+AUX ufoai-2.5.0_p20180603-mxml3.patch 913 BLAKE2B e9d731a506bfd04d1e6fcf323c9acfcf3c895cf26dc8de308dcbc2ea62b67c643f1dcf58f8ff6087919887d0c8107ffac513c49bcd72a811238dea60edaf7dc6 SHA512 4197a7d444d1180362535f69a03bac3ab28473b1349b3c1d5daf2b360d0a7c5c00b07b6996274d08d3a52f9322f709478bd2c077c786e9501b596a6471eec74d
 DIST ufoai-2.5-data.tar 1277143040 BLAKE2B 20795ec6ebc976087f28fd0e912190bd9094494cc1b206bcc8e1956dec148cb7ab96f244db22e4836b91c0ecfae794cd206296e898015453d8ad6625d4e4ab32 SHA512 9a7be359c82cd633db657c8619cb488b5d41b9f93cd10bdeffd5896d8a1ba3bb828b5969acd14c2a69abb3f53f18113af4ca19435aea80ded94d8df68b11deec
 DIST ufoai-2.5-mappack.tar.bz2 12200150 BLAKE2B d20f96f74a4b71a4ff55e4e3f81380ee35a71c6e34d35e6300487c916f2d836e240428e8f8529cca13d46ccd5440e7f59d5bfe5f451a2cd84469f8f1e85dc796 SHA512 0f44cc3d99ceb80f91e5df0f7cbd57ce3170f5635feb082c002ab9a0f4f81216b05c346c698475c33e88f97032186f4620bad71d02bfa95ecb5c5d4f68c71994
 DIST ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip 33194032 BLAKE2B caebfe5ca0eaa6376659d4aa69132c29aa4af870135a769af3541bd919164d79ab9dfe8007a40bb95507a443f6f1d968bb85b1befe8b6999f9033a0d74d7a7fb SHA512 825ca6f8ac76a3a60746ac1be4406445dd18bab80372c21c2ddfcf4d999db8549614df41386e94197013bb7b4b342ac6d9be8c969b5e1be79e8ee25cf45719c6
-EBUILD ufoai-2.5.0_p20180603.ebuild 3972 BLAKE2B dc47c6537bbf7f4f824300bb639009b64d7cb27fe0f36a334c79617fdac03ab4c4c7d2ef1068121c8730c8775bdc988828496f9366507dde30154b756ecf78f8 SHA512 65256cda61fda4e051a859836841fa8575e8dd224242781e7b444c403bc51ef71807eed6ba919194a9d31719b64c67a430df3b92959ff0f4654b04bf7a38f6e6
+EBUILD ufoai-2.5.0_p20180603.ebuild 3901 BLAKE2B 604c11c940c4a2fda1451d0544c6601c529e07e780b58ca5a84340da4c24c7a54ecd8e4d0bcc29d4d91fbd46aab82c34d0ce9400c2ab5dd6ae1969e9e5fbe2f7 SHA512 b7c06c9bf9e7325359dcde9c29fc918370a4a87248fb0b0ec1eaaae2e129890ef4b06f55297e7007d01d047ebd9fb0a25c68aae40e652da18c7ca2c9dd5010db
 MISC metadata.xml 536 BLAKE2B d0037cae0706304da8c17767d8980eadd1b437bce5f75e980e3a42113b2596d6ed0017962720a9f0c1cc726ceb63028249d5b87b57cf1166dee03d4b884f5d42 SHA512 e02322e3077645800fdc90673261658fe0c33f5e20282cdf40a1867ce85e07e79967f38999031c652f259520489cc65942ae252f8a26182cbdeae6ac5024271d
diff --git a/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-mxml3.patch b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-mxml3.patch
new file mode 100644
index 000000000000..256b43e94b2c
--- /dev/null
+++ b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-mxml3.patch
@@ -0,0 +1,29 @@
+From 163073ab9527cdaa33d77a713b8e46ff462a2b5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tam=C3=A1s=20Feh=C3=A9rv=C3=A1ri?=
+ <geever@users.sourceforge.net>
+Date: Sat, 3 Aug 2019 15:21:05 +0200
+Subject: [PATCH] * {{Bug|5739}} MiniXML (mxml) 3.x compatibility
+
+---
+ src/common/xml.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/xml.cpp b/src/common/xml.cpp
+index 7aeceb3a29..5a66ccc887 100644
+--- a/src/common/xml.cpp
++++ b/src/common/xml.cpp
+@@ -509,8 +509,13 @@ static mxml_type_t mxml_ufo_type_cb (xmlNode_t* node)
+ 	/* You can lookup attributes and/or use the
+ 	 * element name, hierarchy, etc... */
+ 	const char* type = mxmlElementGetAttr(node, "type");
+-	if (type == nullptr)
++	if (type == nullptr) {
++#ifdef MXML_MAJOR_VERSION
++		type = mxmlGetElement(node);
++#else
+ 		type = node->value.element.name;
++#endif
++	}
+ 
+ 	if (Q_streq(type, "int"))
+ 		return MXML_INTEGER;
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
index 0fd98165739d..2ce3bcbcdbe8 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop flag-o-matic gnome2-utils toolchain-funcs versionator
+inherit desktop flag-o-matic toolchain-funcs xdg
 
 # 2.5.0 requires several patches
 COMMIT="8b4533e85fdc0665889ff285e1521432084ee784"
 
 # UFO:AI v2.5.0 was uploaded to SourceForge as 2.5
-DIST_VERSION=$(get_version_component_range 1-2)
+DIST_VERSION=$(ver_cut 1-2)
 
 # Install game data here
 DATADIR="/usr/share/${PN}"
@@ -30,6 +30,7 @@ IUSE="+client cpu_flags_x86_sse debug editor server"
 REQUIRED_USE="|| ( client editor server )"
 
 RDEPEND="
+	dev-libs/mxml
 	net-misc/curl
 	sys-libs/zlib
 
@@ -75,7 +76,11 @@ DEPEND="
 "
 
 S="${WORKDIR}/${PN}-code-${COMMIT}"
-PATCHES=( "${FILESDIR}"/${P}-install.patch )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-install.patch
+	"${FILESDIR}"/${P}-mxml3.patch
+)
 
 src_unpack() {
 	use editor && unpack ${PN}-${DIST_VERSION}-mappack.tar.bz2
@@ -89,6 +94,9 @@ src_prepare() {
 
 	# Make the build system a bit happier, will be fixed upstream
 	mkdir -p base/{maps,models} contrib/installer/mojosetup/scripts || die
+
+	# Remove bundled mxml
+	rm -r src/libs/mxml/ || die
 }
 
 src_configure() {
@@ -160,7 +168,3 @@ src_install() {
 		doins -r "${WORKDIR}"/${PN}-${DIST_VERSION}-mappack/*
 	fi
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }